fix conflict
This commit is contained in:
parent
b14401c320
commit
4d3a18890b
@ -886,7 +886,7 @@
|
||||
"icon": "icon-file-text",
|
||||
"idx": 1,
|
||||
"is_submittable": 1,
|
||||
"modified": "2014-09-10 12:26:59.555710",
|
||||
"modified": "2014-09-09 05:35:32.156763",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Accounts",
|
||||
"name": "Purchase Invoice",
|
||||
|
@ -772,7 +772,7 @@
|
||||
"icon": "icon-file-text",
|
||||
"idx": 1,
|
||||
"is_submittable": 1,
|
||||
"modified": "2014-09-10 13:23:02.825233",
|
||||
"modified": "2014-09-10 05:35:32.583024",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Buying",
|
||||
"name": "Purchase Order",
|
||||
|
Loading…
x
Reference in New Issue
Block a user