Commit 12c9879d authored by Patrick's avatar Patrick

Always display customer charged instead of total price with tax if different from the buyer

parent b6d8d519
...@@ -141,7 +141,7 @@ class CustomerInvoice(models.Model): ...@@ -141,7 +141,7 @@ class CustomerInvoice(models.Model):
if self.status < PERMANENCE_INVOICED or not customer_charged: if self.status < PERMANENCE_INVOICED or not customer_charged:
return self.total_price_with_tax return self.total_price_with_tax
else: else:
return self.customer_charged if self.total_price_with_tax != DECIMAL_ZERO else DECIMAL_ZERO return self.customer_charged # if self.total_price_with_tax != DECIMAL_ZERO else RepanierMoney()
def get_total_price_wo_tax(self): def get_total_price_wo_tax(self):
return self.get_total_price_with_tax() - self.get_total_tax() return self.get_total_price_with_tax() - self.get_total_tax()
...@@ -375,7 +375,7 @@ class CustomerInvoice(models.Model): ...@@ -375,7 +375,7 @@ class CustomerInvoice(models.Model):
offer_item_id=a_purchase.offer_item_id, offer_item_id=a_purchase.offer_item_id,
q_order=DECIMAL_ZERO, q_order=DECIMAL_ZERO,
batch_job=True, batch_job=True,
comment=_("Cancelled qty : %s") % number_format(purchase.quantity_ordered, 4) comment=_("Cancelled qty : %s") % number_format(a_purchase.quantity_ordered, 4)
) )
def __str__(self): def __str__(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment