nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'price_list_country'

Browse Source 
Conflicts:
	home/page/latest_updates/latest_updates.js
	setup/doctype/price_list/price_list.txt
This commit is contained in:
Anand Doshi
2013-05-02 16:25:46 +05:30
parent 97e2a7eeb9 d7ad13a8a7
commit 9d504e4706
10 changed files with 132 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stock/doctype/item_price/item_price.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-03-08 15:37:16",
"creation": "2013-04-29 15:18:04",
"docstatus": 0,
"modified": "2013-03-21 17:29:15",
"modified": "2013-04-29 19:16:45",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -68,13 +68,13 @@
"doctype": "DocField",
"fieldname": "selling",
"fieldtype": "Check",
"label": "For Selling"
"label": "Valid For Selling"
},
{
"description": "Allow this price in purchase related forms",
"doctype": "DocField",
"fieldname": "buying",
"fieldtype": "Check",
"label": "For Buying"
"label": "Valid For Buying"
}
]