Merge pull request #89 from nabinhait/master

dt mapper and post render in pv
This commit is contained in:
Nabin Hait 2011-09-09 03:50:41 -07:00
commit f3a3b62b67
11 changed files with 205 additions and 71 deletions

View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
'modified': '2011-08-09 11:14:09',
'modified': '2011-09-07 12:12:58',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -22,8 +22,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
'match_id': 1,
'name': '__common__',
'parent': 'Delivery Note-Receivable Voucher',
'parentfield': 'field_mapper_details',
@ -32,7 +30,7 @@
# These values are common for all DocType Mapper
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'from_doctype': 'Delivery Note',
'module': 'Accounts',
'name': '__common__',
@ -42,7 +40,7 @@
# DocType Mapper, Delivery Note-Receivable Voucher
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'name': 'Delivery Note-Receivable Voucher'
},
@ -50,6 +48,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt)) / flt(obj.basic_rate)',
'map': 'Yes',
'match_id': 1,
'to_field': 'qty'
},
@ -57,6 +57,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
'map': 'Yes',
'match_id': 1,
'to_field': 'delivery_note'
},
@ -64,6 +66,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
'map': 'Yes',
'match_id': 1,
'to_field': 'dn_detail'
},
@ -71,6 +75,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_docname',
'map': 'Yes',
'match_id': 1,
'to_field': 'sales_order'
},
@ -78,6 +84,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_detail_docname',
'map': 'Yes',
'match_id': 1,
'to_field': 'so_detail'
},
@ -85,6 +93,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.amount) - flt(obj.billed_amt)',
'map': 'Yes',
'match_id': 1,
'to_field': 'amount'
},
@ -92,9 +102,20 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt)) * flt(obj.export_rate)/flt(obj.basic_rate)',
'map': 'Yes',
'match_id': 1,
'to_field': 'export_amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'naming_series',
'map': 'No',
'match_id': 0,
'to_field': 'naming_series'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',

View File

@ -5,8 +5,8 @@
{
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-05-13 11:26:20',
'modified_by': 'umair@iwebnotes.com',
'modified': '2011-09-07 12:10:30',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -22,8 +22,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
'match_id': 1,
'name': '__common__',
'parent': 'Purchase Order-Payable Voucher',
'parentfield': 'field_mapper_details',
@ -32,7 +30,7 @@
# These values are common for all DocType Mapper
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'from_doctype': 'Purchase Order',
'module': 'Accounts',
'name': '__common__',
@ -42,7 +40,7 @@
# DocType Mapper, Purchase Order-Payable Voucher
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'name': 'Purchase Order-Payable Voucher'
},
@ -50,6 +48,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
'map': 'Yes',
'match_id': 1,
'to_field': 'qty'
},
@ -57,6 +57,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'purchase_rate',
'map': 'Yes',
'match_id': 1,
'to_field': 'rate'
},
@ -64,6 +66,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
'map': 'Yes',
'match_id': 1,
'to_field': 'amount'
},
@ -71,6 +75,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
'map': 'Yes',
'match_id': 1,
'to_field': 'import_amount'
},
@ -78,6 +84,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
'map': 'Yes',
'match_id': 1,
'to_field': 'purchase_order'
},
@ -85,9 +93,20 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
'map': 'Yes',
'match_id': 1,
'to_field': 'po_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'naming_series',
'map': 'No',
'match_id': 0,
'to_field': 'naming_series'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',

View File

@ -5,8 +5,8 @@
{
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-05-13 12:18:34',
'modified_by': 'umair@iwebnotes.com',
'modified': '2011-09-07 12:09:55',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -22,8 +22,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
'match_id': 1,
'name': '__common__',
'parent': 'Purchase Receipt-Payable Voucher',
'parentfield': 'field_mapper_details',
@ -32,7 +30,7 @@
# These values are common for all DocType Mapper
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'from_doctype': 'Purchase Receipt',
'module': 'Accounts',
'name': '__common__',
@ -42,7 +40,7 @@
# DocType Mapper, Purchase Receipt-Payable Voucher
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'name': 'Purchase Receipt-Payable Voucher'
},
@ -50,6 +48,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
'map': 'Yes',
'match_id': 1,
'to_field': 'qty'
},
@ -57,6 +57,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'purchase_rate',
'map': 'Yes',
'match_id': 1,
'to_field': 'rate'
},
@ -64,6 +66,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
'map': 'Yes',
'match_id': 1,
'to_field': 'amount'
},
@ -71,6 +75,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
'map': 'Yes',
'match_id': 1,
'to_field': 'import_amount'
},
@ -78,6 +84,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
'map': 'Yes',
'match_id': 1,
'to_field': 'purchase_receipt'
},
@ -85,6 +93,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_docname',
'map': 'Yes',
'match_id': 1,
'to_field': 'purchase_order'
},
@ -92,6 +102,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
'map': 'Yes',
'match_id': 1,
'to_field': 'pr_detail'
},
@ -99,9 +111,20 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_detail_docname',
'map': 'Yes',
'match_id': 1,
'to_field': 'po_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'naming_series',
'map': 'No',
'match_id': 0,
'to_field': 'naming_series'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',

