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

Merge pull request #1167 from akhileshdarjee/master

Browse Source 
[fix] [minor] customer name visibility fixed in sales invoice
This commit is contained in:
Anand Doshi 2013-12-09 03:03:39 -08:00
commit c9df05126a
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hr/doctype/earning_type/earning_type.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-01-24 11:03:32", "creation": "2013-01-24 11:03:32",
"docstatus": 0, "docstatus": 0,
"modified": "2013-07-22 15:25:26", "modified": "2013-12-09 16:24:07",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -85,7 +85,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "exemption_limit", "fieldname": "exemption_limit",
"fieldtype": "Float", "fieldtype": "Float",
"hidden": 1, "hidden": 0,
"label": "Exemption Limit", "label": "Exemption Limit",
"oldfieldname": "exemption_limit", "oldfieldname": "exemption_limit",
"oldfieldtype": "Currency" "oldfieldtype": "Currency"

6
manufacturing/doctype/bom/bom.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-01-22 15:11:38", "creation": "2013-01-22 15:11:38",
"docstatus": 0, "docstatus": 0,
"modified": "2013-12-04 11:51:36", "modified": "2013-12-09 16:25:50",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -121,12 +121,12 @@
}, },
{ {
"depends_on": "with_operations", "depends_on": "with_operations",
"description": "Specify the operations, operating cost and give a unique Operation no to your operations.",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "operations", "fieldname": "operations",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Operations", "label": "Operations",
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break"
"options": "Specify the operations, operating cost and give a unique Operation no to your operations."
}, },
{ {
"doctype": "DocField", "doctype": "DocField",

2
selling/sales_common.js
View File

@ -95,7 +95,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
refresh: function() { refresh: function() {
this._super(); this._super();
this.frm.toggle_display("customer_name", 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) { if(this.frm.fields_dict.packing_details) {
var packing_list_exists = this.frm.get_doclist({parentfield: "packing_details"}).length; var packing_list_exists = this.frm.get_doclist({parentfield: "packing_details"}).length;
this.frm.toggle_display("packing_list", packing_list_exists ? true : false); this.frm.toggle_display("packing_list", packing_list_exists ? true : false);

4
stock/doctype/delivery_note/delivery_note.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-24 19:29:09", "creation": "2013-05-24 19:29:09",
"docstatus": 0, "docstatus": 0,
"modified": "2013-11-03 14:20:19", "modified": "2013-12-09 16:24:08",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -229,7 +229,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "po_date", "fieldname": "po_date",
"fieldtype": "Date", "fieldtype": "Date",
"hidden": 1, "hidden": 0,
"label": "Customer's Purchase Order Date", "label": "Customer's Purchase Order Date",
"no_copy": 0, "no_copy": 0,
"oldfieldname": "po_date", "oldfieldname": "po_date",

2
stock/doctype/stock_entry/stock_entry.js
View File

@ -106,7 +106,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
}, },
callback: function(r) { callback: function(r) {
if (!r.exc) { 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; if(!d.expense_account) d.expense_account = r.message;
} }
} }

10
stock/doctype/stock_entry/stock_entry.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-04-09 11:43:55", "creation": "2013-04-09 11:43:55",
"docstatus": 0, "docstatus": 0,
"modified": "2013-11-03 14:11:42", "modified": "2013-12-09 16:24:10",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -108,7 +108,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "delivery_note_no", "fieldname": "delivery_note_no",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1, "hidden": 0,
"in_filter": 0, "in_filter": 0,
"label": "Delivery Note No", "label": "Delivery Note No",
"no_copy": 1, "no_copy": 1,
@ -126,7 +126,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "sales_invoice_no", "fieldname": "sales_invoice_no",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1, "hidden": 0,
"label": "Sales Invoice No", "label": "Sales Invoice No",
"no_copy": 1, "no_copy": 1,
"options": "Sales Invoice", "options": "Sales Invoice",
@ -139,7 +139,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "purchase_receipt_no", "fieldname": "purchase_receipt_no",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1, "hidden": 0,
"in_filter": 0, "in_filter": 0,
"label": "Purchase Receipt No", "label": "Purchase Receipt No",
"no_copy": 1, "no_copy": 1,
@ -299,7 +299,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "production_order", "fieldname": "production_order",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1, "hidden": 0,
"in_filter": 1, "in_filter": 1,
"label": "Production Order", "label": "Production Order",
"no_copy": 0, "no_copy": 0,