From 27184e0e050a1223c79fc63b2c95cae013fc2e87 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 6 Dec 2012 11:46:41 +0530 Subject: [PATCH 1/2] default filters set in debtors and creditors ledger --- .../creditors_ledger/creditors_ledger.txt | 54 +++++++++---------- .../debtors_ledger/debtors_ledger.txt | 54 +++++++++---------- .../reload_debtors_creditors_ledger.py | 5 ++ patches/patch_list.py | 4 ++ 4 files changed, 59 insertions(+), 58 deletions(-) create mode 100644 patches/december_2012/reload_debtors_creditors_ledger.py diff --git a/accounts/search_criteria/creditors_ledger/creditors_ledger.txt b/accounts/search_criteria/creditors_ledger/creditors_ledger.txt index 9a7565c2d7..12134e1ec0 100644 --- a/accounts/search_criteria/creditors_ledger/creditors_ledger.txt +++ b/accounts/search_criteria/creditors_ledger/creditors_ledger.txt @@ -1,31 +1,27 @@ -# Search Criteria, creditors_ledger [ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:51', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:51', - 'modified_by': u'Administrator', - 'owner': u'nabin@webnotestech.com' - }, - - # These values are common for all Search Criteria - { - 'criteria_name': u"Creditor's Ledger", - 'doc_type': u'GL Entry', - 'doctype': 'Search Criteria', - 'filters': u"{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", - 'module': u'Accounts', - 'name': '__common__', - 'page_len': 50, - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, creditors_ledger - { - 'doctype': 'Search Criteria', - 'name': u'creditors_ledger' - } + { + "owner": "nabin@erpnext.com", + "docstatus": 0, + "creation": "2012-05-14 18:05:41", + "modified_by": "nabin@erpnext.com", + "modified": "2012-12-06 11:36:09" + }, + { + "custom_query": null, + "report_script": null, + "page_len": 50, + "module": "Accounts", + "standard": "Yes", + "sort_order": "DESC", + "filters": "{\"GL Entry\\u0001Voucher Type\":[],\"GL Entry\\u0001Is Cancelled\":[\"No\"],\"GL Entry\\u0001Is Opening\":[\"\"],\"GL Entry\\u0001Fiscal Year\":[\"\"]}", + "doc_type": "GL Entry", + "name": "__common__", + "doctype": "Search Criteria", + "sort_by": "`tabGL Entry`.`name`", + "criteria_name": "Creditor's Ledger" + }, + { + "name": "creditors_ledger", + "doctype": "Search Criteria" + } ] \ No newline at end of file diff --git a/accounts/search_criteria/debtors_ledger/debtors_ledger.txt b/accounts/search_criteria/debtors_ledger/debtors_ledger.txt index 09910970d6..a86800318e 100644 --- a/accounts/search_criteria/debtors_ledger/debtors_ledger.txt +++ b/accounts/search_criteria/debtors_ledger/debtors_ledger.txt @@ -1,31 +1,27 @@ -# Search Criteria, debtors_ledger [ - - # These values are common in all dictionaries - { - 'creation': '2012-04-03 12:49:51', - 'docstatus': 0, - 'modified': '2012-04-03 12:49:51', - 'modified_by': u'Administrator', - 'owner': u'nabin@webnotestech.com' - }, - - # These values are common for all Search Criteria - { - 'criteria_name': u"Debtor's Ledger", - 'doc_type': u'GL Entry', - 'doctype': 'Search Criteria', - 'filters': u"{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'No','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", - 'module': u'Accounts', - 'name': '__common__', - 'page_len': 50, - 'sort_order': u'DESC', - 'standard': u'Yes' - }, - - # Search Criteria, debtors_ledger - { - 'doctype': 'Search Criteria', - 'name': u'debtors_ledger' - } + { + "owner": "nabin@erpnext.com", + "docstatus": 0, + "creation": "2012-05-14 18:05:42", + "modified_by": "nabin@erpnext.com", + "modified": "2012-12-06 11:37:15" + }, + { + "custom_query": null, + "report_script": null, + "page_len": 50, + "module": "Accounts", + "standard": "Yes", + "sort_order": "DESC", + "filters": "{\"GL Entry\\u0001Voucher Type\":[],\"GL Entry\\u0001Is Cancelled\":[\"No\"],\"GL Entry\\u0001Is Opening\":[],\"GL Entry\\u0001Fiscal Year\":[]}", + "doc_type": "GL Entry", + "name": "__common__", + "doctype": "Search Criteria", + "sort_by": "`tabGL Entry`.`name`", + "criteria_name": "Debtor's Ledger" + }, + { + "name": "debtors_ledger", + "doctype": "Search Criteria" + } ] \ No newline at end of file diff --git a/patches/december_2012/reload_debtors_creditors_ledger.py b/patches/december_2012/reload_debtors_creditors_ledger.py new file mode 100644 index 0000000000..7f88a6f47d --- /dev/null +++ b/patches/december_2012/reload_debtors_creditors_ledger.py @@ -0,0 +1,5 @@ +def execute(): + import webnotes + from webnotes.modules import reload_doc + reload_doc("accounts", "search_criteria", "debtors_ledger") + reload_doc("accounts", "search_criteria", "creditors_ledger") \ No newline at end of file diff --git a/patches/patch_list.py b/patches/patch_list.py index 88a77735f5..38847eb875 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -721,4 +721,8 @@ patch_list = [ 'patch_module': 'patches.december_2012', 'patch_file': 'repost_projected_qty', }, + { + 'patch_module': 'patches.december_2012', + 'patch_file': 'reload_debtors_creditors_ledger', + }, ] \ No newline at end of file From 8e6ab709f5c927ca8f58b68fab2e093d44d72bdc Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 6 Dec 2012 11:55:41 +0530 Subject: [PATCH 2/2] fix in delivery note unhide of adj_rate and ref_rate --- stock/doctype/delivery_note/delivery_note.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js index 622767511e..7929baa8f2 100644 --- a/stock/doctype/delivery_note/delivery_note.js +++ b/stock/doctype/delivery_note/delivery_note.js @@ -263,8 +263,6 @@ var set_print_hide= function(doc, cdt, cdn){ } else { dn_fields['currency'].print_hide = 0; dn_item_fields['export_rate'].print_hide = 0; - dn_item_fields['adj_rate'].print_hide = 0; - dn_item_fields['ref_rate'].print_hide = 0; dn_item_fields['export_amount'].print_hide = 0; } }