View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:36',
'docstatus': 0,
'modified': '2011-08-31 16:53:11',
'modified': '2011-09-07 12:05:03',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -22,7 +22,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
'name': '__common__',
'parent': 'Sales Order-Receivable Voucher',
'parentfield': 'field_mapper_details',
@ -50,6 +49,7 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
'map': 'Yes',
'match_id': 0,
'to_field': 'customer'
},
@ -58,6 +58,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt))/flt(obj.basic_rate)',
'map': 'Yes',
'match_id': 1,
'to_field': 'qty'
},
@ -66,6 +67,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
'map': 'Yes',
'match_id': 1,
'to_field': 'sales_order'
},
@ -74,6 +76,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
'map': 'Yes',
'match_id': 1,
'to_field': 'so_detail'
},
@ -82,6 +85,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval:flt(obj.amount) - flt(obj.billed_amt)',
'map': 'Yes',
'match_id': 1,
'to_field': 'amount'
},
@ -90,6 +94,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt))* flt(obj.export_rate)/flt(obj.basic_rate)',
'map': 'Yes',
'match_id': 1,
'to_field': 'export_amount'
},
@ -99,6 +104,7 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'project_name',
'map': 'Yes',
'match_id': 0,
'to_field': 'project_name'
},
@ -107,10 +113,20 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'reserved_warehouse',
'map': 'Yes',
'match_id': 1,
'to_field': 'warehouse'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'naming_series',
'map': 'No',
'match_id': 0,
'to_field': 'naming_series'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',

View File

@ -20,12 +20,15 @@ cur_frm.cscript.onload = function(doc,dt,dn) {
}
if(doc.__islocal){
if(doc.supplier) {cur_frm.cscript.supplier(doc,dt,dn)}
hide_field(['supplier_address','contact_person','supplier_name','address_display','contact_display','contact_mobile','contact_email']);
hide_field(['supplier_address', 'contact_person', 'supplier_name', 'address_display', 'contact_display', 'contact_mobile', 'contact_email']);
}
}
if(doc.supplier) unhide_field(['supplier_address','contact_person','supplier_name','address_display','contact_display','contact_mobile','contact_email']);
//Onload post render
//------------------------
cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
if(doc.__islocal && doc.supplier) cur_frm.cscript.supplier(doc,dt,dn);
}
// Refresh

View File

@ -5,8 +5,8 @@
{
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
'modified': '2011-05-10 16:04:40',
'modified_by': 'umair@iwebnotes.com',
'modified': '2011-09-07 12:12:30',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -23,7 +23,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
'name': '__common__',
'parent': 'Enquiry-Quotation',
'parentfield': 'field_mapper_details',
@ -32,7 +31,7 @@
# These values are common for all DocType Mapper
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'from_doctype': 'Enquiry',
'module': 'Selling',
'name': '__common__',
@ -42,7 +41,7 @@
# DocType Mapper, Enquiry-Quotation
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'name': 'Enquiry-Quotation'
},
@ -50,6 +49,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'uom',
'map': 'Yes',
'match_id': 1,
'to_field': 'stock_uom'
},
@ -58,6 +58,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
'map': 'Yes',
'match_id': 0,
'to_field': 'enq_no'
},
@ -66,6 +67,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_docname'
},
@ -74,6 +76,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_doctype'
},
@ -82,6 +85,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'enquiry_from',
'map': 'Yes',
'match_id': 0,
'to_field': 'quotation_to'
},
@ -90,10 +94,38 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'enquiry_type',
'map': 'Yes',
'match_id': 0,
'to_field': 'order_type'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'transaction_date',
'map': 'No',
'match_id': 0,
'to_field': 'transaction_date'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'status',
'map': 'No',
'match_id': 0,
'to_field': 'status'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'naming_series',
'map': 'No',
'match_id': 0,
'to_field': 'naming_series'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',

