From fc6e7447bfb810b6c9a6ead7dc4919b7767e449f Mon Sep 17 00:00:00 2001 From: Hugo LEVY-FALK Date: Tue, 10 Jul 2018 13:43:21 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Copytright=20oubli=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cotisations/payment_methods/comnpay/urls.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/cotisations/payment_methods/comnpay/urls.py b/cotisations/payment_methods/comnpay/urls.py index d7b1e293..241d53dd 100644 --- a/cotisations/payment_methods/comnpay/urls.py +++ b/cotisations/payment_methods/comnpay/urls.py @@ -1,3 +1,23 @@ +# -*- mode: python; coding: utf-8 -*- +# Re2o est un logiciel d'administration développé initiallement au rezometz. Il +# se veut agnostique au réseau considéré, de manière à être installable en +# quelques clics. +# +# Copyright © 2018 Hugo Levy-Falk +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. from django.conf.urls import url from . import views From 8b2e776097e589c6589579e9579a0c082cc76293 Mon Sep 17 00:00:00 2001 From: Hugo LEVY-FALK Date: Tue, 10 Jul 2018 14:51:08 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Enl=C3=A8ve=20le=20raw=20sql=20des=20migrat?= =?UTF-8?q?ions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0032_chequepayment_comnpaypayment.py | 7 ++++--- .../migrations/0044_remove_payment_pass.py | 20 +++++++++++++++++++ ...y => 0045_remove_unused_payment_fields.py} | 7 ++----- .../migrations/0030_auto_20171004_0235.py | 1 + 4 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 preferences/migrations/0044_remove_payment_pass.py rename preferences/migrations/{0036_auto_20180705_0840.py => 0045_remove_unused_payment_fields.py} (85%) diff --git a/cotisations/migrations/0032_chequepayment_comnpaypayment.py b/cotisations/migrations/0032_chequepayment_comnpaypayment.py index 9c3fab02..81fada42 100644 --- a/cotisations/migrations/0032_chequepayment_comnpaypayment.py +++ b/cotisations/migrations/0032_chequepayment_comnpaypayment.py @@ -31,17 +31,18 @@ def add_comnpay(apps, schema_editor): comnpay.payment = payment comnpay.save() payment.moyen = "ComnPay" + payment.save() class Migration(migrations.Migration): dependencies = [ + ('preferences', '0044_remove_payment_pass'), ('cotisations', '0031_article_allow_self_subscription'), ] operations = [ - migrations.RunSQL('update preferences_assooption set payment_pass="" where id=1;'), migrations.CreateModel( name='ChequePayment', fields=[ @@ -60,6 +61,6 @@ class Migration(migrations.Migration): ], bases=(cotisations.payment_methods.mixins.PaymentMethodMixin, models.Model), ), - migrations.RunPython(add_comnpay), - migrations.RunPython(add_cheque), + # migrations.RunPython(add_comnpay), + # migrations.RunPython(add_cheque), ] diff --git a/preferences/migrations/0044_remove_payment_pass.py b/preferences/migrations/0044_remove_payment_pass.py new file mode 100644 index 00000000..23d45145 --- /dev/null +++ b/preferences/migrations/0044_remove_payment_pass.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.7 on 2018-07-05 13:40 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('preferences', '0035_optionaluser_allow_self_subscription'), + ] + + operations = [ + migrations.RemoveField( + model_name='assooption', + name='payment_pass', + ), + ] + diff --git a/preferences/migrations/0036_auto_20180705_0840.py b/preferences/migrations/0045_remove_unused_payment_fields.py similarity index 85% rename from preferences/migrations/0036_auto_20180705_0840.py rename to preferences/migrations/0045_remove_unused_payment_fields.py index 9dc67dac..49c628d4 100644 --- a/preferences/migrations/0036_auto_20180705_0840.py +++ b/preferences/migrations/0045_remove_unused_payment_fields.py @@ -8,7 +8,8 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('preferences', '0035_optionaluser_allow_self_subscription'), + ('preferences', '0044_remove_payment_pass'), + ('cotisations', '0032_chequepayment_comnpaypayment'), ] operations = [ @@ -20,10 +21,6 @@ class Migration(migrations.Migration): model_name='assooption', name='payment_id', ), - migrations.RemoveField( - model_name='assooption', - name='payment_pass', - ), migrations.RemoveField( model_name='optionaluser', name='allow_self_subscription', diff --git a/topologie/migrations/0030_auto_20171004_0235.py b/topologie/migrations/0030_auto_20171004_0235.py index 83f3b022..ac3ceeba 100644 --- a/topologie/migrations/0030_auto_20171004_0235.py +++ b/topologie/migrations/0030_auto_20171004_0235.py @@ -10,6 +10,7 @@ class Migration(migrations.Migration): dependencies = [ ('topologie', '0029_auto_20171002_0334'), + ('machines', '0049_vlan'), ] operations = [