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

Billed amount in SO and DN based on export amount and patch for it

Browse Source
This commit is contained in:
Nabin Hait 2012-08-29 11:46:12 +05:30
parent 12e1a5f983
commit 9c043b2f51
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/patches/august_2012/repost_billed_amt.py Normal file
View File

@ -0,0 +1,9 @@
def execute():
import webnotes
from webnotes.model.code import get_obj
from selling.doctype.sales_common.sales_common import StatusUpdater
invoices = webnotes.conn.sql("select name from `tabSales Invoice` where docstatus = 1")
for inv in invoices:
inv_obj = get_obj('Sales Invoice', inv[0], with_children=1)
StatusUpdater(inv_obj, 1).update_all_qty()

12
erpnext/selling/doctype/sales_common/sales_common.py
View File

@ -689,14 +689,14 @@ class StatusUpdater:
self.validate_qty({
'source_dt' :'Sales Invoice Item',
'compare_field' :'billed_amt',
'compare_ref_field' :'amount',
'compare_ref_field' :'export_amount',
'target_dt' :'Sales Order Item',
'join_field' :'so_detail'
})
self.validate_qty({
'source_dt' :'Sales Invoice Item',
'compare_field' :'billed_amt',
'compare_ref_field' :'amount',
'compare_ref_field' :'export_amount',
'target_dt' :'Delivery Note Item',
'join_field' :'dn_detail'
}, no_tolerance =1)
@ -808,9 +808,9 @@ class StatusUpdater:
'target_dt' :'Sales Order Item',
'target_parent_dt' :'Sales Order',
'target_parent_field' :'per_billed',
'target_ref_field' :'amount',
'target_ref_field' :'export_amount',
'source_dt' :'Sales Invoice Item',
'source_field' :'amount',
'source_field' :'export_amount',
'join_field' :'so_detail',
'percent_join_field' :'sales_order',
'status_field' :'billing_status',
@ -822,9 +822,9 @@ class StatusUpdater:
'target_dt' :'Delivery Note Item',
'target_parent_dt' :'Delivery Note',
'target_parent_field' :'per_billed',
'target_ref_field' :'amount',
'target_ref_field' :'export_amount',
'source_dt' :'Sales Invoice Item',
'source_field' :'amount',
'source_field' :'export_amount',
'join_field' :'dn_detail',
'percent_join_field' :'delivery_note',
'status_field' :'billing_status',