[merge] re-applied changes to sales invoice & delivery note
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index d4c7003..e253f8d 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -33,6 +33,29 @@
"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,
"collapsible": 0,
@@ -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"
}
\ No newline at end of file
diff --git a/erpnext/patches/v6_0/set_default_title.py b/erpnext/patches/v6_0/set_default_title.py
index a42ebbb..e72e5c0 100644
--- a/erpnext/patches/v6_0/set_default_title.py
+++ b/erpnext/patches/v6_0/set_default_title.py
@@ -27,3 +27,6 @@
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""")
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index bbd2f40..d30d5d6 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -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",