From d3c74c1a1bbb023fd4b2314a098c659624fca7dd Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Tue, 9 Jul 2013 11:51:24 +0530 Subject: [PATCH 1/3] [Cleanup][Report] Added company in Warehouse-wise Stock Balance & removed filters from both reports --- .../batch_wise_balance_history.js | 21 ---------- .../batch_wise_balance_history.py | 11 ------ .../warehouse_wise_stock_balance.js | 14 ------- .../warehouse_wise_stock_balance.py | 38 ++++++++----------- 4 files changed, 16 insertions(+), 68 deletions(-) diff --git a/stock/report/batch_wise_balance_history/batch_wise_balance_history.js b/stock/report/batch_wise_balance_history/batch_wise_balance_history.js index 0ba1938a59..98293e45f7 100644 --- a/stock/report/batch_wise_balance_history/batch_wise_balance_history.js +++ b/stock/report/batch_wise_balance_history/batch_wise_balance_history.js @@ -1,26 +1,5 @@ wn.query_reports["Batch-Wise Balance History"] = { "filters": [ - { - "fieldname":"item_code", - "label": "Item", - "fieldtype": "Link", - "options": "Item", - "width": "80" - }, - { - "fieldname":"warehouse", - "label": "Warehouse", - "fieldtype": "Link", - "options": "Warehouse", - "width": "80" - }, - { - "fieldname":"batch_no", - "label": "Batch", - "fieldtype": "Link", - "options": "Batch", - "width": "80" - }, { "fieldname":"from_date", "label": "From Date", diff --git a/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/stock/report/batch_wise_balance_history/batch_wise_balance_history.py index ca3e775f72..530465e9ae 100644 --- a/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +++ b/stock/report/batch_wise_balance_history/batch_wise_balance_history.py @@ -49,15 +49,6 @@ def get_columns(filters): def get_conditions(filters): conditions = "" - if filters.get("item_code"): - conditions += " and item_code='%s'" % filters["item_code"] - - if filters.get("warehouse"): - conditions += " and warehouse='%s'" % filters["warehouse"] - - if filters.get("batch_no"): - conditions += " and batch_no='%s'" % filters["batch_no"] - if not filters.get("from_date"): webnotes.msgprint("Please enter From Date", raise_exception=1) @@ -100,8 +91,6 @@ def get_item_warehouse_batch_map(filters): return iwb_map def get_item_details(filters): - if filters.get("item_code"): - conditions = " and name = '%s'" % filters["item_code"] item_map = {} for d in webnotes.conn.sql("select name, item_name, description from tabItem", as_dict=1): item_map.setdefault(d.name, d) diff --git a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js b/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js index 5e1eb3a7b2..2ce5b4b4ab 100644 --- a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js +++ b/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js @@ -1,19 +1,5 @@ wn.query_reports["Warehouse-Wise Stock Balance"] = { "filters": [ - { - "fieldname":"item_code", - "label": "Item", - "fieldtype": "Link", - "options": "Item", - "width": "80" - }, - { - "fieldname":"warehouse", - "label": "Warehouse", - "fieldtype": "Link", - "options": "Warehouse", - "width": "80" - }, { "fieldname":"from_date", "label": "From Date", diff --git a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py b/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py index 324bbe3e8c..4389aa59e4 100644 --- a/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py +++ b/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py @@ -26,34 +26,29 @@ def execute(filters=None): iwb_map = get_item_warehouse_map(filters) data = [] - for item in sorted(iwb_map): - for wh in sorted(iwb_map[item]): - qty_dict = iwb_map[item][wh] - data.append([item, item_map[item]["item_name"], - item_map[item]["description"], wh, - qty_dict.opening_qty, qty_dict.in_qty, - qty_dict.out_qty, qty_dict.bal_qty - ]) + for company in sorted(iwb_map): + for item in sorted(iwb_map[company]): + for wh in sorted(iwb_map[company][item]): + qty_dict = iwb_map[company][item][wh] + data.append([item, item_map[item]["item_name"], + item_map[item]["description"], wh, + qty_dict.opening_qty, qty_dict.in_qty, + qty_dict.out_qty, qty_dict.bal_qty, company + ]) return columns, data def get_columns(filters): """return columns based on filters""" - columns = ["Item:Link/Item:100"] + ["Item Name::150"] + ["Description::150"] + \ - ["Warehouse:Link/Warehouse:100"] + ["Opening Qty::90"] + \ - ["In Qty::80"] + ["Out Qty::80"] + ["Balance Qty::90"] + columns = ["Item:Link/Item:100", "Item Name::150", "Description::150", \ + "Warehouse:Link/Warehouse:100", "Opening Qty::90", \ + "In Qty::80", "Out Qty::80", "Balance Qty::90", "Company:Link/Company:100"] return columns def get_conditions(filters): conditions = "" - if filters.get("item_code"): - conditions += " and item_code='%s'" % filters["item_code"] - - if filters.get("warehouse"): - conditions += " and warehouse='%s'" % filters["warehouse"] - if not filters.get("from_date"): webnotes.msgprint("Please enter From Date", raise_exception=1) @@ -68,7 +63,7 @@ def get_conditions(filters): def get_stock_ledger_entries(filters): conditions = get_conditions(filters) return webnotes.conn.sql("""select item_code, warehouse, - posting_date, actual_qty + posting_date, actual_qty, company from `tabStock Ledger Entry` where ifnull(is_cancelled, 'No') = 'No' %s order by item_code, warehouse""" % conditions, as_dict=1) @@ -78,10 +73,11 @@ def get_item_warehouse_map(filters): iwb_map = {} for d in sle: - iwb_map.setdefault(d.item_code, {}).setdefault(d.warehouse, webnotes._dict({\ + iwb_map.setdefault(d.company, {}).setdefault(d.item_code, {}).\ + setdefault(d.warehouse, webnotes._dict({\ "opening_qty": 0.0, "in_qty": 0.0, "out_qty": 0.0, "bal_qty": 0.0 })) - qty_dict = iwb_map[d.item_code][d.warehouse] + qty_dict = iwb_map[d.company][d.item_code][d.warehouse] if d.posting_date < filters["from_date"]: qty_dict.opening_qty += flt(d.actual_qty) elif d.posting_date >= filters["from_date"] and d.posting_date <= filters["to_date"]: @@ -95,8 +91,6 @@ def get_item_warehouse_map(filters): return iwb_map def get_item_details(filters): - if filters.get("item_code"): - conditions = " and name = '%s'" % filters["item_code"] item_map = {} for d in webnotes.conn.sql("select name, item_name, description from tabItem", as_dict=1): item_map.setdefault(d.name, d) From 3b999225bac7cc55733b954ddb0d0097542f6fca Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 9 Jul 2013 12:35:52 +0530 Subject: [PATCH 2/3] [validation] over billing against DN/PR --- .../purchase_invoice/purchase_invoice.py | 1 + .../doctype/sales_invoice/sales_invoice.py | 1 + controllers/accounts_controller.py | 16 ++++++++++++++++ .../delivery_note/test_delivery_note.py | 19 +++++++++++++++++++ .../purchase_receipt/test_purchase_receipt.py | 6 +++++- 5 files changed, 42 insertions(+), 1 deletion(-) diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.py b/accounts/doctype/purchase_invoice/purchase_invoice.py index c7135f47c9..ca13458f3e 100644 --- a/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -75,6 +75,7 @@ class DocType(BuyingController): self.validate_write_off_account() self.update_raw_material_cost() self.update_valuation_rate("entries") + self.validate_multiple_billing("Purchase Receipt", "pr_detail", "import_amount") def get_credit_to(self): acc_head = sql("""select name, credit_days from `tabAccount` diff --git a/accounts/doctype/sales_invoice/sales_invoice.py b/accounts/doctype/sales_invoice/sales_invoice.py index c5c510c58f..35f9002fcf 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.py +++ b/accounts/doctype/sales_invoice/sales_invoice.py @@ -93,6 +93,7 @@ class DocType(SellingController): self.validate_c_form() self.validate_time_logs_are_submitted() self.validate_recurring_invoice() + self.validate_multiple_billing("Delivered Note", "dn_detail", "export_amount") def on_submit(self): if cint(self.doc.update_stock) == 1: diff --git a/controllers/accounts_controller.py b/controllers/accounts_controller.py index 957958cddc..41b033bb0f 100644 --- a/controllers/accounts_controller.py +++ b/controllers/accounts_controller.py @@ -354,6 +354,22 @@ class AccountsController(TransactionBase): "advance_amount": flt(d.amount), "allocate_amount": 0 }) + + def validate_multiple_billing(self, ref_dt, item_ref_dn, based_on): + for item in self.doclist.get({"parentfield": "entries"}): + if item.fields.get(item_ref_dn): + already_billed = webnotes.conn.sql("""select sum(%s) from `tab%s` + where %s=%s and docstatus=1""" % (based_on, self.tname, item_ref_dn, '%s'), + item.fields[item_ref_dn])[0][0] + if already_billed: + max_allowed_amt = webnotes.conn.get_value(ref_dt + " Item", + item.fields[item_ref_dn], based_on) + + if flt(already_billed) + flt(item.fields[based_on]) > max_allowed_amt: + webnotes.msgprint(_("Row ")+ item.idx + ": " + item.item_code + + _(" will be over-billed against mentioned ") + ref_dt + + _(". Max allowed " + based_on + ": " + max_allowed_amt), + raise_exception=1) def get_company_default(self, fieldname): from accounts.utils import get_company_default diff --git a/stock/doctype/delivery_note/test_delivery_note.py b/stock/doctype/delivery_note/test_delivery_note.py index a8ff87ecc4..e7e66ed30a 100644 --- a/stock/doctype/delivery_note/test_delivery_note.py +++ b/stock/doctype/delivery_note/test_delivery_note.py @@ -28,6 +28,25 @@ class TestDeliveryNote(unittest.TestCase): pr.run_method("calculate_taxes_and_totals") pr.insert() pr.submit() + + def test_over_billing_against_dn(self): + from stock.doctype.delivery_note.delivery_note import make_sales_invoice + + dn = webnotes.bean(copy=test_records[0]).insert() + + self.assertRaises(webnotes.ValidationError, make_sales_invoice, + dn.doc.name) + + dn = webnotes.bean("Delivery Note", dn.doc.name) + dn.submit() + si = make_sales_invoice(dn.doc.name) + + self.assertEquals(len(si), len(dn.doclist)) + + # modify export_amount + si[1].export_rate = 200 + self.assertRaises(webnotes.ValidationError, webnotes.bean(si).submit) + def test_delivery_note_no_gl_entry(self): webnotes.conn.sql("""delete from `tabBin`""") diff --git a/stock/doctype/purchase_receipt/test_purchase_receipt.py b/stock/doctype/purchase_receipt/test_purchase_receipt.py index e754e69836..377f91d831 100644 --- a/stock/doctype/purchase_receipt/test_purchase_receipt.py +++ b/stock/doctype/purchase_receipt/test_purchase_receipt.py @@ -22,7 +22,7 @@ import webnotes.defaults from webnotes.utils import cint class TestPurchaseReceipt(unittest.TestCase): - def test_make_purchase_invocie(self): + def test_make_purchase_invoice(self): from stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice pr = webnotes.bean(copy=test_records[0]).insert() @@ -37,6 +37,10 @@ class TestPurchaseReceipt(unittest.TestCase): self.assertEquals(pi[0]["doctype"], "Purchase Invoice") self.assertEquals(len(pi), len(pr.doclist)) + # modify import_rate + pi[1].import_rate = 200 + self.assertRaises(webnotes.ValidationError, webnotes.bean(pi).submit) + def test_purchase_receipt_no_gl_entry(self): pr = webnotes.bean(copy=test_records[0]) pr.run_method("calculate_taxes_and_totals") From bdee6e074a7104969530881513eae3eabb4029d7 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 9 Jul 2013 13:03:39 +0530 Subject: [PATCH 3/3] [cleanup] moved company to top section, hide company if only one exists, changed field labels --- .../purchase_invoice/purchase_invoice.txt | 257 ++++++++---------- .../purchase_invoice_item.txt | 16 +- .../doctype/sales_invoice/sales_invoice.py | 2 +- .../doctype/sales_invoice/sales_invoice.txt | 64 ++--- .../sales_invoice_item/sales_invoice_item.txt | 26 +- .../purchase_common/purchase_common.js | 15 + .../doctype/purchase_order/purchase_order.txt | 216 +++++++-------- .../purchase_order_item.txt | 8 +- .../supplier_quotation/supplier_quotation.txt | 193 ++++++------- .../supplier_quotation_item.txt | 12 +- public/js/queries.js | 1 + public/js/startup.js | 6 - public/js/transaction.js | 1 + public/js/utils.js | 36 ++- selling/doctype/quotation/quotation.txt | 53 ++-- .../doctype/quotation_item/quotation_item.txt | 8 +- selling/doctype/sales_order/sales_order.txt | 71 +++-- .../sales_order_item/sales_order_item.txt | 10 +- stock/doctype/delivery_note/delivery_note.txt | 97 +++---- .../delivery_note_item/delivery_note_item.txt | 8 +- .../material_request/material_request.txt | 60 ++-- .../purchase_receipt/purchase_receipt.txt | 182 ++++++------- .../purchase_receipt_item.txt | 16 +- 23 files changed, 616 insertions(+), 742 deletions(-) diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt index 779b056404..64b9f5c66b 100755 --- a/accounts/doctype/purchase_invoice/purchase_invoice.txt +++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-07-08 18:03:17", + "modified": "2013-07-09 12:51:06", "modified_by": "Administrator", "owner": "Administrator" }, @@ -172,7 +172,7 @@ "fieldname": "bill_no", "fieldtype": "Data", "in_filter": 1, - "label": "Bill No", + "label": "Supplier Invoice No", "oldfieldname": "bill_no", "oldfieldtype": "Data", "print_hide": 1, @@ -185,7 +185,7 @@ "fieldname": "bill_date", "fieldtype": "Date", "in_filter": 1, - "label": "Bill Date", + "label": "Supplier Invoice Date", "oldfieldname": "bill_date", "oldfieldtype": "Date", "print_hide": 1, @@ -195,37 +195,34 @@ }, { "doctype": "DocField", - "fieldname": "items", - "fieldtype": "Section Break", - "label": "Items", - "oldfieldtype": "Section Break", - "options": "icon-shopping-cart", - "read_only": 0 - }, - { - "allow_on_submit": 1, - "doctype": "DocField", - "fieldname": "entries", - "fieldtype": "Table", - "label": "Entries", - "oldfieldname": "entries", - "oldfieldtype": "Table", - "options": "Purchase Invoice Item", - "read_only": 0 + "fieldname": "amended_from", + "fieldtype": "Link", + "label": "Amended From", + "no_copy": 1, + "oldfieldname": "amended_from", + "oldfieldtype": "Link", + "options": "Purchase Invoice", + "print_hide": 1, + "read_only": 1 }, { "doctype": "DocField", - "fieldname": "recalculate", - "fieldtype": "Button", - "label": "Recalculate", - "oldfieldtype": "Button", - "read_only": 0 + "fieldname": "company", + "fieldtype": "Link", + "in_filter": 1, + "label": "Company", + "oldfieldname": "company", + "oldfieldtype": "Link", + "options": "Company", + "print_hide": 1, + "read_only": 0, + "search_index": 1 }, { "doctype": "DocField", "fieldname": "currency_price_list", "fieldtype": "Section Break", - "label": "Currency & Price List", + "label": "Currency and Price List", "options": "icon-tag", "read_only": 0 }, @@ -287,6 +284,59 @@ "print_hide": 1, "read_only": 0 }, + { + "doctype": "DocField", + "fieldname": "items", + "fieldtype": "Section Break", + "label": "Items", + "oldfieldtype": "Section Break", + "options": "icon-shopping-cart", + "read_only": 0 + }, + { + "allow_on_submit": 1, + "doctype": "DocField", + "fieldname": "entries", + "fieldtype": "Table", + "label": "Entries", + "oldfieldname": "entries", + "oldfieldtype": "Table", + "options": "Purchase Invoice Item", + "read_only": 0 + }, + { + "doctype": "DocField", + "fieldname": "section_break_26", + "fieldtype": "Section Break" + }, + { + "doctype": "DocField", + "fieldname": "net_total_import", + "fieldtype": "Currency", + "label": "Net Total", + "oldfieldname": "net_total_import", + "oldfieldtype": "Currency", + "options": "currency", + "print_hide": 1, + "read_only": 1 + }, + { + "doctype": "DocField", + "fieldname": "column_break_28", + "fieldtype": "Column Break" + }, + { + "description": "Will be calculated automatically when you enter the details", + "doctype": "DocField", + "fieldname": "net_total", + "fieldtype": "Currency", + "label": "Net Total (Company Currency)", + "oldfieldname": "net_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "print_hide": 1, + "read_only": 1 + }, { "description": "Add / Edit Taxes and Charges", "doctype": "DocField", @@ -308,16 +358,6 @@ "print_hide": 1, "read_only": 0 }, - { - "doctype": "DocField", - "fieldname": "get_tax_detail", - "fieldtype": "Button", - "label": "Get Tax Detail", - "oldfieldtype": "Button", - "options": "get_purchase_tax_details", - "print_hide": 1, - "read_only": 0 - }, { "doctype": "DocField", "fieldname": "purchase_tax_details", @@ -328,15 +368,6 @@ "options": "Purchase Taxes and Charges", "read_only": 0 }, - { - "doctype": "DocField", - "fieldname": "calculate_tax", - "fieldtype": "Button", - "label": "Calculate Tax", - "oldfieldtype": "Button", - "print_hide": 1, - "read_only": 0 - }, { "doctype": "DocField", "fieldname": "tax_calculation", @@ -346,50 +377,6 @@ "print_hide": 1, "read_only": 0 }, - { - "doctype": "DocField", - "fieldname": "total_tax", - "fieldtype": "Currency", - "label": "Total Tax", - "oldfieldname": "total_tax", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "print_hide": 1, - "read_only": 1 - }, - { - "depends_on": "supplier", - "doctype": "DocField", - "fieldname": "contact_section", - "fieldtype": "Section Break", - "label": "Contact Info", - "options": "icon-bullhorn", - "read_only": 0 - }, - { - "doctype": "DocField", - "fieldname": "supplier_address", - "fieldtype": "Link", - "label": "Supplier Address", - "options": "Address", - "read_only": 0 - }, - { - "doctype": "DocField", - "fieldname": "col_break23", - "fieldtype": "Column Break", - "read_only": 0, - "width": "50%" - }, - { - "doctype": "DocField", - "fieldname": "contact_person", - "fieldtype": "Link", - "label": "Contact Person", - "options": "Contact", - "print_hide": 1, - "read_only": 0 - }, { "doctype": "DocField", "fieldname": "totals", @@ -399,22 +386,11 @@ "options": "icon-money", "read_only": 0 }, - { - "doctype": "DocField", - "fieldname": "net_total_import", - "fieldtype": "Currency", - "label": "Net Total (Import)", - "oldfieldname": "net_total_import", - "oldfieldtype": "Currency", - "options": "currency", - "print_hide": 1, - "read_only": 1 - }, { "doctype": "DocField", "fieldname": "other_charges_added_import", "fieldtype": "Currency", - "label": "Taxes and Charges Added (Import)", + "label": "Taxes and Charges Added", "oldfieldname": "other_charges_added_import", "oldfieldtype": "Currency", "options": "currency", @@ -425,7 +401,7 @@ "doctype": "DocField", "fieldname": "other_charges_deducted_import", "fieldtype": "Currency", - "label": "Taxes and Charges Deducted (Import)", + "label": "Taxes and Charges Deducted", "oldfieldname": "other_charges_deducted_import", "oldfieldtype": "Currency", "options": "currency", @@ -437,7 +413,7 @@ "fieldname": "grand_total_import", "fieldtype": "Currency", "in_list_view": 1, - "label": "Grand Total (Import)", + "label": "Grand Total", "oldfieldname": "grand_total_import", "oldfieldtype": "Currency", "options": "currency", @@ -448,7 +424,7 @@ "doctype": "DocField", "fieldname": "in_words_import", "fieldtype": "Data", - "label": "In Words (Import)", + "label": "In Words", "oldfieldname": "in_words_import", "oldfieldtype": "Data", "print_hide": 1, @@ -504,12 +480,11 @@ "width": "50%" }, { - "description": "Will be calculated automatically when you enter the details", "doctype": "DocField", - "fieldname": "net_total", + "fieldname": "total_tax", "fieldtype": "Currency", - "label": "Net Total", - "oldfieldname": "net_total", + "label": "Total Tax (Company Currency)", + "oldfieldname": "total_tax", "oldfieldtype": "Currency", "options": "Company:company:default_currency", "print_hide": 1, @@ -519,7 +494,7 @@ "doctype": "DocField", "fieldname": "other_charges_added", "fieldtype": "Currency", - "label": "Taxes and Charges Added", + "label": "Taxes and Charges Added (Company Currency)", "oldfieldname": "other_charges_added", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -530,7 +505,7 @@ "doctype": "DocField", "fieldname": "other_charges_deducted", "fieldtype": "Currency", - "label": "Taxes and Charges Deducted", + "label": "Taxes and Charges Deducted (Company Currency)", "oldfieldname": "other_charges_deducted", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -541,7 +516,7 @@ "doctype": "DocField", "fieldname": "grand_total", "fieldtype": "Currency", - "label": "Grand Total", + "label": "Grand Total (Company Currency)", "oldfieldname": "grand_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -553,7 +528,7 @@ "doctype": "DocField", "fieldname": "in_words", "fieldtype": "Data", - "label": "In Words", + "label": "In Words (Company Currency)", "oldfieldname": "in_words", "oldfieldtype": "Data", "print_hide": 1, @@ -657,6 +632,39 @@ "fieldtype": "Text Editor", "label": "Terms and Conditions1" }, + { + "depends_on": "supplier", + "doctype": "DocField", + "fieldname": "contact_section", + "fieldtype": "Section Break", + "label": "Contact Info", + "options": "icon-bullhorn", + "read_only": 0 + }, + { + "doctype": "DocField", + "fieldname": "supplier_address", + "fieldtype": "Link", + "label": "Supplier Address", + "options": "Address", + "read_only": 0 + }, + { + "doctype": "DocField", + "fieldname": "col_break23", + "fieldtype": "Column Break", + "read_only": 0, + "width": "50%" + }, + { + "doctype": "DocField", + "fieldname": "contact_person", + "fieldtype": "Link", + "label": "Contact Person", + "options": "Contact", + "print_hide": 1, + "read_only": 0 + }, { "doctype": "DocField", "fieldname": "more_info", @@ -694,18 +702,6 @@ "read_only": 0, "search_index": 0 }, - { - "doctype": "DocField", - "fieldname": "amended_from", - "fieldtype": "Link", - "label": "Amended From", - "no_copy": 1, - "oldfieldname": "amended_from", - "oldfieldtype": "Link", - "options": "Purchase Invoice", - "print_hide": 1, - "read_only": 1 - }, { "allow_on_submit": 1, "doctype": "DocField", @@ -749,19 +745,6 @@ "fieldtype": "Column Break", "read_only": 0 }, - { - "doctype": "DocField", - "fieldname": "company", - "fieldtype": "Link", - "in_filter": 1, - "label": "Company", - "oldfieldname": "company", - "oldfieldtype": "Link", - "options": "Company", - "print_hide": 1, - "read_only": 0, - "search_index": 1 - }, { "doctype": "DocField", "fieldname": "fiscal_year", diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt index 8df4306f57..867cd7a136 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-04-19 11:00:07", + "creation": "2013-05-22 12:43:10", "docstatus": 0, - "modified": "2013-05-22 12:01:56", + "modified": "2013-07-09 12:21:47", "modified_by": "Administrator", "owner": "Administrator" }, @@ -86,7 +86,7 @@ "doctype": "DocField", "fieldname": "import_ref_rate", "fieldtype": "Currency", - "label": "Ref Rate ", + "label": "Price List Rate", "options": "currency", "print_hide": 1, "read_only": 0 @@ -126,7 +126,7 @@ "doctype": "DocField", "fieldname": "purchase_ref_rate", "fieldtype": "Currency", - "label": "Ref Rate*", + "label": "Price List Rate (Company Currency)", "options": "Company:company:default_currency", "print_hide": 1, "read_only": 0 @@ -135,7 +135,7 @@ "doctype": "DocField", "fieldname": "rate", "fieldtype": "Currency", - "label": "Rate*", + "label": "Rate (Company Currency)", "oldfieldname": "rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -147,7 +147,7 @@ "doctype": "DocField", "fieldname": "amount", "fieldtype": "Currency", - "label": "Amount*", + "label": "Amount (Company Currency)", "oldfieldname": "amount", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -223,7 +223,7 @@ "fieldname": "purchase_order", "fieldtype": "Link", "in_filter": 1, - "label": "Pur Order", + "label": "Purchase Order", "no_copy": 1, "oldfieldname": "purchase_order", "oldfieldtype": "Link", @@ -251,7 +251,7 @@ "fieldname": "purchase_receipt", "fieldtype": "Link", "in_filter": 1, - "label": "Pur Receipt", + "label": "Purchase Receipt", "no_copy": 1, "oldfieldname": "purchase_receipt", "oldfieldtype": "Link", diff --git a/accounts/doctype/sales_invoice/sales_invoice.py b/accounts/doctype/sales_invoice/sales_invoice.py index c5c510c58f..23fe75eaff 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.py +++ b/accounts/doctype/sales_invoice/sales_invoice.py @@ -149,7 +149,7 @@ class DocType(SellingController): self.make_cancel_gl_entries() def update_status_updater_args(self): - if cint(self.doc.is_pos) and cint(self.doc.update_stock): + if cint(self.doc.update_stock): self.status_updater.append({ 'source_dt':'Sales Invoice Item', 'target_dt':'Sales Order Item', diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt index c935789efb..e3c60a0a5c 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.txt +++ b/accounts/doctype/sales_invoice/sales_invoice.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:05", "docstatus": 0, - "modified": "2013-07-09 11:18:43", + "modified": "2013-07-09 12:48:05", "modified_by": "Administrator", "owner": "Administrator" }, @@ -223,7 +223,7 @@ "doctype": "DocField", "fieldname": "currency_section", "fieldtype": "Section Break", - "label": "Price List and Currency", + "label": "Currency and Price List", "options": "icon-tag", "read_only": 0 }, @@ -350,20 +350,30 @@ "print_hide": 1, "read_only": 0 }, + { + "doctype": "DocField", + "fieldname": "section_break_30", + "fieldtype": "Section Break" + }, { "doctype": "DocField", "fieldname": "net_total_export", "fieldtype": "Currency", - "label": "Net Total (Export)", + "label": "Net Total", "options": "currency", "print_hide": 0, "read_only": 1 }, + { + "doctype": "DocField", + "fieldname": "column_break_32", + "fieldtype": "Column Break" + }, { "doctype": "DocField", "fieldname": "net_total", "fieldtype": "Currency", - "label": "Net Total*", + "label": "Net Total (Company Currency)", "oldfieldname": "net_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -371,15 +381,6 @@ "read_only": 1, "reqd": 1 }, - { - "doctype": "DocField", - "fieldname": "recalculate_values", - "fieldtype": "Button", - "label": "Re-Calculate Values", - "oldfieldtype": "Button", - "print_hide": 1, - "read_only": 0 - }, { "doctype": "DocField", "fieldname": "taxes", @@ -449,19 +450,8 @@ "doctype": "DocField", "fieldname": "other_charges_total_export", "fieldtype": "Currency", - "label": "Total Taxes and Charges (Export)", - "options": "currency", - "print_hide": 1, - "read_only": 1 - }, - { - "doctype": "DocField", - "fieldname": "other_charges_total", - "fieldtype": "Currency", "label": "Total Taxes and Charges", - "oldfieldname": "other_charges_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", + "options": "currency", "print_hide": 1, "read_only": 1 }, @@ -472,12 +462,14 @@ }, { "doctype": "DocField", - "fieldname": "calculate_charges", - "fieldtype": "Button", - "label": "Calculate Taxes and Charges", - "oldfieldtype": "Button", + "fieldname": "other_charges_total", + "fieldtype": "Currency", + "label": "Total Taxes and Charges (Company Currency)", + "oldfieldname": "other_charges_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", "print_hide": 1, - "read_only": 0 + "read_only": 1 }, { "doctype": "DocField", @@ -494,7 +486,7 @@ "fieldname": "grand_total_export", "fieldtype": "Currency", "in_list_view": 1, - "label": "Grand Total (Export)", + "label": "Grand Total", "oldfieldname": "grand_total_export", "oldfieldtype": "Currency", "options": "currency", @@ -506,7 +498,7 @@ "doctype": "DocField", "fieldname": "rounded_total_export", "fieldtype": "Currency", - "label": "Rounded Total (Export)", + "label": "Rounded Total", "oldfieldname": "rounded_total_export", "oldfieldtype": "Currency", "options": "currency", @@ -517,7 +509,7 @@ "doctype": "DocField", "fieldname": "in_words_export", "fieldtype": "Data", - "label": "In Words (Export)", + "label": "In Words", "oldfieldname": "in_words_export", "oldfieldtype": "Data", "print_hide": 0, @@ -558,7 +550,7 @@ "fieldname": "grand_total", "fieldtype": "Currency", "in_filter": 1, - "label": "Grand Total", + "label": "Grand Total (Company Currency)", "oldfieldname": "grand_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -571,7 +563,7 @@ "doctype": "DocField", "fieldname": "rounded_total", "fieldtype": "Currency", - "label": "Rounded Total", + "label": "Rounded Total (Company Currency)", "oldfieldname": "rounded_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -583,7 +575,7 @@ "doctype": "DocField", "fieldname": "in_words", "fieldtype": "Data", - "label": "In Words", + "label": "In Words (Company Currency)", "oldfieldname": "in_words", "oldfieldtype": "Data", "print_hide": 1, diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt index 1a9cd48f60..b0fd7c7e33 100644 --- a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt +++ b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-04 11:02:19", "docstatus": 0, - "modified": "2013-06-26 14:34:00", + "modified": "2013-07-09 12:46:12", "modified_by": "Administrator", "owner": "Administrator" }, @@ -85,7 +85,7 @@ "doctype": "DocField", "fieldname": "qty", "fieldtype": "Float", - "label": "Qty", + "label": "Quantity", "oldfieldname": "qty", "oldfieldtype": "Currency", "read_only": 0, @@ -146,7 +146,7 @@ "doctype": "DocField", "fieldname": "base_ref_rate", "fieldtype": "Currency", - "label": "Price List Rate*", + "label": "Price List Rate (Company Currency)", "oldfieldname": "base_ref_rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -158,7 +158,7 @@ "fieldname": "basic_rate", "fieldtype": "Currency", "in_filter": 0, - "label": "Basic Rate*", + "label": "Basic Rate (Company Currency)", "oldfieldname": "basic_rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -171,7 +171,7 @@ "doctype": "DocField", "fieldname": "amount", "fieldtype": "Currency", - "label": "Amount*", + "label": "Amount (Company Currency)", "oldfieldname": "amount", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -320,7 +320,7 @@ "fieldtype": "Data", "hidden": 1, "in_filter": 1, - "label": "SO Detail ", + "label": "Sales Order Item", "no_copy": 1, "oldfieldname": "so_detail", "oldfieldtype": "Data", @@ -348,7 +348,7 @@ "fieldtype": "Data", "hidden": 1, "in_filter": 1, - "label": "DN Detail", + "label": "Delivery Note Item", "no_copy": 1, "oldfieldname": "dn_detail", "oldfieldtype": "Data", @@ -375,18 +375,6 @@ "print_hide": 1, "read_only": 1 }, - { - "doctype": "DocField", - "fieldname": "clear_pending", - "fieldtype": "Check", - "hidden": 1, - "label": "Clear Pending", - "no_copy": 1, - "oldfieldname": "clear_pending", - "oldfieldtype": "Check", - "print_hide": 1, - "read_only": 1 - }, { "doctype": "DocField", "fieldname": "buying_amount", diff --git a/buying/doctype/purchase_common/purchase_common.js b/buying/doctype/purchase_common/purchase_common.js index 0d4a615ec1..b6070ba95e 100644 --- a/buying/doctype/purchase_common/purchase_common.js +++ b/buying/doctype/purchase_common/purchase_common.js @@ -220,6 +220,21 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({ } }, + purchase_other_charges: function() { + var me = this; + if(this.frm.doc.purchase_other_charges) { + this.frm.call({ + doc: this.frm.doc, + method: "get_purchase_tax_details", + callback: function(r) { + if(!r.exc) { + me.calculate_taxes_and_totals(); + } + } + }); + } + }, + calculate_taxes_and_totals: function() { this._super(); this.calculate_total_advance("Purchase Invoice", "advance_allocation_details"); diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt index f9e8375e10..1699c56cb1 100644 --- a/buying/doctype/purchase_order/purchase_order.txt +++ b/buying/doctype/purchase_order/purchase_order.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-07-08 17:49:29", + "modified": "2013-07-09 12:50:00", "modified_by": "Administrator", "owner": "Administrator" }, @@ -139,55 +139,37 @@ }, { "doctype": "DocField", - "fieldname": "items", - "fieldtype": "Section Break", - "label": "Items", - "oldfieldtype": "Section Break", - "options": "icon-shopping-cart" + "fieldname": "amended_from", + "fieldtype": "Data", + "hidden": 0, + "label": "Amended From", + "no_copy": 1, + "oldfieldname": "amended_from", + "oldfieldtype": "Data", + "print_hide": 1, + "read_only": 1, + "report_hide": 0 }, { - "allow_on_submit": 1, + "description": "Select the relevant company name if you have multiple companies", "doctype": "DocField", - "fieldname": "po_details", - "fieldtype": "Table", - "label": "Purchase Order Items", + "fieldname": "company", + "fieldtype": "Link", + "in_filter": 1, + "label": "Company", "no_copy": 0, - "oldfieldname": "po_details", - "oldfieldtype": "Table", - "options": "Purchase Order Item" - }, - { - "doctype": "DocField", - "fieldname": "sb_last_purchase", - "fieldtype": "Section Break" - }, - { - "doctype": "DocField", - "fieldname": "get_last_purchase_rate", - "fieldtype": "Button", - "label": "Get Last Purchase Rate", - "oldfieldtype": "Button", - "print_hide": 0 - }, - { - "doctype": "DocField", - "fieldname": "column_break2", - "fieldtype": "Column Break", - "print_width": "50%", - "width": "50%" - }, - { - "doctype": "DocField", - "fieldname": "recalculate_values", - "fieldtype": "Button", - "label": "Re-Calculate Values", - "oldfieldtype": "Button" + "oldfieldname": "company", + "oldfieldtype": "Link", + "options": "Company", + "print_hide": 1, + "reqd": 1, + "search_index": 1 }, { "doctype": "DocField", "fieldname": "price_list_and_currency", "fieldtype": "Section Break", - "label": "Currency & Price List", + "label": "Currency and Price List", "options": "icon-tag" }, { @@ -253,6 +235,68 @@ "label": "Price List Exchange Rate", "print_hide": 1 }, + { + "doctype": "DocField", + "fieldname": "items", + "fieldtype": "Section Break", + "label": "Items", + "oldfieldtype": "Section Break", + "options": "icon-shopping-cart" + }, + { + "allow_on_submit": 1, + "doctype": "DocField", + "fieldname": "po_details", + "fieldtype": "Table", + "label": "Purchase Order Items", + "no_copy": 0, + "oldfieldname": "po_details", + "oldfieldtype": "Table", + "options": "Purchase Order Item" + }, + { + "doctype": "DocField", + "fieldname": "sb_last_purchase", + "fieldtype": "Section Break" + }, + { + "doctype": "DocField", + "fieldname": "net_total_import", + "fieldtype": "Currency", + "label": "Net Total", + "no_copy": 0, + "oldfieldname": "net_total_import", + "oldfieldtype": "Currency", + "options": "currency", + "print_hide": 1, + "read_only": 1 + }, + { + "doctype": "DocField", + "fieldname": "get_last_purchase_rate", + "fieldtype": "Button", + "label": "Get Last Purchase Rate", + "oldfieldtype": "Button", + "print_hide": 0 + }, + { + "doctype": "DocField", + "fieldname": "column_break_26", + "fieldtype": "Column Break" + }, + { + "doctype": "DocField", + "fieldname": "net_total", + "fieldtype": "Currency", + "label": "Net Total (Company Currency)", + "no_copy": 1, + "oldfieldname": "net_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "print_hide": 1, + "read_only": 1, + "reqd": 0 + }, { "doctype": "DocField", "fieldname": "taxes", @@ -274,15 +318,6 @@ "options": "Purchase Taxes and Charges Master", "print_hide": 1 }, - { - "doctype": "DocField", - "fieldname": "get_tax_detail", - "fieldtype": "Button", - "label": "Get Tax Detail", - "oldfieldtype": "Button", - "options": "get_purchase_tax_details", - "print_hide": 1 - }, { "doctype": "DocField", "fieldname": "purchase_tax_details", @@ -293,14 +328,6 @@ "oldfieldtype": "Table", "options": "Purchase Taxes and Charges" }, - { - "doctype": "DocField", - "fieldname": "calculate_tax", - "fieldtype": "Button", - "label": "Calculate Tax", - "oldfieldtype": "Button", - "print_hide": 1 - }, { "doctype": "DocField", "fieldname": "tax_calculation", @@ -318,23 +345,11 @@ "oldfieldtype": "Section Break", "options": "icon-money" }, - { - "doctype": "DocField", - "fieldname": "net_total_import", - "fieldtype": "Currency", - "label": "Net Total (Import)", - "no_copy": 0, - "oldfieldname": "net_total_import", - "oldfieldtype": "Currency", - "options": "currency", - "print_hide": 1, - "read_only": 1 - }, { "doctype": "DocField", "fieldname": "other_charges_added_import", "fieldtype": "Currency", - "label": "Taxes and Charges Added (Import)", + "label": "Taxes and Charges Added", "no_copy": 0, "oldfieldname": "other_charges_added_import", "oldfieldtype": "Currency", @@ -347,7 +362,7 @@ "doctype": "DocField", "fieldname": "other_charges_deducted_import", "fieldtype": "Currency", - "label": "Taxes and Charges Deducted (Import)", + "label": "Taxes and Charges Deducted", "no_copy": 0, "oldfieldname": "other_charges_deducted_import", "oldfieldtype": "Currency", @@ -361,7 +376,7 @@ "fieldname": "grand_total_import", "fieldtype": "Currency", "in_list_view": 1, - "label": "Grand Total (Import)", + "label": "Grand Total", "no_copy": 0, "oldfieldname": "grand_total_import", "oldfieldtype": "Currency", @@ -374,7 +389,7 @@ "doctype": "DocField", "fieldname": "in_words_import", "fieldtype": "Data", - "label": "In Words(Import)", + "label": "In Words", "oldfieldname": "in_words_import", "oldfieldtype": "Data", "print_hide": 1, @@ -387,24 +402,11 @@ "oldfieldtype": "Column Break", "print_hide": 0 }, - { - "doctype": "DocField", - "fieldname": "net_total", - "fieldtype": "Currency", - "label": "Net Total*", - "no_copy": 1, - "oldfieldname": "net_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "print_hide": 1, - "read_only": 1, - "reqd": 0 - }, { "doctype": "DocField", "fieldname": "other_charges_added", "fieldtype": "Currency", - "label": "Taxes and Charges Added", + "label": "Taxes and Charges Added (Company Currency)", "no_copy": 0, "oldfieldname": "other_charges_added", "oldfieldtype": "Currency", @@ -416,7 +418,7 @@ "doctype": "DocField", "fieldname": "other_charges_deducted", "fieldtype": "Currency", - "label": "Taxes and Charges Deducted", + "label": "Taxes and Charges Deducted (Company Currency)", "no_copy": 0, "oldfieldname": "other_charges_deducted", "oldfieldtype": "Currency", @@ -428,7 +430,7 @@ "doctype": "DocField", "fieldname": "total_tax", "fieldtype": "Currency", - "label": "Total Tax*", + "label": "Total Tax (Company Currency)", "no_copy": 1, "oldfieldname": "total_tax", "oldfieldtype": "Currency", @@ -440,7 +442,7 @@ "doctype": "DocField", "fieldname": "grand_total", "fieldtype": "Currency", - "label": "Grand Total", + "label": "Grand Total (Company Currency)", "no_copy": 1, "oldfieldname": "grand_total", "oldfieldtype": "Currency", @@ -452,7 +454,7 @@ "doctype": "DocField", "fieldname": "rounded_total", "fieldtype": "Currency", - "label": "Rounded Total", + "label": "Rounded Total (Company Currency)", "oldfieldname": "rounded_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -464,7 +466,7 @@ "doctype": "DocField", "fieldname": "in_words", "fieldtype": "Data", - "label": "In Words", + "label": "In Words (Company Currency)", "oldfieldname": "in_words", "oldfieldtype": "Data", "print_hide": 1, @@ -581,34 +583,6 @@ "options": "link:Letter Head", "print_hide": 1 }, - { - "doctype": "DocField", - "fieldname": "amended_from", - "fieldtype": "Data", - "hidden": 0, - "label": "Amended From", - "no_copy": 1, - "oldfieldname": "amended_from", - "oldfieldtype": "Data", - "print_hide": 1, - "read_only": 1, - "report_hide": 0 - }, - { - "description": "Select the relevant company name if you have multiple companies", - "doctype": "DocField", - "fieldname": "company", - "fieldtype": "Link", - "in_filter": 1, - "label": "Company", - "no_copy": 0, - "oldfieldname": "company", - "oldfieldtype": "Link", - "options": "Company", - "print_hide": 1, - "reqd": 1, - "search_index": 1 - }, { "doctype": "DocField", "fieldname": "fiscal_year", diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt index 1ee27004df..927f6e1218 100755 --- a/buying/doctype/purchase_order_item/purchase_order_item.txt +++ b/buying/doctype/purchase_order_item/purchase_order_item.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:06", "docstatus": 0, - "modified": "2013-07-08 13:51:42", + "modified": "2013-07-09 12:16:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -160,7 +160,7 @@ "doctype": "DocField", "fieldname": "purchase_ref_rate", "fieldtype": "Currency", - "label": "Ref Rate*", + "label": "Price List Rate (Company Currency)", "options": "Company:company:default_currency", "print_hide": 1, "read_only": 0 @@ -170,7 +170,7 @@ "doctype": "DocField", "fieldname": "purchase_rate", "fieldtype": "Currency", - "label": "Rate*", + "label": "Rate (Company Currency)", "oldfieldname": "purchase_rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -185,7 +185,7 @@ "doctype": "DocField", "fieldname": "amount", "fieldtype": "Currency", - "label": "Amount*", + "label": "Amount (Company Currency)", "oldfieldname": "amount", "oldfieldtype": "Currency", "options": "Company:company:default_currency", diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt index 0984ac7ffa..3cb5046f21 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.txt +++ b/buying/doctype/supplier_quotation/supplier_quotation.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:45", "docstatus": 0, - "modified": "2013-07-08 15:14:48", + "modified": "2013-07-09 12:49:31", "modified_by": "Administrator", "owner": "Administrator" }, @@ -139,40 +139,37 @@ }, { "doctype": "DocField", - "fieldname": "items", - "fieldtype": "Section Break", - "label": "Items", - "oldfieldtype": "Section Break", - "options": "icon-shopping-cart" + "fieldname": "amended_from", + "fieldtype": "Data", + "hidden": 1, + "label": "Amended From", + "no_copy": 1, + "oldfieldname": "amended_from", + "oldfieldtype": "Data", + "print_hide": 1, + "read_only": 1, + "report_hide": 0 }, { - "allow_on_submit": 1, + "description": "Select the relevant company name if you have multiple companies", "doctype": "DocField", - "fieldname": "quotation_items", - "fieldtype": "Table", - "label": "Quotation Items", + "fieldname": "company", + "fieldtype": "Link", + "in_filter": 1, + "label": "Company", "no_copy": 0, - "oldfieldname": "po_details", - "oldfieldtype": "Table", - "options": "Supplier Quotation Item" - }, - { - "doctype": "DocField", - "fieldname": "section_break0", - "fieldtype": "Section Break" - }, - { - "doctype": "DocField", - "fieldname": "recalculate_values", - "fieldtype": "Button", - "label": "Re-Calculate Values", - "oldfieldtype": "Button" + "oldfieldname": "company", + "oldfieldtype": "Link", + "options": "Company", + "print_hide": 1, + "reqd": 1, + "search_index": 1 }, { "doctype": "DocField", "fieldname": "currency_price_list", "fieldtype": "Section Break", - "label": "Currency & Price List", + "label": "Currency and Price List", "options": "icon-tag" }, { @@ -235,6 +232,60 @@ "label": "Price List Exchange Rate", "print_hide": 1 }, + { + "doctype": "DocField", + "fieldname": "items", + "fieldtype": "Section Break", + "label": "Items", + "oldfieldtype": "Section Break", + "options": "icon-shopping-cart" + }, + { + "allow_on_submit": 1, + "doctype": "DocField", + "fieldname": "quotation_items", + "fieldtype": "Table", + "label": "Quotation Items", + "no_copy": 0, + "oldfieldname": "po_details", + "oldfieldtype": "Table", + "options": "Supplier Quotation Item" + }, + { + "doctype": "DocField", + "fieldname": "section_break_22", + "fieldtype": "Section Break" + }, + { + "doctype": "DocField", + "fieldname": "net_total_import", + "fieldtype": "Currency", + "label": "Net Total", + "no_copy": 0, + "oldfieldname": "net_total_import", + "oldfieldtype": "Currency", + "options": "currency", + "print_hide": 1, + "read_only": 1 + }, + { + "doctype": "DocField", + "fieldname": "column_break_24", + "fieldtype": "Column Break" + }, + { + "doctype": "DocField", + "fieldname": "net_total", + "fieldtype": "Currency", + "label": "Net Total (Company Currency)", + "no_copy": 1, + "oldfieldname": "net_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "print_hide": 1, + "read_only": 1, + "reqd": 0 + }, { "doctype": "DocField", "fieldname": "taxes", @@ -255,15 +306,6 @@ "options": "Purchase Taxes and Charges Master", "print_hide": 1 }, - { - "doctype": "DocField", - "fieldname": "get_tax_detail", - "fieldtype": "Button", - "label": "Get Tax Detail", - "oldfieldtype": "Button", - "options": "get_purchase_tax_details", - "print_hide": 1 - }, { "doctype": "DocField", "fieldname": "purchase_tax_details", @@ -274,14 +316,6 @@ "oldfieldtype": "Table", "options": "Purchase Taxes and Charges" }, - { - "doctype": "DocField", - "fieldname": "calculate_tax", - "fieldtype": "Button", - "label": "Calculate Tax", - "oldfieldtype": "Button", - "print_hide": 1 - }, { "doctype": "DocField", "fieldname": "tax_calculation", @@ -299,23 +333,11 @@ "oldfieldtype": "Section Break", "options": "icon-money" }, - { - "doctype": "DocField", - "fieldname": "net_total_import", - "fieldtype": "Currency", - "label": "Net Total (Import)", - "no_copy": 0, - "oldfieldname": "net_total_import", - "oldfieldtype": "Currency", - "options": "currency", - "print_hide": 1, - "read_only": 1 - }, { "doctype": "DocField", "fieldname": "other_charges_added_import", "fieldtype": "Currency", - "label": "Taxes and Charges Added (Import)", + "label": "Taxes and Charges Added", "no_copy": 0, "oldfieldname": "other_charges_added_import", "oldfieldtype": "Currency", @@ -328,7 +350,7 @@ "doctype": "DocField", "fieldname": "other_charges_deducted_import", "fieldtype": "Currency", - "label": "Taxes and Charges Deducted (Import)", + "label": "Taxes and Charges Deducted", "no_copy": 0, "oldfieldname": "other_charges_deducted_import", "oldfieldtype": "Currency", @@ -342,7 +364,7 @@ "fieldname": "grand_total_import", "fieldtype": "Currency", "in_list_view": 1, - "label": "Grand Total (Import)", + "label": "Grand Total", "no_copy": 0, "oldfieldname": "grand_total_import", "oldfieldtype": "Currency", @@ -355,7 +377,7 @@ "doctype": "DocField", "fieldname": "in_words_import", "fieldtype": "Data", - "label": "In Words(Import)", + "label": "In Words", "oldfieldname": "in_words_import", "oldfieldtype": "Data", "print_hide": 1, @@ -368,24 +390,11 @@ "oldfieldtype": "Column Break", "print_hide": 0 }, - { - "doctype": "DocField", - "fieldname": "net_total", - "fieldtype": "Currency", - "label": "Net Total*", - "no_copy": 1, - "oldfieldname": "net_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "print_hide": 1, - "read_only": 1, - "reqd": 0 - }, { "doctype": "DocField", "fieldname": "other_charges_added", "fieldtype": "Currency", - "label": "Taxes and Charges Added", + "label": "Taxes and Charges Added (Company Currency)", "no_copy": 0, "oldfieldname": "other_charges_added", "oldfieldtype": "Currency", @@ -397,7 +406,7 @@ "doctype": "DocField", "fieldname": "other_charges_deducted", "fieldtype": "Currency", - "label": "Taxes and Charges Deducted", + "label": "Taxes and Charges Deducted (Company Currency)", "no_copy": 0, "oldfieldname": "other_charges_deducted", "oldfieldtype": "Currency", @@ -409,7 +418,7 @@ "doctype": "DocField", "fieldname": "total_tax", "fieldtype": "Currency", - "label": "Total Tax*", + "label": "Total Tax (Company Currency)", "no_copy": 1, "oldfieldname": "total_tax", "oldfieldtype": "Currency", @@ -421,7 +430,7 @@ "doctype": "DocField", "fieldname": "grand_total", "fieldtype": "Currency", - "label": "Grand Total", + "label": "Grand Total (Company Currency)", "no_copy": 1, "oldfieldname": "grand_total", "oldfieldtype": "Currency", @@ -433,7 +442,7 @@ "doctype": "DocField", "fieldname": "rounded_total", "fieldtype": "Currency", - "label": "Rounded Total", + "label": "Rounded Total (Company Currency)", "oldfieldname": "rounded_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -445,7 +454,7 @@ "doctype": "DocField", "fieldname": "in_words", "fieldtype": "Data", - "label": "In Words", + "label": "In Words (Company Currency)", "oldfieldname": "in_words", "oldfieldtype": "Data", "print_hide": 1, @@ -553,39 +562,11 @@ "options": "\nYes\nNo", "print_hide": 1 }, - { - "doctype": "DocField", - "fieldname": "amended_from", - "fieldtype": "Data", - "hidden": 1, - "label": "Amended From", - "no_copy": 1, - "oldfieldname": "amended_from", - "oldfieldtype": "Data", - "print_hide": 1, - "read_only": 1, - "report_hide": 0 - }, { "doctype": "DocField", "fieldname": "column_break_57", "fieldtype": "Column Break" }, - { - "description": "Select the relevant company name if you have multiple companies", - "doctype": "DocField", - "fieldname": "company", - "fieldtype": "Link", - "in_filter": 1, - "label": "Company", - "no_copy": 0, - "oldfieldname": "company", - "oldfieldtype": "Link", - "options": "Company", - "print_hide": 1, - "reqd": 1, - "search_index": 1 - }, { "doctype": "DocField", "fieldname": "fiscal_year", diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt index 6b24d2f86f..d4df4041be 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-03-07 11:42:56", + "creation": "2013-05-22 12:43:10", "docstatus": 0, - "modified": "2013-05-22 12:02:28", + "modified": "2013-07-09 12:15:15", "modified_by": "Administrator", "owner": "Administrator" }, @@ -106,7 +106,7 @@ "doctype": "DocField", "fieldname": "import_ref_rate", "fieldtype": "Currency", - "label": "Ref Rate ", + "label": "Price List Rate", "options": "currency", "print_hide": 1, "read_only": 0 @@ -145,7 +145,7 @@ "doctype": "DocField", "fieldname": "purchase_ref_rate", "fieldtype": "Currency", - "label": "Ref Rate*", + "label": "Price List Rate (Company Currency)", "options": "Company:company:default_currency", "print_hide": 1, "read_only": 0 @@ -155,7 +155,7 @@ "doctype": "DocField", "fieldname": "purchase_rate", "fieldtype": "Currency", - "label": "Rate*", + "label": "Rate (Company Currency)", "oldfieldname": "purchase_rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -170,7 +170,7 @@ "doctype": "DocField", "fieldname": "amount", "fieldtype": "Currency", - "label": "Amount*", + "label": "Amount (Company Currency)", "oldfieldname": "amount", "oldfieldtype": "Currency", "options": "Company:company:default_currency", diff --git a/public/js/queries.js b/public/js/queries.js index 24ddc13590..a7e137e3f9 100644 --- a/public/js/queries.js +++ b/public/js/queries.js @@ -15,6 +15,7 @@ // along with this program. If not, see . // searches for enabled profiles +wn.provide("erpnext.utils"); erpnext.utils.profile_query = function() { return "select name, concat_ws(' ', first_name, middle_name, last_name) \ from `tabProfile` where ifnull(enabled, 0)=1 and docstatus < 2 and \ diff --git a/public/js/startup.js b/public/js/startup.js index 26e521981d..33059e33ae 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -71,12 +71,6 @@ erpnext.startup.start = function() { } } -erpnext.hide_naming_series = function() { - if(cur_frm.fields_dict.naming_series) { - cur_frm.toggle_display("naming_series", cur_frm.doc.__islocal?true:false); - } -} - erpnext.setup_mousetrap = function() { $(document).keydown("meta+g ctrl+g", function(e) { wn.ui.toolbar.search.show(); diff --git a/public/js/transaction.js b/public/js/transaction.js index 79e7a56820..50de3d5478 100644 --- a/public/js/transaction.js +++ b/public/js/transaction.js @@ -45,6 +45,7 @@ erpnext.TransactionController = wn.ui.form.Controller.extend({ refresh: function() { this.frm.clear_custom_buttons(); erpnext.hide_naming_series(); + erpnext.hide_company(); this.show_item_wise_taxes(); this.frm.fields_dict.currency ? this.currency() : this.set_dynamic_labels(); }, diff --git a/public/js/utils.js b/public/js/utils.js index 0284670761..b44a8755db 100644 --- a/public/js/utils.js +++ b/public/js/utils.js @@ -13,13 +13,31 @@ // // You should have received a copy of the GNU General Public License // along with this program. If not, see . -wn.provide("erpnext.utils"); +wn.provide("erpnext"); -erpnext.get_currency = function(company) { - if(!company && cur_frm) - company = cur_frm.doc.company; - if(company) - return wn.model.get(":Company", company).default_currency || wn.boot.sysdefaults.currency; - else - return wn.boot.sysdefaults.currency; -} +$.extend(erpnext, { + get_currency: function(company) { + if(!company && cur_frm) + company = cur_frm.doc.company; + if(company) + return wn.model.get(":Company", company).default_currency || wn.boot.sysdefaults.currency; + else + return wn.boot.sysdefaults.currency; + }, + + hide_naming_series: function() { + if(cur_frm.fields_dict.naming_series) { + cur_frm.toggle_display("naming_series", cur_frm.doc.__islocal?true:false); + } + }, + + hide_company: function() { + if(cur_frm.fields_dict.company) { + var companies = Object.keys(locals[":Company"]); + if(companies.length === 1) { + if(!cur_frm.doc.company) cur_frm.set_value("company", companies[0]); + cur_frm.toggle_display("company", false); + } + } + } +}); \ No newline at end of file diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt index 243963c944..19eefa344e 100644 --- a/selling/doctype/quotation/quotation.txt +++ b/selling/doctype/quotation/quotation.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:08", "docstatus": 0, - "modified": "2013-07-08 15:51:41", + "modified": "2013-07-09 12:48:56", "modified_by": "Administrator", "owner": "Administrator" }, @@ -236,7 +236,7 @@ "doctype": "DocField", "fieldname": "section_break0", "fieldtype": "Section Break", - "label": "Price List and Currency", + "label": "Currency and Price List", "options": "icon-tag", "read_only": 0 }, @@ -348,15 +348,20 @@ "doctype": "DocField", "fieldname": "net_total_export", "fieldtype": "Currency", - "label": "Net Total (Export)", + "label": "Net Total", "options": "currency", "read_only": 1 }, + { + "doctype": "DocField", + "fieldname": "column_break_28", + "fieldtype": "Column Break" + }, { "doctype": "DocField", "fieldname": "net_total", "fieldtype": "Currency", - "label": "Net Total*", + "label": "Net Total (Company Currency)", "no_copy": 0, "oldfieldname": "net_total", "oldfieldtype": "Currency", @@ -366,15 +371,6 @@ "reqd": 0, "width": "100px" }, - { - "doctype": "DocField", - "fieldname": "recalculate_values", - "fieldtype": "Button", - "label": "Re-Calculate Values", - "oldfieldtype": "Button", - "print_hide": 1, - "read_only": 0 - }, { "doctype": "DocField", "fieldname": "taxes", @@ -445,19 +441,8 @@ "doctype": "DocField", "fieldname": "other_charges_total_export", "fieldtype": "Currency", - "label": "Taxes and Charges Total (Export)", - "options": "currency", - "print_hide": 1, - "read_only": 1 - }, - { - "doctype": "DocField", - "fieldname": "other_charges_total", - "fieldtype": "Currency", "label": "Taxes and Charges Total", - "oldfieldname": "other_charges_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", + "options": "currency", "print_hide": 1, "read_only": 1 }, @@ -468,12 +453,14 @@ }, { "doctype": "DocField", - "fieldname": "calculate_charges", - "fieldtype": "Button", - "label": "Calculate Taxes and Charges", - "oldfieldtype": "Button", + "fieldname": "other_charges_total", + "fieldtype": "Currency", + "label": "Taxes and Charges Total (Company Currency)", + "oldfieldname": "other_charges_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", "print_hide": 1, - "read_only": 0 + "read_only": 1 }, { "doctype": "DocField", @@ -539,7 +526,7 @@ "doctype": "DocField", "fieldname": "grand_total", "fieldtype": "Currency", - "label": "Grand Total*", + "label": "Grand Total (Company Currency)", "no_copy": 0, "oldfieldname": "grand_total", "oldfieldtype": "Currency", @@ -553,7 +540,7 @@ "doctype": "DocField", "fieldname": "rounded_total", "fieldtype": "Currency", - "label": "Rounded Total", + "label": "Rounded Total (Company Currency)", "no_copy": 0, "oldfieldname": "rounded_total", "oldfieldtype": "Currency", @@ -567,7 +554,7 @@ "doctype": "DocField", "fieldname": "in_words", "fieldtype": "Data", - "label": "In Words", + "label": "In Words (Company Currency)", "no_copy": 0, "oldfieldname": "in_words", "oldfieldtype": "Data", diff --git a/selling/doctype/quotation_item/quotation_item.txt b/selling/doctype/quotation_item/quotation_item.txt index 11ac1bae10..a15166af99 100644 --- a/selling/doctype/quotation_item/quotation_item.txt +++ b/selling/doctype/quotation_item/quotation_item.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 11:42:57", "docstatus": 0, - "modified": "2013-05-22 12:10:32", + "modified": "2013-07-09 12:24:21", "modified_by": "Administrator", "owner": "Administrator" }, @@ -174,7 +174,7 @@ "doctype": "DocField", "fieldname": "base_ref_rate", "fieldtype": "Currency", - "label": "Price List Rate*", + "label": "Price List Rate (Company Currency)", "oldfieldname": "base_ref_rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -189,7 +189,7 @@ "fieldname": "basic_rate", "fieldtype": "Currency", "in_filter": 0, - "label": "Basic Rate*", + "label": "Basic Rate (Company Currency)", "oldfieldname": "basic_rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -206,7 +206,7 @@ "fieldname": "amount", "fieldtype": "Currency", "in_filter": 0, - "label": "Amount*", + "label": "Amount (Company Currency)", "oldfieldname": "amount", "oldfieldtype": "Currency", "options": "Company:company:default_currency", diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt index 572164a3c9..37c9e21b27 100644 --- a/selling/doctype/sales_order/sales_order.txt +++ b/selling/doctype/sales_order/sales_order.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-18 12:39:59", "docstatus": 0, - "modified": "2013-07-08 15:54:25", + "modified": "2013-07-09 12:47:46", "modified_by": "Administrator", "owner": "Administrator" }, @@ -210,7 +210,7 @@ "fieldname": "po_no", "fieldtype": "Data", "hidden": 0, - "label": "P.O. No", + "label": "Customer's Purchase Order No", "oldfieldname": "po_no", "oldfieldtype": "Data", "print_hide": 0, @@ -223,7 +223,7 @@ "fieldname": "po_date", "fieldtype": "Date", "hidden": 0, - "label": "P.O. Date", + "label": "Customer's Purchase Order Date", "oldfieldname": "po_date", "oldfieldtype": "Date", "print_hide": 0, @@ -255,7 +255,7 @@ "doctype": "DocField", "fieldname": "sec_break45", "fieldtype": "Section Break", - "label": "Price List and Currency", + "label": "Currency and Price List", "options": "icon-tag" }, { @@ -364,19 +364,29 @@ "print_hide": 1, "read_only": 1 }, + { + "doctype": "DocField", + "fieldname": "section_break_31", + "fieldtype": "Section Break" + }, { "doctype": "DocField", "fieldname": "net_total_export", "fieldtype": "Currency", - "label": "Net Total (Export)", + "label": "Net Total", "options": "currency", "read_only": 1 }, + { + "doctype": "DocField", + "fieldname": "column_break_33", + "fieldtype": "Column Break" + }, { "doctype": "DocField", "fieldname": "net_total", "fieldtype": "Currency", - "label": "Net Total*", + "label": "Net Total (Company Currency)", "oldfieldname": "net_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -385,15 +395,6 @@ "reqd": 0, "width": "150px" }, - { - "doctype": "DocField", - "fieldname": "recalculate_values", - "fieldtype": "Button", - "label": "Re-Calculate Values", - "oldfieldtype": "Button", - "print_hide": 1, - "search_index": 0 - }, { "doctype": "DocField", "fieldname": "taxes", @@ -458,23 +459,11 @@ "doctype": "DocField", "fieldname": "other_charges_total_export", "fieldtype": "Currency", - "label": "Taxes and Charges Total (Export)", + "label": "Taxes and Charges Total", "options": "currency", "print_hide": 1, "read_only": 1 }, - { - "doctype": "DocField", - "fieldname": "other_charges_total", - "fieldtype": "Currency", - "label": "Taxes and Charges Total", - "oldfieldname": "other_charges_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "print_hide": 1, - "read_only": 1, - "width": "150px" - }, { "doctype": "DocField", "fieldname": "column_break_46", @@ -482,11 +471,15 @@ }, { "doctype": "DocField", - "fieldname": "calculate_charges", - "fieldtype": "Button", - "label": "Calculate Taxes and Charges", - "oldfieldtype": "Button", - "print_hide": 0 + "fieldname": "other_charges_total", + "fieldtype": "Currency", + "label": "Taxes and Charges Total (Company Currency)", + "oldfieldname": "other_charges_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "print_hide": 1, + "read_only": 1, + "width": "150px" }, { "doctype": "DocField", @@ -501,7 +494,7 @@ "doctype": "DocField", "fieldname": "grand_total_export", "fieldtype": "Currency", - "label": "Grand Total (Export)", + "label": "Grand Total", "oldfieldname": "grand_total_export", "oldfieldtype": "Currency", "options": "currency", @@ -514,7 +507,7 @@ "doctype": "DocField", "fieldname": "rounded_total_export", "fieldtype": "Currency", - "label": "Rounded Total (Export)", + "label": "Rounded Total", "oldfieldname": "rounded_total_export", "oldfieldtype": "Currency", "options": "currency", @@ -526,7 +519,7 @@ "doctype": "DocField", "fieldname": "in_words_export", "fieldtype": "Data", - "label": "In Words (Export)", + "label": "In Words", "oldfieldname": "in_words_export", "oldfieldtype": "Data", "print_hide": 0, @@ -545,7 +538,7 @@ "doctype": "DocField", "fieldname": "grand_total", "fieldtype": "Currency", - "label": "Grand Total*", + "label": "Grand Total (Company Currency)", "oldfieldname": "grand_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -558,7 +551,7 @@ "doctype": "DocField", "fieldname": "rounded_total", "fieldtype": "Currency", - "label": "Rounded Total", + "label": "Rounded Total (Company Currency)", "oldfieldname": "rounded_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -571,7 +564,7 @@ "doctype": "DocField", "fieldname": "in_words", "fieldtype": "Data", - "label": "In Words", + "label": "In Words (Company Currency)", "oldfieldname": "in_words", "oldfieldtype": "Data", "print_hide": 1, diff --git a/selling/doctype/sales_order_item/sales_order_item.txt b/selling/doctype/sales_order_item/sales_order_item.txt index 7276fc329c..0d1ca5ba2e 100644 --- a/selling/doctype/sales_order_item/sales_order_item.txt +++ b/selling/doctype/sales_order_item/sales_order_item.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 11:42:58", "docstatus": 0, - "modified": "2013-05-22 12:10:03", + "modified": "2013-07-09 12:28:31", "modified_by": "Administrator", "owner": "Administrator" }, @@ -163,7 +163,7 @@ "doctype": "DocField", "fieldname": "base_ref_rate", "fieldtype": "Currency", - "label": "Price List Rate*", + "label": "Price List Rate (Company Currency)", "oldfieldname": "base_ref_rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -177,7 +177,7 @@ "doctype": "DocField", "fieldname": "basic_rate", "fieldtype": "Currency", - "label": "Basic Rate*", + "label": "Basic Rate (Company Currency)", "oldfieldname": "basic_rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -192,7 +192,7 @@ "doctype": "DocField", "fieldname": "amount", "fieldtype": "Currency", - "label": "Amount*", + "label": "Amount (Company Currency)", "no_copy": 0, "oldfieldname": "amount", "oldfieldtype": "Currency", @@ -337,7 +337,7 @@ "fieldtype": "Link", "hidden": 0, "in_filter": 1, - "label": "Quotation No.", + "label": "Quotation", "no_copy": 1, "oldfieldname": "prevdoc_docname", "oldfieldtype": "Link", diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt index 5cdae86692..cfdd8cd5ab 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-07-08 17:46:45", + "modified": "2013-07-09 12:48:27", "modified_by": "Administrator", "owner": "Administrator" }, @@ -212,34 +212,12 @@ "search_index": 1, "width": "100px" }, - { - "doctype": "DocField", - "fieldname": "challan_no", - "fieldtype": "Data", - "hidden": 1, - "label": "Challan No", - "oldfieldname": "challan_no", - "oldfieldtype": "Data", - "print_hide": 1, - "read_only": 0 - }, - { - "doctype": "DocField", - "fieldname": "challan_date", - "fieldtype": "Date", - "hidden": 1, - "label": "Challan Date", - "oldfieldname": "challan_date", - "oldfieldtype": "Date", - "print_hide": 1, - "read_only": 0 - }, { "doctype": "DocField", "fieldname": "po_no", "fieldtype": "Data", "hidden": 1, - "label": "P.O. No", + "label": "Customer's Purchase Order No", "no_copy": 0, "oldfieldname": "po_no", "oldfieldtype": "Data", @@ -254,7 +232,7 @@ "fieldname": "po_date", "fieldtype": "Data", "hidden": 1, - "label": "P.O. Date", + "label": "Customer's Purchase Order Date", "no_copy": 0, "oldfieldname": "po_date", "oldfieldtype": "Data", @@ -267,7 +245,7 @@ "doctype": "DocField", "fieldname": "sec_break25", "fieldtype": "Section Break", - "label": "Price List and Currency", + "label": "Currency and Price List", "options": "icon-tag", "read_only": 0 }, @@ -390,19 +368,29 @@ "print_hide": 1, "read_only": 0 }, + { + "doctype": "DocField", + "fieldname": "section_break_31", + "fieldtype": "Section Break" + }, { "doctype": "DocField", "fieldname": "net_total_export", "fieldtype": "Currency", - "label": "Net Total (Export)", + "label": "Net Total", "options": "currency", "read_only": 1 }, + { + "doctype": "DocField", + "fieldname": "column_break_33", + "fieldtype": "Column Break" + }, { "doctype": "DocField", "fieldname": "net_total", "fieldtype": "Currency", - "label": "Net Total*", + "label": "Net Total (Company Currency)", "no_copy": 0, "oldfieldname": "net_total", "oldfieldtype": "Currency", @@ -413,14 +401,6 @@ "reqd": 0, "width": "150px" }, - { - "doctype": "DocField", - "fieldname": "recalculate_values", - "fieldtype": "Button", - "label": "Re-Calculate Values", - "oldfieldtype": "Button", - "read_only": 0 - }, { "doctype": "DocField", "fieldname": "taxes", @@ -490,24 +470,11 @@ "doctype": "DocField", "fieldname": "other_charges_total_export", "fieldtype": "Currency", - "label": "Taxes and Charges Total (Export)", + "label": "Taxes and Charges Total", "options": "company", "print_hide": 1, "read_only": 1 }, - { - "doctype": "DocField", - "fieldname": "other_charges_total", - "fieldtype": "Currency", - "label": "Taxes and Charges Total", - "oldfieldname": "other_charges_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "print_hide": 1, - "print_width": "150px", - "read_only": 1, - "width": "150px" - }, { "doctype": "DocField", "fieldname": "column_break_47", @@ -515,12 +482,16 @@ }, { "doctype": "DocField", - "fieldname": "calculate_charges", - "fieldtype": "Button", - "label": "Calculate Charges", - "oldfieldtype": "Button", + "fieldname": "other_charges_total", + "fieldtype": "Currency", + "label": "Taxes and Charges Total (Company Currency)", + "oldfieldname": "other_charges_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", "print_hide": 1, - "read_only": 0 + "print_width": "150px", + "read_only": 1, + "width": "150px" }, { "doctype": "DocField", @@ -536,7 +507,7 @@ "doctype": "DocField", "fieldname": "grand_total_export", "fieldtype": "Currency", - "label": "Grand Total (Export)", + "label": "Grand Total", "no_copy": 0, "oldfieldname": "grand_total_export", "oldfieldtype": "Currency", @@ -551,7 +522,7 @@ "doctype": "DocField", "fieldname": "rounded_total_export", "fieldtype": "Currency", - "label": "Rounded Total (Export)", + "label": "Rounded Total", "no_copy": 0, "oldfieldname": "rounded_total_export", "oldfieldtype": "Currency", @@ -566,7 +537,7 @@ "doctype": "DocField", "fieldname": "in_words_export", "fieldtype": "Data", - "label": "In Words (Export)", + "label": "In Words", "no_copy": 0, "oldfieldname": "in_words_export", "oldfieldtype": "Data", @@ -586,7 +557,7 @@ "doctype": "DocField", "fieldname": "grand_total", "fieldtype": "Currency", - "label": "Grand Total", + "label": "Grand Total (Company Currency)", "no_copy": 0, "oldfieldname": "grand_total", "oldfieldtype": "Currency", @@ -601,7 +572,7 @@ "doctype": "DocField", "fieldname": "rounded_total", "fieldtype": "Currency", - "label": "Rounded Total", + "label": "Rounded Total (Company Currency)", "no_copy": 0, "oldfieldname": "rounded_total", "oldfieldtype": "Currency", @@ -616,7 +587,7 @@ "doctype": "DocField", "fieldname": "in_words", "fieldtype": "Data", - "label": "In Words", + "label": "In Words (Company Currency)", "no_copy": 0, "oldfieldname": "in_words", "oldfieldtype": "Data", @@ -690,7 +661,7 @@ "doctype": "DocField", "fieldname": "lr_no", "fieldtype": "Data", - "label": "LR No", + "label": "Vehicle No", "no_copy": 0, "oldfieldname": "lr_no", "oldfieldtype": "Data", @@ -706,7 +677,7 @@ "doctype": "DocField", "fieldname": "lr_date", "fieldtype": "Date", - "label": "LR Date", + "label": "Vehicle Dispatch Date", "no_copy": 0, "oldfieldname": "lr_date", "oldfieldtype": "Date", diff --git a/stock/doctype/delivery_note_item/delivery_note_item.txt b/stock/doctype/delivery_note_item/delivery_note_item.txt index 69b5bc4d49..ef5a98435d 100644 --- a/stock/doctype/delivery_note_item/delivery_note_item.txt +++ b/stock/doctype/delivery_note_item/delivery_note_item.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-22 13:15:44", "docstatus": 0, - "modified": "2013-07-08 17:46:21", + "modified": "2013-07-09 12:42:09", "modified_by": "Administrator", "owner": "Administrator" }, @@ -169,7 +169,7 @@ "doctype": "DocField", "fieldname": "base_ref_rate", "fieldtype": "Currency", - "label": "Price List Rate*", + "label": "Price List Rate (Company Currency)", "oldfieldname": "base_ref_rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -183,7 +183,7 @@ "doctype": "DocField", "fieldname": "basic_rate", "fieldtype": "Currency", - "label": "Rate*", + "label": "Rate (Company Currency)", "oldfieldname": "basic_rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -197,7 +197,7 @@ "doctype": "DocField", "fieldname": "amount", "fieldtype": "Currency", - "label": "Amount*", + "label": "Amount (Company Currency)", "oldfieldname": "amount", "oldfieldtype": "Currency", "options": "Company:company:default_currency", diff --git a/stock/doctype/material_request/material_request.txt b/stock/doctype/material_request/material_request.txt index 649210ee57..92bca0ada9 100644 --- a/stock/doctype/material_request/material_request.txt +++ b/stock/doctype/material_request/material_request.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 14:48:38", "docstatus": 0, - "modified": "2013-07-08 16:18:00", + "modified": "2013-07-09 11:39:32", "modified_by": "Administrator", "owner": "Administrator" }, @@ -79,6 +79,35 @@ "print_hide": 1, "reqd": 1 }, + { + "doctype": "DocField", + "fieldname": "amended_from", + "fieldtype": "Data", + "label": "Amended From", + "no_copy": 1, + "oldfieldname": "amended_from", + "oldfieldtype": "Data", + "print_hide": 1, + "print_width": "150px", + "read_only": 1, + "width": "150px" + }, + { + "description": "Select the relevant company name if you have multiple companies", + "doctype": "DocField", + "fieldname": "company", + "fieldtype": "Link", + "in_filter": 1, + "label": "Company", + "oldfieldname": "company", + "oldfieldtype": "Link", + "options": "Company", + "print_hide": 1, + "print_width": "150px", + "reqd": 1, + "search_index": 1, + "width": "150px" + }, { "doctype": "DocField", "fieldname": "items", @@ -130,22 +159,6 @@ "search_index": 1, "width": "100px" }, - { - "description": "Select the relevant company name if you have multiple companies", - "doctype": "DocField", - "fieldname": "company", - "fieldtype": "Link", - "in_filter": 1, - "label": "Company", - "oldfieldname": "company", - "oldfieldtype": "Link", - "options": "Company", - "print_hide": 1, - "print_width": "150px", - "reqd": 1, - "search_index": 1, - "width": "150px" - }, { "doctype": "DocField", "fieldname": "fiscal_year", @@ -224,19 +237,6 @@ "print_hide": 1, "read_only": 1 }, - { - "doctype": "DocField", - "fieldname": "amended_from", - "fieldtype": "Data", - "label": "Amended From", - "no_copy": 1, - "oldfieldname": "amended_from", - "oldfieldtype": "Data", - "print_hide": 1, - "print_width": "150px", - "read_only": 1, - "width": "150px" - }, { "doctype": "DocField", "fieldname": "remark", diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt index 3b6d876755..94136aed49 100755 --- a/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-07-08 17:46:13", + "modified": "2013-07-09 12:50:25", "modified_by": "Administrator", "owner": "Administrator" }, @@ -172,7 +172,7 @@ "fieldname": "challan_no", "fieldtype": "Data", "hidden": 1, - "label": "Challan No", + "label": "Supplier Shipment No", "no_copy": 1, "oldfieldname": "challan_no", "oldfieldtype": "Data", @@ -186,7 +186,7 @@ "fieldname": "challan_date", "fieldtype": "Date", "hidden": 1, - "label": "Challan Date", + "label": "Supplier Shipment Date", "no_copy": 1, "oldfieldname": "challan_date", "oldfieldtype": "Date", @@ -195,58 +195,11 @@ "reqd": 0, "width": "100px" }, - { - "doctype": "DocField", - "fieldname": "items", - "fieldtype": "Section Break", - "label": "Items", - "oldfieldtype": "Section Break", - "options": "icon-shopping-cart" - }, - { - "allow_on_submit": 1, - "doctype": "DocField", - "fieldname": "purchase_receipt_details", - "fieldtype": "Table", - "label": "Purchase Receipt Items", - "oldfieldname": "purchase_receipt_details", - "oldfieldtype": "Table", - "options": "Purchase Receipt Item", - "print_hide": 0, - "reqd": 0 - }, - { - "doctype": "DocField", - "fieldname": "section_break0", - "fieldtype": "Section Break", - "oldfieldtype": "Section Break" - }, - { - "doctype": "DocField", - "fieldname": "get_current_stock", - "fieldtype": "Button", - "label": "Get Current Stock", - "oldfieldtype": "Button", - "options": "get_current_stock", - "print_hide": 1 - }, - { - "doctype": "DocField", - "fieldname": "column_break_18", - "fieldtype": "Column Break" - }, - { - "doctype": "DocField", - "fieldname": "recalculate_values", - "fieldtype": "Button", - "label": "Re-Calculate Values", - "oldfieldtype": "Button" - }, { "doctype": "DocField", "fieldname": "currency_price_list", "fieldtype": "Section Break", - "label": "Currency & Price List", + "label": "Currency and Price List", "options": "icon-tag" }, { @@ -308,6 +261,71 @@ "label": "Price List Exchange Rate", "print_hide": 1 }, + { + "doctype": "DocField", + "fieldname": "items", + "fieldtype": "Section Break", + "label": "Items", + "oldfieldtype": "Section Break", + "options": "icon-shopping-cart" + }, + { + "allow_on_submit": 1, + "doctype": "DocField", + "fieldname": "purchase_receipt_details", + "fieldtype": "Table", + "label": "Purchase Receipt Items", + "oldfieldname": "purchase_receipt_details", + "oldfieldtype": "Table", + "options": "Purchase Receipt Item", + "print_hide": 0, + "reqd": 0 + }, + { + "doctype": "DocField", + "fieldname": "section_break0", + "fieldtype": "Section Break", + "oldfieldtype": "Section Break" + }, + { + "doctype": "DocField", + "fieldname": "net_total_import", + "fieldtype": "Currency", + "label": "Net Total", + "oldfieldname": "net_total_import", + "oldfieldtype": "Currency", + "options": "currency", + "print_hide": 1, + "read_only": 1 + }, + { + "doctype": "DocField", + "fieldname": "get_current_stock", + "fieldtype": "Button", + "label": "Get Current Stock", + "oldfieldtype": "Button", + "options": "get_current_stock", + "print_hide": 1 + }, + { + "doctype": "DocField", + "fieldname": "column_break_27", + "fieldtype": "Column Break" + }, + { + "doctype": "DocField", + "fieldname": "net_total", + "fieldtype": "Currency", + "label": "Net Total (Company Currency)", + "oldfieldname": "net_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "print_hide": 1, + "print_width": "150px", + "read_only": 1, + "reqd": 1, + "width": "150px" + }, { "description": "Add / Edit Taxes and Charges", "doctype": "DocField", @@ -328,15 +346,6 @@ "options": "Purchase Taxes and Charges Master", "print_hide": 1 }, - { - "doctype": "DocField", - "fieldname": "get_tax_detail", - "fieldtype": "Button", - "label": "Get Tax Detail", - "oldfieldtype": "Button", - "options": "get_purchase_tax_details", - "print_hide": 1 - }, { "doctype": "DocField", "fieldname": "purchase_tax_details", @@ -346,14 +355,6 @@ "oldfieldtype": "Table", "options": "Purchase Taxes and Charges" }, - { - "doctype": "DocField", - "fieldname": "calculate_tax", - "fieldtype": "Button", - "label": "Calculate Tax", - "oldfieldtype": "Button", - "print_hide": 1 - }, { "doctype": "DocField", "fieldname": "tax_calculation", @@ -371,22 +372,11 @@ "oldfieldtype": "Section Break", "options": "icon-money" }, - { - "doctype": "DocField", - "fieldname": "net_total_import", - "fieldtype": "Currency", - "label": "Net Total (Import)", - "oldfieldname": "net_total_import", - "oldfieldtype": "Currency", - "options": "currency", - "print_hide": 1, - "read_only": 1 - }, { "doctype": "DocField", "fieldname": "other_charges_added_import", "fieldtype": "Currency", - "label": "Taxes and Charges Added (Import)", + "label": "Taxes and Charges Added", "oldfieldname": "other_charges_added_import", "oldfieldtype": "Currency", "options": "currency", @@ -397,7 +387,7 @@ "doctype": "DocField", "fieldname": "other_charges_deducted_import", "fieldtype": "Currency", - "label": "Taxes and Charges Deducted (Import)", + "label": "Taxes and Charges Deducted", "oldfieldname": "other_charges_deducted_import", "oldfieldtype": "Currency", "options": "currency", @@ -408,7 +398,7 @@ "doctype": "DocField", "fieldname": "grand_total_import", "fieldtype": "Currency", - "label": "Grand Total (Import)", + "label": "Grand Total", "oldfieldname": "grand_total_import", "oldfieldtype": "Currency", "options": "currency", @@ -419,7 +409,7 @@ "doctype": "DocField", "fieldname": "in_words_import", "fieldtype": "Data", - "label": "In Words (Import)", + "label": "In Words", "oldfieldname": "in_words_import", "oldfieldtype": "Data", "print_hide": 1, @@ -432,25 +422,11 @@ "print_width": "50%", "width": "50%" }, - { - "doctype": "DocField", - "fieldname": "net_total", - "fieldtype": "Currency", - "label": "Net Total", - "oldfieldname": "net_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "print_hide": 1, - "print_width": "150px", - "read_only": 1, - "reqd": 1, - "width": "150px" - }, { "doctype": "DocField", "fieldname": "other_charges_added", "fieldtype": "Currency", - "label": "Taxes and Charges Added", + "label": "Taxes and Charges Added (Company Currency)", "oldfieldname": "other_charges_added", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -461,7 +437,7 @@ "doctype": "DocField", "fieldname": "other_charges_deducted", "fieldtype": "Currency", - "label": "Taxes and Charges Deducted", + "label": "Taxes and Charges Deducted (Company Currency)", "oldfieldname": "other_charges_deducted", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -472,7 +448,7 @@ "doctype": "DocField", "fieldname": "total_tax", "fieldtype": "Currency", - "label": "Total Tax", + "label": "Total Tax (Company Currency)", "oldfieldname": "total_tax", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -483,7 +459,7 @@ "doctype": "DocField", "fieldname": "grand_total", "fieldtype": "Currency", - "label": "Grand Total", + "label": "Grand Total (Company Currency)", "oldfieldname": "grand_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -494,7 +470,7 @@ "doctype": "DocField", "fieldname": "rounded_total", "fieldtype": "Currency", - "label": "Rounded Total", + "label": "Rounded Total (Company Currency)", "oldfieldname": "rounded_total", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -506,7 +482,7 @@ "doctype": "DocField", "fieldname": "in_words", "fieldtype": "Data", - "label": "In Words", + "label": "In Words (Company Currency)", "oldfieldname": "in_words", "oldfieldtype": "Data", "print_hide": 1, diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt index 0f6e9b5611..186ab3de82 100755 --- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt +++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:10", "docstatus": 0, - "modified": "2013-07-08 17:46:17", + "modified": "2013-07-09 12:20:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -124,7 +124,7 @@ "doctype": "DocField", "fieldname": "import_ref_rate", "fieldtype": "Currency", - "label": "Ref Rate ", + "label": "Price List Rate", "options": "currency", "print_hide": 1, "read_only": 0 @@ -165,7 +165,7 @@ "doctype": "DocField", "fieldname": "purchase_ref_rate", "fieldtype": "Currency", - "label": "Price List Rate*", + "label": "Price List Rate (Company Currency)", "options": "Company:company:default_currency", "print_hide": 1, "read_only": 0 @@ -175,7 +175,7 @@ "doctype": "DocField", "fieldname": "purchase_rate", "fieldtype": "Currency", - "label": "Rate*", + "label": "Rate (Company Currency)", "oldfieldname": "purchase_rate", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -190,7 +190,7 @@ "doctype": "DocField", "fieldname": "amount", "fieldtype": "Currency", - "label": "Amount*", + "label": "Amount (Company Currency)", "oldfieldname": "amount", "oldfieldtype": "Currency", "options": "Company:company:default_currency", @@ -314,7 +314,7 @@ "doctype": "DocField", "fieldname": "qa_no", "fieldtype": "Link", - "label": "QA No", + "label": "Quality Inspection", "no_copy": 1, "oldfieldname": "qa_no", "oldfieldtype": "Link", @@ -378,7 +378,7 @@ "fieldtype": "Link", "hidden": 0, "in_filter": 1, - "label": "PO No", + "label": "Purchase Order", "no_copy": 1, "oldfieldname": "prevdoc_docname", "oldfieldtype": "Link", @@ -396,7 +396,7 @@ "fieldtype": "Date", "hidden": 1, "in_filter": 1, - "label": "PO Date", + "label": "Purchase Order Date", "no_copy": 1, "oldfieldname": "prevdoc_date", "oldfieldtype": "Date",