View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
'modified': '2010-10-14 13:39:44',
'modified': '2011-09-07 12:11:39',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -36,7 +36,7 @@
# These values are common for all DocType Mapper
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'from_doctype': 'Lead',
'module': 'Selling',
'name': '__common__',
@ -45,7 +45,7 @@
# DocType Mapper, Lead-Customer
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'name': 'Lead-Customer'
},
@ -63,20 +63,6 @@
'to_field': 'customer_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'contact_no',
'to_field': 'phone_1'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'fax',
'to_field': 'fax_1'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail'

View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
'modified': '2010-08-05 20:21:54',
'modified': '2011-09-07 12:11:00',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -26,7 +26,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
'match_id': 0,
'name': '__common__',
'parent': 'Lead-Enquiry',
@ -36,7 +35,7 @@
# These values are common for all DocType Mapper
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'from_doctype': 'Lead',
'module': 'Selling',
'name': '__common__',
@ -45,7 +44,7 @@
# DocType Mapper, Lead-Enquiry
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'name': 'Lead-Enquiry'
},
@ -53,6 +52,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'campaign_name',
'map': 'Yes',
'to_field': 'campaign'
},
@ -60,6 +60,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'doctype',
'map': 'Yes',
'to_field': 'enquiry_from'
},
@ -67,9 +68,18 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
'map': 'Yes',
'to_field': 'lead'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'status',
'map': 'No',
'to_field': 'status'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail'

View File

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-08-25 18:25:02',
'modified': '2011-09-07 12:08:48',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -30,7 +30,7 @@
# These values are common for all DocType Mapper
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'from_doctype': 'Quotation',
'module': 'Selling',
'name': '__common__',
@ -40,7 +40,7 @@
# DocType Mapper, Quotation-Sales Order
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'name': 'Quotation-Sales Order'
},
@ -110,6 +110,15 @@
'to_field': 'naming_series'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'status',
'map': 'No',
'match_id': 0,
'to_field': 'status'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',

View File

@ -5,7 +5,7 @@
{
'creation': '2010-12-15 08:39:22',
'docstatus': 0,
'modified': '2010-12-14 20:43:41',
'modified': '2011-09-07 12:08:19',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -22,7 +22,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
'name': '__common__',
'parent': 'Receivable Voucher-Delivery Note',
'parentfield': 'field_mapper_details',
@ -31,7 +30,7 @@
# These values are common for all DocType Mapper
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'from_doctype': 'Receivable Voucher',
'module': 'Stock',
'name': '__common__',
@ -41,7 +40,7 @@
# DocType Mapper, Receivable Voucher-Delivery Note
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'name': 'Receivable Voucher-Delivery Note'
},
@ -49,6 +48,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.delivered_qty)',
'map': 'Yes',
'match_id': 1,
'to_field': 'qty'
},
@ -57,6 +57,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_docname'
},
@ -65,6 +66,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_doctype'
},
@ -73,6 +75,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_detail_docname'
},
@ -81,6 +84,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)',
'map': 'Yes',
'match_id': 1,
'to_field': 'amount'
},
@ -89,6 +93,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)',
'map': 'Yes',
'match_id': 1,
'to_field': 'export_amount'
},
@ -96,9 +101,10 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'customer_address',
'from_field': 'naming_series',
'map': 'No',
'match_id': 0,
'to_field': 'delivery_address'
'to_field': 'naming_series'
},
# Table Mapper Detail

View File

@ -5,8 +5,8 @@
{
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-05-16 11:48:19',
'modified_by': 'umair@iwebnotes.com',
'modified': '2011-09-07 12:06:54',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -30,7 +30,7 @@
# These values are common for all DocType Mapper
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'from_doctype': 'Sales Order',
'module': 'Stock',
'name': '__common__',
@ -40,7 +40,7 @@
# DocType Mapper, Sales Order-Delivery Note
{
'doctype': 'DocType Mapper',
'doctype': u'DocType Mapper',
'name': 'Sales Order-Delivery Note'
},
@ -174,15 +174,6 @@
'to_field': 'warehouse'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'allocated_amount',
'map': 'Yes',
'match_id': 0,
'to_field': 'customer_mobile_no'
},
# Field Mapper Detail
{
'checking_operator': '=',
@ -203,6 +194,24 @@
'to_field': 'customer'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'naming_series',
'map': 'No',
'match_id': 0,
'to_field': 'naming_series'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'status',
'map': 'No',
'match_id': 0,
'to_field': 'status'
},
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',