Skip to content
Extraits de code Groupes Projets
Valider f7f096ed rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

[mig] Migration 13.0

parent 908ffbcd
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -8,7 +8,7 @@ manifest_required_authors=Le Filament ...@@ -8,7 +8,7 @@ manifest_required_authors=Le Filament
manifest_required_keys=license manifest_required_keys=license
manifest_deprecated_keys=description,active manifest_deprecated_keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=14.0 valid_odoo_versions=13.0
[MESSAGES CONTROL] [MESSAGES CONTROL]
disable=all disable=all
......
...@@ -8,7 +8,7 @@ manifest_required_authors=Le Filament ...@@ -8,7 +8,7 @@ manifest_required_authors=Le Filament
manifest_required_keys=license manifest_required_keys=license
manifest_deprecated_keys=description,active manifest_deprecated_keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=14.0 valid_odoo_versions=13.0
[MESSAGES CONTROL] [MESSAGES CONTROL]
disable=all disable=all
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
{ {
"name": "CG SCOP - Cotisations", "name": "CG SCOP - Cotisations",
"summary": "CG SCOP - Cotisations", "summary": "CG SCOP - Cotisations",
"version": "14.0.1.0.0", "version": "13.0.1.0.0",
"author": "Le Filament", "author": "Le Filament",
"license": "AGPL-3", "license": "AGPL-3",
"application": False, "application": False,
......
...@@ -40,9 +40,9 @@ class ScopContributionReport(models.Model): ...@@ -40,9 +40,9 @@ class ScopContributionReport(models.Model):
"amount_total_signed", "amount_total_signed",
"amount_residual_signed", "amount_residual_signed",
"state", "state",
"move_type", "type",
"is_contribution", "is_contribution",
"payment_state", "invoice_payment_state",
], ],
} }
...@@ -73,7 +73,7 @@ class ScopContributionReport(models.Model): ...@@ -73,7 +73,7 @@ class ScopContributionReport(models.Model):
where_str = """ where_str = """
WHERE WHERE
i.state = 'posted' i.state = 'posted'
AND i.move_type in ('out_invoice', 'out_refund') AND i.type in ('out_invoice', 'out_refund')
AND i.is_contribution = true AND i.is_contribution = true
""" """
return where_str return where_str
...@@ -187,7 +187,7 @@ class ScopContributionReport(models.Model): ...@@ -187,7 +187,7 @@ class ScopContributionReport(models.Model):
] ]
) )
) )
refund_ids = invoice_ids.filtered(lambda i: i.move_type == "out_refund") refund_ids = invoice_ids.filtered(lambda i: i.type == "out_refund")
if refund_ids: if refund_ids:
return True return True
else: else:
...@@ -278,6 +278,6 @@ class ScopContributionReport(models.Model): ...@@ -278,6 +278,6 @@ class ScopContributionReport(models.Model):
"=", "=",
self.type_contribution_id.id, self.type_contribution_id.id,
), ),
("move_type", "=", "out_invoice"), ("type", "=", "out_invoice"),
("state", "=", "posted"), ("state", "=", "posted"),
] ]
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<field name="mode">primary</field> <field name="mode">primary</field>
<field name="inherit_id" ref="account.view_move_form" /> <field name="inherit_id" ref="account.view_move_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//div[@name='journal_div']" position="after"> <xpath expr="//field[@name='journal_id']" position="after">
<field <field
name="partner_ur_id" name="partner_ur_id"
readonly="1" readonly="1"
...@@ -120,22 +120,22 @@ ...@@ -120,22 +120,22 @@
<filter <filter
name="draft" name="draft"
string="Brouillon" string="Brouillon"
domain="['|', ('state','=','draft'), ('move_type','in', ['out_invoice', 'out_refund'])]" domain="['|', ('state','=','draft'), ('type','in', ['out_invoice', 'out_refund'])]"
/> />
<filter <filter
name="unpaid" name="unpaid"
string="Non payées" string="Non payées"
domain="[('payment_state', 'in', ['not_paid', 'in_payment', 'partial']), ('state', '=', 'posted')]" domain="[('invoice_payment_state', 'in', ['not_paid', 'in_payment', 'partial']), ('state', '=', 'posted')]"
/> />
<filter <filter
name="paid" name="paid"
string="Payé" string="Payé"
domain="[('payment_state', '=', 'paid'), ('state', '=', 'posted')]" domain="[('invoice_payment_state', '=', 'paid'), ('state', '=', 'posted')]"
/> />
<filter <filter
name="late" name="late"
string="Retard" string="Retard"
domain="['&amp;', ('invoice_date_due', '&lt;', time.strftime('%Y-%m-%d')), ('state', '=', 'posted'), ('payment_state', 'in', ('not_paid', 'partial'))]" domain="['&amp;', ('invoice_date_due', '&lt;', time.strftime('%Y-%m-%d')), ('state', '=', 'posted'), ('invoice_payment_state', 'in', ('not_paid', 'partial'))]"
/> />
<separator /> <separator />
<filter <filter
...@@ -188,13 +188,13 @@ ...@@ -188,13 +188,13 @@
<record id="account.action_move_out_invoice_type" model="ir.actions.act_window"> <record id="account.action_move_out_invoice_type" model="ir.actions.act_window">
<field <field
name="domain" name="domain"
eval="[('move_type','=', 'out_invoice'), ('is_contribution', '!=', True)]" eval="[('type','=', 'out_invoice'), ('is_contribution', '!=', True)]"
/> />
</record> </record>
<record id="account.action_move_out_refund_type" model="ir.actions.act_window"> <record id="account.action_move_out_refund_type" model="ir.actions.act_window">
<field <field
name="domain" name="domain"
eval="[('move_type','=', 'out_refund'), ('is_contribution', '!=', True)]" eval="[('type','=', 'out_refund'), ('is_contribution', '!=', True)]"
/> />
</record> </record>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
>Confirmer l'annulation de l'ordre de prélèvement ?</attribute> >Confirmer l'annulation de l'ordre de prélèvement ?</attribute>
</xpath> </xpath>
<xpath <xpath
expr="//button[@name='action_uploaded_cancel']" expr="//button[@name='action_done_cancel']"
position="attributes" position="attributes"
> >
<attribute <attribute
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<field name="inherit_id" ref="account.res_config_settings_view_form" /> <field name="inherit_id" ref="account.res_config_settings_view_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath <xpath
expr="//div[@name='fiscal_localization_setting_container']" expr="//div[@id='invoicing_settings']"
position="after" position="after"
> >
<h2>Cotisations</h2> <h2>Cotisations</h2>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter