diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index f8948342307..98bf24ab9e2 100755
--- a/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt
@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2013-01-15 18:42:58",
+ "creation": "2013-01-18 12:46:57",
"modified_by": "Administrator",
- "modified": "2013-01-17 20:24:23"
+ "modified": "2013-01-18 13:25:16"
},
{
"autoname": "naming_series:",
@@ -29,7 +29,6 @@
"read": 1,
"doctype": "DocPerm",
"parenttype": "DocType",
- "report": 1,
"parentfield": "permissions"
},
{
@@ -280,6 +279,7 @@
},
{
"print_hide": 1,
+ "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"label": "Price List",
"options": "Price List",
@@ -798,23 +798,13 @@
"hidden": 1,
"permlevel": 0
},
- {
- "amend": 0,
- "create": 0,
- "doctype": "DocPerm",
- "submit": 0,
- "write": 0,
- "role": "Accounts Manager",
- "cancel": 0,
- "permlevel": 1
- },
{
"amend": 1,
"create": 1,
"doctype": "DocPerm",
"submit": 1,
"write": 1,
- "role": "Accounts Manager",
+ "role": "Accounts User",
"cancel": 1,
"permlevel": 0
},
@@ -824,15 +814,6 @@
"doctype": "DocPerm",
"submit": 0,
"write": 0,
- "role": "Accounts User",
- "cancel": 0,
- "permlevel": 1
- },
- {
- "amend": 0,
- "create": 0,
- "doctype": "DocPerm",
- "submit": 0,
"role": "Purchase User",
"cancel": 0,
"permlevel": 1
@@ -848,19 +829,64 @@
"permlevel": 0
},
{
- "amend": 1,
- "create": 1,
- "doctype": "DocPerm",
- "submit": 1,
- "write": 1,
- "role": "Accounts User",
- "cancel": 1,
- "permlevel": 0
- },
- {
+ "amend": 0,
+ "create": 0,
"doctype": "DocPerm",
+ "submit": 0,
+ "write": 0,
"role": "Supplier",
+ "cancel": 0,
"permlevel": 0,
"match": "supplier"
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 0,
+ "role": "Accounts Manager",
+ "cancel": 0,
+ "permlevel": 1
+ },
+ {
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "role": "Accounts Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 0,
+ "role": "Accounts User",
+ "cancel": 0,
+ "permlevel": 1
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 0,
+ "role": "Auditor",
+ "cancel": 0,
+ "permlevel": 1
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 0,
+ "role": "Auditor",
+ "cancel": 0,
+ "permlevel": 0
}
]
\ No newline at end of file
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt
index f7e0a847120..9bea0b18565 100644
--- a/buying/doctype/purchase_order/purchase_order.txt
+++ b/buying/doctype/purchase_order/purchase_order.txt
@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2013-01-17 11:11:23",
+ "creation": "2013-01-18 12:46:59",
"modified_by": "Administrator",
- "modified": "2013-01-17 20:26:53"
+ "modified": "2013-01-18 13:24:20"
},
{
"autoname": "naming_series:",
@@ -30,7 +30,6 @@
"read": 1,
"doctype": "DocPerm",
"parenttype": "DocType",
- "report": 1,
"parentfield": "permissions"
},
{
@@ -292,6 +291,7 @@
},
{
"print_hide": 1,
+ "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"label": "Price List",
"options": "Price List",
@@ -851,62 +851,18 @@
"hidden": 1,
"permlevel": 0
},
- {
- "amend": 0,
- "create": 0,
- "doctype": "DocPerm",
- "submit": 0,
- "write": 0,
- "cancel": 0,
- "role": "Material User",
- "permlevel": 1
- },
- {
- "amend": 0,
- "create": 0,
- "doctype": "DocPerm",
- "submit": 0,
- "write": 0,
- "cancel": 0,
- "role": "Material User",
- "permlevel": 0
- },
- {
- "amend": 0,
- "create": 0,
- "doctype": "DocPerm",
- "submit": 0,
- "write": 0,
- "cancel": 0,
- "role": "Purchase Manager",
- "permlevel": 1
- },
{
"amend": 1,
"create": 1,
"doctype": "DocPerm",
"submit": 1,
"write": 1,
- "cancel": 1,
- "role": "Purchase Manager",
- "permlevel": 0
- },
- {
- "amend": 1,
- "create": 1,
- "doctype": "DocPerm",
- "submit": 1,
- "write": 1,
- "cancel": 1,
"role": "Purchase User",
+ "cancel": 1,
"permlevel": 0
},
{
- "amend": 0,
- "create": 0,
"doctype": "DocPerm",
- "submit": 0,
- "cancel": 0,
"role": "All",
"permlevel": 1
},
@@ -916,14 +872,50 @@
"permlevel": 0,
"match": "supplier"
},
+ {
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "All",
+ "permlevel": 2
+ },
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
- "write": 1,
+ "write": 0,
+ "role": "Purchase Manager",
"cancel": 0,
- "role": "All",
- "permlevel": 2
+ "permlevel": 1
+ },
+ {
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "role": "Purchase Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 0,
+ "role": "Material User",
+ "cancel": 0,
+ "permlevel": 1
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 0,
+ "role": "Material User",
+ "cancel": 0,
+ "permlevel": 0
}
]
\ No newline at end of file
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt
index cc95a497b4c..df83deba290 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.txt
+++ b/buying/doctype/supplier_quotation/supplier_quotation.txt
@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2013-01-17 11:11:23",
+ "creation": "2013-01-18 12:47:01",
"modified_by": "Administrator",
- "modified": "2013-01-17 20:25:22"
+ "modified": "2013-01-18 13:25:50"
},
{
"autoname": "naming_series:",
@@ -30,7 +30,6 @@
"read": 1,
"doctype": "DocPerm",
"parenttype": "DocType",
- "report": 1,
"parentfield": "permissions"
},
{
@@ -242,6 +241,7 @@
},
{
"print_hide": 1,
+ "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"label": "Price List",
"options": "Price List",
@@ -489,8 +489,8 @@
},
{
"print_hide": 1,
- "allow_on_submit": 1,
"oldfieldtype": "Select",
+ "allow_on_submit": 1,
"doctype": "DocField",
"label": "Letter Head",
"oldfieldname": "letter_head",
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index e5b0547d18a..8cdc2b78976 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -1,4 +1,7 @@
erpnext.updates = [
+ ["18th January, 2013", [
+ "Buying: Added Price List to purchase cycle",
+ ]],
["16th January, 2013", [
"Job Applicant: Track Job Applicants and extract them from a mailbox like 'jobs@example.com'. See Jobs Email Settings.",
"Extract leads: Extract Leads from a mailbox like 'sales@example.com'. See Sales Email Settings.",
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt
index 9de7fc29b94..81bc70c89f0 100755
--- a/stock/doctype/purchase_receipt/purchase_receipt.txt
+++ b/stock/doctype/purchase_receipt/purchase_receipt.txt
@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2013-01-17 11:11:24",
+ "creation": "2013-01-18 12:47:03",
"modified_by": "Administrator",
- "modified": "2013-01-17 20:23:38"
+ "modified": "2013-01-18 13:25:36"
},
{
"autoname": "naming_series:",
@@ -30,7 +30,6 @@
"read": 1,
"doctype": "DocPerm",
"parenttype": "DocType",
- "report": 1,
"parentfield": "permissions"
},
{
@@ -201,8 +200,8 @@
},
{
"print_hide": 0,
- "allow_on_submit": 1,
"oldfieldtype": "Table",
+ "allow_on_submit": 1,
"doctype": "DocField",
"label": "Purchase Receipt Items",
"oldfieldname": "purchase_receipt_details",
@@ -317,6 +316,7 @@
},
{
"print_hide": 1,
+ "description": "Consider this Price List for fetching rate. (only which have \"For Buying\" as checked)",
"doctype": "DocField",
"label": "Price List",
"options": "Price List",
@@ -939,62 +939,18 @@
"hidden": 1,
"permlevel": 0
},
- {
- "amend": 0,
- "create": 0,
- "doctype": "DocPerm",
- "submit": 0,
- "write": 0,
- "cancel": 0,
- "role": "Material Manager",
- "permlevel": 1
- },
{
"amend": 1,
"create": 1,
"doctype": "DocPerm",
"submit": 1,
"write": 1,
- "cancel": 1,
- "role": "Material Manager",
- "permlevel": 0
- },
- {
- "amend": 0,
- "create": 0,
- "doctype": "DocPerm",
- "submit": 0,
- "write": 0,
- "cancel": 0,
- "role": "Material User",
- "permlevel": 1
- },
- {
- "amend": 1,
- "create": 1,
- "doctype": "DocPerm",
- "submit": 1,
- "write": 1,
- "cancel": 1,
- "role": "Material User",
- "permlevel": 0
- },
- {
- "amend": 1,
- "create": 1,
- "doctype": "DocPerm",
- "submit": 1,
- "write": 1,
- "cancel": 1,
"role": "Purchase User",
+ "cancel": 1,
"permlevel": 0
},
{
- "amend": 0,
- "create": 0,
"doctype": "DocPerm",
- "submit": 0,
- "cancel": 0,
"role": "Purchase User",
"permlevel": 1
},
@@ -1004,14 +960,50 @@
"permlevel": 0,
"match": "supplier"
},
+ {
+ "doctype": "DocPerm",
+ "write": 1,
+ "role": "All",
+ "permlevel": 2
+ },
{
"amend": 0,
"create": 0,
"doctype": "DocPerm",
"submit": 0,
- "write": 1,
+ "write": 0,
+ "role": "Material Manager",
"cancel": 0,
- "role": "All",
- "permlevel": 2
+ "permlevel": 1
+ },
+ {
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "role": "Material Manager",
+ "cancel": 1,
+ "permlevel": 0
+ },
+ {
+ "amend": 0,
+ "create": 0,
+ "doctype": "DocPerm",
+ "submit": 0,
+ "write": 0,
+ "role": "Material User",
+ "cancel": 0,
+ "permlevel": 1
+ },
+ {
+ "amend": 1,
+ "create": 1,
+ "doctype": "DocPerm",
+ "submit": 1,
+ "write": 1,
+ "role": "Material User",
+ "cancel": 1,
+ "permlevel": 0
}
]
\ No newline at end of file