nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip)

Browse Source
This commit is contained in:
Rushabh Mehta
2013-08-09 15:29:59 +05:30
parent be64070ed9
commit 0b9954059c
25 changed files with 158 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buying/doctype/buying_settings/buying_settings.py
View File

@@ -11,6 +11,6 @@ class DocType:
self.doc, self.doclist = d, dl
def validate(self):
for key in ["supplier_type", "supp_master_name", "maintain_same_rate"]:
for key in ["supplier_type", "supp_master_name", "maintain_same_rate", "buying_price_list"]:
webnotes.conn.set_default(key, self.doc.fields.get(key, ""))

9
buying/doctype/buying_settings/buying_settings.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-06-25 11:04:03",
"docstatus": 0,
"modified": "2013-07-05 14:29:41",
"modified": "2013-08-09 14:38:46",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -53,6 +53,13 @@
"label": "Default Supplier Type",
"options": "Supplier Type"
},
{
"doctype": "DocField",
"fieldname": "buying_price_list",
"fieldtype": "Link",
"label": "Default Buying Price List",
"options": "Price List"
},
{
"doctype": "DocField",
"fieldname": "column_break_3",

4
buying/doctype/purchase_order/purchase_order.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
"modified": "2013-08-08 14:22:03",
"modified": "2013-08-09 14:45:51",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -211,7 +211,7 @@
{
"description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"fieldname": "price_list_name",
"fieldname": "buying_price_list",
"fieldtype": "Link",
"label": "Price List",
"options": "Price List",

4
buying/doctype/supplier_quotation/supplier_quotation.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:45",
"docstatus": 0,
"modified": "2013-08-08 14:22:08",
"modified": "2013-08-09 14:45:58",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -208,7 +208,7 @@
{
"description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"fieldname": "price_list_name",
"fieldname": "buying_price_list",
"fieldtype": "Link",
"label": "Price List",
"options": "Price List",

27
buying/page/buying_home/buying_home.js
View File

@@ -111,9 +111,14 @@ wn.module_page["Buying"] = [
icon: "icon-list",
items: [
{
"label":wn._("Item-wise Purchase History"),
route: "query-report/Item-wise Purchase History",
doctype: "Item"
"label":wn._("Requested Items To Be Ordered"),
route: "query-report/Requested Items To Be Ordered",
doctype: "Material Request"
},
{
"label":wn._("Material Requests for which Supplier Quotations are not created"),
route: "query-report/Material Requests for which Supplier Quotations are not created",
doctype: "Material Request"
},
{
"label":wn._("Purchase In Transit"),
@@ -121,20 +126,20 @@ wn.module_page["Buying"] = [
doctype: "Purchase Order"
},
{
"label":wn._("Requested Items To Be Ordered"),
route: "query-report/Requested Items To Be Ordered",
doctype: "Material Request"
"label":wn._("Item-wise Purchase History"),
route: "query-report/Item-wise Purchase History",
doctype: "Item"
},
{
"label":wn._("Item-wise Last Purchase Rate"),
route: "query-report/Item-wise Last Purchase Rate",
doctype: "Item"
},
{
"label":wn._("Purchase Order Trends"),
route: "query-report/Purchase Order Trends",
doctype: "Purchase Order"
},
{
"label":wn._("Item-wise Last Purchase Rate"),
route: "query-report/Item-wise Last Purchase Rate",
doctype: "Item"
}
]
}
]