Commit 18db73f2 authored by klafyvel's avatar klafyvel Committed by chirac
Browse files

fix dependencies names

parent 93c2d369
......@@ -53,7 +53,7 @@ def _create_api_permission():
api_permission.save()
_create_api_permission()
#_create_api_permission()
def can_view(user, *args, **kwargs):
......
......@@ -15,57 +15,57 @@ class Migration(migrations.Migration):
initial = True
dependencies = []
replaces = [
("cotisations", "0001_initial.py"),
("cotisations", "0002_remove_facture_article.py"),
("cotisations", "0003_auto_20160702_1448.py"),
("cotisations", "0004_auto_20160702_1528.py"),
("cotisations", "0005_auto_20160702_1532.py"),
("cotisations", "0006_auto_20160702_1534.py"),
("cotisations", "0007_auto_20160702_1543.py"),
("cotisations", "0008_auto_20160702_1614.py"),
("cotisations", "0009_remove_cotisation_user.py"),
("cotisations", "0010_auto_20160702_1840.py"),
("cotisations", "0011_auto_20160702_1911.py"),
("cotisations", "0012_auto_20160704_0118.py"),
("cotisations", "0013_auto_20160711_2240.py"),
("cotisations", "0014_auto_20160712_0245.py"),
("cotisations", "0015_auto_20160714_2142.py"),
("cotisations", "0016_auto_20160715_0110.py"),
("cotisations", "0017_auto_20170718_2329.py"),
("cotisations", "0018_paiement_type_paiement.py"),
("cotisations", "0019_auto_20170819_0055.py"),
("cotisations", "0020_auto_20170819_0057.py"),
("cotisations", "0021_auto_20170819_0104.py"),
("cotisations", "0022_auto_20170824_0128.py"),
("cotisations", "0023_auto_20170902_1303.py"),
("cotisations", "0024_auto_20171015_2033.py"),
("cotisations", "0025_article_type_user.py"),
("cotisations", "0026_auto_20171028_0126.py"),
("cotisations", "0027_auto_20171029_1156.py"),
("cotisations", "0028_auto_20171231_0007.py"),
("cotisations", "0029_auto_20180414_2056.py"),
("cotisations", "0030_custom_payment.py"),
("cotisations", "0031_comnpaypayment_production.py"),
("cotisations", "0032_custom_invoice.py"),
("cotisations", "0033_auto_20180818_1319.py"),
("cotisations", "0034_auto_20180831_1532.py"),
("cotisations", "0035_notepayment.py"),
("cotisations", "0036_custominvoice_remark.py"),
("cotisations", "0037_costestimate.py"),
("cotisations", "0038_auto_20181231_1657.py"),
("cotisations", "0039_freepayment.py"),
("cotisations", "0040_auto_20191002_2335.py"),
("cotisations", "0041_auto_20191103_2131.py"),
("cotisations", "0042_auto_20191120_0159.py"),
("cotisations", "0043_separation_membership_connection_p1.py"),
("cotisations", "0044_separation_membership_connection_p2.py"),
("cotisations", "0045_separation_membership_connection_p3.py"),
("cotisations", "0046_article_need_membership.py"),
("cotisations", "0047_article_need_membership_init.py"),
("cotisations", "0048_auto_20201017_0018.py"),
("cotisations", "0049_auto_20201102_2305.py"),
("cotisations", "0050_auto_20201102_2342.py"),
("cotisations", "0051_auto_20201228_1636.py"),
("cotisations", "0001_initial"),
("cotisations", "0002_remove_facture_article"),
("cotisations", "0003_auto_20160702_1448"),
("cotisations", "0004_auto_20160702_1528"),
("cotisations", "0005_auto_20160702_1532"),
("cotisations", "0006_auto_20160702_1534"),
("cotisations", "0007_auto_20160702_1543"),
("cotisations", "0008_auto_20160702_1614"),
("cotisations", "0009_remove_cotisation_user"),
("cotisations", "0010_auto_20160702_1840"),
("cotisations", "0011_auto_20160702_1911"),
("cotisations", "0012_auto_20160704_0118"),
("cotisations", "0013_auto_20160711_2240"),
("cotisations", "0014_auto_20160712_0245"),
("cotisations", "0015_auto_20160714_2142"),
("cotisations", "0016_auto_20160715_0110"),
("cotisations", "0017_auto_20170718_2329"),
("cotisations", "0018_paiement_type_paiement"),
("cotisations", "0019_auto_20170819_0055"),
("cotisations", "0020_auto_20170819_0057"),
("cotisations", "0021_auto_20170819_0104"),
("cotisations", "0022_auto_20170824_0128"),
("cotisations", "0023_auto_20170902_1303"),
("cotisations", "0024_auto_20171015_2033"),
("cotisations", "0025_article_type_user"),
("cotisations", "0026_auto_20171028_0126"),
("cotisations", "0027_auto_20171029_1156"),
("cotisations", "0028_auto_20171231_0007"),
("cotisations", "0029_auto_20180414_2056"),
("cotisations", "0030_custom_payment"),
("cotisations", "0031_comnpaypayment_production"),
("cotisations", "0032_custom_invoice"),
("cotisations", "0033_auto_20180818_1319"),
("cotisations", "0034_auto_20180831_1532"),
("cotisations", "0035_notepayment"),
("cotisations", "0036_custominvoice_remark"),
("cotisations", "0037_costestimate"),
("cotisations", "0038_auto_20181231_1657"),
("cotisations", "0039_freepayment"),
("cotisations", "0040_auto_20191002_2335"),
("cotisations", "0041_auto_20191103_2131"),
("cotisations", "0042_auto_20191120_0159"),
("cotisations", "0043_separation_membership_connection_p1"),
("cotisations", "0044_separation_membership_connection_p2"),
("cotisations", "0045_separation_membership_connection_p3"),
("cotisations", "0046_article_need_membership"),
("cotisations", "0047_article_need_membership_init"),
("cotisations", "0048_auto_20201017_0018"),
("cotisations", "0049_auto_20201102_2305"),
("cotisations", "0050_auto_20201102_2342"),
("cotisations", "0051_auto_20201228_1636"),
]
operations = [
migrations.CreateModel(
......@@ -317,24 +317,34 @@ class Migration(migrations.Migration):
default=True, verbose_name="need membership to be purchased"
),
),
("type_user", models.CharField(
choices=[
("Adherent", "Member"),
("Club", "Club"),
("All", "Both of them"),
],
default="All",
max_length=255,
verbose_name="type of users concerned",
)),
("available_for_everyone", models.BooleanField(default=False, verbose_name="is available for every user")),
(
"type_user",
models.CharField(
choices=[
("Adherent", "Member"),
("Club", "Club"),
("All", "Both of them"),
],
default="All",
max_length=255,
verbose_name="type of users concerned",
),
),
(
"available_for_everyone",
models.BooleanField(
default=False, verbose_name="is available for every user"
),
),
],
options={
"permissions":(("view_article", "Can view an article object"),("buy_every_article", "Can buy every article")),
"verbose_name":"article",
"verbose_name_plural":"articles"
}
"permissions": (
("view_article", "Can view an article object"),
("buy_every_article", "Can buy every article"),
),
"verbose_name": "article",
"verbose_name_plural": "articles",
},
),
migrations.CreateModel(
name="Banque",
......@@ -353,10 +363,14 @@ class Migration(migrations.Migration):
verbose_name="ID",
),
),
("name", models.CharField(max_length=255))
],
options={"permissions": (("view_banque", "Can view a bank object"),), "verbose_name":"bank", "verbose_name_plural":"banks"}
),
("name", models.CharField(max_length=255)),
],
options={
"permissions": (("view_banque", "Can view a bank object"),),
"verbose_name": "bank",
"verbose_name_plural": "banks",
},
),
migrations.CreateModel(
name="Paiement",
bases=(
......@@ -375,15 +389,33 @@ class Migration(migrations.Migration):
),
),
("moyen", models.CharField(max_length=255, verbose_name="method")),
("available_for_everyone", models.BooleanField(default=False, verbose_name="is available for every user",)),
("is_balance", models.BooleanField(default=False,editable=False, verbose_name="is user balance",help_text="There should be only one balance payment method.",validators=[cotisations.models.check_no_balance]))
(
"available_for_everyone",
models.BooleanField(
default=False,
verbose_name="is available for every user",
),
),
(
"is_balance",
models.BooleanField(
default=False,
editable=False,
verbose_name="is user balance",
help_text="There should be only one balance payment method.",
validators=[cotisations.models.check_no_balance],
),
),
],
options={
"permissions":(("view_paiement", "Can view a payment method object"), ("use_every_payment", "Can use every payment method")),
"permissions": (
("view_paiement", "Can view a payment method object"),
("use_every_payment", "Can use every payment method"),
),
"verbose_name": "payment method",
"verbose_name_plural": "payment methods"
}
),
"verbose_name_plural": "payment methods",
},
),
migrations.CreateModel(
name="Cotisation",
bases=(
......@@ -401,18 +433,32 @@ class Migration(migrations.Migration):
verbose_name="ID",
),
),
("date_start_con", models.DateTimeField(verbose_name="start date for the connection")),
("date_end_con", models.DateTimeField(verbose_name="end date for the connection")),
("date_start_memb", models.DateTimeField(verbose_name="start date for the membership")),
("date_end_memb", models.DateTimeField(verbose_name="end date for the membership"))
],
(
"date_start_con",
models.DateTimeField(verbose_name="start date for the connection"),
),
(
"date_end_con",
models.DateTimeField(verbose_name="end date for the connection"),
),
(
"date_start_memb",
models.DateTimeField(verbose_name="start date for the membership"),
),
(
"date_end_memb",
models.DateTimeField(verbose_name="end date for the membership"),
),
],
options={
"permissions":( ("view_cotisation", "Can view a subscription object"),("change_all_cotisation", "Can edit the previous subscriptions")),
"verbose_name":"subscription",
"verbose_name_plural":"subscriptions"
}
),
"permissions": (
("view_cotisation", "Can view a subscription object"),
("change_all_cotisation", "Can edit the previous subscriptions"),
),
"verbose_name": "subscription",
"verbose_name_plural": "subscriptions",
},
),
migrations.CreateModel(
name="BalancePayment",
bases=(cotisations.payment_methods.mixins.PaymentMethodMixin, models.Model),
......@@ -426,13 +472,37 @@ class Migration(migrations.Migration):
verbose_name="ID",
),
),
("minimum_balance", models.DecimalField(verbose_name="minimum balance",help_text="The minimal amount of money allowed for the balance at the end of a payment. You can specify a negative amount.", max_digits=5, decimal_places=2, default=0)),
("maximum_balance", models.DecimalField(verbose_name="maximum balance", help_text="The maximal amount of money allowed for the balance.", max_digits=5, decimal_places=2, default=50, blank=True, null=True)),
("credit_balance_allowed", models.BooleanField(verbose_name="allow user to credit their balance", default=False))
],
options={"verbose_name", "user balance"}
),
(
"minimum_balance",
models.DecimalField(
verbose_name="minimum balance",
help_text="The minimal amount of money allowed for the balance at the end of a payment. You can specify a negative amount.",
max_digits=5,
decimal_places=2,
default=0,
),
),
(
"maximum_balance",
models.DecimalField(
verbose_name="maximum balance",
help_text="The maximal amount of money allowed for the balance.",
max_digits=5,
decimal_places=2,
default=50,
blank=True,
null=True,
),
),
(
"credit_balance_allowed",
models.BooleanField(
verbose_name="allow user to credit their balance", default=False
),
),
],
options={"verbose_name", "user balance"},
),
migrations.CreateModel(
name="ChequePayment",
bases=(cotisations.payment_methods.mixins.PaymentMethodMixin, models.Model),
......@@ -446,9 +516,9 @@ class Migration(migrations.Migration):
verbose_name="ID",
),
),
],
options={"verbose_name", "cheque"}
),
],
options={"verbose_name", "cheque"},
),
migrations.CreateModel(
name="ComnpayPayment",
bases=(cotisations.payment_methods.mixins.PaymentMethodMixin, models.Model),
......@@ -462,13 +532,44 @@ class Migration(migrations.Migration):
verbose_name="ID",
),
),
("payment_credential", models.CharField(max_length=255, default="", blank=True, verbose_name="ComNpay VAT Number")),
("payment_pass", re2o.aes_field.AESEncryptedField(max_length=255, null=True, blank=True, verbose_name="ComNpay secret key")),
("minimum_payment", models.DecimalField(verbose_name="minimum payment", help_text="The minimal amount of money you have to use when paying with ComNpay.", max_digits=5,decimal_places=2,default=1)),
("production", models.BooleanField(default=True, verbose_name="production mode enabled (production URL, instead of homologation)"))
],
options={"verbose_name", "ComNpay"}
),
(
"payment_credential",
models.CharField(
max_length=255,
default="",
blank=True,
verbose_name="ComNpay VAT Number",
),
),
(
"payment_pass",
re2o.aes_field.AESEncryptedField(
max_length=255,
null=True,
blank=True,
verbose_name="ComNpay secret key",
),
),
(
"minimum_payment",
models.DecimalField(
verbose_name="minimum payment",
help_text="The minimal amount of money you have to use when paying with ComNpay.",
max_digits=5,
decimal_places=2,
default=1,
),
),
(
"production",
models.BooleanField(
default=True,
verbose_name="production mode enabled (production URL, instead of homologation)",
),
),
],
options={"verbose_name", "ComNpay"},
),
migrations.CreateModel(
name="FreePayment",
bases=(cotisations.payment_methods.mixins.PaymentMethodMixin, models.Model),
......@@ -482,9 +583,9 @@ class Migration(migrations.Migration):
verbose_name="ID",
),
),
],
options={"verbose_name", "Free payment"}
),
],
options={"verbose_name", "Free payment"},
),
migrations.CreateModel(
name="NotePayment",
bases=(cotisations.payment_methods.mixins.PaymentMethodMixin, models.Model),
......@@ -500,12 +601,8 @@ class Migration(migrations.Migration):
),
("server", models.CharField(max_length=255, verbose_name="server")),
("port", models.PositiveIntegerField(blank=True, null=True)),
("id_note", models.PositiveIntegerField(blank=True, null=True))
],
options={"verbose_name", "NoteKfet"}
),
]
("id_note", models.PositiveIntegerField(blank=True, null=True)),
],
options={"verbose_name", "NoteKfet"},
),
]
......@@ -14,115 +14,115 @@ class Migration(migrations.Migration):
initial = True
dependencies = []
replaces = [
("machines", "0001_initial.py"),
("machines", "0001_squashed_0108.py"),
("machines", "0002_auto_20160703_1444.py"),
("machines", "0003_auto_20160703_1450.py"),
("machines", "0004_auto_20160703_1451.py"),
("machines", "0005_auto_20160703_1523.py"),
("machines", "0006_auto_20160703_1813.py"),
("machines", "0007_auto_20160703_1816.py"),
("machines", "0008_remove_interface_ipv6.py"),
("machines", "0009_auto_20160703_2358.py"),
("machines", "0010_auto_20160704_0104.py"),
("machines", "0011_auto_20160704_0105.py"),
("machines", "0012_auto_20160704_0118.py"),
("machines", "0013_auto_20160705_1014.py"),
("machines", "0014_auto_20160706_1220.py"),
("machines", "0015_auto_20160707_0105.py"),
("machines", "0016_auto_20160708_1633.py"),
("machines", "0017_auto_20160708_1645.py"),
("machines", "0018_auto_20160708_1813.py"),
("machines", "0019_auto_20160718_1141.py"),
("machines", "0020_auto_20160718_1849.py"),
("machines", "0021_auto_20161006_1943.py"),
("machines", "0022_auto_20161011_1829.py"),
("machines", "0023_iplist_ip_type.py"),
("machines", "0024_machinetype_need_infra.py"),
("machines", "0025_auto_20161023_0038.py"),
("machines", "0026_auto_20161026_1348.py"),
("machines", "0027_alias.py"),
("machines", "0028_iptype_domaine_ip.py"),
("machines", "0029_iptype_domaine_range.py"),
("machines", "0030_auto_20161118_1730.py"),
("machines", "0031_auto_20161119_1709.py"),
("machines", "0032_auto_20161119_1850.py"),
("machines", "0033_extension_need_infra.py"),
("machines", "0034_iplist_need_infra.py"),
("machines", "0035_auto_20161224_1201.py"),
("machines", "0036_auto_20161224_1204.py"),
("machines", "0037_domain_cname.py"),
("machines", "0038_auto_20161224_1721.py"),
("machines", "0039_auto_20161224_1732.py"),
("machines", "0040_remove_interface_dns.py"),
("machines", "0041_remove_ns_interface.py"),
("machines", "0042_ns_ns.py"),
("machines", "0043_auto_20170721_0350.py"),
("machines", "0044_auto_20170808_0233.py"),
("machines", "0045_auto_20170808_0348.py"),
("machines", "0046_auto_20170808_1423.py"),
("machines", "0047_auto_20170809_0606.py"),
("machines", "0048_auto_20170823_2315.py"),
("machines", "0049_vlan.py"),
("machines", "0050_auto_20170826_0022.py"),
("machines", "0051_iptype_vlan.py"),
("machines", "0052_auto_20170828_2322.py"),
("machines", "0053_text.py"),
("machines", "0054_text_zone.py"),
("machines", "0055_nas.py"),
("machines", "0056_nas_port_access_mode.py"),
("machines", "0057_nas_autocapture_mac.py"),
("machines", "0058_auto_20171002_0350.py"),
("machines", "0059_iptype_prefix_v6.py"),
("machines", "0060_iptype_ouverture_ports.py"),
("machines", "0061_auto_20171015_2033.py"),
("machines", "0062_extension_origin_v6.py"),
("machines", "0063_auto_20171020_0040.py"),
("machines", "0064_auto_20171115_0253.py"),
("machines", "0065_auto_20171115_1514.py"),
("machines", "0066_srv.py"),
("machines", "0067_auto_20171116_0152.py"),
("machines", "0068_auto_20171116_0252.py"),
("machines", "0069_auto_20171116_0822.py"),
("machines", "0070_auto_20171231_1947.py"),
("machines", "0071_auto_20171231_2100.py"),
("machines", "0072_auto_20180108_1822.py"),
("machines", "0073_auto_20180128_2203.py"),
("machines", "0074_auto_20180129_0352.py"),
("machines", "0075_auto_20180130_0052.py"),
("machines", "0076_auto_20180130_1623.py"),
("machines", "0077_auto_20180409_2243.py"),
("machines", "0078_auto_20180415_1252.py"),
("machines", "0079_auto_20180416_0107.py"),
("machines", "0080_auto_20180502_2334.py"),
("machines", "0081_auto_20180521_1413.py"),
("machines", "0082_auto_20180525_2209.py"),
("machines", "0083_remove_duplicate_rights.py"),
("machines", "0084_dname.py"),
("machines", "0085_sshfingerprint.py"),
("machines", "0086_role.py"),
("machines", "0087_dnssec.py"),
("machines", "0088_iptype_prefix_v6_length.py"),
("machines", "0089_auto_20180805_1148.py"),
("machines", "0090_auto_20180805_1459.py"),
("machines", "0091_auto_20180806_2310.py"),
("machines", "0092_auto_20180807_0926.py"),
("machines", "0093_auto_20180807_1115.py"),
("machines", "0094_auto_20180815_1918.py"),
("machines", "0095_auto_20180919_2225.py"),
("machines", "0096_auto_20181013_1417.py"),
("machines", "0097_extension_dnssec.py"),
("machines", "0098_auto_20190102_1745.py"),
("machines", "0099_role_recursive_dns.py"),
("machines", "0100_auto_20190102_1753.py"),
("machines", "0101_auto_20190108_1623.py"),
("machines", "0102_auto_20190303_1611.py"),
("machines", "0103_auto_20191002_2222.py"),
("machines", "0104_auto_20191002_2231.py"),
("machines", "0105_dname_ttl.py"),
("machines", "0106_auto_20191120_0159.py"),
("machines", "0107_fix_lowercase_domain.py"),
("machines", "0108_ipv6list_active.py"),
("machines", "0001_initial"),
("machines", "0001_squashed_0108"),
("machines", "0002_auto_20160703_1444"),
("machines", "0003_auto_20160703_1450"),
("machines", "0004_auto_20160703_1451"),
("machines", "0005_auto_20160703_1523"),
("machines", "0006_auto_20160703_1813"),
("machines", "0007_auto_20160703_1816"),
("machines", "0008_remove_interface_ipv6"),
("machines", "0009_auto_20160703_2358"),
("machines", "0010_auto_20160704_0104"),
("machines", "0011_auto_20160704_0105"),
("machines", "0012_auto_20160704_0118"),
("machines", "0013_auto_20160705_1014"),
("machines", "0014_auto_20160706_1220"),
("machines", "0015_auto_20160707_0105"),
("machines", "0016_auto_20160708_1633"),
("machines", "0017_auto_20160708_1645"),
("machines", "0018_auto_20160708_1813"),
("machines", "0019_auto_20160718_1141"),
("machines", "0020_auto_20160718_1849"),
("machines", "0021_auto_20161006_1943"),
("machines", "0022_auto_20161011_1829"),
("machines", "0023_iplist_ip_type"),
("machines", "0024_machinetype_need_infra"),
("machines", "0025_auto_20161023_0038"),
("machines", "0026_auto_20161026_1348"),
("machines", "0027_alias"),
("machines", "0028_iptype_domaine_ip"),
("machines", "0029_iptype_domaine_range"),
("machines", "0030_auto_20161118_1730"),
("machines", "0031_auto_20161119_1709"),
("machines", "0032_auto_20161119_1850"),
("machines", "0033_extension_need_infra"),
("machines", "0034_iplist_need_infra"),
("machines", "0035_auto_20161224_1201"),
("machines", "0036_auto_20161224_1204"),
("machines", "0037_domain_cname"),
("machines", "0038_auto_20161224_1721"),
("machines", "0039_auto_20161224_1732"),
("machines", "0040_remove_interface_dns"),
("machines", "0041_remove_ns_interface"),
("machines", "0042_ns_ns"),
("machines", "0043_auto_20170721_0350"),
("machines", "0044_auto_20170808_0233"),
("machines", "0045_auto_20170808_0348"),
("machines", "0046_auto_20170808_1423"),
("machines", "0047_auto_20170809_0606"),
("machines", "0048_auto_20170823_2315"),
("machines", "0049_vlan"),
("machines", "0050_auto_20170826_0022"),
("machines", "0051_iptype_vlan"),
("machines", "0052_auto_20170828_2322"),
("machines", "0053_text"),
("machines", "0054_text_zone"),
("machines", "0055_nas"),
("machines", "0056_nas_port_access_mode"),
("machines", "0057_nas_autocapture_mac"),
("machines", "0058_auto_20171002_0350"),
("machines", "0059_iptype_prefix_v6"),
("machines", "0060_iptype_ouverture_ports"),
("machines", "0061_auto_20171015_2033"),
("machines", "0062_extension_origin_v6"),
("machines", "0063_auto_20171020_0040"),
("machines", "0064_auto_20171115_0253"),
("machines", "0065_auto_20171115_1514"),
("machines", "0066_srv"),
("machines", "0067_auto_20171116_0152"),
("machines", "0068_auto_20171116_0252"),
("machines", "0069_auto_20171116_0822"),