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

Merge pull request #96 from nabinhait/master

Browse Source 
mapper
This commit is contained in:
Nabin Hait 2011-09-13 01:41:43 -07:00
commit 876dccef0d
9 changed files with 189 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt
View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
'modified': '2011-09-07 12:12:58',
'modified': '2011-09-13 13:23:44',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -116,6 +116,15 @@
'to_field': 'naming_series'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'incentives',
'map': 'No',
'match_id': 3,
'to_field': 'incentives'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',

11
accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:36',
'docstatus': 0,
'modified': '2011-09-07 12:05:03',
'modified': '2011-09-13 13:23:04',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -127,6 +127,15 @@
'to_field': 'naming_series'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'incentives',
'map': 'No',
'match_id': 3,
'to_field': 'incentives'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',

150
accounts/Module Def/Accounts/Accounts.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2010-09-25 10:50:34',
'creation': '2010-09-25 10:50:37',
'docstatus': 0,
'modified': '2011-07-28 12:01:10',
'modified': '2011-09-12 13:22:15',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -31,7 +31,7 @@
# These values are common for all Module Def
{
'disabled': 'No',
'doctype': 'Module Def',
'doctype': u'Module Def',
'doctype_list': 'GL Mapper, Journal Voucher\nGL Mapper, Payable Voucher\nGL Mapper, Receivable Voucher\nDocType Label, Receivable Voucher\nDocType Label, Payable Voucher',
'file_list': 'finance.gif,FileData/00210',
'is_hidden': 'No',
@ -40,13 +40,13 @@
'module_icon': 'Accounts.gif',
'module_label': 'Accounts',
'module_name': 'Accounts',
'module_seq': 3,
'module_seq': 5,
'name': '__common__'
},
# Module Def, Accounts
{
'doctype': 'Module Def',
'doctype': u'Module Def',
'name': 'Accounts'
},
@ -57,8 +57,7 @@
'display_name': 'Chart of Accounts',
'doc_name': 'Accounts Browser',
'doc_type': 'Pages',
'doctype': 'Module Def Item',
'idx': 1
'doctype': 'Module Def Item'
},
# Module Def Item
@ -68,8 +67,7 @@
'display_name': 'Chart of Cost Centers',
'doc_name': 'Accounts Browser',
'doc_type': 'Pages',
'doctype': 'Module Def Item',
'idx': 2
'doctype': 'Module Def Item'
},
# Module Def Item
@ -79,8 +77,7 @@
'doc_name': 'Journal Voucher',
'doc_type': 'Forms',
'doctype': 'Module Def Item',
'fields': 'voucher_type\nvoucher_date\nfiscal_year\ntotal_debit\ntotal_credit',
'idx': 3
'fields': 'voucher_type\nvoucher_date\nfiscal_year\ntotal_debit\ntotal_credit'
},
# Module Def Item
@ -90,8 +87,7 @@
'doc_name': 'Receivable Voucher',
'doc_type': 'Forms',
'doctype': 'Module Def Item',
'fields': 'voucher_date\ndue_date\ndebit_to\ngrand_total\noutstanding_amount',
'idx': 4
'fields': 'voucher_date\ndue_date\ndebit_to\ngrand_total\noutstanding_amount'
},
# Module Def Item
@ -101,8 +97,7 @@
'doc_name': 'Payable Voucher',
'doc_type': 'Forms',
'doctype': 'Module Def Item',
'fields': 'voucher_date\ncredit_to\nbill_no\ngrand_total\noutstanding_amount',
'idx': 5
'fields': 'voucher_date\ncredit_to\nbill_no\ngrand_total\noutstanding_amount'
},
# Module Def Item
@ -111,8 +106,7 @@
'display_name': 'Lease Agreement',
'doc_name': 'Lease Agreement',
'doc_type': 'Forms',
'doctype': 'Module Def Item',
'idx': 6
'doctype': 'Module Def Item'
},
# Module Def Item
@ -122,8 +116,7 @@
'doc_name': 'Financial Statements',
'doc_type': 'Pages',
'doctype': 'Module Def Item',
'icon': 'table.gif',
'idx': 7
'icon': 'table.gif'
},
# Module Def Item
@ -132,8 +125,7 @@
'display_name': 'Bank Reconciliation',
'doc_name': 'Bank Reconciliation',
'doc_type': 'Single DocType',
'doctype': 'Module Def Item',
'idx': 8
'doctype': 'Module Def Item'
},
# Module Def Item
@ -141,8 +133,7 @@
'display_name': 'TDS Payment',
'doc_name': 'TDS Payment',
'doc_type': 'Setup Forms',
'doctype': 'Module Def Item',
'idx': 9
'doctype': 'Module Def Item'
},
# Module Def Item
@ -150,8 +141,7 @@
'display_name': 'TDS Return Acknowledgement',
'doc_name': 'TDS Return Acknowledgement',
'doc_type': 'Setup Forms',
'doctype': 'Module Def Item',
'idx': 10
'doctype': 'Module Def Item'
},
# Module Def Item
@ -159,8 +149,7 @@
'display_name': 'Form 16A',
'doc_name': 'Form 16A',
'doc_type': 'Setup Forms',
'doctype': 'Module Def Item',
'idx': 11
'doctype': 'Module Def Item'
},
# Module Def Item
@ -169,8 +158,7 @@
'display_name': 'Period Closing Voucher',
'doc_name': 'Period Closing Voucher',
'doc_type': 'Setup Forms',
'doctype': 'Module Def Item',
'idx': 12
'doctype': 'Module Def Item'
},
# Module Def Item
@ -179,8 +167,7 @@
'display_name': 'Ledger Balance Export',
'doc_name': 'Ledger Balance Export',
'doc_type': 'Single DocType',
'doctype': 'Module Def Item',
'idx': 13
'doctype': 'Module Def Item'
},
# Module Def Item
@ -188,8 +175,7 @@
'display_name': 'General Ledger',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 14
'doctype': 'Module Def Item'
},
# Module Def Item
@ -197,8 +183,7 @@
'display_name': 'Accounts Receivable',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 15
'doctype': 'Module Def Item'
},
# Module Def Item
@ -206,8 +191,7 @@
'display_name': 'Accounts Payable',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 16
'doctype': 'Module Def Item'
},
# Module Def Item
@ -215,8 +199,7 @@
'display_name': 'Bank Reconciliation Statement',
'doc_name': 'Journal Voucher Detail',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 17
'doctype': 'Module Def Item'
},
# Module Def Item
@ -224,8 +207,7 @@
'display_name': 'Trial Balance',
'doc_name': 'Account',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 18
'doctype': 'Module Def Item'
},
# Module Def Item
@ -233,8 +215,7 @@
'display_name': 'Sales Register',
'doc_name': 'Receivable Voucher',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 19
'doctype': 'Module Def Item'
},
# Module Def Item
@ -242,8 +223,7 @@
'display_name': 'Purchase Register',
'doc_name': 'Payable Voucher',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 20
'doctype': 'Module Def Item'
},
# Module Def Item
@ -251,8 +231,7 @@
'display_name': 'Bank Clearance report',
'doc_name': 'Journal Voucher Detail',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 21
'doctype': 'Module Def Item'
},
# Module Def Item
@ -260,8 +239,7 @@
'display_name': 'Monthly Ledger Summary Report',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 22
'doctype': 'Module Def Item'
},
# Module Def Item
@ -269,8 +247,7 @@
'display_name': 'Collection Report',
'doc_name': 'Journal Voucher Detail',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 23
'doctype': 'Module Def Item'
},
# Module Def Item
@ -278,8 +255,7 @@
'display_name': 'Total amout collection for a period - Customerwise',
'doc_name': 'Account',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 24
'doctype': 'Module Def Item'
},
# Module Def Item
@ -287,8 +263,7 @@
'display_name': 'Payment Report',
'doc_name': 'Journal Voucher Detail',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 25
'doctype': 'Module Def Item'
},
# Module Def Item
@ -296,8 +271,7 @@
'display_name': 'Itemwise Sales Register',
'doc_name': 'RV Detail',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 26
'doctype': 'Module Def Item'
},
# Module Def Item
@ -305,8 +279,7 @@
'display_name': 'Itemwise Purchase Register',
'doc_name': 'PV Detail',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 27
'doctype': 'Module Def Item'
},
# Module Def Item
@ -314,8 +287,7 @@
'display_name': 'Cost Center wise Expense',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 28
'doctype': 'Module Def Item'
},
# Module Def Item
@ -323,8 +295,7 @@
'display_name': 'TDS Return',
'doc_name': 'TDS Payment Detail',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 29
'doctype': 'Module Def Item'
},
# Module Def Item
@ -332,8 +303,7 @@
'display_name': 'Budget Variance Report',
'doc_name': 'Budget Detail',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 30
'doctype': 'Module Def Item'
},
# Module Def Item
@ -341,8 +311,7 @@
'display_name': 'Payment Receipt Report',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 31
'doctype': 'Module Def Item'
},
# Module Def Item
@ -351,8 +320,7 @@
'display_name': 'Business Associate Commission Report',
'doc_name': 'Receivable Voucher',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 32
'doctype': 'Module Def Item'
},
# Module Def Item
@ -360,8 +328,7 @@
'display_name': 'Lease Agreement List',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 33
'doctype': 'Module Def Item'
},
# Module Def Item
@ -369,8 +336,7 @@
'display_name': 'Lease Monthly Future Installment Inflows',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 34
'doctype': 'Module Def Item'
},
# Module Def Item
@ -378,8 +344,7 @@
'display_name': 'Lease Overdue Age Wise',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 35
'doctype': 'Module Def Item'
},
# Module Def Item
@ -387,8 +352,7 @@
'display_name': 'Lease Overdue List',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 36
'doctype': 'Module Def Item'
},
# Module Def Item
@ -396,17 +360,7 @@
'display_name': 'Lease Receipts Client Wise',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 37
},
# Module Def Item
{
'display_name': 'Lease Receipt Summary Month Wise',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 38
'doctype': 'Module Def Item'
},
# Module Def Item
@ -414,28 +368,26 @@
'display_name': 'Lease Yearly Future Installment Inflows',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 39
'doctype': 'Module Def Item'
},
# Module Def Item
{
'display_name': 'Voucher wise tax details',
'doc_name': 'RV Tax Detail',
'doc_type': 'Reports',
'doctype': 'Module Def Item'
},
# Module Def Role
{
'doctype': 'Module Def Role',
'idx': 1,
'role': 'Accounts Manager'
},
# Module Def Role
{
'doctype': 'Module Def Role',
'idx': 2,
'role': 'Accounts User'
},
# Module Def Role
{
'doctype': 'Module Def Role',
'idx': 3,
'role': 'Administrator'
}
]

