From b7084b899597d37e2c77d4fe968e9c8ea8ca1f10 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 7 Feb 2013 18:15:04 +0530 Subject: [PATCH 1/5] Update hr/doctype/appraisal/appraisal.py fixed issue in appraisal --- hr/doctype/appraisal/appraisal.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hr/doctype/appraisal/appraisal.py b/hr/doctype/appraisal/appraisal.py index 849e48ac37..3d49c311d9 100644 --- a/hr/doctype/appraisal/appraisal.py +++ b/hr/doctype/appraisal/appraisal.py @@ -77,10 +77,9 @@ class DocType: msgprint("Total weightage assigned should be 100%. It is :" + str(total_w) + "%", raise_exception=1) - if webnotes.conn.get_default("employee", webnotes.session.user) != self.doc.employee: - - if total==0: - msgprint("Total can't be zero. You must atleast give some points!", raise_exception=1) + if webnotes.conn.get_value("Employee", self.doc.employee, "user_id") != \ + webnotes.session.user and total == 0: + msgprint("Total can't be zero. You must atleast give some points!", raise_exception=1) self.doc.total_score = total From 6209046772f2f7c9f83b6b0749ec22fe9d32a9de Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 7 Feb 2013 19:47:34 +0530 Subject: [PATCH 2/5] added some test records --- accounts/doctype/account/account.py | 30 +++++++++++- accounts/doctype/cost_center/cost_center.py | 10 ++++ accounts/doctype/fiscal_year/fiscal_year.py | 11 +++-- .../purchase_invoice/purchase_invoice.py | 2 +- .../purchase_invoice/test_purchase_invoice.py | 45 ++---------------- buying/doctype/supplier/supplier.py | 9 ++++ controllers/buying_controller.py | 10 +++- .../test_leave_application.py | 4 +- selling/doctype/customer/customer.py | 10 ++++ setup/doctype/brand/brand.py | 9 +++- setup/doctype/company/company.py | 6 +-- setup/doctype/country/country.py | 9 +++- setup/doctype/currency/currency.py | 2 - .../doctype/customer_group/customer_group.py | 14 ++++-- setup/doctype/item_group/item_group.py | 17 ++++++- setup/doctype/territory/territory.py | 11 ++++- setup/doctype/uom/uom.py | 9 +++- .../doctype/warehouse_type/warehouse_type.py | 9 +++- stock/doctype/item/item.py | 46 ++++++++++++++++++- stock/doctype/warehouse/warehouse.py | 15 ++++-- 20 files changed, 210 insertions(+), 68 deletions(-) diff --git a/accounts/doctype/account/account.py b/accounts/doctype/account/account.py index 0e3ace19fb..14af7cf4ef 100644 --- a/accounts/doctype/account/account.py +++ b/accounts/doctype/account/account.py @@ -23,8 +23,6 @@ from webnotes import msgprint sql = webnotes.conn.sql get_value = webnotes.conn.get_value -test_records = [] - class DocType: def __init__(self,d,dl): self.doc, self.doclist = d,dl @@ -208,3 +206,31 @@ def get_parent_account(doctype, txt, searchfield, start, page_len, args): return webnotes.conn.sql("""select name from tabAccount where group_or_ledger = 'Group' and docstatus != 2 and company = '%s' and name like '%%%s%%'""" % (args["company"], txt)) + +def make_test_records(verbose): + from webnotes.test_runner import load_module_and_make_records, make_test_objects + + load_module_and_make_records("Company", verbose) + + accounts = [ + # [account_name, parent_account, group_or_ledger] + ["_Test Account Stock Expenses", "Direct Expenses - _TC", "Group"], + ["_Test Account Shipping Charges", "_Test Account Stock Expenses - _TC", "Ledger"], + ["_Test Account Customs Duty", "_Test Account Stock Expenses - _TC", "Ledger"], + ["_Test Account Tax Assets", "Current Assets - _TC", "Group"], + ["_Test Account VAT", "_Test Account Tax Assets - _TC", "Ledger"], + ["_Test Account Cost for Goods Sold", "Expenses - _TC", "Ledger"], + ["_Test Account Excise Duty", "_Test Account Tax Assets - _TC", "Ledger"], + ["_Test Account Education Cess", "_Test Account Tax Assets - _TC", "Ledger"], + ["_Test Account S&H Education Cess", "_Test Account Tax Assets - _TC", "Ledger"], + ["_Test Account CST", "Direct Expenses - _TC", "Ledger"], + ["_Test Account Discount", "Direct Expenses - _TC", "Ledger"] + ] + + return make_test_objects([[{ + "doctype": "Account", + "account_name": account_name, + "parent_account": parent_account, + "company": "_Test Company", + "group_or_ledger": group_or_ledger + }] for account_name, parent_account, group_or_ledger in accounts]) \ No newline at end of file diff --git a/accounts/doctype/cost_center/cost_center.py b/accounts/doctype/cost_center/cost_center.py index d23b08681c..65d1f68520 100644 --- a/accounts/doctype/cost_center/cost_center.py +++ b/accounts/doctype/cost_center/cost_center.py @@ -98,3 +98,13 @@ class DocType(DocTypeNestedSet): (cost_center_name, old)) return " - ".join(parts) + +test_records = [ + [{ + "doctype": "Cost Center", + "cost_center_name": "_Test Cost Center", + "parent_cost_center": "Root - _TC", + "company_name": "_Test Company", + "group_or_ledger": "Ledger" + }], +] \ No newline at end of file diff --git a/accounts/doctype/fiscal_year/fiscal_year.py b/accounts/doctype/fiscal_year/fiscal_year.py index d5dff6ee4b..34134777db 100644 --- a/accounts/doctype/fiscal_year/fiscal_year.py +++ b/accounts/doctype/fiscal_year/fiscal_year.py @@ -31,6 +31,11 @@ class DocType: msgprint(self.doc.name + _(""" is now the default Fiscal Year. \ Please refresh your browser for the change to take effect.""")) - -test_records = [[{"doctype":"Fiscal Year", "year":"_Test Fiscal Year", - "year_start_date":"2013-01-01"}]] \ No newline at end of file + +test_records = [ + [{ + "doctype": "Fiscal Year", + "year": "_Test Fiscal Year", + "year_start_date": "2013-01-01" + }] +] \ No newline at end of file diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.py b/accounts/doctype/purchase_invoice/purchase_invoice.py index 98bfda554d..8b65e0dbda 100644 --- a/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -526,4 +526,4 @@ class DocType(BuyingController): def on_update(self): pass - + diff --git a/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/accounts/doctype/purchase_invoice/test_purchase_invoice.py index f7cfc96eab..d13af0e653 100644 --- a/accounts/doctype/purchase_invoice/test_purchase_invoice.py +++ b/accounts/doctype/purchase_invoice/test_purchase_invoice.py @@ -20,7 +20,6 @@ import unittest import webnotes import webnotes.model from webnotes.utils import nowdate -from webnotes.test_runner import make_test_records from stock.doctype.purchase_receipt import test_purchase_receipt @@ -147,9 +146,9 @@ class TestPurchaseInvoice(unittest.TestCase): self.load_test_data() def load_test_data(self): - make_test_records("Company") + from webnotes.test_runner import make_test_records + make_test_records("Purchase Invoice", verbose=0) - def test_gl_entries(self): wrapper = webnotes.model_wrapper(purchase_invoice_doclist).insert() wrapper.submit() @@ -172,7 +171,7 @@ class TestPurchaseInvoice(unittest.TestCase): for d in gl_entries: self.assertEqual([d.debit, d.credit], expected_gl_entries.get(d.account)) - def test_purchase_invoice_calculation(self): + def atest_purchase_invoice_calculation(self): test_doclist = [] + purchase_invoice_doclist for doc in test_doclist: if doc["doctype"] == "Purchase Taxes and Charges": @@ -205,42 +204,8 @@ class TestPurchaseInvoice(unittest.TestCase): for i, item in enumerate(wrapper.doclist.get({"parentfield": "entries"})): self.assertEqual(item.item_code, expected_values[i][0]) self.assertEqual(item.item_tax_amount, expected_values[i][1]) - - - # def test_purchase_invoice_calculation(self): - # from webnotes.model.doclist import DocList - # wrapper = webnotes.insert(DocList(purchase_invoice_doclist)) - # wrapper.load_from_db() - # dl = wrapper.doclist - # - # # test net total - # self.assertEqual(dl[0].net_total, 1250) - # - # # test tax amounts and totals - # expected_values = [ - # ["Shipping Charges - %s" % abbr, 100, 1350], - # ["Customs Duty - %s" % abbr, 125, 1350], - # ["Excise Duty - %s" % abbr, 140, 1490], - # ["Education Cess - %s" % abbr, 2.8, 1492.8], - # ["S&H Education Cess - %s" % abbr, 1.4, 1494.2], - # ["CST - %s" % abbr, 29.88, 1524.08], - # ["VAT - Test - %s" % abbr, 156.25, 1680.33], - # ["Discount - %s" % abbr, -168.03, 1512.30], - # ] - # for i, tax in enumerate(dl.get({"parentfield": "taxes_and_charges"})): - # # print tax.account_head, tax.tax_amount, tax.total - # self.assertEqual(tax.account_head, expected_values[i][0]) - # self.assertEqual(tax.tax_amount, expected_values[i][1]) - # self.assertEqual(tax.total, expected_values[i][2]) - # - # # test item tax amount - # expected_values = [ - # ["Home Desktop 100", 90], - # ["Home Desktop 200", 135] - # ] - # for i, item in enumerate(dl.get({"parentfield": "purchase_invoice_items"})): - # self.assertEqual(item.item_code, expected_values[i][0]) - # self.assertEqual(item.valuation_tax_amount, expected_values[i][1]) + + # self.assertEqual(dl[0].net_total, 1250) def tearDown(self): webnotes.conn.rollback() \ No newline at end of file diff --git a/buying/doctype/supplier/supplier.py b/buying/doctype/supplier/supplier.py index 096a43e3ff..0149f81cc5 100644 --- a/buying/doctype/supplier/supplier.py +++ b/buying/doctype/supplier/supplier.py @@ -182,3 +182,12 @@ class DocType(TransactionBase): #update master_name in doctype account webnotes.conn.sql("""update `tabAccount` set master_name = %s, master_type = 'Supplier' where master_name = %s""" , (new,old)) + +test_records = [ + [{ + "doctype": "Supplier", + "supplier_name": "_Test Supplier", + "supplier_type": "_Test Supplier Type", + "company": "_Test Company" + }] +] \ No newline at end of file diff --git a/controllers/buying_controller.py b/controllers/buying_controller.py index f416b853fb..511ca17fd0 100644 --- a/controllers/buying_controller.py +++ b/controllers/buying_controller.py @@ -86,4 +86,12 @@ class BuyingController(AccountsController): self.doc.currency) def calculate_taxes_and_totals(self): - pass \ No newline at end of file + self.doc.conversion_rate = flt(self.doc.conversion_rate) + + # self.calculate_item_values() + # self.initialize_taxes() + # self.calculate_net_total() + # self.calculate_taxes() + # self.calculate_totals() + # self.set_total_in_words() + \ No newline at end of file diff --git a/hr/doctype/leave_application/test_leave_application.py b/hr/doctype/leave_application/test_leave_application.py index e7c1bccd00..22164a7f79 100644 --- a/hr/doctype/leave_application/test_leave_application.py +++ b/hr/doctype/leave_application/test_leave_application.py @@ -1,6 +1,9 @@ import sys import unittest +if __name__=="__main__": + sys.path.extend([".", "app", "lib"]) + from hr.doctype.leave_application.leave_application import LeaveDayBlockedError class TestLeaveApplication(unittest.TestCase): @@ -53,7 +56,6 @@ test_records = [ }]] if __name__=="__main__": - sys.path.extend(["app", "lib"]) import webnotes webnotes.connect() diff --git a/selling/doctype/customer/customer.py b/selling/doctype/customer/customer.py index 01fa69cc48..315e7931a9 100644 --- a/selling/doctype/customer/customer.py +++ b/selling/doctype/customer/customer.py @@ -249,3 +249,13 @@ class DocType(TransactionBase): #update master_name in doctype account webnotes.conn.sql("""update `tabAccount` set master_name = %s, master_type = 'Customer' where master_name = %s""", (new,old)) + +test_records = [ + [{ + "doctype": "Customer", + "customer_type": "Individual", + "customer_group": "_Test Customer Group", + "territory": "_Test Territory", + "company": "_Test Company" + }] +] \ No newline at end of file diff --git a/setup/doctype/brand/brand.py b/setup/doctype/brand/brand.py index 7f48feb2eb..19546da1a9 100644 --- a/setup/doctype/brand/brand.py +++ b/setup/doctype/brand/brand.py @@ -19,4 +19,11 @@ import webnotes class DocType: def __init__(self, d, dl): - self.doc, self.doclist = d, dl \ No newline at end of file + self.doc, self.doclist = d, dl + +test_records = [ + [{ + "doctype": "Brand", + "brand": "_Test Brand" + }] +] \ No newline at end of file diff --git a/setup/doctype/company/company.py b/setup/doctype/company/company.py index b36253ed39..a951af58c9 100644 --- a/setup/doctype/company/company.py +++ b/setup/doctype/company/company.py @@ -258,9 +258,9 @@ class DocType: test_records = [ [{ + "doctype": "Company", "company_name": "_Test Company", - "abbr": "TC", + "abbr": "_TC", "default_currency": "INR", - "doctype": "Company" - }] + }], ] \ No newline at end of file diff --git a/setup/doctype/country/country.py b/setup/doctype/country/country.py index 7f48feb2eb..360f67915b 100644 --- a/setup/doctype/country/country.py +++ b/setup/doctype/country/country.py @@ -19,4 +19,11 @@ import webnotes class DocType: def __init__(self, d, dl): - self.doc, self.doclist = d, dl \ No newline at end of file + self.doc, self.doclist = d, dl + +test_records = [ + [{ + "doctype": "Country", + "country_name": "_Test Country" + }] +] \ No newline at end of file diff --git a/setup/doctype/currency/currency.py b/setup/doctype/currency/currency.py index 73076cbde2..7794430349 100644 --- a/setup/doctype/currency/currency.py +++ b/setup/doctype/currency/currency.py @@ -20,5 +20,3 @@ import webnotes class DocType: def __init__(self, d, dl): self.doc, self.doclist = d, dl - -test_records = [] \ No newline at end of file diff --git a/setup/doctype/customer_group/customer_group.py b/setup/doctype/customer_group/customer_group.py index b34d3c6425..fa81dcad15 100644 --- a/setup/doctype/customer_group/customer_group.py +++ b/setup/doctype/customer_group/customer_group.py @@ -16,9 +16,6 @@ from __future__ import unicode_literals import webnotes - -from webnotes.model import db_exists -from webnotes.model.wrapper import copy_doclist from webnotes import msgprint sql = webnotes.conn.sql @@ -63,4 +60,13 @@ class DocType(DocTypeNestedSet): You can not trash/cancel/delete this customer group.", raise_exception=1) # rebuild tree - super(DocType, self).on_trash() \ No newline at end of file + super(DocType, self).on_trash() + +test_records = [ + [{ + "doctype": "Customer Group", + "customer_group_name": "_Test Customer Group", + "parent_customer_group": "All Customer Groups", + "is_group": "No" + }] +] \ No newline at end of file diff --git a/setup/doctype/item_group/item_group.py b/setup/doctype/item_group/item_group.py index 32c5d527c0..c0fd9068ab 100644 --- a/setup/doctype/item_group/item_group.py +++ b/setup/doctype/item_group/item_group.py @@ -67,4 +67,19 @@ class DocType(DocTypeNestedSet): if self.doc.slideshow: from website.helpers.slideshow import get_slideshow - get_slideshow(self) \ No newline at end of file + get_slideshow(self) + +test_records = [ + [{ + "doctype": "Item Group", + "item_group_name": "_Test Item Group", + "parent_item_group": "All Item Groups", + "is_group": "No" + }], + [{ + "doctype": "Item Group", + "item_group_name": "_Test Item Group Desktops", + "parent_item_group": "All Item Groups", + "is_group": "No" + }], +] \ No newline at end of file diff --git a/setup/doctype/territory/territory.py b/setup/doctype/territory/territory.py index 6d2da6a336..11bd4cc9c4 100644 --- a/setup/doctype/territory/territory.py +++ b/setup/doctype/territory/territory.py @@ -32,4 +32,13 @@ class DocType(DocTypeNestedSet): for d in getlist(self.doclist, 'target_details'): if not flt(d.target_qty) and not flt(d.target_amount): msgprint("Either target qty or target amount is mandatory.") - raise Exception \ No newline at end of file + raise Exception + +test_records = [ + [{ + "doctype": "Territory", + "territory_name": "_Test Territory", + "parent_territory": "All Territories", + "is_group": "No", + }] +] \ No newline at end of file diff --git a/setup/doctype/uom/uom.py b/setup/doctype/uom/uom.py index 7f48feb2eb..733cb57822 100644 --- a/setup/doctype/uom/uom.py +++ b/setup/doctype/uom/uom.py @@ -19,4 +19,11 @@ import webnotes class DocType: def __init__(self, d, dl): - self.doc, self.doclist = d, dl \ No newline at end of file + self.doc, self.doclist = d, dl + +test_records = [ + [{ + "doctype": "UOM", + "uom_name": "_Test UOM" + }] +] \ No newline at end of file diff --git a/setup/doctype/warehouse_type/warehouse_type.py b/setup/doctype/warehouse_type/warehouse_type.py index 7f48feb2eb..451db4122c 100644 --- a/setup/doctype/warehouse_type/warehouse_type.py +++ b/setup/doctype/warehouse_type/warehouse_type.py @@ -19,4 +19,11 @@ import webnotes class DocType: def __init__(self, d, dl): - self.doc, self.doclist = d, dl \ No newline at end of file + self.doc, self.doclist = d, dl + +test_records = [ + [{ + "doctype": "Warehouse Type", + "warehouse_type": "_Test Warehouse Type" + }] +] \ No newline at end of file diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py index 2bbf48a370..b2923b1dd5 100644 --- a/stock/doctype/item/item.py +++ b/stock/doctype/item/item.py @@ -220,4 +220,48 @@ class DocType: if self.doc.slideshow: from website.helpers.slideshow import get_slideshow - get_slideshow(self) \ No newline at end of file + get_slideshow(self) + +test_records = [ + [{ + "doctype": "Item", + "item_code": "_Test Item Home Desktop 100", + "item_name": "_Test Item Home Desktop 100", + "description": "_Test Item Home Desktop 100", + "item_group": "_Test Item Group Desktops", + "is_stock_item": "Yes", + "is_asset_item": "No", + "has_batch_no": "No", + "has_serial_no": "No", + "is_purchase_item": "Yes", + "is_sales_item": "Yes", + "is_service_item": "No", + "is_sample_item": "No", + "inspection_required": "No", + "is_pro_applicable": "No", + "is_sub_contracted_item": "No", + }, + { + "doctype": "Item Tax", + "tax_type": "_Test Account Excise Duty - _TC", + "tax_rate": 10 + }], + [{ + "doctype": "Item", + "item_code": "_Test Item Home Desktop 200", + "item_name": "_Test Item Home Desktop 200", + "description": "_Test Item Home Desktop 200", + "item_group": "_Test Item Group Desktops", + "is_stock_item": "Yes", + "is_asset_item": "No", + "has_batch_no": "No", + "has_serial_no": "No", + "is_purchase_item": "Yes", + "is_sales_item": "Yes", + "is_service_item": "No", + "is_sample_item": "No", + "inspection_required": "No", + "is_pro_applicable": "No", + "is_sub_contracted_item": "No", + }], +] \ No newline at end of file diff --git a/stock/doctype/warehouse/warehouse.py b/stock/doctype/warehouse/warehouse.py index 7c3cbd6feb..a4ee3704e2 100644 --- a/stock/doctype/warehouse/warehouse.py +++ b/stock/doctype/warehouse/warehouse.py @@ -18,7 +18,6 @@ from __future__ import unicode_literals import webnotes from webnotes.utils import cstr, flt, validate_email_add -from webnotes.model.doc import Document from webnotes.model.code import get_obj from webnotes import msgprint @@ -204,7 +203,15 @@ class DocType: # delete cancelled sle if sql("""select name from `tabStock Ledger Entry` where warehouse = %s and ifnull('is_cancelled', '') = 'No'""", self.doc.name): - mdgprint("""Warehosue can not be deleted as stock ledger entry - exists for this warehosue.""", raise_exception=1) + msgprint("""Warehosue can not be deleted as stock ledger entry + exists for this warehouse.""", raise_exception=1) else: - sql("delete from `tabStock Ledger Entry` where warehouse = %s", self.doc.name) \ No newline at end of file + sql("delete from `tabStock Ledger Entry` where warehouse = %s", self.doc.name) + +test_records = [ + [{ + "doctype": "Warehouse", + "warehouse_name": "_Test Warehouse", + "warehouse_type": "_Test Warehouse Type" + }] +] \ No newline at end of file From 677b4b4e7992565505581fbfe1e19ddcab28093c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 7 Feb 2013 22:19:47 +0530 Subject: [PATCH 3/5] dynamic loading of grid reports --- startup/report_data_map.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/startup/report_data_map.py b/startup/report_data_map.py index dc1833d1e2..ff9f3e44cf 100644 --- a/startup/report_data_map.py +++ b/startup/report_data_map.py @@ -47,7 +47,7 @@ data_map = { "order_by": "lft" }, "GL Entry": { - "columns": ["account", "posting_date", "cost_center", "debit", "credit", "is_opening", + "columns": ["name", "account", "posting_date", "cost_center", "debit", "credit", "is_opening", "company", "voucher_type", "voucher_no", "remarks"], "conditions": ["ifnull(is_cancelled, 'No')='No'"], "order_by": "posting_date, account", @@ -86,7 +86,7 @@ data_map = { "order_by": "name" }, "Stock Ledger Entry": { - "columns": ["posting_date", "posting_time", "item_code", "warehouse", "actual_qty as qty", + "columns": ["name", "posting_date", "posting_time", "item_code", "warehouse", "actual_qty as qty", "voucher_type", "voucher_no", "ifnull(incoming_rate,0) as incoming_rate"], "conditions": ["ifnull(is_cancelled, 'No')='No'"], "order_by": "posting_date, posting_time, name", @@ -102,7 +102,7 @@ data_map = { "order_by": "posting_date, posting_time, name", }, "Production Order": { - "columns": ["production_item as item_code", + "columns": ["name", "production_item as item_code", "(ifnull(qty, 0) - ifnull(produced_qty, 0)) as qty", "fg_warehouse as warehouse"], "conditions": ["docstatus=1", "status != 'Stopped'", "ifnull(fg_warehouse, '')!=''", @@ -113,7 +113,7 @@ data_map = { }, }, "Purchase Request Item": { - "columns": ["item_code", "warehouse", + "columns": ["name", "item_code", "warehouse", "(ifnull(qty, 0) - ifnull(ordered_qty, 0)) as qty"], "from": "`tabPurchase Request Item` item, `tabPurchase Request` main", "conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'", @@ -124,7 +124,7 @@ data_map = { }, }, "Purchase Order Item": { - "columns": ["item_code", "warehouse", + "columns": ["name", "item_code", "warehouse", "(ifnull(qty, 0) - ifnull(received_qty, 0)) as qty"], "from": "`tabPurchase Order Item` item, `tabPurchase Order` main", "conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'", @@ -136,7 +136,7 @@ data_map = { }, "Sales Order Item": { - "columns": ["item_code", "(ifnull(qty, 0) - ifnull(delivered_qty, 0)) as qty", + "columns": ["name", "item_code", "(ifnull(qty, 0) - ifnull(delivered_qty, 0)) as qty", "reserved_warehouse as warehouse"], "from": "`tabSales Order Item` item, `tabSales Order` main", "conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'", @@ -178,7 +178,7 @@ data_map = { } }, "Sales Invoice Item": { - "columns": ["parent", "item_code", "qty", "amount"], + "columns": ["name", "parent", "item_code", "qty", "amount"], "conditions": ["docstatus=1", "ifnull(parent, '')!=''"], "order_by": "parent", "links": { @@ -196,7 +196,7 @@ data_map = { } }, "Sales Order Item[Sales Analytics]": { - "columns": ["parent", "item_code", "qty", "amount"], + "columns": ["name", "parent", "item_code", "qty", "amount"], "conditions": ["docstatus=1", "ifnull(parent, '')!=''"], "order_by": "parent", "links": { @@ -214,7 +214,7 @@ data_map = { } }, "Delivery Note Item[Sales Analytics]": { - "columns": ["parent", "item_code", "qty", "amount"], + "columns": ["name", "parent", "item_code", "qty", "amount"], "conditions": ["docstatus=1", "ifnull(parent, '')!=''"], "order_by": "parent", "links": { @@ -246,7 +246,7 @@ data_map = { } }, "Purchase Invoice Item": { - "columns": ["parent", "item_code", "qty", "amount"], + "columns": ["name", "parent", "item_code", "qty", "amount"], "conditions": ["docstatus=1", "ifnull(parent, '')!=''"], "order_by": "parent", "links": { @@ -264,7 +264,7 @@ data_map = { } }, "Purchase Order Item[Purchase Analytics]": { - "columns": ["parent", "item_code", "qty", "amount"], + "columns": ["name", "parent", "item_code", "qty", "amount"], "conditions": ["docstatus=1", "ifnull(parent, '')!=''"], "order_by": "parent", "links": { @@ -282,7 +282,7 @@ data_map = { } }, "Purchase Receipt Item[Purchase Analytics]": { - "columns": ["parent", "item_code", "qty", "amount"], + "columns": ["name", "parent", "item_code", "qty", "amount"], "conditions": ["docstatus=1", "ifnull(parent, '')!=''"], "order_by": "parent", "links": { From 197861f576b0d0079b613b96be0c53d019603de3 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 8 Feb 2013 11:28:40 +0530 Subject: [PATCH 4/5] Update hr/doctype/leave_application/leave_application.txt changed permlevel for some fiedls in leave application --- hr/doctype/leave_application/leave_application.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt index e105dff0f1..ec17544df5 100644 --- a/hr/doctype/leave_application/leave_application.txt +++ b/hr/doctype/leave_application/leave_application.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-02 14:40:08", "docstatus": 0, - "modified": "2013-02-07 08:54:22", + "modified": "2013-02-08 11:27:22", "modified_by": "Administrator", "owner": "Administrator" }, @@ -165,7 +165,7 @@ "fieldtype": "Date", "label": "Posting Date", "no_copy": 1, - "permlevel": 2, + "permlevel": 0, "reqd": 1 }, { @@ -175,7 +175,7 @@ "in_filter": 1, "label": "Fiscal Year", "options": "link:Fiscal Year", - "permlevel": 2, + "permlevel": 0, "read_only": 0, "reqd": 1, "search_index": 0 @@ -195,7 +195,7 @@ "fieldtype": "Link", "label": "Letter Head", "options": "Letter Head", - "permlevel": 2, + "permlevel": 0, "print_hide": 1, "read_only": 0 }, @@ -250,4 +250,4 @@ "role": "Leave Approver", "submit": 0 } -] \ No newline at end of file +] From df35645e2a2243ce3cec279bd624020ce9686b06 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 8 Feb 2013 13:09:18 +0530 Subject: [PATCH 5/5] Update hr/doctype/employee/employee.txt removed salary structure button --- hr/doctype/employee/employee.txt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt index e8879f5fb8..7b1f730353 100644 --- a/hr/doctype/employee/employee.txt +++ b/hr/doctype/employee/employee.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-23 19:57:17", "docstatus": 0, - "modified": "2013-01-29 17:47:25", + "modified": "2013-02-08 13:07:25", "modified_by": "Administrator", "owner": "Administrator" }, @@ -543,14 +543,6 @@ "fieldtype": "Date", "label": "Valid Upto" }, - { - "doctype": "DocField", - "fieldname": "salary_structure", - "fieldtype": "Button", - "hidden": 1, - "label": "Salary Structure", - "oldfieldtype": "Button" - }, { "doctype": "DocField", "fieldname": "place_of_issue", @@ -775,4 +767,4 @@ "role": "HR Manager", "write": 1 } -] \ No newline at end of file +]