Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Item-Tax-Template' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12

Browse Source 
# Conflicts:
#	erpnext/patches.txt
#	erpnext/selling/doctype/sales_order/sales_order.json
This commit is contained in:
Saif Ur Rehman 2019-01-24 23:41:35 +05:00
commit 37d7b80572
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -4113,7 +4113,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2018-12-27 02:01:13.780828",
"modified": "2019-01-09 16:51:47.917330",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",