Skip to content
Extraits de code Groupes Projets
Valider 0fbb6486 rédigé par Arthur - Enercoop's avatar Arthur - Enercoop
Parcourir les fichiers

Merge branch oacc_account_surplus:16.0 into 16.0

parents cdcd8464 9d86e590
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -23,10 +23,11 @@ class AccOperation(models.Model): ...@@ -23,10 +23,11 @@ class AccOperation(models.Model):
string="Liste des Prix du Surplus", string="Liste des Prix du Surplus",
) )
# todo
account_move_surplus_ids = fields.One2many( account_move_surplus_ids = fields.One2many(
"account.move", "account.move",
"acc_operation_id", "acc_operation_id",
domain=[("acc_delivery_counter_id", "=", False)], domain=[("acc_delivery_counter_ids", "=", False)],
string="Factures de surplus", string="Factures de surplus",
) )
......
...@@ -17,7 +17,7 @@ class AccountMove(models.Model): ...@@ -17,7 +17,7 @@ class AccountMove(models.Model):
# ------------------------------------------------------ # ------------------------------------------------------
@api.depends( @api.depends(
"acc_operation_id", "acc_operation_id",
"acc_delivery_counter_id", "acc_delivery_counter_ids",
"move_type", "move_type",
"partner_id", "partner_id",
"company_id", "company_id",
...@@ -29,7 +29,7 @@ class AccountMove(models.Model): ...@@ -29,7 +29,7 @@ class AccountMove(models.Model):
and not move.acc_operation_id and not move.acc_operation_id
): ):
continue continue
elif move.acc_delivery_counter_id: elif move.acc_delivery_counter_ids:
super()._compute_terms_tax() super()._compute_terms_tax()
else: else:
if not move.company_id.use_invoice_terms_tax_surplus: if not move.company_id.use_invoice_terms_tax_surplus:
......
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