From bc06c7c17c131ff52d5f9c38672b9fee6954849f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 3 Oct 2012 11:13:12 +0530 Subject: [PATCH] Fixes in GL Mapper --- .../Purchase Invoice with write off.txt | 36 +++--- .../Purchase Invoice/Purchase Invoice.txt | 113 +++++++++++++++++- 2 files changed, 130 insertions(+), 19 deletions(-) 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 9cb6116cee..acbe877a93 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 @@ -3,24 +3,24 @@ # These values are common in all dictionaries { - 'creation': '2012-04-23 11:43:56', - 'docstatus': 0, - 'modified': '2012-04-23 11:43:56', - 'modified_by': u'Administrator', - 'owner': u'Administrator' + u'creation': '2012-04-30 19:55:05', + u'docstatus': 0, + u'modified': '2012-10-03 11:08:09', + u'modified_by': u'Administrator', + u'owner': u'Administrator' }, # These values are common for all GL Mapper { 'doc_type': u'Purchase Invoice with write off', - 'doctype': 'GL Mapper', - 'name': '__common__' + u'doctype': u'GL Mapper', + u'name': u'__common__' }, # These values are common for all GL Mapper Detail { - 'doctype': u'GL Mapper Detail', - 'name': '__common__', + u'doctype': u'GL Mapper Detail', + u'name': u'__common__', 'parent': u'Purchase Invoice with write off', 'parentfield': u'fields', 'parenttype': u'GL Mapper' @@ -28,8 +28,8 @@ # GL Mapper, Purchase Invoice with write off { - 'doctype': 'GL Mapper', - 'name': u'Purchase Invoice with write off' + u'doctype': u'GL Mapper', + u'name': u'Purchase Invoice with write off' }, # GL Mapper Detail @@ -41,7 +41,7 @@ 'cost_center': u'cost_center', 'credit': u'value:0', 'debit': u'amount', - 'doctype': u'GL Mapper Detail', + u'doctype': u'GL Mapper Detail', 'fiscal_year': u'parent:fiscal_year', 'is_opening': u'parent:is_opening', 'posting_date': u'parent:posting_date', @@ -59,9 +59,9 @@ 'aging_date': u'parent:aging_date', 'company': u'parent:company', 'cost_center': u'cost_center', - 'credit': u"value:d.fields.get('category') != 'For Valuation' and d.fields.get('add_deduct_tax') == 'Deduct' and d.fields.get('tax_amount') or 0", - 'debit': u"value:d.fields.get('category') != 'For Valuation' and d.fields.get('add_deduct_tax') == 'Add' and d.fields.get('tax_amount') or 0", - 'doctype': u'GL Mapper Detail', + 'credit': u"value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Deduct' and d.fields.get('tax_amount') or 0", + 'debit': u"value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Add' and d.fields.get('tax_amount') or 0", + u'doctype': u'GL Mapper Detail', 'fiscal_year': u'parent:fiscal_year', 'is_opening': u'parent:is_opening', 'posting_date': u'parent:posting_date', @@ -80,7 +80,7 @@ 'company': u'company', 'credit': u'ded_amount', 'debit': u'value:0', - 'doctype': u'GL Mapper Detail', + u'doctype': u'GL Mapper Detail', 'fiscal_year': u'fiscal_year', 'is_opening': u'is_opening', 'posting_date': u'posting_date', @@ -100,7 +100,7 @@ 'company': u'company', 'credit': u'total_amount_to_pay', 'debit': u'value:0', - 'doctype': u'GL Mapper Detail', + u'doctype': u'GL Mapper Detail', 'fiscal_year': u'fiscal_year', 'is_opening': u'is_opening', 'posting_date': u'posting_date', @@ -119,7 +119,7 @@ 'cost_center': u'write_off_cost_center', 'credit': u'write_off_amount', 'debit': u'value:0', - 'doctype': u'GL Mapper Detail', + u'doctype': u'GL Mapper Detail', 'fiscal_year': u'fiscal_year', 'is_opening': u'is_opening', 'posting_date': u'posting_date', diff --git a/accounts/GL Mapper/Purchase Invoice/Purchase Invoice.txt b/accounts/GL Mapper/Purchase Invoice/Purchase Invoice.txt index 7fcf199579..61851d979c 100644 --- a/accounts/GL Mapper/Purchase Invoice/Purchase Invoice.txt +++ b/accounts/GL Mapper/Purchase Invoice/Purchase Invoice.txt @@ -1 +1,112 @@ -[{'doc_type': 'Purchase Invoice', 'modified_by': 'nabin@webnotestech.com', 'name': 'Purchase Invoice', 'parent': None, 'creation': '2009-03-12 12:09:24', 'modified': '2010-05-26 16:48:58', 'module': 'Accounts', 'doctype': 'GL Mapper', 'idx': None, 'parenttype': None, 'owner': 'Administrator', 'docstatus': 0, 'parentfield': None}, {'creation': '2009-03-12 12:09:24', 'voucher_type': 'parent:doctype', 'doctype': 'GL Mapper Detail', 'owner': 'Administrator', 'cost_center': 'cost_center', 'voucher_no': 'parent:name', 'modified_by': 'nabin@webnotestech.com', 'against_voucher': None, 'table_field': 'entries', 'transaction_date': 'parent:voucher_date', 'debit': 'amount', 'docstatus': 0, 'parent': 'Purchase Invoice', 'company': 'parent:company', 'aging_date': 'parent:aging_date', 'fiscal_year': 'parent:fiscal_year', 'is_advance': None, 'remarks': 'parent:remarks', 'account': 'expense_head', 'name': 'GLMDetail00002', 'idx': 1, 'against_voucher_type': None, 'modified': '2010-05-26 16:48:58', 'against': 'parent:credit_to', 'credit': 'value:0', 'parenttype': 'GL Mapper', 'is_opening': 'parent:is_opening', 'posting_date': 'parent:posting_date', 'parentfield': 'fields'}, {'creation': '2009-03-12 12:09:24', 'voucher_type': 'parent:doctype', 'doctype': 'GL Mapper Detail', 'owner': 'Administrator', 'cost_center': 'cost_center', 'voucher_no': 'parent:name', 'modified_by': 'nabin@webnotestech.com', 'against_voucher': None, 'table_field': 'purchase_tax_details', 'transaction_date': 'parent:voucher_date', 'debit': "value:d.fields.get('category') != 'For Valuation' and d.fields.get('add_deduct_tax') == 'Add' and d.fields.get('tax_amount') or 0", 'docstatus': 0, 'parent': 'Purchase Invoice', 'company': 'parent:company', 'aging_date': 'parent:aging_date', 'fiscal_year': 'parent:fiscal_year', 'is_advance': None, 'remarks': 'parent:remarks', 'account': 'account_head', 'name': 'GLMDetail00003', 'idx': 2, 'against_voucher_type': None, 'modified': '2010-05-26 16:48:58', 'against': 'parent:credit_to', 'credit': "value:d.fields.get('category') != 'For Valuation' and d.fields.get('add_deduct_tax') == 'Deduct' and d.fields.get('tax_amount') or 0", 'parenttype': 'GL Mapper', 'is_opening': 'parent:is_opening', 'posting_date': 'parent:posting_date', 'parentfield': 'fields'}, {'creation': '2009-03-12 12:09:24', 'voucher_type': 'doctype', 'doctype': 'GL Mapper Detail', 'owner': 'Administrator', 'cost_center': '', 'voucher_no': 'name', 'modified_by': 'nabin@webnotestech.com', 'against_voucher': None, 'table_field': '', 'transaction_date': 'voucher_date', 'debit': 'value:0', 'docstatus': 0, 'parent': 'Purchase Invoice', 'company': 'company', 'aging_date': 'aging_date', 'fiscal_year': 'fiscal_year', 'is_advance': None, 'remarks': 'remarks', 'account': 'tax_code', 'name': 'GLMDetail00004', 'idx': 3, 'against_voucher_type': None, 'modified': '2010-05-26 16:48:58', 'against': 'credit_to', 'credit': 'ded_amount', 'parenttype': 'GL Mapper', 'is_opening': 'is_opening', 'posting_date': 'posting_date', 'parentfield': 'fields'}, {'creation': '2009-03-12 12:09:24', 'voucher_type': 'doctype', 'doctype': 'GL Mapper Detail', 'owner': 'Administrator', 'cost_center': '', 'voucher_no': 'name', 'modified_by': 'nabin@webnotestech.com', 'against_voucher': 'name', 'table_field': '', 'transaction_date': 'voucher_date', 'debit': 'value:0', 'docstatus': 0, 'parent': 'Purchase Invoice', 'company': 'company', 'aging_date': 'aging_date', 'fiscal_year': 'fiscal_year', 'is_advance': None, 'remarks': 'remarks', 'account': 'credit_to', 'name': 'GLMDetail00005', 'idx': 4, 'against_voucher_type': "value:'Purchase Invoice'", 'modified': '2010-05-26 16:48:58', 'against': 'against_expense_account', 'credit': 'total_amount_to_pay', 'parenttype': 'GL Mapper', 'is_opening': 'is_opening', 'posting_date': 'posting_date', 'parentfield': 'fields'}] \ No newline at end of file +# GL Mapper, Purchase Invoice +[ + + # These values are common in all dictionaries + { + u'creation': '2012-04-30 19:55:04', + u'docstatus': 0, + u'modified': '2012-10-03 11:07:26', + u'modified_by': u'Administrator', + u'owner': u'Administrator' + }, + + # These values are common for all GL Mapper + { + 'doc_type': u'Purchase Invoice', + u'doctype': u'GL Mapper', + u'name': u'__common__' + }, + + # These values are common for all GL Mapper Detail + { + u'doctype': u'GL Mapper Detail', + u'name': u'__common__', + 'parent': u'Purchase Invoice', + 'parentfield': u'fields', + 'parenttype': u'GL Mapper' + }, + + # GL Mapper, Purchase Invoice + { + u'doctype': u'GL Mapper', + u'name': u'Purchase Invoice' + }, + + # GL Mapper Detail + { + 'account': u'expense_head', + 'against': u'parent:credit_to', + 'aging_date': u'parent:aging_date', + 'company': u'parent:company', + 'cost_center': u'cost_center', + 'credit': u'value:0', + 'debit': u'amount', + u'doctype': u'GL Mapper Detail', + 'fiscal_year': u'parent:fiscal_year', + 'is_opening': u'parent:is_opening', + 'posting_date': u'parent:posting_date', + 'remarks': u'parent:remarks', + 'table_field': u'entries', + 'transaction_date': u'parent:voucher_date', + 'voucher_no': u'parent:name', + 'voucher_type': u'parent:doctype' + }, + + # GL Mapper Detail + { + 'account': u'account_head', + 'against': u'parent:credit_to', + 'aging_date': u'parent:aging_date', + 'company': u'parent:company', + 'cost_center': u'cost_center', + 'credit': u"value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Deduct' and d.fields.get('tax_amount') or 0", + 'debit': u"value:d.fields.get('category') != 'Valuation' and d.fields.get('add_deduct_tax') == 'Add' and d.fields.get('tax_amount') or 0", + u'doctype': u'GL Mapper Detail', + 'fiscal_year': u'parent:fiscal_year', + 'is_opening': u'parent:is_opening', + 'posting_date': u'parent:posting_date', + 'remarks': u'parent:remarks', + 'table_field': u'purchase_tax_details', + 'transaction_date': u'parent:voucher_date', + 'voucher_no': u'parent:name', + 'voucher_type': u'parent:doctype' + }, + + # GL Mapper Detail + { + 'account': u'tax_code', + 'against': u'credit_to', + 'aging_date': u'aging_date', + 'company': u'company', + 'credit': u'ded_amount', + 'debit': u'value:0', + u'doctype': u'GL Mapper Detail', + 'fiscal_year': u'fiscal_year', + 'is_opening': u'is_opening', + 'posting_date': u'posting_date', + 'remarks': u'remarks', + 'transaction_date': u'voucher_date', + 'voucher_no': u'name', + 'voucher_type': u'doctype' + }, + + # GL Mapper Detail + { + 'account': u'credit_to', + 'against': u'against_expense_account', + 'against_voucher': u'name', + 'against_voucher_type': u"value:'Purchase Invoice'", + 'aging_date': u'aging_date', + 'company': u'company', + 'credit': u'total_amount_to_pay', + 'debit': u'value:0', + u'doctype': u'GL Mapper Detail', + 'fiscal_year': u'fiscal_year', + 'is_opening': u'is_opening', + 'posting_date': u'posting_date', + 'remarks': u'remarks', + 'transaction_date': u'voucher_date', + 'voucher_no': u'name', + 'voucher_type': u'doctype' + } +] \ No newline at end of file