From ee9efb568b725ca6fe865db915ba521144d0fae9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 12 Oct 2011 12:42:07 +0530 Subject: [PATCH] flds added in mapper --- .../Purchase Order-Payable Voucher.txt | 22 +++++++------- .../Purchase Receipt-Payable Voucher.txt | 29 ++++++++++++++++++- .../payable_voucher/payable_voucher.js | 8 ----- .../Purchase Order-Purchase Receipt.txt | 26 ++++++++++++++++- 4 files changed, 63 insertions(+), 22 deletions(-) diff --git a/erpnext/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt b/erpnext/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt index 1949110274..e58f738329 100644 --- a/erpnext/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt +++ b/erpnext/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:35', 'docstatus': 0, - 'modified': '2011-09-15 15:04:43', + 'modified': '2011-10-12 12:10:15', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -107,6 +107,15 @@ 'to_field': 'naming_series' }, + # Field Mapper Detail + { + 'doctype': 'Field Mapper Detail', + 'from_field': 'total_tax', + 'map': 'Yes', + 'match_id': 0, + 'to_field': 'total_tax' + }, + # Table Mapper Detail { 'doctype': 'Table Mapper Detail', @@ -116,17 +125,6 @@ 'validation_logic': 'docstatus =1' }, - # Table Mapper Detail - { - 'doctype': 'Table Mapper Detail', - 'from_field': 'po_details', - 'from_table': 'PO Detail', - 'match_id': 1, - 'to_field': 'entries', - 'to_table': 'PV Detail', - 'validation_logic': 'ifnull(billed_qty,0) < qty' - }, - # Table Mapper Detail { 'doctype': 'Table Mapper Detail', diff --git a/erpnext/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt b/erpnext/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt index 94408e7a2b..1744c4dc27 100644 --- a/erpnext/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt +++ b/erpnext/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:35', 'docstatus': 0, - 'modified': '2011-09-15 15:04:44', + 'modified': '2011-10-12 10:49:26', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -125,6 +125,33 @@ 'to_field': 'naming_series' }, + # Field Mapper Detail + { + 'doctype': 'Field Mapper Detail', + 'from_field': 'net_total', + 'map': 'Yes', + 'match_id': 0, + 'to_field': 'net_total' + }, + + # Field Mapper Detail + { + 'doctype': 'Field Mapper Detail', + 'from_field': 'grand_total', + 'map': 'Yes', + 'match_id': 0, + 'to_field': 'grand_total' + }, + + # Field Mapper Detail + { + 'doctype': 'Field Mapper Detail', + 'from_field': 'total_tax', + 'map': 'Yes', + 'match_id': 0, + 'to_field': 'total_tax' + }, + # Table Mapper Detail { 'doctype': 'Table Mapper Detail', diff --git a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js index 5c27683504..f4c8776dbe 100644 --- a/erpnext/accounts/doctype/payable_voucher/payable_voucher.js +++ b/erpnext/accounts/doctype/payable_voucher/payable_voucher.js @@ -52,7 +52,6 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { //Supplier cur_frm.cscript.supplier = function(doc,dt,dn) { - var callback = function(r,rt) { var doc = locals[cur_frm.doctype][cur_frm.docname]; get_server_fields('get_credit_to','','',doc, dt, dn, 0, callback2); @@ -144,13 +143,6 @@ cur_frm.cscript.is_opening = function(doc, dt, dn) { } /* ******************************** TRIGGERS **************************************** */ -/* -// Supplier -// --------- -cur_frm.cscript.supplier = function(doc,cdt,cdn){ - get_server_fields('get_credit_to','','',doc,cdt,cdn); -} -*/ // Conversion Rate // ---------------- diff --git a/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt b/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt index 9a860078c3..196d028b67 100644 --- a/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt +++ b/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:35', 'docstatus': 0, - 'modified': '2011-10-11 10:01:02', + 'modified': '2011-10-12 10:49:40', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -153,6 +153,30 @@ 'to_field': 'schedule_date' }, + # Field Mapper Detail + { + 'doctype': 'Field Mapper Detail', + 'from_field': 'net_total', + 'match_id': 0, + 'to_field': 'net_total' + }, + + # Field Mapper Detail + { + 'doctype': 'Field Mapper Detail', + 'from_field': 'grand_total', + 'match_id': 0, + 'to_field': 'grand_total' + }, + + # Field Mapper Detail + { + 'doctype': 'Field Mapper Detail', + 'from_field': 'total_tax', + 'match_id': 0, + 'to_field': 'total_tax' + }, + # Table Mapper Detail { 'doctype': 'Table Mapper Detail',