nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi
2013-07-30 14:51:08 +05:30
parent 733681a426 de72b44d28
commit d2cb598b6b
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
selling/doctype/sales_order/sales_order.py
View File

@@ -375,7 +375,7 @@ def make_delivery_note(source_name, target_doclist=None):
target.amount = (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)
target.export_amount = (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)
target.qty = flt(obj.qty) - flt(obj.delivered_qty)
doclist = get_mapped_doclist("Sales Order", source_name, {
"Sales Order": {
"doctype": "Delivery Note",
@@ -396,7 +396,8 @@ def make_delivery_note(source_name, target_doclist=None):
"parenttype": "prevdoc_doctype",
"reserved_warehouse": "warehouse"
},
"postprocess": update_item
"postprocess": update_item,
"condition": lambda doc: doc.delivered_qty < doc.qty
},
"Sales Taxes and Charges": {
"doctype": "Sales Taxes and Charges",
@@ -416,7 +417,7 @@ def make_sales_invoice(source_name, target_doclist=None):
target.export_amount = flt(obj.export_amount) - flt(obj.billed_amt)
target.amount = target.export_amount * flt(source_parent.conversion_rate)
target.qty = obj.export_rate and target.export_amount / flt(obj.export_rate) or obj.qty
doclist = get_mapped_doclist("Sales Order", source_name, {
"Sales Order": {
"doctype": "Sales Invoice",