Change when there are sales with discount and sales with total amount zero, still creating POS Sales Journal Entry
This commit is contained in:
parent
790d003f1c
commit
74c25332e1
@ -145,8 +145,8 @@ class PosSession(models.Model):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
order_payment_total = order_payment_totals.get(order.id, 0.0)
|
order_payment_total = order_payment_totals.get(order.id, 0.0)
|
||||||
if float_is_zero(order_payment_total, precision_rounding=order.currency_id.rounding):
|
#if float_is_zero(order_payment_total, precision_rounding=order.currency_id.rounding):
|
||||||
continue
|
# continue
|
||||||
|
|
||||||
order_amount = order_sale_amounts['amount']
|
order_amount = order_sale_amounts['amount']
|
||||||
order_amount_converted = order_sale_amounts['amount_converted']
|
order_amount_converted = order_sale_amounts['amount_converted']
|
||||||
@ -155,10 +155,12 @@ class PosSession(models.Model):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
for payment in order.payment_ids:
|
for payment in order.payment_ids:
|
||||||
|
#if float_is_zero(payment.amount, precision_rounding=order.currency_id.rounding):
|
||||||
|
# continue
|
||||||
if float_is_zero(payment.amount, precision_rounding=order.currency_id.rounding):
|
if float_is_zero(payment.amount, precision_rounding=order.currency_id.rounding):
|
||||||
continue
|
payment_proportion = 1.0
|
||||||
|
else:
|
||||||
payment_proportion = payment.amount / order_payment_total
|
payment_proportion = payment.amount / order_payment_total
|
||||||
|
|
||||||
net_amount = order_amount * payment_proportion
|
net_amount = order_amount * payment_proportion
|
||||||
net_amount_converted = order_amount_converted * payment_proportion
|
net_amount_converted = order_amount_converted * payment_proportion
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user