From b2c2fca8a58bedc3226efb41ad1c088a40ea7f0d Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 5 Mar 2014 18:24:48 +0530 Subject: [PATCH] Added Pricing Rule to Accounts, Buying, Selling home --- erpnext/accounts/doctype/pricing_rule/pricing_rule.txt | 3 ++- erpnext/config/accounts.py | 7 ++++++- erpnext/config/buying.py | 5 +++++ erpnext/config/selling.py | 7 ++++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.txt b/erpnext/accounts/doctype/pricing_rule/pricing_rule.txt index d0925a25991..413405c962d 100644 --- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.txt +++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.txt @@ -2,7 +2,7 @@ { "creation": "2014-02-21 15:02:51", "docstatus": 0, - "modified": "2014-02-28 14:49:15", + "modified": "2014-03-05 18:23:34", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "PRULE.#####", "doctype": "DocType", "document_type": "Master", + "icon": "icon-gift", "istable": 0, "module": "Accounts", "name": "__common__" diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py index 7ae67fa18bc..2a47c2ab4f3 100644 --- a/erpnext/config/accounts.py +++ b/erpnext/config/accounts.py @@ -103,9 +103,14 @@ data = [ }, { "type": "doctype", - "name": "Shipping Rules", + "name": "Shipping Rule", "description": _("Rules for adding shipping costs.") }, + { + "type": "doctype", + "name": "Pricing Rule", + "description": _("Rules for applying pricing and discount.") + }, { "type": "doctype", "name": "Currency", diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py index 41f689f2877..0c8c2f647a2 100644 --- a/erpnext/config/buying.py +++ b/erpnext/config/buying.py @@ -87,6 +87,11 @@ data = [ "description": _("Multiple Item prices."), "route": "Report/Item Price" }, + { + "type": "doctype", + "name": "Pricing Rule", + "description": _("Rules for applying pricing and discount.") + }, ] }, { diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py index 2646167f3a0..65cec9e22e7 100644 --- a/erpnext/config/selling.py +++ b/erpnext/config/selling.py @@ -121,7 +121,7 @@ data = [ }, { "type": "doctype", - "name": "Shipping Rules", + "name": "Shipping Rule", "description": _("Rules for adding shipping costs.") }, { @@ -135,6 +135,11 @@ data = [ "description": _("Multiple Item prices."), "route": "Report/Item Price" }, + { + "type": "doctype", + "name": "Pricing Rule", + "description": _("Rules for applying pricing and discount.") + }, { "type": "doctype", "name": "Sales BOM",