From 5ce1b8b8f9f6a0cb10441ed81a567eff83a93063 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Mon, 9 Dec 2013 16:29:04 +0530 Subject: [PATCH] [fix] [minor] customer name visibility fixed in sales invoice --- hr/doctype/earning_type/earning_type.txt | 4 ++-- manufacturing/doctype/bom/bom.txt | 6 +++--- selling/sales_common.js | 2 +- stock/doctype/delivery_note/delivery_note.txt | 4 ++-- stock/doctype/stock_entry/stock_entry.js | 2 +- stock/doctype/stock_entry/stock_entry.txt | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/hr/doctype/earning_type/earning_type.txt b/hr/doctype/earning_type/earning_type.txt index 0c84cf1d4e..902a4ed85b 100644 --- a/hr/doctype/earning_type/earning_type.txt +++ b/hr/doctype/earning_type/earning_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-24 11:03:32", "docstatus": 0, - "modified": "2013-07-22 15:25:26", + "modified": "2013-12-09 16:24:07", "modified_by": "Administrator", "owner": "Administrator" }, @@ -85,7 +85,7 @@ "doctype": "DocField", "fieldname": "exemption_limit", "fieldtype": "Float", - "hidden": 1, + "hidden": 0, "label": "Exemption Limit", "oldfieldname": "exemption_limit", "oldfieldtype": "Currency" diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt index 68553fb9e3..a5ff125293 100644 --- a/manufacturing/doctype/bom/bom.txt +++ b/manufacturing/doctype/bom/bom.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-22 15:11:38", "docstatus": 0, - "modified": "2013-12-04 11:51:36", + "modified": "2013-12-09 16:25:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -121,12 +121,12 @@ }, { "depends_on": "with_operations", + "description": "Specify the operations, operating cost and give a unique Operation no to your operations.", "doctype": "DocField", "fieldname": "operations", "fieldtype": "Section Break", "label": "Operations", - "oldfieldtype": "Section Break", - "options": "Specify the operations, operating cost and give a unique Operation no to your operations." + "oldfieldtype": "Section Break" }, { "doctype": "DocField", diff --git a/selling/sales_common.js b/selling/sales_common.js index ee55dfab7a..d6c8fdd0e4 100644 --- a/selling/sales_common.js +++ b/selling/sales_common.js @@ -95,7 +95,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ refresh: function() { this._super(); this.frm.toggle_display("customer_name", - (this.customer_name && this.frm.doc.customer_name!==this.frm.doc.customer)); + (this.frm.doc.customer_name && this.frm.doc.customer_name!==this.frm.doc.customer)); if(this.frm.fields_dict.packing_details) { var packing_list_exists = this.frm.get_doclist({parentfield: "packing_details"}).length; this.frm.toggle_display("packing_list", packing_list_exists ? true : false); diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt index 7fb166e686..1dc3cd3011 100644 --- a/stock/doctype/delivery_note/delivery_note.txt +++ b/stock/doctype/delivery_note/delivery_note.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:09", "docstatus": 0, - "modified": "2013-11-03 14:20:19", + "modified": "2013-12-09 16:24:08", "modified_by": "Administrator", "owner": "Administrator" }, @@ -229,7 +229,7 @@ "doctype": "DocField", "fieldname": "po_date", "fieldtype": "Date", - "hidden": 1, + "hidden": 0, "label": "Customer's Purchase Order Date", "no_copy": 0, "oldfieldname": "po_date", diff --git a/stock/doctype/stock_entry/stock_entry.js b/stock/doctype/stock_entry/stock_entry.js index ed41d7d879..76284eabb7 100644 --- a/stock/doctype/stock_entry/stock_entry.js +++ b/stock/doctype/stock_entry/stock_entry.js @@ -106,7 +106,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({ }, callback: function(r) { if (!r.exc) { - for(d in getchildren('Stock Entry Detail',doc.name,'mtn_details')) { + for(d in getchildren('Stock Entry Detail', me.frm.doc.name, 'mtn_details')) { if(!d.expense_account) d.expense_account = r.message; } } diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt index ca9b5f29a2..18a07a3550 100644 --- a/stock/doctype/stock_entry/stock_entry.txt +++ b/stock/doctype/stock_entry/stock_entry.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-09 11:43:55", "docstatus": 0, - "modified": "2013-11-03 14:11:42", + "modified": "2013-12-09 16:24:10", "modified_by": "Administrator", "owner": "Administrator" }, @@ -108,7 +108,7 @@ "doctype": "DocField", "fieldname": "delivery_note_no", "fieldtype": "Link", - "hidden": 1, + "hidden": 0, "in_filter": 0, "label": "Delivery Note No", "no_copy": 1, @@ -126,7 +126,7 @@ "doctype": "DocField", "fieldname": "sales_invoice_no", "fieldtype": "Link", - "hidden": 1, + "hidden": 0, "label": "Sales Invoice No", "no_copy": 1, "options": "Sales Invoice", @@ -139,7 +139,7 @@ "doctype": "DocField", "fieldname": "purchase_receipt_no", "fieldtype": "Link", - "hidden": 1, + "hidden": 0, "in_filter": 0, "label": "Purchase Receipt No", "no_copy": 1, @@ -299,7 +299,7 @@ "doctype": "DocField", "fieldname": "production_order", "fieldtype": "Link", - "hidden": 1, + "hidden": 0, "in_filter": 1, "label": "Production Order", "no_copy": 0,