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

map payment terms template from SO to SI

Browse Source
This commit is contained in:
Nabin Hait 2018-06-28 23:11:12 +05:30
parent 52fb43fc4f
commit 7324815fdb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py
View File

@ -19,7 +19,7 @@ def execute(filters=None):
last_pur_price = frappe.db.get_value("Item", rows[0], "last_purchase_rate") last_pur_price = frappe.db.get_value("Item", rows[0], "last_purchase_rate")
if rows[4] > 0: if rows[4] > 0:
diff_qty = rows[4] - reqd_qty diff_qty = rows[4] - reqd_qty
summ_data.append([rows[0], rows[1], item_map[rows[0]]["manufacturer"], item_map[rows[0]]["manufacturer_part_no"], rows[3], rows[4], reqd_qty, diff_qty, last_pur_price]) summ_data.append([rows[0], rows[1], item_map[rows[0]]["manufacturer"], item_map[rows[0]]["manufacturer_part_no"], rows[3], rows[4], reqd_qty, diff_qty, last_pur_price])
else: else:
diff_qty = 0 - reqd_qty diff_qty = 0 - reqd_qty
summ_data.append([rows[0], rows[1], item_map[rows[0]]["manufacturer"], item_map[rows[0]]["manufacturer_part_no"], rows[3], "0.000", reqd_qty, diff_qty, last_pur_price]) summ_data.append([rows[0], rows[1], item_map[rows[0]]["manufacturer"], item_map[rows[0]]["manufacturer_part_no"], rows[3], "0.000", reqd_qty, diff_qty, last_pur_price])
@ -86,6 +86,6 @@ def get_bom_stock(filters):
GROUP BY bom_item.item_code""".format(qty_field=qty_field, table=table, conditions=conditions, bom=bom)) GROUP BY bom_item.item_code""".format(qty_field=qty_field, table=table, conditions=conditions, bom=bom))
def get_item_details(item_code): def get_item_details(item_code):
items = frappe.db.sql("""select it.item_group, it.item_name, it.stock_uom, it.name, it.brand, it.description, it.manufacturer_part_no, it.manufacturer from tabItem it where it.item_code = %s""", item_code, as_dict=1) items = frappe.db.sql("""select it.item_group, it.item_name, it.stock_uom, it.name, it.brand, it.description, it.manufacturer_part_no, it.manufacturer from tabItem it where it.item_code = %s""", item_code, as_dict=1)
return dict((d.name, d) for d in items) return dict((d.name, d) for d in items)

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

@ -573,7 +573,8 @@ def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False):
"Sales Order": { "Sales Order": {
"doctype": "Sales Invoice", "doctype": "Sales Invoice",
"field_map": { "field_map": {
"party_account_currency": "party_account_currency" "party_account_currency": "party_account_currency",
"payment_terms_template": "payment_terms_template"
}, },
"validation": { "validation": {
"docstatus": ["=", 1] "docstatus": ["=", 1]