From d4c7159f60950f06aa153be3b33a5153d69a8ef8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 25 Jan 2013 18:31:06 +0530 Subject: [PATCH] fixes in dynamic label setting and column hiding based on currency --- .../purchase_invoice_item/purchase_invoice_item.txt | 10 +++++----- buying/doctype/purchase_common/purchase_common.js | 4 ++-- .../purchase_order_item/purchase_order_item.txt | 10 +++++----- .../supplier_quotation_item.txt | 10 +++++----- .../purchase_receipt_item/purchase_receipt_item.txt | 10 +++++----- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt index a810a451b2..bc763a4830 100755 --- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt +++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-10 16:34:08", + "creation": "2013-01-24 11:03:29", "docstatus": 0, - "modified": "2013-01-23 17:11:17", + "modified": "2013-01-25 18:28:20", "modified_by": "Administrator", "owner": "Administrator" }, @@ -118,7 +118,7 @@ "doctype": "DocField", "fieldname": "purchase_ref_rate", "fieldtype": "Currency", - "label": "Ref Rate *", + "label": "Ref Rate*", "options": "eval:erpnext.get_currency()", "print_hide": 1 }, @@ -126,7 +126,7 @@ "doctype": "DocField", "fieldname": "rate", "fieldtype": "Currency", - "label": "Rate *(Default Curr.)", + "label": "Rate*", "oldfieldname": "rate", "oldfieldtype": "Currency", "options": "eval:erpnext.get_currency()", @@ -137,7 +137,7 @@ "doctype": "DocField", "fieldname": "amount", "fieldtype": "Currency", - "label": "Amount (Default Curr.)", + "label": "Amount*", "oldfieldname": "amount", "oldfieldtype": "Currency", "options": "eval:erpnext.get_currency()", diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js index bb513fca74..5abf41ccd0 100644 --- a/buying/doctype/purchase_common/purchase_common.js +++ b/buying/doctype/purchase_common/purchase_common.js @@ -228,10 +228,10 @@ erpnext.buying.BuyingController = erpnext.utils.Controller.extend({ // toggle columns var item_grid = this.frm.fields_dict[this.fname].grid; - var hide = this.frm.doc.currency == company_currency; + var show = this.frm.doc.currency != company_currency; $.each(["purchase_rate", "purchase_ref_rate", "amount", "rate"], function(i, fname) { if(wn.meta.get_docfield(item_grid.doctype, fname)) - item_grid.set_column_disp(fname, hide); + item_grid.set_column_disp(fname, show); }); // set labels diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt index de70973607..97304968c9 100755 --- a/buying/doctype/purchase_order_item/purchase_order_item.txt +++ b/buying/doctype/purchase_order_item/purchase_order_item.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-10 16:34:10", + "creation": "2013-01-24 11:03:31", "docstatus": 0, - "modified": "2013-01-23 17:11:19", + "modified": "2013-01-25 18:26:49", "modified_by": "Administrator", "owner": "Administrator" }, @@ -151,7 +151,7 @@ "doctype": "DocField", "fieldname": "purchase_ref_rate", "fieldtype": "Currency", - "label": "Ref Rate *", + "label": "Ref Rate*", "options": "eval:erpnext.get_currency()", "print_hide": 1 }, @@ -160,7 +160,7 @@ "doctype": "DocField", "fieldname": "purchase_rate", "fieldtype": "Currency", - "label": "Rate (Default Curr.) *", + "label": "Rate*", "oldfieldname": "purchase_rate", "oldfieldtype": "Currency", "options": "eval:erpnext.get_currency()", @@ -174,7 +174,7 @@ "doctype": "DocField", "fieldname": "amount", "fieldtype": "Currency", - "label": "Amount (Default Curr.)", + "label": "Amount*", "oldfieldname": "amount", "oldfieldtype": "Currency", "options": "eval:erpnext.get_currency()", diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt index 44323791f4..60b424e51f 100644 --- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt +++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-10 16:34:12", + "creation": "2013-01-24 11:03:32", "docstatus": 0, - "modified": "2013-01-23 17:11:19", + "modified": "2013-01-25 18:28:54", "modified_by": "Administrator", "owner": "Administrator" }, @@ -137,7 +137,7 @@ "doctype": "DocField", "fieldname": "purchase_ref_rate", "fieldtype": "Currency", - "label": "Ref Rate *", + "label": "Ref Rate*", "options": "eval:erpnext.get_currency()", "print_hide": 1 }, @@ -146,7 +146,7 @@ "doctype": "DocField", "fieldname": "purchase_rate", "fieldtype": "Currency", - "label": "Rate (Default Curr.) *", + "label": "Rate*", "oldfieldname": "purchase_rate", "oldfieldtype": "Currency", "options": "eval:erpnext.get_currency()", @@ -160,7 +160,7 @@ "doctype": "DocField", "fieldname": "amount", "fieldtype": "Currency", - "label": "Amount (Default Curr.)", + "label": "Amount*", "oldfieldname": "amount", "oldfieldtype": "Currency", "options": "eval:erpnext.get_currency()", diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt index 12619b0ca2..693bfcabb4 100755 --- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt +++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-10 16:34:28", + "creation": "2013-01-24 11:03:43", "docstatus": 0, - "modified": "2013-01-23 17:11:25", + "modified": "2013-01-25 18:27:53", "modified_by": "Administrator", "owner": "Administrator" }, @@ -155,7 +155,7 @@ "doctype": "DocField", "fieldname": "purchase_ref_rate", "fieldtype": "Currency", - "label": "Ref Rate *", + "label": "Ref Rate*", "options": "eval:erpnext.get_currency()", "print_hide": 1 }, @@ -164,7 +164,7 @@ "doctype": "DocField", "fieldname": "purchase_rate", "fieldtype": "Currency", - "label": "Rate *(Default Curr.)", + "label": "Rate*", "oldfieldname": "purchase_rate", "oldfieldtype": "Currency", "options": "eval:erpnext.get_currency()", @@ -178,7 +178,7 @@ "doctype": "DocField", "fieldname": "amount", "fieldtype": "Currency", - "label": "Amount (Default Curr.)", + "label": "Amount*", "oldfieldname": "amount", "oldfieldtype": "Currency", "options": "eval:erpnext.get_currency()",