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

Merge branch 'develop' into sla_fix

Browse Source
This commit is contained in:
Himanshu 2019-06-27 00:18:56 +05:30 committed by GitHub
commit 6596f6e218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@ -419,6 +419,8 @@ def get_returned_qty_map(delivery_note):
@frappe.whitelist() @frappe.whitelist()
def make_sales_invoice(source_name, target_doc=None): def make_sales_invoice(source_name, target_doc=None):
doc = frappe.get_doc('Delivery Note', source_name) doc = frappe.get_doc('Delivery Note', source_name)
to_make_invoice_qty_map = {}
returned_qty_map = get_returned_qty_map(source_name) returned_qty_map = get_returned_qty_map(source_name)
invoiced_qty_map = get_invoiced_qty_map(source_name) invoiced_qty_map = get_invoiced_qty_map(source_name)
@ -439,8 +441,7 @@ def make_sales_invoice(source_name, target_doc=None):
target.update(get_fetch_values("Sales Invoice", 'company_address', target.company_address)) target.update(get_fetch_values("Sales Invoice", 'company_address', target.company_address))
def update_item(source_doc, target_doc, source_parent): def update_item(source_doc, target_doc, source_parent):
target_doc.qty, returned_qty = get_pending_qty(source_doc) target_doc.qty = to_make_invoice_qty_map[source_doc.name]
returned_qty_map[source_doc.item_code] = returned_qty
if source_doc.serial_no and source_parent.per_billed > 0: if source_doc.serial_no and source_parent.per_billed > 0:
target_doc.serial_no = get_delivery_note_serial_no(source_doc.item_code, target_doc.serial_no = get_delivery_note_serial_no(source_doc.item_code,
@ -450,7 +451,7 @@ def make_sales_invoice(source_name, target_doc=None):
pending_qty = item_row.qty - invoiced_qty_map.get(item_row.name, 0) pending_qty = item_row.qty - invoiced_qty_map.get(item_row.name, 0)
returned_qty = 0 returned_qty = 0
if returned_qty_map.get(item_row.item_code) > 0: if returned_qty_map.get(item_row.item_code, 0) > 0:
returned_qty = flt(returned_qty_map.get(item_row.item_code, 0)) returned_qty = flt(returned_qty_map.get(item_row.item_code, 0))
returned_qty_map[item_row.item_code] -= pending_qty returned_qty_map[item_row.item_code] -= pending_qty
@ -462,7 +463,9 @@ def make_sales_invoice(source_name, target_doc=None):
pending_qty -= returned_qty pending_qty -= returned_qty
returned_qty = 0 returned_qty = 0
return pending_qty, returned_qty to_make_invoice_qty_map[item_row.name] = pending_qty
return pending_qty
doc = get_mapped_doc("Delivery Note", source_name, { doc = get_mapped_doc("Delivery Note", source_name, {
"Delivery Note": { "Delivery Note": {
@ -482,7 +485,7 @@ def make_sales_invoice(source_name, target_doc=None):
"cost_center": "cost_center" "cost_center": "cost_center"
}, },
"postprocess": update_item, "postprocess": update_item,
"filter": lambda d: get_pending_qty(d)[0] <= 0 if not doc.get("is_return") else get_pending_qty(d)[0] > 0 "filter": lambda d: get_pending_qty(d) <= 0 if not doc.get("is_return") else get_pending_qty(d) > 0
}, },
"Sales Taxes and Charges": { "Sales Taxes and Charges": {
"doctype": "Sales Taxes and Charges", "doctype": "Sales Taxes and Charges",