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
manifest_required_keys=license
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
valid_odoo_versions=14.0
valid_odoo_versions=13.0
[MESSAGES CONTROL]
disable=all
......
......@@ -8,7 +8,7 @@ manifest_required_authors=Le Filament
manifest_required_keys=license
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
valid_odoo_versions=14.0
valid_odoo_versions=13.0
[MESSAGES CONTROL]
disable=all
......
......@@ -3,7 +3,7 @@
{
"name": "CG SCOP - Cotisations",
"summary": "CG SCOP - Cotisations",
"version": "14.0.1.0.0",
"version": "13.0.1.0.0",
"author": "Le Filament",
"license": "AGPL-3",
"application": False,
......
......@@ -40,9 +40,9 @@ class ScopContributionReport(models.Model):
"amount_total_signed",
"amount_residual_signed",
"state",
"move_type",
"type",
"is_contribution",
"payment_state",
"invoice_payment_state",
],
}
......@@ -73,7 +73,7 @@ class ScopContributionReport(models.Model):
where_str = """
WHERE
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
"""
return where_str
......@@ -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:
return True
else:
......@@ -278,6 +278,6 @@ class ScopContributionReport(models.Model):
"=",
self.type_contribution_id.id,
),
("move_type", "=", "out_invoice"),
("type", "=", "out_invoice"),
("state", "=", "posted"),
]
......@@ -13,7 +13,7 @@
<field name="mode">primary</field>
<field name="inherit_id" ref="account.view_move_form" />
<field name="arch" type="xml">
<xpath expr="//div[@name='journal_div']" position="after">
<xpath expr="//field[@name='journal_id']" position="after">
<field
name="partner_ur_id"
readonly="1"
......@@ -120,22 +120,22 @@
<filter
name="draft"
string="Brouillon"
domain="['|', ('state','=','draft'), ('move_type','in', ['out_invoice', 'out_refund'])]"
domain="['|', ('state','=','draft'), ('type','in', ['out_invoice', 'out_refund'])]"
/>
<filter
name="unpaid"
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
name="paid"
string="Payé"
domain="[('payment_state', '=', 'paid'), ('state', '=', 'posted')]"
domain="[('invoice_payment_state', '=', 'paid'), ('state', '=', 'posted')]"
/>
<filter
name="late"
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 />
<filter
......@@ -188,13 +188,13 @@
<record id="account.action_move_out_invoice_type" model="ir.actions.act_window">
<field
name="domain"
eval="[('move_type','=', 'out_invoice'), ('is_contribution', '!=', True)]"
eval="[('type','=', 'out_invoice'), ('is_contribution', '!=', True)]"
/>
</record>
<record id="account.action_move_out_refund_type" model="ir.actions.act_window">
<field
name="domain"
eval="[('move_type','=', 'out_refund'), ('is_contribution', '!=', True)]"
eval="[('type','=', 'out_refund'), ('is_contribution', '!=', True)]"
/>
</record>
......
......@@ -22,7 +22,7 @@
>Confirmer l'annulation de l'ordre de prélèvement ?</attribute>
</xpath>
<xpath
expr="//button[@name='action_uploaded_cancel']"
expr="//button[@name='action_done_cancel']"
position="attributes"
>
<attribute
......
......@@ -9,7 +9,7 @@
<field name="inherit_id" ref="account.res_config_settings_view_form" />
<field name="arch" type="xml">
<xpath
expr="//div[@name='fiscal_localization_setting_container']"
expr="//div[@id='invoicing_settings']"
position="after"
>
<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