updated gl mapper for tds entry
diff --git a/accounts/GL Mapper/Journal Voucher/Journal Voucher.txt b/accounts/GL Mapper/Journal Voucher/Journal Voucher.txt
index bf2ff1a..63c1df8 100644
--- a/accounts/GL Mapper/Journal Voucher/Journal Voucher.txt
+++ b/accounts/GL Mapper/Journal Voucher/Journal Voucher.txt
@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2012-05-01 12:46:31",
+ "creation": "2012-04-17 11:29:12",
"modified_by": "Administrator",
- "modified": "2012-05-01 09:16:31"
+ "modified": "2013-01-18 10:39:49"
},
{
"doc_type": "Journal Voucher",
@@ -12,9 +12,27 @@
"doctype": "GL Mapper"
},
{
- "name": "__common__",
"parent": "Journal Voucher",
+ "company": "parent:company",
+ "fiscal_year": "parent:fiscal_year",
+ "voucher_type": "parent:doctype",
+ "debit": "debit",
+ "is_advance": "is_advance",
+ "remarks": "parent:remark",
+ "cost_center": "cost_center",
+ "account": "account",
+ "voucher_no": "parent:name",
+ "aging_date": "parent:aging_date",
+ "name": "__common__",
+ "against_voucher": "value:d.against_voucher or d.against_invoice or d.against_jv or ''",
+ "against_voucher_type": "value:(d.against_voucher and 'Purchase Invoice') or (d.against_invoice and 'Sales Invoice') or (d.against_jv and 'Journal Voucher') or ''",
"doctype": "GL Mapper Detail",
+ "against": "against_account",
+ "credit": "credit",
+ "table_field": "entries",
+ "transaction_date": "parent:voucher_date",
+ "is_opening": "parent:is_opening",
+ "posting_date": "parent:posting_date",
"parenttype": "GL Mapper",
"parentfield": "fields"
},
@@ -23,40 +41,6 @@
"doctype": "GL Mapper"
},
{
- "account": "account",
- "doctype": "GL Mapper Detail",
- "credit": "credit",
- "against_voucher_type": "value:(d.against_voucher and 'Purchase Invoice') or (d.against_invoice and 'Sales Invoice') or (d.against_jv and 'Journal Voucher') or ''",
- "company": "parent:company",
- "debit": "debit",
- "fiscal_year": "parent:fiscal_year",
- "against": "against_account",
- "voucher_type": "parent:doctype",
- "against_voucher": "value:d.against_voucher or d.against_invoice or d.against_jv or ''",
- "table_field": "entries",
- "transaction_date": "parent:voucher_date",
- "is_advance": "is_advance",
- "aging_date": "parent:aging_date",
- "is_opening": "parent:is_opening",
- "remarks": "parent:remark",
- "posting_date": "parent:posting_date",
- "voucher_no": "parent:name",
- "cost_center": "cost_center"
- },
- {
- "account": "tax_code",
- "doctype": "GL Mapper Detail",
- "company": "company",
- "debit": "value:0",
- "fiscal_year": "fiscal_year",
- "against": "supplier_account",
- "voucher_type": "doctype",
- "credit": "ded_amount",
- "transaction_date": "voucher_date",
- "aging_date": "aging_date",
- "is_opening": "is_opening",
- "remarks": "remark",
- "posting_date": "posting_date",
- "voucher_no": "name"
+ "doctype": "GL Mapper Detail"
}
]
\ No newline at end of file
diff --git a/accounts/GL Mapper/Purchase Invoice with write off/Purchase Invoice with write off.txt b/accounts/GL Mapper/Purchase Invoice with write off/Purchase Invoice with write off.txt
index f32b13b..5b47fd7 100644
--- a/accounts/GL Mapper/Purchase Invoice with write off/Purchase Invoice with write off.txt
+++ b/accounts/GL Mapper/Purchase Invoice with write off/Purchase Invoice with write off.txt
@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2012-10-03 11:29:52",
+ "creation": "2012-10-03 11:26:38",
"modified_by": "Administrator",
- "modified": "2012-10-03 11:08:09"
+ "modified": "2013-01-18 10:38:40"
},
{
"doc_type": "Purchase Invoice with write off",
@@ -24,7 +24,9 @@
},
{
"account": "expense_head",
+ "doctype": "GL Mapper Detail",
"company": "parent:company",
+ "debit": "amount",
"fiscal_year": "parent:fiscal_year",
"against": "parent:credit_to",
"voucher_type": "parent:doctype",
@@ -32,17 +34,17 @@
"table_field": "entries",
"transaction_date": "parent:voucher_date",
"aging_date": "parent:aging_date",
- "doctype": "GL Mapper Detail",
- "remarks": "parent:remarks",
"is_opening": "parent:is_opening",
+ "remarks": "parent:remarks",
+ "posting_date": "parent:posting_date",
"voucher_no": "parent:name",
- "debit": "amount",
- "cost_center": "cost_center",
- "posting_date": "parent:posting_date"
+ "cost_center": "cost_center"
},
{
"account": "account_head",
+ "doctype": "GL Mapper Detail",
"company": "parent:company",
+ "debit": "value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Add' and d.fields.get('tax_amount') or 0",
"fiscal_year": "parent:fiscal_year",
"against": "parent:credit_to",
"voucher_type": "parent:doctype",
@@ -50,63 +52,45 @@
"table_field": "purchase_tax_details",
"transaction_date": "parent:voucher_date",
"aging_date": "parent:aging_date",
- "doctype": "GL Mapper Detail",
- "remarks": "parent:remarks",
"is_opening": "parent:is_opening",
+ "remarks": "parent:remarks",
+ "posting_date": "parent:posting_date",
"voucher_no": "parent:name",
- "debit": "value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Add' and d.fields.get('tax_amount') or 0",
- "cost_center": "cost_center",
- "posting_date": "parent:posting_date"
- },
- {
- "account": "tax_code",
- "company": "company",
- "fiscal_year": "fiscal_year",
- "against": "credit_to",
- "voucher_type": "doctype",
- "credit": "ded_amount",
- "debit": "value:0",
- "transaction_date": "voucher_date",
- "aging_date": "aging_date",
- "doctype": "GL Mapper Detail",
- "remarks": "remarks",
- "is_opening": "is_opening",
- "voucher_no": "name",
- "posting_date": "posting_date"
+ "cost_center": "cost_center"
},
{
"account": "credit_to",
+ "doctype": "GL Mapper Detail",
"against_voucher": "name",
"against_voucher_type": "value:'Purchase Invoice'",
"company": "company",
+ "debit": "value:0",
"fiscal_year": "fiscal_year",
"against": "against_expense_account",
"voucher_type": "doctype",
"credit": "total_amount_to_pay",
- "debit": "value:0",
"transaction_date": "voucher_date",
"aging_date": "aging_date",
- "doctype": "GL Mapper Detail",
- "remarks": "remarks",
"is_opening": "is_opening",
- "voucher_no": "name",
- "posting_date": "posting_date"
+ "remarks": "remarks",
+ "posting_date": "posting_date",
+ "voucher_no": "name"
},
{
"account": "write_off_account",
+ "doctype": "GL Mapper Detail",
"company": "company",
+ "debit": "value:0",
"fiscal_year": "fiscal_year",
"against": "credit_to",
"voucher_type": "doctype",
"credit": "write_off_amount",
- "debit": "value:0",
"transaction_date": "voucher_date",
"aging_date": "aging_date",
- "doctype": "GL Mapper Detail",
- "remarks": "remarks",
"is_opening": "is_opening",
+ "remarks": "remarks",
+ "posting_date": "posting_date",
"voucher_no": "name",
- "cost_center": "write_off_cost_center",
- "posting_date": "posting_date"
+ "cost_center": "write_off_cost_center"
}
]
\ No newline at end of file
diff --git a/accounts/GL Mapper/Purchase Invoice/Purchase Invoice.txt b/accounts/GL Mapper/Purchase Invoice/Purchase Invoice.txt
index b3dbdbf..662cf8d 100644
--- a/accounts/GL Mapper/Purchase Invoice/Purchase Invoice.txt
+++ b/accounts/GL Mapper/Purchase Invoice/Purchase Invoice.txt
@@ -2,9 +2,9 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2012-10-03 11:29:52",
+ "creation": "2012-10-03 11:26:38",
"modified_by": "Administrator",
- "modified": "2012-10-03 11:07:26"
+ "modified": "2013-01-18 10:39:38"
},
{
"doc_type": "Purchase Invoice",
@@ -59,22 +59,6 @@
"cost_center": "cost_center"
},
{
- "account": "tax_code",
- "doctype": "GL Mapper Detail",
- "company": "company",
- "debit": "value:0",
- "fiscal_year": "fiscal_year",
- "against": "credit_to",
- "voucher_type": "doctype",
- "credit": "ded_amount",
- "transaction_date": "voucher_date",
- "aging_date": "aging_date",
- "is_opening": "is_opening",
- "remarks": "remarks",
- "posting_date": "posting_date",
- "voucher_no": "name"
- },
- {
"account": "credit_to",
"doctype": "GL Mapper Detail",
"against_voucher": "name",
diff --git a/patches/january_2013/remove_tds_entry_from_gl_mapper.py b/patches/january_2013/remove_tds_entry_from_gl_mapper.py
new file mode 100644
index 0000000..ac8511d
--- /dev/null
+++ b/patches/january_2013/remove_tds_entry_from_gl_mapper.py
@@ -0,0 +1,5 @@
+def execute():
+ from webnotes.modules.import_file import import_file
+ import_file("accounts", "GL Mapper", "Journal Voucher")
+ import_file("accounts", "GL Mapper", "Purchase Invoice")
+ import_file("accounts", "GL Mapper", "Purchase Invoice with write off")
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index e5e9d87..d5d87a6 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -16,138 +16,139 @@
from __future__ import unicode_literals
patch_list = [
- "patches.mar_2012.so_rv_mapper_fix",
- "patches.mar_2012.clean_property_setter",
- "patches.jan_mar_2012.sync_ref_db",
- "patches.april_2012.naming_series_patch",
- "patches.jan_mar_2012.rename_dt",
- "patches.mar_2012.cleanup_control_panel",
- "patches.mar_2012.doctype_get_refactor",
- "patches.mar_2012.delete_docformat",
- "patches.mar_2012.usertags",
- "patches.april_2012.reload_c_form",
- "patches.april_2012.after_sync_cleanup",
- "patches.april_2012.remove_default_from_rv_detail",
- "patches.april_2012.update_role_in_address",
- "patches.april_2012.update_permlevel_in_address",
- "patches.april_2012.update_appraisal_permission",
- "patches.april_2012.serial_no_fixes",
- "patches.april_2012.repost_stock_for_posting_time",
- "patches.may_2012.cleanup_property_setter",
- "patches.may_2012.rename_prev_doctype",
- "patches.may_2012.cleanup_notification_control",
- "patches.may_2012.renamedt_in_custom_search_criteria",
- "patches.may_2012.stock_reco_patch",
- "patches.may_2012.reload_reports",
- "patches.may_2012.page_role_series_fix",
- "patches.may_2012.reload_sales_invoice_pf",
- "patches.may_2012.std_pf_readonly",
- "patches.may_2012.reload_so_pending_items",
- "patches.may_2012.customize_form_cleanup",
- "patches.may_2012.cs_server_readonly",
- "patches.may_2012.clear_session_cache",
- "patches.may_2012.same_purchase_rate_patch",
- "patches.may_2012.create_report_manager_role",
- "patches.may_2012.reload_customer_address_contact",
- "patches.may_2012.profile_perm_patch",
- "patches.may_2012.remove_euro_currency",
- "patches.may_2012.remove_communication_log",
- "patches.june_2012.barcode_in_feature_setup",
- "patches.june_2012.copy_uom_for_pur_inv_item",
- "patches.june_2012.fetch_organization_from_lead",
- "patches.june_2012.reports_list_permission",
- "patches.june_2012.support_ticket_autoreply",
- "patches.june_2012.series_unique_patch",
- "patches.june_2012.set_recurring_type",
- "patches.june_2012.alter_tabsessions",
- "patches.june_2012.delete_old_parent_entries",
- "patches.april_2012.delete_about_contact",
- "patches.july_2012.reload_pr_po_mapper",
- "patches.july_2012.address_contact_perms",
- "patches.july_2012.packing_list_cleanup_and_serial_no",
- "patches.july_2012.deprecate_import_data_control",
- "patches.july_2012.default_freeze_account",
- "patches.july_2012.update_purchase_tax",
- "patches.june_2012.cms2",
- "patches.july_2012.auth_table",
- "patches.july_2012.remove_event_role_owner_match",
- "patches.july_2012.deprecate_bulk_rename",
- "patches.july_2012.blog_guest_permission",
- "patches.july_2012.bin_permission",
- "patches.july_2012.project_patch_repeat",
- "patches.july_2012.repost_stock_due_to_wrong_packing_list",
- "patches.july_2012.supplier_quotation",
- "patches.august_2012.report_supplier_quotations",
- "patches.august_2012.task_allocated_to_assigned",
- "patches.august_2012.change_profile_permission",
- "patches.august_2012.changed_blog_date_format",
- "patches.august_2012.repost_billed_amt",
- "patches.august_2012.remove_cash_flow_statement",
- "patches.september_2012.stock_report_permissions_for_accounts",
- "patches.september_2012.communication_delete_permission",
- "patches.september_2012.all_permissions_patch",
- "patches.september_2012.customer_permission_patch",
- "patches.september_2012.add_stock_ledger_entry_index",
- "patches.september_2012.plot_patch",
- "patches.september_2012.event_permission",
- "patches.september_2012.repost_stock",
- "patches.september_2012.reload_gross_profit",
- "patches.september_2012.rebuild_trees",
- "patches.september_2012.deprecate_account_balance",
- "patches.september_2012.profile_delete_permission",
- "patches.october_2012.update_permission",
- "patches.october_2012.reload_gl_mapper",
- "patches.october_2012.fix_wrong_vouchers",
- "patches.october_2012.remove_old_customer_contact_address",
- "patches.october_2012.company_fiscal_year_docstatus_patch",
- "patches.october_2012.update_account_property",
- "patches.october_2012.remove_old_trial_bal",
- "patches.october_2012.fix_cancelled_gl_entries",
- "patches.october_2012.custom_script_delete_permission",
- "patches.november_2012.custom_field_insert_after",
- "patches.november_2012.delete_item_sales_register1",
- "patches.november_2012.rename_employee_leave_balance_report",
- "patches.november_2012.report_permissions",
- "patches.november_2012.customer_issue_allocated_to_assigned",
- "patches.november_2012.reset_appraisal_permissions",
- "patches.november_2012.disable_cancelled_profiles",
- "patches.november_2012.remove_old_unbilled_items_report",
- "patches.november_2012.support_ticket_response_to_communication",
- "patches.november_2012.cancelled_bom_patch",
- "patches.november_2012.communication_sender_and_recipient",
- "patches.november_2012.update_delivered_billed_percentage_for_pos",
- "patches.november_2012.add_theme_to_profile",
- "patches.november_2012.add_employee_field_in_employee",
- "patches.november_2012.leave_application_cleanup",
- "patches.november_2012.production_order_patch",
- "patches.november_2012.gle_floating_point_issue",
- "patches.december_2012.deprecate_tds",
- "patches.december_2012.expense_leave_reload",
- "patches.december_2012.repost_ordered_qty",
- "patches.december_2012.repost_projected_qty",
- "patches.december_2012.reload_debtors_creditors_ledger",
- "patches.december_2012.website_cache_refactor",
- "patches.december_2012.production_cleanup",
- "patches.december_2012.fix_default_print_format",
- "patches.december_2012.file_list_rename",
- "patches.december_2012.replace_createlocal",
- "patches.december_2012.clear_web_cache",
- "patches.december_2012.remove_quotation_next_contact",
- "patches.december_2012.stock_entry_cleanup",
- "patches.december_2012.production_order_naming_series",
- "patches.december_2012.rebuild_item_group_tree",
- "patches.december_2012.address_title",
- "patches.december_2012.delete_form16_print_format",
- "patches.december_2012.remove_project_mapper",
- "patches.december_2012.update_print_width",
- "patches.january_2013.remove_bad_permissions",
- "patches.january_2013.deprecate_stock_search_criteria",
- "patches.january_2013.remove_support_search_criteria",
- "patches.january_2013.holiday_list_patch",
- "patches.january_2013.stock_reconciliation_patch",
- "patches.january_2013.report_permission",
- "patches.january_2013.give_report_permission_on_read",
- "patches.january_2013.update_closed_on",
- "patches.january_2013.change_patch_structure",
- "patches.january_2013.update_country_info",
+ "patches.mar_2012.so_rv_mapper_fix",
+ "patches.mar_2012.clean_property_setter",
+ "patches.jan_mar_2012.sync_ref_db",
+ "patches.april_2012.naming_series_patch",
+ "patches.jan_mar_2012.rename_dt",
+ "patches.mar_2012.cleanup_control_panel",
+ "patches.mar_2012.doctype_get_refactor",
+ "patches.mar_2012.delete_docformat",
+ "patches.mar_2012.usertags",
+ "patches.april_2012.reload_c_form",
+ "patches.april_2012.after_sync_cleanup",
+ "patches.april_2012.remove_default_from_rv_detail",
+ "patches.april_2012.update_role_in_address",
+ "patches.april_2012.update_permlevel_in_address",
+ "patches.april_2012.update_appraisal_permission",
+ "patches.april_2012.serial_no_fixes",
+ "patches.april_2012.repost_stock_for_posting_time",
+ "patches.may_2012.cleanup_property_setter",
+ "patches.may_2012.rename_prev_doctype",
+ "patches.may_2012.cleanup_notification_control",
+ "patches.may_2012.renamedt_in_custom_search_criteria",
+ "patches.may_2012.stock_reco_patch",
+ "patches.may_2012.reload_reports",
+ "patches.may_2012.page_role_series_fix",
+ "patches.may_2012.reload_sales_invoice_pf",
+ "patches.may_2012.std_pf_readonly",
+ "patches.may_2012.reload_so_pending_items",
+ "patches.may_2012.customize_form_cleanup",
+ "patches.may_2012.cs_server_readonly",
+ "patches.may_2012.clear_session_cache",
+ "patches.may_2012.same_purchase_rate_patch",
+ "patches.may_2012.create_report_manager_role",
+ "patches.may_2012.reload_customer_address_contact",
+ "patches.may_2012.profile_perm_patch",
+ "patches.may_2012.remove_euro_currency",
+ "patches.may_2012.remove_communication_log",
+ "patches.june_2012.barcode_in_feature_setup",
+ "patches.june_2012.copy_uom_for_pur_inv_item",
+ "patches.june_2012.fetch_organization_from_lead",
+ "patches.june_2012.reports_list_permission",
+ "patches.june_2012.support_ticket_autoreply",
+ "patches.june_2012.series_unique_patch",
+ "patches.june_2012.set_recurring_type",
+ "patches.june_2012.alter_tabsessions",
+ "patches.june_2012.delete_old_parent_entries",
+ "patches.april_2012.delete_about_contact",
+ "patches.july_2012.reload_pr_po_mapper",
+ "patches.july_2012.address_contact_perms",
+ "patches.july_2012.packing_list_cleanup_and_serial_no",
+ "patches.july_2012.deprecate_import_data_control",
+ "patches.july_2012.default_freeze_account",
+ "patches.july_2012.update_purchase_tax",
+ "patches.june_2012.cms2",
+ "patches.july_2012.auth_table",
+ "patches.july_2012.remove_event_role_owner_match",
+ "patches.july_2012.deprecate_bulk_rename",
+ "patches.july_2012.blog_guest_permission",
+ "patches.july_2012.bin_permission",
+ "patches.july_2012.project_patch_repeat",
+ "patches.july_2012.repost_stock_due_to_wrong_packing_list",
+ "patches.july_2012.supplier_quotation",
+ "patches.august_2012.report_supplier_quotations",
+ "patches.august_2012.task_allocated_to_assigned",
+ "patches.august_2012.change_profile_permission",
+ "patches.august_2012.changed_blog_date_format",
+ "patches.august_2012.repost_billed_amt",
+ "patches.august_2012.remove_cash_flow_statement",
+ "patches.september_2012.stock_report_permissions_for_accounts",
+ "patches.september_2012.communication_delete_permission",
+ "patches.september_2012.all_permissions_patch",
+ "patches.september_2012.customer_permission_patch",
+ "patches.september_2012.add_stock_ledger_entry_index",
+ "patches.september_2012.plot_patch",
+ "patches.september_2012.event_permission",
+ "patches.september_2012.repost_stock",
+ "patches.september_2012.reload_gross_profit",
+ "patches.september_2012.rebuild_trees",
+ "patches.september_2012.deprecate_account_balance",
+ "patches.september_2012.profile_delete_permission",
+ "patches.october_2012.update_permission",
+ "patches.october_2012.reload_gl_mapper",
+ "patches.october_2012.fix_wrong_vouchers",
+ "patches.october_2012.remove_old_customer_contact_address",
+ "patches.october_2012.company_fiscal_year_docstatus_patch",
+ "patches.october_2012.update_account_property",
+ "patches.october_2012.remove_old_trial_bal",
+ "patches.october_2012.fix_cancelled_gl_entries",
+ "patches.october_2012.custom_script_delete_permission",
+ "patches.november_2012.custom_field_insert_after",
+ "patches.november_2012.delete_item_sales_register1",
+ "patches.november_2012.rename_employee_leave_balance_report",
+ "patches.november_2012.report_permissions",
+ "patches.november_2012.customer_issue_allocated_to_assigned",
+ "patches.november_2012.reset_appraisal_permissions",
+ "patches.november_2012.disable_cancelled_profiles",
+ "patches.november_2012.remove_old_unbilled_items_report",
+ "patches.november_2012.support_ticket_response_to_communication",
+ "patches.november_2012.cancelled_bom_patch",
+ "patches.november_2012.communication_sender_and_recipient",
+ "patches.november_2012.update_delivered_billed_percentage_for_pos",
+ "patches.november_2012.add_theme_to_profile",
+ "patches.november_2012.add_employee_field_in_employee",
+ "patches.november_2012.leave_application_cleanup",
+ "patches.november_2012.production_order_patch",
+ "patches.november_2012.gle_floating_point_issue",
+ "patches.december_2012.deprecate_tds",
+ "patches.december_2012.expense_leave_reload",
+ "patches.december_2012.repost_ordered_qty",
+ "patches.december_2012.repost_projected_qty",
+ "patches.december_2012.reload_debtors_creditors_ledger",
+ "patches.december_2012.website_cache_refactor",
+ "patches.december_2012.production_cleanup",
+ "patches.december_2012.fix_default_print_format",
+ "patches.december_2012.file_list_rename",
+ "patches.december_2012.replace_createlocal",
+ "patches.december_2012.clear_web_cache",
+ "patches.december_2012.remove_quotation_next_contact",
+ "patches.december_2012.stock_entry_cleanup",
+ "patches.december_2012.production_order_naming_series",
+ "patches.december_2012.rebuild_item_group_tree",
+ "patches.december_2012.address_title",
+ "patches.december_2012.delete_form16_print_format",
+ "patches.december_2012.remove_project_mapper",
+ "patches.december_2012.update_print_width",
+ "patches.january_2013.remove_bad_permissions",
+ "patches.january_2013.deprecate_stock_search_criteria",
+ "patches.january_2013.remove_support_search_criteria",
+ "patches.january_2013.holiday_list_patch",
+ "patches.january_2013.stock_reconciliation_patch",
+ "patches.january_2013.report_permission",
+ "patches.january_2013.give_report_permission_on_read",
+ "patches.january_2013.update_closed_on",
+ "patches.january_2013.change_patch_structure",
+ "patches.january_2013.update_country_info",
+ "patches.january_2013.remove_tds_entry_from_gl_mapper",
]
\ No newline at end of file