[Karthi] | BAH-3611 | Refactor. Discount issue has been fixed (#76)

Bahmni · Mar 6, 2024 · cc42f16 · cc42f16
1 parent 1ee3833
commit cc42f16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/bahmni_sale/models/sale_order.py b/bahmni_sale/models/sale_order.py
@@ -32,7 +32,7 @@ def _compute_amounts(self):
  amount_tax += line.price_tax
  amount_total = amount_untaxed + amount_tax
 
- if order.discount_percentage:
+ if order.discount_type == 'percentage':
  tot_discount = amount_total * order.discount_percentage / 100
  else:
  tot_discount = order.discount

diff --git a/bahmni_sale/views/sale_order_views.xml b/bahmni_sale/views/sale_order_views.xml
@@ -33,15 +33,14 @@
  options="{'currency_field': 'currency_id'}"/>
  <field name="discount_type" required="1" attrs="{'invisible': [('amount_untaxed', '=', 0.00)]}"/>
 
- <field name="discount_percentage" widget='monetary'
- options="{'currency_field': 'currency_id'}"
+ <field name="discount_percentage" widget='monetary' force_save = "1" 
  attrs="{'readonly': [('discount_type', '=', 'fixed')],'invisible': [('discount_type', 'in', ('fixed','none'))]}"/>
 
- <field name="discount" widget='monetary'
+ <field name="discount" widget='monetary' force_save = "1" 
  options="{'currency_field': 'currency_id'}"
  attrs="{'readonly': [('discount_type', '=', 'percentage')],'invisible': [('discount_type', 'in', ('none'))]}"/>
 
- <field name="disc_acc_id" 
+ <field name="disc_acc_id" force_save = "1" 
  attrs="{'required': [('discount', '!=', 0.0)],'invisible': ['|', ('discount_type', '=', 'none'),('discount', '=', 0.0)]}"/>
 
  <field name="round_off_amount" widget='monetary'