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

minor fix

Browse Source
This commit is contained in:
Nabin Hait 2018-03-20 11:19:38 +05:30
parent 54f3a0f7c6
commit 8a8966ce9b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@ -131,7 +131,7 @@ def get_serial_no_for_item(args):
"name": args.name, "name": args.name,
"serial_no": args.serial_no "serial_no": args.serial_no
}) })
if args.get("parenttype") in ("Sales Invoice", "Delivery Note") and args.stock_qty > 0: if args.get("parenttype") in ("Sales Invoice", "Delivery Note") and flt(args.stock_qty) > 0:
item_details.serial_no = get_serial_no(args) item_details.serial_no = get_serial_no(args)
return item_details return item_details

4
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -751,7 +751,7 @@
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 1, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
@ -4683,7 +4683,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2018-03-13 15:19:54.711885", "modified": "2018-03-16 15:19:54.711885",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",