0
accounts/search_criteria/voucher_wise_tax_details/__init__.py Normal file
View File

47
accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.js Normal file
View File

@ -0,0 +1,47 @@
report.customize_filters = function() {
this.hide_all_filters();
//Add filter
this.add_filter({fieldname:'based_on', label:'Based On', fieldtype:'Select', options:'Sales Order'+NEWLINE+'Delivery Note'+NEWLINE+'Sales Invoice', report_default:'Sales Invoice', ignore : 1,parent:'RV Tax Detail', single_select :1, in_first_page:1});
this.add_filter({fieldname:'posting_date', label:'Date', fieldtype:'Date', options:'', ignore : 1,parent:'RV Tax Detail', in_first_page:1});
this.add_filter({fieldname:'voucher_id', label:'Voucher Id', fieldtype:'Data', options:'', ignore : 1,parent:'RV Tax Detail', in_first_page:1});
this.add_filter({fieldname:'tax_account', label:'Tax Account', fieldtype:'Link', options:'Account', ignore : 1,parent:'RV Tax Detail', in_first_page:1});
}
// hide sections
//--------------------------------------
this.mytabs.items['More Filters'].hide();
this.mytabs.items['Select Columns'].hide();
// Get query
//--------------------------------------
report.get_query = function() {
based_on = this.get_filter('RV Tax Detail', 'Based On').get_value();
from_date = this.get_filter('RV Tax Detail', 'From Date').get_value();
to_date = this.get_filter('RV Tax Detail', 'To Date').get_value();
vid = this.get_filter('RV Tax Detail', 'Voucher Id').get_value();
acc = this.get_filter('RV Tax Detail', 'Tax Account').get_value();
date_fld = 'transaction_date';
if(based_on == 'Sales Invoice') {
based_on = 'Receivable Voucher';
date_fld = 'voucher_date';
}
sp_cond = '';
if (from_date) sp_cond += repl(' AND t1.%(dt)s >= "%(from_date)s"', {dt:date_fld, from_date:from_date});
if (to_date) sp_cond += repl(' AND t1.%(dt)s <= "%(to_date)s"', {dt:date_fld, to_date:to_date});
if (vid) sp_cond += repl(' AND t1.name LIKE "%%(voucher)s%"', {voucher:vid});
if (acc) sp_cond += repl(' AND t2.account_head = "%(acc)s"', {acc:acc});
return repl('SELECT t1.`name`, t1.`%(dt)s`, t1.`customer_name`, t1.net_total, t2.account_head, t2.description, t2.rate, t2.tax_amount \
FROM `tab%(parent)s` t1, `tabRV Tax Detail` t2 \
WHERE t1.docstatus=1 AND t2.`parenttype` = "%(parent)s" \
AND t2.`parent` = t1.`name` \
%(cond)s ORDER BY t1.`name` DESC, t1.%(dt)s DESC', {parent:based_on, cond:sp_cond, dt:date_fld});
}

