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

[fix] [minor] merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2013-11-26 16:04:53 +05:30
parent ad35d1b409 9f51ee4a84
commit 5033ef03cf
6 changed files with 85 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
"modified": "2013-11-05 23:09:58",
"modified": "2013-11-22 17:15:58",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -263,7 +263,7 @@
"oldfieldname": "net_total_import",
"oldfieldtype": "Currency",
"options": "currency",
"print_hide": 1,
"print_hide": 0,
"read_only": 1
},
{
@@ -376,7 +376,7 @@
"oldfieldname": "grand_total_import",
"oldfieldtype": "Currency",
"options": "currency",
"print_hide": 1,
"print_hide": 0,
"read_only": 1,
"report_hide": 0
},
@@ -387,7 +387,7 @@
"label": "In Words",
"oldfieldname": "in_words_import",
"oldfieldtype": "Data",
"print_hide": 1,
"print_hide": 0,
"read_only": 1
},
{

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

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:45",
"docstatus": 0,
"modified": "2013-11-03 14:14:12",
"modified": "2013-11-22 17:16:16",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -262,7 +262,7 @@
"oldfieldname": "net_total_import",
"oldfieldtype": "Currency",
"options": "currency",
"print_hide": 1,
"print_hide": 0,
"read_only": 1
},
{
@@ -366,7 +366,7 @@
"oldfieldname": "grand_total_import",
"oldfieldtype": "Currency",
"options": "currency",
"print_hide": 1,
"print_hide": 0,
"read_only": 1,
"report_hide": 0
},
@@ -377,7 +377,7 @@
"label": "In Words",
"oldfieldname": "in_words_import",
"oldfieldtype": "Data",
"print_hide": 1,
"print_hide": 0,
"read_only": 1
},
{