Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
accounts/search_criteria/creditors_ledger/creditors_ledger.txt
View File

@ -1,31 +1,27 @@
# Search Criteria, creditors_ledger
[ [
# These values are common in all dictionaries
{ {
'creation': '2012-04-03 12:49:51', "owner": "nabin@erpnext.com",
'docstatus': 0, "docstatus": 0,
'modified': '2012-04-03 12:49:51', "creation": "2012-05-14 18:05:41",
'modified_by': u'Administrator', "modified_by": "nabin@erpnext.com",
'owner': u'nabin@webnotestech.com' "modified": "2012-12-06 11:36:09"
}, },
# These values are common for all Search Criteria
{ {
'criteria_name': u"Creditor's Ledger", "custom_query": null,
'doc_type': u'GL Entry', "report_script": null,
'doctype': 'Search Criteria', "page_len": 50,
'filters': u"{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", "module": "Accounts",
'module': u'Accounts', "standard": "Yes",
'name': '__common__', "sort_order": "DESC",
'page_len': 50, "filters": "{\"GL Entry\\u0001Voucher Type\":[],\"GL Entry\\u0001Is Cancelled\":[\"No\"],\"GL Entry\\u0001Is Opening\":[\"\"],\"GL Entry\\u0001Fiscal Year\":[\"\"]}",
'sort_order': u'DESC', "doc_type": "GL Entry",
'standard': u'Yes' "name": "__common__",
"doctype": "Search Criteria",
"sort_by": "`tabGL Entry`.`name`",
"criteria_name": "Creditor's Ledger"
}, },
# Search Criteria, creditors_ledger
{ {
'doctype': 'Search Criteria', "name": "creditors_ledger",
'name': u'creditors_ledger' "doctype": "Search Criteria"
} }
] ]

42
accounts/search_criteria/debtors_ledger/debtors_ledger.txt
View File

@ -1,31 +1,27 @@
# Search Criteria, debtors_ledger
[ [
# These values are common in all dictionaries
{ {
'creation': '2012-04-03 12:49:51', "owner": "nabin@erpnext.com",
'docstatus': 0, "docstatus": 0,
'modified': '2012-04-03 12:49:51', "creation": "2012-05-14 18:05:42",
'modified_by': u'Administrator', "modified_by": "nabin@erpnext.com",
'owner': u'nabin@webnotestech.com' "modified": "2012-12-06 11:37:15"
}, },
# These values are common for all Search Criteria
{ {
'criteria_name': u"Debtor's Ledger", "custom_query": null,
'doc_type': u'GL Entry', "report_script": null,
'doctype': 'Search Criteria', "page_len": 50,
'filters': u"{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'No','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", "module": "Accounts",
'module': u'Accounts', "standard": "Yes",
'name': '__common__', "sort_order": "DESC",
'page_len': 50, "filters": "{\"GL Entry\\u0001Voucher Type\":[],\"GL Entry\\u0001Is Cancelled\":[\"No\"],\"GL Entry\\u0001Is Opening\":[],\"GL Entry\\u0001Fiscal Year\":[]}",
'sort_order': u'DESC', "doc_type": "GL Entry",
'standard': u'Yes' "name": "__common__",
"doctype": "Search Criteria",
"sort_by": "`tabGL Entry`.`name`",
"criteria_name": "Debtor's Ledger"
}, },
# Search Criteria, debtors_ledger
{ {
'doctype': 'Search Criteria', "name": "debtors_ledger",
'name': u'debtors_ledger' "doctype": "Search Criteria"
} }
] ]

5
patches/december_2012/reload_debtors_creditors_ledger.py Normal file
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")

4
patches/patch_list.py
View File

@ -721,4 +721,8 @@ patch_list = [
'patch_module': 'patches.december_2012', 'patch_module': 'patches.december_2012',
'patch_file': 'repost_projected_qty', 'patch_file': 'repost_projected_qty',
}, },
{
'patch_module': 'patches.december_2012',
'patch_file': 'reload_debtors_creditors_ledger',
},
] ]

2
stock/doctype/delivery_note/delivery_note.js
View File

@ -263,8 +263,6 @@ var set_print_hide= function(doc, cdt, cdn){
} else { } else {
dn_fields['currency'].print_hide = 0; dn_fields['currency'].print_hide = 0;
dn_item_fields['export_rate'].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; dn_item_fields['export_amount'].print_hide = 0;
} }
} }