Browse Source
Merge pull request #14954 from saurabh6790/conflict_fixes
[minor] remove conflicts
develop
Saurabh
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
2 deletions
-
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
|
|
@ -15,7 +15,6 @@ |
|
|
"engine": "InnoDB", |
|
|
"engine": "InnoDB", |
|
|
"fields": [ |
|
|
"fields": [ |
|
|
{ |
|
|
{ |
|
|
<<<<<<< HEAD |
|
|
|
|
|
"allow_bulk_edit": 0, |
|
|
"allow_bulk_edit": 0, |
|
|
"allow_in_quick_entry": 0, |
|
|
"allow_in_quick_entry": 0, |
|
|
"allow_on_submit": 0, |
|
|
"allow_on_submit": 0, |
|
|
@ -5443,7 +5442,7 @@ |
|
|
"istable": 0, |
|
|
"istable": 0, |
|
|
"max_attachments": 0, |
|
|
"max_attachments": 0, |
|
|
"menu_index": 0, |
|
|
"menu_index": 0, |
|
|
"modified": "2018-07-12 13:16:20.918322", |
|
|
"modified": "2018-07-18 13:16:20.918322", |
|
|
"modified_by": "Administrator", |
|
|
"modified_by": "Administrator", |
|
|
"module": "Accounts", |
|
|
"module": "Accounts", |
|
|
"name": "Sales Invoice", |
|
|
"name": "Sales Invoice", |
|
|
|
