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

[merge] re-applied changes to sales invoice & delivery note

Browse Source
This commit is contained in:
Rushabh Mehta 2015-08-27 11:05:26 +05:30
parent 5bec301929
commit cd2d8a0410
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@ -32,6 +32,29 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 1,
"bold": 0,
"collapsible": 0,
"default": "{customer_name}",
"fieldname": "title",
"fieldtype": "Data",
"hidden": 1,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Title",
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 1,
@ -1701,7 +1724,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "",
"depends_on": "is_pos",
"fieldname": "write_off_outstanding_amount_automatically",
"fieldtype": "Check",
"hidden": 0,
@ -1723,7 +1746,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:doc.is_pos===1||(doc.advances && doc.advances.length>0)",
"depends_on": "",
"fieldname": "column_break_74",
"fieldtype": "Column Break",
"hidden": 0,
@ -2859,7 +2882,7 @@
"is_submittable": 1,
"issingle": 0,
"istable": 0,
"modified": "2015-08-20 17:33:34.747470",
"modified": "2015-08-27 01:33:40.206780",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
@ -2951,5 +2974,5 @@
"search_fields": "posting_date, due_date, customer, fiscal_year, base_grand_total, outstanding_amount",
"sort_field": "modified",
"sort_order": "DESC",
"title_field": "customer_name"
"title_field": "title"
}

3
erpnext/patches/v6_0/set_default_title.py
View File

@ -27,3 +27,6 @@ def execute():
frappe.reload_doctype("Stock Entry")
frappe.db.sql("""update `tabStock Entry` set title = purpose""")
frappe.reload_doctype("Sales Invoice")
frappe.db.sql("""update `tabSales Invoice` set title = customer_name""")

4
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -1210,7 +1210,7 @@
"options": "\nGrand Total\nNet Total",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide": 1,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@ -2438,7 +2438,7 @@
"is_submittable": 1,
"issingle": 0,
"istable": 0,
"modified": "2015-08-26 08:30:51.771362",
"modified": "2015-08-27 01:34:57.976420",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",