Fixes in authorization rule based on average discount
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 498aec1..8153d8d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -157,7 +157,7 @@
self.check_credit(self.grand_total)
- frappe.get_doc('Authorization Control').validate_approving_authority(self.doctype, self.grand_total, self)
+ frappe.get_doc('Authorization Control').validate_approving_authority(self.doctype, self.company, self.grand_total, self)
self.update_prevdoc_status('submit')
frappe.db.set(self, 'status', 'Submitted')
@@ -357,17 +357,6 @@
}
}, target_doc, postprocess)
- def set_advance_vouchers(source, target):
- advance_voucher_list = []
-
- advance_voucher = frappe.db.sql("""
- select
- t1.name as voucher_no, t1.posting_date, t1.remark, t2.account,
- t2.name as voucher_detail_no, {amount_query} as payment_amount, t2.is_advance
- from
- `tabJournal Voucher` t1, `tabJournal Voucher Detail` t2
- """)
-
return doclist
@frappe.whitelist()
diff --git a/erpnext/setup/doctype/authorization_control/authorization_control.py b/erpnext/setup/doctype/authorization_control/authorization_control.py
index 8e7b0ce..fbf4b1c 100644
--- a/erpnext/setup/doctype/authorization_control/authorization_control.py
+++ b/erpnext/setup/doctype/authorization_control/authorization_control.py
@@ -98,9 +98,12 @@
if doc_obj:
price_list_rate, base_rate = 0, 0
for d in doc_obj.get(doc_obj.fname):
- if d.base_price_list_rate and d.base_rate:
- price_list_rate += flt(d.base_price_list_rate)
+ if d.base_rate:
+ price_list_rate += flt(d.base_price_list_rate) or flt(d.base_rate)
base_rate += flt(d.base_rate)
+ if doc_obj.get("discount_amount"):
+ base_rate -= flt(doc_obj.discount_amount)
+
if price_list_rate: av_dis = 100 - flt(base_rate * 100 / price_list_rate)
final_based_on = ['Grand Total','Average Discount','Customerwise Discount','Itemwise Discount']