22
accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.py Normal file
View File

@ -0,0 +1,22 @@
if filter_values.get('based_on') == 'Sales Invoice':
based_on_dt = 'Receivable Voucher'
else:
based_on_dt = filter_values.get('based_on')
cols = [
[filter_values.get('based_on'), 'Link','150px', based_on_dt],
['Transaction Date', 'Date', '120px', ''],
['Customer', 'Link','150px','Customer'],
['Net Total', 'Currency', '80px', ''],
['Tax Account', 'Link','150px','Account'],
['Description', 'Text','120px',''],
['Tax Rate', 'Currency', '80px', ''],
['Tax Amount', 'Currency', '80px', '']
]
for c in cols:
colnames.append(c[0])
coltypes.append(c[1])
colwidths.append(c[2])
coloptions.append(c[3])
col_idx[c[0]] = len(colnames)-1

34
accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.txt Normal file
View File

@ -0,0 +1,34 @@
# Search Criteria, voucher_wise_tax_details
[
# These values are common in all dictionaries
{
'creation': '2011-09-06 15:36:58',
'docstatus': 0,
'modified': '2011-09-06 15:50:28',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all Search Criteria
{
'columns': 'RV Tax Detail\x01Type,RV Tax Detail\x01Account Head,RV Tax Detail\x01Cost Center,RV Tax Detail\x01Description,RV Tax Detail\x01Rate,RV Tax Detail\x01Amount*,RV Tax Detail\x01Total*',
'criteria_name': 'Voucher wise tax details',
'doc_type': 'RV Tax Detail',
'doctype': 'Search Criteria',
'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'','Delivery Note\x01Fiscal Year':''}",
'module': 'Accounts',
'name': '__common__',
'page_len': 50,
'parent_doc_type': 'Delivery Note',
'sort_by': '`tabRV Tax Detail`.`parent`',
'sort_order': 'DESC',
'standard': 'Yes'
},
# Search Criteria, voucher_wise_tax_details
{
'doctype': 'Search Criteria',
'name': 'voucher_wise_tax_details'
}
]

6
patches/patch.py
View File

@ -1,7 +1,7 @@
# REMEMBER to update this
# ========================
last_patch = 360
last_patch = 362
#-------------------------------------------
@ -317,3 +317,7 @@ def execute(patch_no):
sql("update `tabDocField` set print_hide =1 where fieldname in ('pack_no', 'pack_gross_wt', 'weight_uom', 'pack_nett_wt') and parent = 'Delivery Note Detail'")
elif patch_no == 360:
sql("update `tabDocField` set print_hide =1 where fieldname = 'print_packing_slip' and parent = 'Delivery Note'")
elif patch_no == 361:
sql("update `tabModule Def Item` set doc_name = 'GL Entry' where display_name in ('Lease Agreement List', 'Lease Monthly Future Installment Inflows', 'Lease Overdue Age Wise', 'Lease Overdue List', 'Lease Receipts Client Wise', 'Lease Receipt Summary Month Wise', 'Lease Yearly Future Installment Inflows') and parent = 'Accounts'")
elif patch_no == 362:
sql("update `tabDocField` set no_copy = 1 where fieldname in ('amended_from', 'amendment_date', 'file_list', 'naming_series', 'status')")

11
stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-09-07 12:06:54',
'modified': '2011-09-13 13:23:26',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -212,6 +212,15 @@
'to_field': 'status'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'incentives',
'map': 'No',
'match_id': 3,
'to_field': 'incentives'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',