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

[fixes] minor fixes, added eval on pricing rule, Sales Order Item, Quotation Item

Browse Source
This commit is contained in:
mbauskar 2016-01-21 19:59:13 +05:30 committed by rohitwaghchaure
parent 6f60339e75
commit b6d19bcfc2
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/pricing_rule/pricing_rule.json
View File

@ -731,6 +731,7 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"depends_on": "eval: doc.selling == 1",
"fieldname": "margin", "fieldname": "margin",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,
@ -755,6 +756,7 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"default": "Percentage",
"fieldname": "type", "fieldname": "type",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 0, "hidden": 0,
@ -803,6 +805,7 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"default": "0",
"fieldname": "rate", "fieldname": "rate",
"fieldtype": "Float", "fieldtype": "Float",
"hidden": 0, "hidden": 0,
@ -1024,7 +1027,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-01-18 17:00:59.492217", "modified": "2016-01-21 19:10:54.861787",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Pricing Rule", "name": "Pricing Rule",

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

@ -168,7 +168,9 @@ def get_pricing_rule_for_item(args):
"discount_percentage": 0.0 "discount_percentage": 0.0
}) })
else: else:
item_details.discount_percentage = pricing_rule.discount_percentage # if user changed the discount percentage then set discount_percentage of user
item_details.discount_percentage = pricing_rule.discount_percentage if args.discount_percentage == pricing_rule.discount_percentage\
else args.discount_percentage
return item_details return item_details

1
erpnext/selling/doctype/sales_order_item/sales_order_item.json
View File

@ -459,6 +459,7 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"depends_on": "eval:doc.price_list_rate",
"fieldname": "type", "fieldname": "type",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 0, "hidden": 0,

1
erpnext/selling/sales_common.js
View File

@ -302,7 +302,6 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
callback: function(r) { callback: function(r) {
if(!r.exc){ if(!r.exc){
var doc = frappe.model.sync(r.message); var doc = frappe.model.sync(r.message);
console.log(r.message)
frappe.set_route("Form", r.message.doctype, r.message.name); frappe.set_route("Form", r.message.doctype, r.message.name);
} }
} }

1
erpnext/stock/get_item_details.py
View File

@ -497,7 +497,6 @@ def apply_price_list(args, as_doc=False):
# update the value # update the value
if fieldname in item and fieldname not in ("name", "doctype"): if fieldname in item and fieldname not in ("name", "doctype"):
item[fieldname] = children[i][fieldname] item[fieldname] = children[i][fieldname]
return args return args
else: else:
return { return {