Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Rushabh Mehta 2012-12-06 12:19:33 +05:30
commit 06d24a60d0
5 changed files with 59 additions and 60 deletions

View File

@ -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"
}
]

View File

@ -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"
}
]

View File

@ -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")

View File

@ -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',
},
]

View File

@ -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;
}
}