Rearranged fields due to merge conflict messup

Browse Source

...

This commit is contained in:

Nabin Hait

2017-11-30 14:29:10 +05:30

parent 8677cd1565

commit e761b9de40

8 changed files with 13351 additions and 13082 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4020

erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

File diff suppressed because it is too large Load Diff

4155

erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

File diff suppressed because it is too large Load Diff