Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2435 from nabinhait/fix1

Browse Source 
Fixes in authorization rule based on average discount
This commit is contained in:
Nabin Hait 2014-12-02 10:36:25 +05:30
commit abcbbc63d8
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/accounts_controller.py
View File

@ -437,7 +437,7 @@ class AccountsController(TransactionBase):
for order, jv_list in order_jv_map.items(): for order, jv_list in order_jv_map.items():
for jv in jv_list: for jv in jv_list:
if not advance_jv_against_si or jv not in advance_jv_against_si: if not advance_jv_against_si or jv not in advance_jv_against_si:
frappe.throw(_("Journal Voucher {0} is linked against Order {1}, hence it must be fetched as advance in Invoice as well.") frappe.msgprint(_("Journal Voucher {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.")
.format(jv, order)) .format(jv, order))

13
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -157,7 +157,7 @@ class SalesOrder(SellingController):
self.check_credit(self.grand_total) 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') self.update_prevdoc_status('submit')
frappe.db.set(self, 'status', 'Submitted') frappe.db.set(self, 'status', 'Submitted')
@ -357,17 +357,6 @@ def make_sales_invoice(source_name, target_doc=None):
} }
}, target_doc, postprocess) }, 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 return doclist
@frappe.whitelist() @frappe.whitelist()

7
erpnext/setup/doctype/authorization_control/authorization_control.py
View File

@ -98,9 +98,12 @@ class AuthorizationControl(TransactionBase):
if doc_obj: if doc_obj:
price_list_rate, base_rate = 0, 0 price_list_rate, base_rate = 0, 0
for d in doc_obj.get(doc_obj.fname): for d in doc_obj.get(doc_obj.fname):
if d.base_price_list_rate and d.base_rate: if d.base_rate:
price_list_rate += flt(d.base_price_list_rate) price_list_rate += flt(d.base_price_list_rate) or flt(d.base_rate)
base_rate += 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) 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'] final_based_on = ['Grand Total','Average Discount','Customerwise Discount','Itemwise Discount']