Feature Setup merge with upstream
diff --git a/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt b/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt
index 3ceb9b2..981e64a 100644
--- a/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt
+++ b/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
- 'modified': '2011-06-15 14:42:33',
+ 'modified': '2011-08-09 11:14:09',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -23,6 +23,7 @@
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
+ 'match_id': 1,
'name': '__common__',
'parent': 'Delivery Note-Receivable Voucher',
'parentfield': 'field_mapper_details',
@@ -48,261 +49,14 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 1,
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer',
- 'idx': 2,
- 'match_id': 0,
- 'to_field': 'customer'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer',
- 'idx': 3,
- 'match_id': 0,
- 'to_field': 'customer'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_name',
- 'idx': 4,
- 'match_id': 0,
- 'to_field': 'customer_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address_display',
- 'idx': 5,
- 'match_id': 0,
- 'to_field': 'address_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_display',
- 'idx': 6,
- 'match_id': 0,
- 'to_field': 'contact_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_mobile',
- 'idx': 7,
- 'match_id': 0,
- 'to_field': 'contact_mobile'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_email',
- 'idx': 8,
- 'match_id': 0,
- 'to_field': 'contact_email'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_group',
- 'idx': 9,
- 'match_id': 0,
- 'to_field': 'customer_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'currency',
- 'idx': 10,
- 'match_id': 0,
- 'to_field': 'currency'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'conversion_rate',
- 'idx': 11,
- 'match_id': 0,
- 'to_field': 'conversion_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'company',
- 'idx': 12,
- 'match_id': 0,
- 'to_field': 'company'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'fiscal_year',
- 'idx': 13,
- 'match_id': 0,
- 'to_field': 'fiscal_year'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'price_list_name',
- 'idx': 14,
- 'match_id': 0,
- 'to_field': 'price_list_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge',
- 'idx': 15,
- 'match_id': 0,
- 'to_field': 'charge'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 16,
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'terms',
- 'idx': 17,
- 'match_id': 0,
- 'to_field': 'terms'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 18,
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'brand',
- 'idx': 19,
- 'match_id': 1,
- 'to_field': 'brand'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 20,
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'batch_no',
- 'idx': 21,
- 'match_id': 1,
- 'to_field': 'batch_no'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'serial_no',
- 'idx': 22,
- 'match_id': 1,
- 'to_field': 'serial_no'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_group',
- 'idx': 23,
- 'match_id': 1,
- 'to_field': 'item_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
- 'idx': 24,
- 'match_id': 1,
+ 'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt)) / flt(obj.basic_rate)',
'to_field': 'qty'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'export_rate',
- 'idx': 25,
- 'match_id': 1,
- 'to_field': 'export_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'base_ref_rate',
- 'idx': 26,
- 'match_id': 1,
- 'to_field': 'base_ref_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'ref_rate',
- 'idx': 27,
- 'match_id': 1,
- 'to_field': 'ref_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'basic_rate',
- 'idx': 28,
- 'match_id': 1,
- 'to_field': 'basic_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 29,
- 'match_id': 1,
'to_field': 'delivery_note'
},
@@ -310,8 +64,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 30,
- 'match_id': 1,
'to_field': 'dn_detail'
},
@@ -319,8 +71,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_docname',
- 'idx': 31,
- 'match_id': 1,
'to_field': 'sales_order'
},
@@ -328,286 +78,27 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_detail_docname',
- 'idx': 32,
- 'match_id': 1,
'to_field': 'so_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'export_rate',
- 'idx': 33,
- 'match_id': 1,
- 'to_field': 'export_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'stock_uom',
- 'idx': 34,
- 'match_id': 1,
- 'to_field': 'stock_uom'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.basic_rate)',
- 'idx': 35,
- 'match_id': 1,
+ 'from_field': 'eval: flt(obj.amount) - flt(obj.billed_amt)',
'to_field': 'amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.export_rate)',
- 'idx': 36,
- 'match_id': 1,
+ 'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt)) * flt(obj.export_rate)/flt(obj.basic_rate)',
'to_field': 'export_amount'
},
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'adj_rate',
- 'idx': 37,
- 'match_id': 1,
- 'to_field': 'adj_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_tax_rate',
- 'idx': 38,
- 'match_id': 1,
- 'to_field': 'item_tax_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge_type',
- 'idx': 39,
- 'match_id': 2,
- 'to_field': 'charge_type'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'row_id',
- 'idx': 40,
- 'match_id': 2,
- 'to_field': 'row_id'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_wise_tax_detail',
- 'idx': 41,
- 'match_id': 2,
- 'to_field': 'item_wise_tax_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 42,
- 'match_id': 2,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'account_head',
- 'idx': 43,
- 'match_id': 2,
- 'to_field': 'account_head'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rate',
- 'idx': 44,
- 'match_id': 2,
- 'to_field': 'rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'tax_amount',
- 'idx': 45,
- 'match_id': 2,
- 'to_field': 'tax_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'total',
- 'idx': 46,
- 'match_id': 2,
- 'to_field': 'total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'sales_person',
- 'idx': 47,
- 'match_id': 3,
- 'to_field': 'sales_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'sales_designation',
- 'idx': 48,
- 'match_id': 3,
- 'to_field': 'sales_designation'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'allocated_percentage',
- 'idx': 49,
- 'match_id': 3,
- 'to_field': 'allocated_percentage'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'allocated_amount',
- 'idx': 50,
- 'match_id': 3,
- 'to_field': 'allocated_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'incentives',
- 'idx': 51,
- 'match_id': 3,
- 'to_field': 'incentives'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'source',
- 'idx': 52,
- 'match_id': 0,
- 'to_field': 'source'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'campaign',
- 'idx': 53,
- 'match_id': 0,
- 'to_field': 'campaign'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 54,
- 'match_id': 0,
- 'to_field': 'territory'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'sales_partner',
- 'idx': 55,
- 'match_id': 0,
- 'to_field': 'sales_partner'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'commission_rate',
- 'idx': 56,
- 'match_id': 0,
- 'to_field': 'commission_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'total_commission',
- 'idx': 57,
- 'match_id': 0,
- 'to_field': 'total_commission'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
- 'idx': 58,
- 'match_id': 0,
- 'to_field': 'customer_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'net_total',
- 'idx': 59,
- 'match_id': 0,
- 'to_field': 'net_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'grand_total',
- 'idx': 60,
- 'match_id': 0,
- 'to_field': 'grand_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'project_name',
- 'idx': 61,
- 'match_id': 0,
- 'to_field': 'project_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'warehouse',
- 'idx': 62,
- 'match_id': 1,
- 'to_field': 'warehouse'
- },
-
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
'from_table': 'Delivery Note',
- 'idx': 1,
'match_id': 0,
'to_table': 'Receivable Voucher',
'validation_logic': 'docstatus=1'
@@ -618,11 +109,10 @@
'doctype': 'Table Mapper Detail',
'from_field': 'delivery_note_details',
'from_table': 'Delivery Note Detail',
- 'idx': 2,
'match_id': 1,
'to_field': 'entries',
'to_table': 'RV Detail',
- 'validation_logic': '(qty > ifnull(billed_qty, 0) or amount > ifnull(billed_amt, 0)) and docstatus = 1'
+ 'validation_logic': 'amount > ifnull(billed_amt, 0) and docstatus = 1'
},
# Table Mapper Detail
@@ -630,7 +120,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'other_charges',
'from_table': 'RV Tax Detail',
- 'idx': 3,
'match_id': 2,
'to_field': 'other_charges',
'to_table': 'RV Tax Detail',
@@ -642,7 +131,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'sales_team',
'from_table': 'Sales Team',
- 'idx': 4,
'match_id': 3,
'to_field': 'sales_team',
'to_table': 'Sales Team',
diff --git a/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt b/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt
index 2a77358..0854802 100644
--- a/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt
+++ b/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt
@@ -14,7 +14,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Project',
- 'idx': 1,
'match_id': 0,
'name': '__common__',
'parent': 'Project-Receivable Voucher',
@@ -26,13 +25,16 @@
# These values are common for all Field Mapper Detail
{
+ 'checking_operator': '=',
'doctype': 'Field Mapper Detail',
+ 'from_field': 'customer',
'map': 'Yes',
'match_id': 0,
'name': '__common__',
'parent': 'Project-Receivable Voucher',
'parentfield': 'field_mapper_details',
- 'parenttype': 'DocType Mapper'
+ 'parenttype': 'DocType Mapper',
+ 'to_field': 'customer'
},
# These values are common for all DocType Mapper
@@ -52,35 +54,7 @@
# Field Mapper Detail
{
- 'checking_operator': '=',
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer',
- 'idx': 1,
- 'to_field': 'customer'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_name',
- 'idx': 2,
- 'to_field': 'customer_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
- 'idx': 3,
- 'to_field': 'customer_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 4,
- 'to_field': 'territory'
+ 'doctype': 'Field Mapper Detail'
},
# Table Mapper Detail
diff --git a/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt b/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt
index 76bdd1e..aa4e787 100644
--- a/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt
+++ b/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt
@@ -6,7 +6,7 @@
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-05-13 11:26:20',
- 'modified_by': 'Administrator',
+ 'modified_by': 'umair@iwebnotes.com',
'owner': 'Administrator'
},
@@ -23,6 +23,7 @@
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
+ 'match_id': 1,
'name': '__common__',
'parent': 'Purchase Order-Payable Voucher',
'parentfield': 'field_mapper_details',
@@ -48,153 +49,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'company',
- 'idx': 1,
- 'match_id': 0,
- 'to_field': 'company'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'fiscal_year',
- 'idx': 2,
- 'match_id': 0,
- 'to_field': 'fiscal_year'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'conversion_rate',
- 'idx': 3,
- 'match_id': 0,
- 'to_field': 'conversion_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'currency',
- 'idx': 4,
- 'match_id': 0,
- 'to_field': 'currency'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'supplier',
- 'idx': 5,
- 'match_id': 0,
- 'to_field': 'supplier'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'supplier_name',
- 'idx': 6,
- 'match_id': 0,
- 'to_field': 'supplier_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'supplier_name',
- 'idx': 6,
- 'match_id': 1,
- 'to_field': 'supplier_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'supplier_address',
- 'idx': 7,
- 'match_id': 0,
- 'to_field': 'supplier_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 8,
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address_display',
- 'idx': 9,
- 'match_id': 0,
- 'to_field': 'address_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_display',
- 'idx': 10,
- 'match_id': 0,
- 'to_field': 'contact_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_mobile',
- 'idx': 11,
- 'match_id': 0,
- 'to_field': 'contact_mobile'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_email',
- 'idx': 12,
- 'match_id': 0,
- 'to_field': 'contact_email'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 13,
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 14,
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'brand',
- 'idx': 15,
- 'match_id': 1,
- 'to_field': 'brand'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
- 'idx': 16,
- 'match_id': 1,
'to_field': 'qty'
},
@@ -202,8 +57,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'purchase_rate',
- 'idx': 17,
- 'match_id': 1,
'to_field': 'rate'
},
@@ -211,44 +64,20 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
- 'idx': 18,
- 'match_id': 1,
'to_field': 'amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'import_rate',
- 'idx': 19,
- 'match_id': 1,
- 'to_field': 'import_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
- 'idx': 20,
- 'match_id': 1,
'to_field': 'import_amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 21,
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 22,
- 'match_id': 1,
'to_field': 'purchase_order'
},
@@ -256,124 +85,13 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 23,
- 'match_id': 1,
'to_field': 'po_detail'
},
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_group',
- 'idx': 24,
- 'match_id': 1,
- 'to_field': 'item_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_tax_rate',
- 'idx': 25,
- 'match_id': 1,
- 'to_field': 'item_tax_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'category',
- 'idx': 26,
- 'match_id': 2,
- 'to_field': 'category'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'add_deduct_tax',
- 'idx': 27,
- 'match_id': 2,
- 'to_field': 'add_deduct_tax'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge_type',
- 'idx': 28,
- 'match_id': 2,
- 'to_field': 'charge_type'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'row_id',
- 'idx': 29,
- 'match_id': 2,
- 'to_field': 'row_id'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_wise_tax_detail',
- 'idx': 30,
- 'match_id': 2,
- 'to_field': 'item_wise_tax_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 31,
- 'match_id': 2,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'account_head',
- 'idx': 32,
- 'match_id': 2,
- 'to_field': 'account_head'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'cost_center',
- 'idx': 33,
- 'match_id': 2,
- 'to_field': 'cost_center'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rate',
- 'idx': 34,
- 'match_id': 2,
- 'to_field': 'rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'project_name',
- 'idx': 35,
- 'match_id': 0,
- 'to_field': 'project_name'
- },
-
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
'from_table': 'Purchase Order',
- 'idx': 1,
'match_id': 0,
'to_table': 'Payable Voucher',
'validation_logic': 'docstatus =1'
@@ -384,7 +102,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'po_details',
'from_table': 'PO Detail',
- 'idx': 2,
'match_id': 1,
'to_field': 'entries',
'to_table': 'PV Detail',
@@ -396,7 +113,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'purchase_tax_details',
'from_table': 'Purchase Tax Detail',
- 'idx': 3,
'match_id': 2,
'to_field': 'purchase_tax_details',
'to_table': 'Purchase Tax Detail',
diff --git a/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt b/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt
index 73967d9..d363acb 100644
--- a/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt
+++ b/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt
@@ -6,7 +6,7 @@
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-05-13 12:18:34',
- 'modified_by': 'Administrator',
+ 'modified_by': 'umair@iwebnotes.com',
'owner': 'Administrator'
},
@@ -23,6 +23,7 @@
{
'doctype': 'Field Mapper Detail',
'map': 'Yes',
+ 'match_id': 1,
'name': '__common__',
'parent': 'Purchase Receipt-Payable Voucher',
'parentfield': 'field_mapper_details',
@@ -48,153 +49,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'company',
- 'idx': 1,
- 'match_id': 0,
- 'to_field': 'company'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'fiscal_year',
- 'idx': 2,
- 'match_id': 0,
- 'to_field': 'fiscal_year'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'supplier',
- 'idx': 3,
- 'match_id': 0,
- 'to_field': 'supplier'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'supplier_name',
- 'idx': 4,
- 'match_id': 0,
- 'to_field': 'supplier_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'supplier_address',
- 'idx': 5,
- 'match_id': 0,
- 'to_field': 'supplier_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 6,
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address_display',
- 'idx': 7,
- 'match_id': 0,
- 'to_field': 'address_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_display',
- 'idx': 8,
- 'match_id': 0,
- 'to_field': 'contact_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_mobile',
- 'idx': 9,
- 'match_id': 0,
- 'to_field': 'contact_mobile'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_email',
- 'idx': 10,
- 'match_id': 0,
- 'to_field': 'contact_email'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'currency',
- 'idx': 11,
- 'match_id': 0,
- 'to_field': 'currency'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'conversion_rate',
- 'idx': 12,
- 'match_id': 0,
- 'to_field': 'conversion_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 13,
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 14,
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'brand',
- 'idx': 15,
- 'match_id': 1,
- 'to_field': 'brand'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 16,
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
- 'idx': 17,
- 'match_id': 1,
'to_field': 'qty'
},
@@ -202,8 +57,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'purchase_rate',
- 'idx': 18,
- 'match_id': 1,
'to_field': 'rate'
},
@@ -211,26 +64,13 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
- 'idx': 19,
- 'match_id': 1,
'to_field': 'amount'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'import_rate',
- 'idx': 20,
- 'match_id': 1,
- 'to_field': 'import_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
- 'idx': 21,
- 'match_id': 1,
'to_field': 'import_amount'
},
@@ -238,8 +78,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 22,
- 'match_id': 1,
'to_field': 'purchase_receipt'
},
@@ -247,8 +85,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_docname',
- 'idx': 23,
- 'match_id': 1,
'to_field': 'purchase_order'
},
@@ -256,8 +92,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 24,
- 'match_id': 1,
'to_field': 'pr_detail'
},
@@ -265,125 +99,14 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_detail_docname',
- 'idx': 25,
- 'match_id': 1,
'to_field': 'po_detail'
},
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_group',
- 'idx': 26,
- 'match_id': 1,
- 'to_field': 'item_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_tax_rate',
- 'idx': 27,
- 'match_id': 1,
- 'to_field': 'item_tax_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'category',
- 'idx': 28,
- 'match_id': 2,
- 'to_field': 'category'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'add_deduct_tax',
- 'idx': 29,
- 'match_id': 2,
- 'to_field': 'add_deduct_tax'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge_type',
- 'idx': 30,
- 'match_id': 2,
- 'to_field': 'charge_type'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'row_id',
- 'idx': 31,
- 'match_id': 2,
- 'to_field': 'row_id'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_wise_tax_detail',
- 'idx': 32,
- 'match_id': 2,
- 'to_field': 'item_wise_tax_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 33,
- 'match_id': 2,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'account_head',
- 'idx': 34,
- 'match_id': 2,
- 'to_field': 'account_head'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'cost_center',
- 'idx': 35,
- 'match_id': 2,
- 'to_field': 'cost_center'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rate',
- 'idx': 36,
- 'match_id': 2,
- 'to_field': 'rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'project_name',
- 'idx': 37,
- 'match_id': 0,
- 'to_field': 'project_name'
- },
-
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
'from_field': 'purchase_receipt_details',
'from_table': 'Purchase Receipt Detail',
- 'idx': 1,
'match_id': 1,
'to_field': 'entries',
'to_table': 'PV Detail',
@@ -394,7 +117,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Purchase Receipt',
- 'idx': 2,
'match_id': 0,
'to_table': 'Payable Voucher',
'validation_logic': 'docstatus=1'
@@ -405,7 +127,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'purchase_tax_details',
'from_table': 'Purchase Tax Detail',
- 'idx': 3,
'match_id': 2,
'to_field': 'purchase_tax_details',
'to_table': 'Purchase Tax Detail',
diff --git a/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt b/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
index 7280ba5..f1f7710 100644
--- a/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
+++ b/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:36',
'docstatus': 0,
- 'modified': '2011-05-16 17:34:21',
+ 'modified': '2011-08-08 16:56:40',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -50,7 +50,6 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
- 'idx': 1,
'match_id': 0,
'to_field': 'customer'
},
@@ -58,170 +57,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
- 'idx': 2,
- 'match_id': 0,
- 'to_field': 'customer_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 3,
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_name',
- 'idx': 4,
- 'match_id': 0,
- 'to_field': 'customer_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address_display',
- 'idx': 5,
- 'match_id': 0,
- 'to_field': 'address_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_display',
- 'idx': 6,
- 'match_id': 0,
- 'to_field': 'contact_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_mobile',
- 'idx': 7,
- 'match_id': 0,
- 'to_field': 'contact_mobile'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_email',
- 'idx': 8,
- 'match_id': 0,
- 'to_field': 'contact_email'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_group',
- 'idx': 10,
- 'match_id': 0,
- 'to_field': 'customer_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'company',
- 'idx': 11,
- 'match_id': 0,
- 'to_field': 'company'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'fiscal_year',
- 'idx': 12,
- 'match_id': 0,
- 'to_field': 'fiscal_year'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge',
- 'idx': 13,
- 'match_id': 0,
- 'to_field': 'charge'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'conversion_rate',
- 'idx': 14,
- 'match_id': 0,
- 'to_field': 'conversion_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'price_list_name',
- 'idx': 15,
- 'match_id': 0,
- 'to_field': 'price_list_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'currency',
- 'idx': 16,
- 'match_id': 0,
- 'to_field': 'currency'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 17,
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 18,
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'brand',
- 'idx': 19,
- 'match_id': 1,
- 'to_field': 'brand'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 20,
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
- 'idx': 21,
+ 'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt))/flt(obj.basic_rate)',
'match_id': 1,
'to_field': 'qty'
},
@@ -229,62 +65,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'base_ref_rate',
- 'idx': 22,
- 'match_id': 1,
- 'to_field': 'base_ref_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'name',
- 'idx': 22,
- 'match_id': 1,
- 'to_field': 'so_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'ref_rate',
- 'idx': 23,
- 'match_id': 1,
- 'to_field': 'ref_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'export_rate',
- 'idx': 23,
- 'match_id': 1,
- 'to_field': 'export_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'basic_rate',
- 'idx': 24,
- 'match_id': 1,
- 'to_field': 'basic_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_group',
- 'idx': 25,
- 'match_id': 1,
- 'to_field': 'item_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 26,
'match_id': 1,
'to_field': 'sales_order'
},
@@ -292,35 +73,15 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'stock_uom',
- 'idx': 27,
- 'match_id': 1,
- 'to_field': 'stock_uom'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 29,
'match_id': 1,
- 'to_field': 'export_rate'
+ 'to_field': 'so_detail'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'export_rate',
- 'idx': 30,
- 'match_id': 1,
- 'to_field': 'export_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.basic_rate)',
- 'idx': 31,
+ 'from_field': 'eval:flt(obj.amount) - flt(obj.billed_amt)',
'match_id': 1,
'to_field': 'amount'
},
@@ -328,261 +89,16 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.export_rate)',
- 'idx': 32,
+ 'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt))* flt(obj.export_rate)/flt(obj.basic_rate)',
'match_id': 1,
'to_field': 'export_amount'
},
# Field Mapper Detail
{
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'adj_rate',
- 'idx': 33,
- 'match_id': 1,
- 'to_field': 'adj_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_tax_rate',
- 'idx': 34,
- 'match_id': 1,
- 'to_field': 'item_tax_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge_type',
- 'idx': 35,
- 'match_id': 2,
- 'to_field': 'charge_type'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'row_id',
- 'idx': 36,
- 'match_id': 2,
- 'to_field': 'row_id'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 37,
- 'match_id': 2,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'account_head',
- 'idx': 38,
- 'match_id': 2,
- 'to_field': 'account_head'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'total_amount',
- 'idx': 39,
- 'match_id': 2,
- 'to_field': 'total_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 39,
- 'match_id': 0,
- 'to_field': 'territory'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'total_tax_amount',
- 'idx': 40,
- 'match_id': 2,
- 'to_field': 'total_tax_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_wise_tax_detail',
- 'idx': 41,
- 'match_id': 2,
- 'to_field': 'item_wise_tax_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'cost_center_other_charges',
- 'idx': 42,
- 'match_id': 2,
- 'to_field': 'cost_center_other_charges'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rate',
- 'idx': 43,
- 'match_id': 2,
- 'to_field': 'rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'tax_amount',
- 'idx': 44,
- 'match_id': 2,
- 'to_field': 'tax_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'total',
- 'idx': 45,
- 'match_id': 2,
- 'to_field': 'total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'source',
- 'idx': 46,
- 'match_id': 0,
- 'to_field': 'source'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'campaign',
- 'idx': 47,
- 'match_id': 0,
- 'to_field': 'campaign'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'tc_name',
- 'idx': 48,
- 'match_id': 0,
- 'to_field': 'tc_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'select_print_heading',
- 'idx': 49,
- 'match_id': 0,
- 'to_field': 'select_print_heading'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'terms',
- 'idx': 50,
- 'match_id': 0,
- 'to_field': 'terms'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'net_total',
- 'idx': 51,
- 'match_id': 0,
- 'to_field': 'net_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'grand_total',
- 'idx': 52,
- 'match_id': 0,
- 'to_field': 'grand_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'other_charges_total',
- 'idx': 53,
- 'match_id': 0,
- 'to_field': 'other_charges_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rounded_total',
- 'idx': 54,
- 'match_id': 0,
- 'to_field': 'rounded_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'in_words',
- 'idx': 55,
- 'match_id': 0,
- 'to_field': 'in_words'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'grand_total_export',
- 'idx': 56,
- 'match_id': 0,
- 'to_field': 'grand_total_export'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rounded_total_export',
- 'idx': 57,
- 'match_id': 0,
- 'to_field': 'rounded_total_export'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'in_words_export',
- 'idx': 58,
- 'match_id': 0,
- 'to_field': 'in_words_export'
- },
-
- # Field Mapper Detail
- {
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'project_name',
- 'idx': 59,
'match_id': 0,
'to_field': 'project_name'
},
@@ -590,80 +106,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'sales_partner',
- 'idx': 60,
- 'match_id': 0,
- 'to_field': 'sales_partner'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'sales_designation',
- 'idx': 61,
- 'match_id': 3,
- 'to_field': 'sales_designation'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'commission_rate',
- 'idx': 62,
- 'match_id': 0,
- 'to_field': 'commission_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'total_commission',
- 'idx': 63,
- 'match_id': 0,
- 'to_field': 'total_commission'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'allocated_percentage',
- 'idx': 64,
- 'match_id': 3,
- 'to_field': 'allocated_percentage'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'sales_person',
- 'idx': 65,
- 'match_id': 3,
- 'to_field': 'sales_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'allocated_amount',
- 'idx': 66,
- 'match_id': 3,
- 'to_field': 'allocated_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'incentives',
- 'idx': 67,
- 'match_id': 3,
- 'to_field': 'incentives'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'reserved_warehouse',
- 'idx': 68,
'match_id': 1,
'to_field': 'warehouse'
},
@@ -672,7 +115,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Sales Order',
- 'idx': 1,
'match_id': 0,
'to_table': 'Receivable Voucher',
'validation_logic': 'docstatus=1'
@@ -683,11 +125,10 @@
'doctype': 'Table Mapper Detail',
'from_field': 'sales_order_detail',
'from_table': 'Sales Order Detail',
- 'idx': 2,
'match_id': 1,
'to_field': 'entries',
'to_table': 'RV Detail',
- 'validation_logic': '(qty > ifnull(billed_qty, 0) or amount > ifnull(billed_amt, 0)) and docstatus = 1'
+ 'validation_logic': 'amount > ifnull(billed_amt, 0) and docstatus = 1'
},
# Table Mapper Detail
@@ -695,7 +136,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'other_charges',
'from_table': 'RV Tax Detail',
- 'idx': 3,
'match_id': 2,
'to_field': 'other_charges',
'to_table': 'RV Tax Detail',
@@ -707,7 +147,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'sales_team',
'from_table': 'Sales Team',
- 'idx': 4,
'match_id': 3,
'to_field': 'sales_team',
'to_table': 'Sales Team',
diff --git a/accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt b/accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt
index f7c9f84..f47c609 100644
--- a/accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt
+++ b/accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-07-26 17:01:34',
+ 'creation': '2011-08-29 13:45:35',
'docstatus': 0,
- 'modified': '2011-07-28 12:55:50',
+ 'modified': '2011-08-29 13:45:35',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
diff --git a/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt b/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt
index a531bb9..05a0f70 100644
--- a/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt
+++ b/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-07-27 13:14:29',
+ 'creation': '2011-08-29 13:45:35',
'docstatus': 0,
- 'modified': '2011-07-27 13:14:29',
+ 'modified': '2011-08-29 13:45:35',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
diff --git a/accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt b/accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt
index 22bdc55..d145442 100644
--- a/accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt
+++ b/accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-07-26 18:11:47',
+ 'creation': '2011-08-29 13:45:35',
'docstatus': 0,
- 'modified': '2011-07-26 18:27:01',
+ 'modified': '2011-08-29 13:45:35',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
diff --git a/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt b/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt
index dcd0f94..1c734a8 100644
--- a/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt
+++ b/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-07-27 13:14:29',
+ 'creation': '2011-08-29 13:45:35',
'docstatus': 0,
- 'modified': '2011-07-27 13:14:29',
+ 'modified': '2011-08-29 13:45:35',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
diff --git a/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt b/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt
index 26c0ff7..b155b39 100644
--- a/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt
+++ b/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-07-28 12:13:41',
+ 'creation': '2011-08-29 13:45:36',
'docstatus': 0,
- 'modified': '2011-07-28 12:56:47',
+ 'modified': '2011-08-29 13:45:36',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
diff --git a/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt b/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt
index aa52224..0969796 100644
--- a/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt
+++ b/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-07-27 13:14:29',
+ 'creation': '2011-08-29 13:45:36',
'docstatus': 0,
- 'modified': '2011-07-27 13:14:29',
+ 'modified': '2011-08-29 13:45:36',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
diff --git a/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt b/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt
index d8d4f34..3041218 100644
--- a/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt
+++ b/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt
@@ -47,19 +47,9 @@
# Field Mapper Detail
{
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'fiscal_year',
- 'idx': 1,
- 'match_id': 0,
- 'to_field': 'fiscal_year'
- },
-
- # Field Mapper Detail
- {
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'company',
- 'idx': 2,
'match_id': 0,
'to_field': 'company'
},
@@ -68,7 +58,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
- 'idx': 3,
'match_id': 1,
'to_field': 'prevdoc_doctype'
},
@@ -77,7 +66,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 4,
'match_id': 1,
'to_field': 'prevdoc_docname'
},
@@ -86,7 +74,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 5,
'match_id': 1,
'to_field': 'prevdoc_detail_docname'
},
@@ -95,7 +82,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'uom',
- 'idx': 6,
'match_id': 1,
'to_field': 'stock_uom'
},
@@ -104,7 +90,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval:flt(1)',
- 'idx': 7,
'match_id': 1,
'to_field': 'conversion_factor'
},
@@ -112,80 +97,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'uom',
- 'idx': 8,
- 'match_id': 1,
- 'to_field': 'uom'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'warehouse',
- 'idx': 9,
- 'match_id': 1,
- 'to_field': 'warehouse'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'schedule_date',
- 'idx': 10,
- 'match_id': 1,
- 'to_field': 'schedule_date'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 11,
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 12,
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'brand',
- 'idx': 13,
- 'match_id': 1,
- 'to_field': 'brand'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 14,
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_group',
- 'idx': 15,
- 'match_id': 1,
- 'to_field': 'item_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval:flt(obj.qty) - flt(obj.ordered_qty)',
- 'idx': 16,
'match_id': 1,
'to_field': 'stock_qty'
},
@@ -194,7 +106,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval:flt(obj.qty) - flt(obj.ordered_qty)',
- 'idx': 17,
'match_id': 1,
'to_field': 'qty'
},
@@ -203,7 +114,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Indent',
- 'idx': 1,
'match_id': 0,
'reference_key': 'prevdoc_docname',
'to_table': 'Purchase Order',
@@ -215,7 +125,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'indent_details',
'from_table': 'Indent Detail',
- 'idx': 2,
'match_id': 1,
'reference_doctype_key': 'prevdoc_doctype',
'to_field': 'po_details',
diff --git a/buying/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt b/buying/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt
index 349603c..d32aeb6 100755
--- a/buying/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt
+++ b/buying/DocType Mapper/Sales Order-Indent/Sales Order-Indent.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2011-04-06 15:33:09',
+ 'creation': '2011-05-05 15:58:13',
'docstatus': 0,
- 'modified': '2011-05-04 14:49:55',
+ 'modified': '2011-05-05 16:20:10',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -49,7 +49,6 @@
'checking_operator': '>=',
'doctype': 'Field Mapper Detail',
'from_field': 'transaction_date',
- 'idx': 1,
'map': 'No',
'match_id': 0,
'to_field': 'transaction_date'
@@ -60,7 +59,6 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'company',
- 'idx': 2,
'map': 'Yes',
'match_id': 0,
'to_field': 'company'
@@ -69,48 +67,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'fiscal_year',
- 'idx': 3,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'fiscal_year'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'tc_name',
- 'idx': 4,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'tc_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'terms',
- 'idx': 5,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'terms'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'letter_head',
- 'idx': 6,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'letter_head'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 7,
'map': 'Yes',
'match_id': 1,
'to_field': 'sales_order_no'
@@ -119,48 +76,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 8,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 9,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 10,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_group',
- 'idx': 11,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'item_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'stock_uom',
- 'idx': 12,
'map': 'Yes',
'match_id': 1,
'to_field': 'uom'
@@ -169,39 +85,17 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'qty',
- 'idx': 13,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'qty'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'reserved_warehouse',
- 'idx': 14,
'map': 'Yes',
'match_id': 1,
'to_field': 'warehouse'
},
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'brand',
- 'idx': 15,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'brand'
- },
-
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
'from_field': 'sales_order_details',
'from_table': 'Sales Order Detail',
- 'idx': 1,
'match_id': 1,
'reference_doctype_key': 'prevdoc_doctype',
'reference_key': 'prevdoc_detail_docname',
@@ -214,7 +108,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Sales Order',
- 'idx': 2,
'match_id': 0,
'reference_key': 'prevdoc_docname',
'to_table': 'Indent',
diff --git a/erpnext_version.py b/erpnext_version.py
new file mode 100644
index 0000000..48e45d5
--- /dev/null
+++ b/erpnext_version.py
@@ -0,0 +1,3 @@
+# version info
+
+version='1.0.0'
diff --git a/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt b/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt
index 8145e4f..b3081bf 100644
--- a/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt
+++ b/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt
@@ -15,7 +15,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'kra_sheet',
'from_table': 'KRA Sheet',
- 'idx': 1,
'match_id': 0,
'name': '__common__',
'parent': 'KRA Template-Appraisal',
@@ -26,17 +25,6 @@
'validation_logic': 'name is not Null'
},
- # These values are common for all Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'map': 'Yes',
- 'match_id': 0,
- 'name': '__common__',
- 'parent': 'KRA Template-Appraisal',
- 'parentfield': 'field_mapper_details',
- 'parenttype': 'DocType Mapper'
- },
-
# These values are common for all DocType Mapper
{
'doctype': 'DocType Mapper',
@@ -52,22 +40,6 @@
'name': 'KRA Template-Appraisal'
},
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'kra',
- 'idx': 1,
- 'to_field': 'kra'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'per_weightage',
- 'idx': 2,
- 'to_field': 'per_weightage'
- },
-
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail'
diff --git a/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt b/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt
index 2dbc46c..03318a1 100644
--- a/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt
+++ b/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt
@@ -6,7 +6,7 @@
'creation': '2010-12-14 10:23:25',
'docstatus': 0,
'modified': '2011-02-12 18:31:40',
- 'modified_by': 'Administrator',
+ 'modified_by': 'umair@iwebnotes.com',
'owner': 'harshada@webnotestech.com'
},
@@ -48,71 +48,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'employee',
- 'idx': 1,
- 'match_id': 0,
- 'to_field': 'employee'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'employee_name',
- 'idx': 2,
- 'match_id': 0,
- 'to_field': 'employee_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'department',
- 'idx': 3,
- 'match_id': 0,
- 'to_field': 'department'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'designation',
- 'idx': 4,
- 'match_id': 0,
- 'to_field': 'designation'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'branch',
- 'idx': 5,
- 'match_id': 0,
- 'to_field': 'branch'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'grade',
- 'idx': 6,
- 'match_id': 0,
- 'to_field': 'grade'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'e_type',
- 'idx': 7,
- 'match_id': 1,
- 'to_field': 'e_type'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'total_earning',
- 'idx': 7,
'match_id': 0,
'to_field': 'gross_pay'
},
@@ -121,7 +57,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'modified_value',
- 'idx': 8,
'match_id': 1,
'to_field': 'e_amount'
},
@@ -129,35 +64,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'total_deduction',
- 'idx': 8,
- 'match_id': 0,
- 'to_field': 'total_deduction'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'd_type',
- 'idx': 9,
- 'match_id': 2,
- 'to_field': 'd_type'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'net_pay',
- 'idx': 9,
- 'match_id': 0,
- 'to_field': 'net_pay'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'd_modified_amt',
- 'idx': 10,
'match_id': 2,
'to_field': 'd_amount'
},
@@ -166,7 +73,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'modified_value',
- 'idx': 12,
'match_id': 1,
'to_field': 'e_modified_amount'
},
@@ -175,7 +81,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'depend_on_lwp',
- 'idx': 13,
'match_id': 1,
'to_field': 'e_depends_on_lwp'
},
@@ -184,7 +89,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'd_modified_amt',
- 'idx': 16,
'match_id': 2,
'to_field': 'd_modified_amount'
},
@@ -193,7 +97,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'depend_on_lwp',
- 'idx': 17,
'match_id': 2,
'to_field': 'd_depends_on_lwp'
},
@@ -202,7 +105,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Salary Structure',
- 'idx': 1,
'match_id': 0,
'to_table': 'Salary Slip'
},
@@ -212,7 +114,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'earning_details',
'from_table': 'Earning Detail',
- 'idx': 2,
'match_id': 1,
'to_field': 'earning_details',
'to_table': 'SS Earning Detail'
@@ -223,7 +124,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'deduction_details',
'from_table': 'Deduction Detail',
- 'idx': 3,
'match_id': 2,
'to_field': 'deduction_details',
'to_table': 'SS Deduction Detail'
diff --git a/master.sql.gz b/master.sql.gz
index 273277e..3d3e220 100644
--- a/master.sql.gz
+++ b/master.sql.gz
Binary files differ
diff --git a/patches/patch.py b/patches/patch.py
index 616be63..fbfdf2e 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -1,7 +1,7 @@
# REMEMBER to update this
# ========================
-last_patch = 346
+last_patch = 349
#-------------------------------------------
def execute(patch_no):
@@ -254,7 +254,18 @@
sql("delete from `tabModule Def Item` where display_name = 'Salary Slip Control Panel' and parent = 'HR'")
reload_doc('hr','Module Def','HR')
elif patch_no == 346:
+ pass
+ elif patch_no == 347:
+ sql("delete from `tabField Mapper Detail` where from_field = to_field and map = 'Yes' and ifnull(checking_operator, '') = ''")
+ elif patch_no == 348:
+ sql("update `tabStock Ledger Entry` set is_cancelled = 'No' where voucher_type = 'Serial No'")
+ elif patch_no == 349:
+ delete_doc('Custom Script', 'Update Series-Server')
+ delete_doc('Custom Script', 'Profile-Client')
+ delete_doc('Custom Script', 'Event-Client')
+ delete_doc('Custom Script', 'File-Server')
+
+ # reload profile with new fields for security
delete_doc('DocType', 'Profile')
reload_doc('core', 'doctype', 'profile')
-
diff --git a/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt b/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt
index 62306cc..dfbef85 100644
--- a/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt
+++ b/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt
@@ -48,32 +48,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 2,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'stock_uom',
- 'idx': 3,
- 'to_field': 'stock_uom'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval:flt(obj.qty)-flt(obj.planned_qty)',
- 'idx': 4,
'to_field': 'prevdoc_reqd_qty'
},
@@ -81,7 +56,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
- 'idx': 5,
'to_field': 'against_document'
},
@@ -89,7 +63,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 6,
'to_field': 'document_no'
},
@@ -97,7 +70,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'start_date',
- 'idx': 7,
'to_field': 'document_date'
},
@@ -105,7 +77,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'end_date',
- 'idx': 8,
'to_field': 'confirmation_date'
},
@@ -113,7 +84,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Production Forecast',
- 'idx': 1,
'match_id': 0,
'to_table': 'Production Plan',
'validation_logic': 'docstatus =1'
@@ -124,7 +94,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'pf_details',
'from_table': 'PF Detail',
- 'idx': 2,
'match_id': 1,
'to_field': 'pp_details',
'to_table': 'PP Detail',
diff --git a/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt b/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt
index 5cab415..6125d98 100644
--- a/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt
+++ b/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt
@@ -48,32 +48,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 2,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'stock_uom',
- 'idx': 3,
- 'to_field': 'stock_uom'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval:flt(obj.qty)-flt(obj.planned_qty)',
- 'idx': 4,
'to_field': 'prevdoc_reqd_qty'
},
@@ -81,7 +56,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
- 'idx': 5,
'to_field': 'source_doctype'
},
@@ -89,7 +63,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 6,
'to_field': 'source_docname'
},
@@ -97,7 +70,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'end_date',
- 'idx': 7,
'to_field': 'confirmation_date'
},
@@ -105,7 +77,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Production Forecast',
- 'idx': 1,
'match_id': 0,
'to_table': 'Production Planning Tool',
'validation_logic': 'docstatus =1'
@@ -116,7 +87,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'pf_details',
'from_table': 'PF Detail',
- 'idx': 2,
'match_id': 1,
'to_field': 'pp_details',
'to_table': 'PP Detail',
diff --git a/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt b/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt
index 5132c78..41c5173 100644
--- a/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt
+++ b/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt
@@ -50,7 +50,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
- 'idx': 1,
'to_field': 'against_document'
},
@@ -58,31 +57,13 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 2,
'to_field': 'document_no'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 3,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 4,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'uom',
- 'idx': 5,
'to_field': 'stock_uom'
},
@@ -90,7 +71,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval:flt(obj.qty)-flt(obj.planned_qty)',
- 'idx': 6,
'to_field': 'prevdoc_total_qty'
},
@@ -98,23 +78,13 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'transaction_date',
- 'idx': 7,
'to_field': 'document_date'
},
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'delivery_date',
- 'idx': 8,
- 'to_field': 'delivery_date'
- },
-
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
'from_table': 'Sales Order',
- 'idx': 1,
'match_id': 0,
'to_table': 'Production Plan',
'validation_logic': 'docstatus =1'
@@ -125,7 +95,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'packing_details',
'from_table': 'Delivery Note Packing Detail',
- 'idx': 2,
'match_id': 1,
'to_field': 'pp_details',
'to_table': 'PP Detail',
diff --git a/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt b/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt
index a4afac7..67abbdc 100644
--- a/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt
+++ b/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt
@@ -6,7 +6,7 @@
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
'modified': '2011-05-17 11:42:57',
- 'modified_by': 'Administrator',
+ 'modified_by': 'umair@iwebnotes.com',
'owner': 'Administrator'
},
@@ -50,26 +50,15 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'company',
- 'idx': 1,
'match_id': 0,
'to_field': 'company'
},
# Field Mapper Detail
{
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'fiscal_year',
- 'idx': 2,
- 'match_id': 0,
- 'to_field': 'fiscal_year'
- },
-
- # Field Mapper Detail
- {
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
- 'idx': 3,
'match_id': 0,
'to_field': 'customer'
},
@@ -77,89 +66,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
- 'idx': 4,
- 'match_id': 0,
- 'to_field': 'customer_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 5,
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_name',
- 'idx': 6,
- 'match_id': 0,
- 'to_field': 'customer_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address_display',
- 'idx': 7,
- 'match_id': 0,
- 'to_field': 'address_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_display',
- 'idx': 8,
- 'match_id': 0,
- 'to_field': 'contact_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_mobile',
- 'idx': 9,
- 'match_id': 0,
- 'to_field': 'contact_mobile'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_email',
- 'idx': 10,
- 'match_id': 0,
- 'to_field': 'contact_email'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 11,
- 'match_id': 0,
- 'to_field': 'territory'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_group',
- 'idx': 12,
- 'match_id': 0,
- 'to_field': 'customer_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 13,
'match_id': 0,
'to_field': 'delivery_note_no'
},
@@ -168,7 +75,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 14,
'match_id': 1,
'to_field': 'prevdoc_detail_docname'
},
@@ -177,7 +83,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 15,
'match_id': 1,
'to_field': 'prevdoc_docname'
},
@@ -186,7 +91,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
- 'idx': 16,
'match_id': 1,
'to_field': 'prevdoc_doctype'
},
@@ -194,26 +98,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 17,
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 18,
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.installed_qty)',
- 'idx': 19,
'match_id': 1,
'to_field': 'qty'
},
@@ -221,17 +106,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'serial_no',
- 'idx': 20,
- 'match_id': 1,
- 'to_field': 'serial_no'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'posting_date',
- 'idx': 21,
'match_id': 2,
'to_field': 'prevdoc_date'
},
@@ -241,7 +116,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'delivery_note_details',
'from_table': 'Delivery Note Detail',
- 'idx': 1,
'match_id': 1,
'to_field': 'installed_item_details',
'to_table': 'Installed Item Details',
@@ -252,7 +126,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Delivery Note',
- 'idx': 2,
'match_id': 0,
'to_table': 'Installation Note',
'validation_logic': 'docstatus = 1'
@@ -262,7 +135,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Delivery Note',
- 'idx': 3,
'match_id': 2,
'reference_doctype_key': 'prevdoc_doctype',
'reference_key': 'prevdoc_docname',
diff --git a/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt b/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
index 78f5a56..4db092d 100644
--- a/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
+++ b/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
@@ -6,7 +6,7 @@
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
'modified': '2011-05-10 16:04:40',
- 'modified_by': 'Administrator',
+ 'modified_by': 'umair@iwebnotes.com',
'owner': 'Administrator'
},
@@ -49,35 +49,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 1,
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 2,
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'qty',
- 'idx': 3,
- 'match_id': 1,
- 'to_field': 'qty'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'uom',
- 'idx': 4,
'match_id': 1,
'to_field': 'stock_uom'
},
@@ -85,26 +57,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'source',
- 'idx': 5,
- 'match_id': 0,
- 'to_field': 'source'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'campaign',
- 'idx': 6,
- 'match_id': 0,
- 'to_field': 'campaign'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 7,
'match_id': 0,
'to_field': 'enq_no'
},
@@ -112,116 +65,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'customer',
- 'idx': 8,
- 'match_id': 0,
- 'to_field': 'customer'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
- 'idx': 9,
- 'match_id': 0,
- 'to_field': 'customer_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 10,
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address_display',
- 'idx': 11,
- 'match_id': 0,
- 'to_field': 'address_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_display',
- 'idx': 12,
- 'match_id': 0,
- 'to_field': 'contact_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_mobile',
- 'idx': 13,
- 'match_id': 0,
- 'to_field': 'contact_mobile'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_email',
- 'idx': 14,
- 'match_id': 0,
- 'to_field': 'contact_email'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 15,
- 'match_id': 0,
- 'to_field': 'territory'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_group',
- 'idx': 16,
- 'match_id': 0,
- 'to_field': 'customer_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 17,
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_group',
- 'idx': 18,
- 'match_id': 1,
- 'to_field': 'item_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'brand',
- 'idx': 19,
- 'match_id': 1,
- 'to_field': 'brand'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 20,
'match_id': 1,
'to_field': 'prevdoc_docname'
},
@@ -230,7 +74,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
- 'idx': 21,
'match_id': 1,
'to_field': 'prevdoc_doctype'
},
@@ -238,26 +81,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'lead',
- 'idx': 22,
- 'match_id': 0,
- 'to_field': 'lead'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'lead_name',
- 'idx': 23,
- 'match_id': 0,
- 'to_field': 'lead_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'enquiry_from',
- 'idx': 24,
'match_id': 0,
'to_field': 'quotation_to'
},
@@ -266,7 +90,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'enquiry_type',
- 'idx': 25,
'match_id': 0,
'to_field': 'order_type'
},
@@ -275,7 +98,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Enquiry',
- 'idx': 1,
'match_id': 0,
'to_table': 'Quotation'
},
@@ -285,7 +107,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'enq_details',
'from_table': 'Enquiry Detail',
- 'idx': 2,
'match_id': 1,
'to_field': 'quotation_details',
'to_table': 'Quotation Detail'
diff --git a/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt b/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
index d91672a..2b7a15a 100644
--- a/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
+++ b/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
@@ -14,7 +14,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Lead',
- 'idx': 1,
'match_id': 0,
'name': '__common__',
'parent': 'Lead-Customer',
@@ -54,7 +53,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 1,
'to_field': 'lead_name'
},
@@ -62,79 +60,13 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'company_name',
- 'idx': 2,
'to_field': 'customer_name'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'address_line1',
- 'idx': 3,
- 'to_field': 'address_line1'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address_line2',
- 'idx': 4,
- 'to_field': 'address_line2'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'city',
- 'idx': 5,
- 'to_field': 'city'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'country',
- 'idx': 6,
- 'to_field': 'country'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'state',
- 'idx': 7,
- 'to_field': 'state'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'pincode',
- 'idx': 8,
- 'to_field': 'pincode'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'company',
- 'idx': 9,
- 'to_field': 'company'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 10,
- 'to_field': 'territory'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'contact_no',
- 'idx': 11,
'to_field': 'phone_1'
},
@@ -142,18 +74,9 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'fax',
- 'idx': 12,
'to_field': 'fax_1'
},
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'website',
- 'idx': 13,
- 'to_field': 'website'
- },
-
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail'
diff --git a/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt b/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
index 716674d..4b32723 100644
--- a/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
+++ b/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
@@ -14,7 +14,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Lead',
- 'idx': 1,
'match_id': 0,
'name': '__common__',
'parent': 'Lead-Enquiry',
@@ -53,107 +52,24 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'source',
- 'idx': 1,
- 'to_field': 'source'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'campaign_name',
- 'idx': 2,
'to_field': 'campaign'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_by',
- 'idx': 3,
- 'to_field': 'contact_by'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'last_contact_date',
- 'idx': 4,
- 'to_field': 'last_contact_date'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_date_ref',
- 'idx': 5,
- 'to_field': 'contact_date_ref'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_date',
- 'idx': 6,
- 'to_field': 'contact_date'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'doctype',
- 'idx': 7,
'to_field': 'enquiry_from'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'lead_name',
- 'idx': 8,
- 'to_field': 'lead_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 9,
'to_field': 'lead'
},
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address',
- 'idx': 10,
- 'to_field': 'address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_no',
- 'idx': 11,
- 'to_field': 'contact_no'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'email_id',
- 'idx': 12,
- 'to_field': 'email_id'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 13,
- 'to_field': 'territory'
- },
-
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail'
diff --git a/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt b/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt
index 1f54abd..04f70ad 100644
--- a/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt
+++ b/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt
@@ -14,7 +14,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Project',
- 'idx': 1,
'match_id': 0,
'name': '__common__',
'parent': 'Project-Sales Order',
@@ -26,13 +25,16 @@
# These values are common for all Field Mapper Detail
{
+ 'checking_operator': '=',
'doctype': 'Field Mapper Detail',
+ 'from_field': 'customer',
'map': 'Yes',
'match_id': 0,
'name': '__common__',
'parent': 'Project-Sales Order',
'parentfield': 'field_mapper_details',
- 'parenttype': 'DocType Mapper'
+ 'parenttype': 'DocType Mapper',
+ 'to_field': 'customer'
},
# These values are common for all DocType Mapper
@@ -52,67 +54,7 @@
# Field Mapper Detail
{
- 'checking_operator': '=',
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer',
- 'idx': 1,
- 'to_field': 'customer'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_name',
- 'idx': 2,
- 'to_field': 'customer_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
- 'idx': 3,
- 'to_field': 'customer_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 4,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_no',
- 'idx': 5,
- 'to_field': 'contact_no'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'email_id',
- 'idx': 6,
- 'to_field': 'email_id'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_group',
- 'idx': 7,
- 'to_field': 'customer_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 8,
- 'to_field': 'territory'
+ 'doctype': 'Field Mapper Detail'
},
# Table Mapper Detail
diff --git a/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt b/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt
index d05553d..4d493a6 100644
--- a/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt
+++ b/selling/DocType Mapper/Quotation-Sales Order/Quotation-Sales Order.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
- 'modified': '2011-05-17 12:55:58',
+ 'modified': '2011-08-25 18:25:02',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -49,7 +49,6 @@
'checking_operator': '>=',
'doctype': 'Field Mapper Detail',
'from_field': 'transaction_date',
- 'idx': 1,
'map': 'No',
'match_id': 0,
'to_field': 'transaction_date'
@@ -58,28 +57,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'order_type',
- 'idx': 2,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'order_type'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'name',
- 'idx': 3,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'quotation_no'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'transaction_date',
- 'idx': 4,
'map': 'Yes',
'match_id': 0,
'to_field': 'quotation_date'
@@ -87,10 +65,18 @@
# Field Mapper Detail
{
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'name',
+ 'map': 'Yes',
+ 'match_id': 0,
+ 'to_field': 'quotation_no'
+ },
+
+ # Field Mapper Detail
+ {
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'company',
- 'idx': 5,
'map': 'Yes',
'match_id': 0,
'to_field': 'company'
@@ -101,7 +87,6 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'fiscal_year',
- 'idx': 6,
'map': 'Yes',
'match_id': 0,
'to_field': 'fiscal_year'
@@ -110,138 +95,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'price_list_name',
- 'idx': 7,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'price_list_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'conversion_rate',
- 'idx': 8,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'conversion_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'currency',
- 'idx': 9,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'currency'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer',
- 'idx': 10,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'customer'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_name',
- 'idx': 11,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'customer_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
- 'idx': 12,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'customer_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address_display',
- 'idx': 14,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'address_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_display',
- 'idx': 15,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'contact_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_mobile',
- 'idx': 16,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'contact_mobile'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_email',
- 'idx': 17,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'contact_email'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 18,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'territory'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_group',
- 'idx': 19,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'customer_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge',
- 'idx': 20,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'charge'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 21,
'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_docname'
@@ -250,411 +104,10 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'adj_rate',
- 'idx': 22,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'adj_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'basic_rate',
- 'idx': 23,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'basic_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'amount',
- 'idx': 24,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'stock_uom',
- 'idx': 25,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'stock_uom'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'ref_rate',
- 'idx': 26,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'ref_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'base_ref_rate',
- 'idx': 27,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'base_ref_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 28,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'qty',
- 'idx': 29,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'qty'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 30,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 31,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'brand',
- 'idx': 32,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'brand'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_group',
- 'idx': 33,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'item_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'export_rate',
- 'idx': 34,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'export_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'export_amount',
- 'idx': 35,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'export_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_tax_rate',
- 'idx': 36,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'item_tax_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'net_total',
- 'idx': 37,
- 'map': 'Yes',
+ 'from_field': 'naming_series',
+ 'map': 'No',
'match_id': 0,
- 'to_field': 'net_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'other_charges_total',
- 'idx': 38,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'other_charges_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'grand_total',
- 'idx': 39,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'grand_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rounded_total',
- 'idx': 40,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'rounded_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'in_words',
- 'idx': 41,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'in_words'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'grand_total_export',
- 'idx': 42,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'grand_total_export'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rounded_total_export',
- 'idx': 43,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'rounded_total_export'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'in_words_export',
- 'idx': 44,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'in_words_export'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge_type',
- 'idx': 45,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'charge_type'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'row_id',
- 'idx': 46,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'row_id'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_wise_tax_detail',
- 'idx': 47,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'item_wise_tax_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 48,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'account_head',
- 'idx': 49,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'account_head'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rate',
- 'idx': 50,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'tax_amount',
- 'idx': 51,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'tax_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'total',
- 'idx': 52,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'idx',
- 'idx': 53,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'idx'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'sales_person',
- 'idx': 54,
- 'map': 'Yes',
- 'match_id': 3,
- 'to_field': 'sales_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'allocated_percentage',
- 'idx': 55,
- 'map': 'Yes',
- 'match_id': 3,
- 'to_field': 'allocated_percentage'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'allocated_amount',
- 'idx': 56,
- 'map': 'Yes',
- 'match_id': 3,
- 'to_field': 'allocated_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 57,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'tc_name',
- 'idx': 57,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'tc_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 57,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'source',
- 'idx': 58,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'source'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'campaign',
- 'idx': 59,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'campaign'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'terms',
- 'idx': 60,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'terms'
+ 'to_field': 'naming_series'
},
# Table Mapper Detail
@@ -662,7 +115,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'sales_team',
'from_table': 'Sales Team',
- 'idx': 1,
'match_id': 3,
'to_field': 'sales_team',
'to_table': 'Sales Team',
@@ -674,7 +126,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'other_charges',
'from_table': 'RV Tax Detail',
- 'idx': 2,
'match_id': 2,
'to_field': 'other_charges',
'to_table': 'RV Tax Detail',
@@ -686,7 +137,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'quotation_details',
'from_table': 'Quotation Detail',
- 'idx': 3,
'match_id': 1,
'reference_doctype_key': 'prevdoc_doctype',
'to_field': 'sales_order_details',
@@ -698,7 +148,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Quotation',
- 'idx': 4,
'match_id': 0,
'reference_key': 'prevdoc_docname',
'to_table': 'Sales Order',
diff --git a/setup/doctype/update_series/update_series.py b/setup/doctype/update_series/update_series.py
new file mode 100644
index 0000000..dcca22a
--- /dev/null
+++ b/setup/doctype/update_series/update_series.py
@@ -0,0 +1,41 @@
+# Please edit this list and import only required elements
+import webnotes
+
+from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
+from webnotes.model import db_exists
+from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
+from webnotes.model.doclist import getlist, copy_doclist
+from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
+from webnotes import session, form, is_testing, msgprint, errprint
+
+set = webnotes.conn.set
+sql = webnotes.conn.sql
+get_value = webnotes.conn.get_value
+in_transaction = webnotes.conn.in_transaction
+convert_to_lists = webnotes.conn.convert_to_lists
+
+# -----------------------------------------------------------------------------------------
+
+class DocType:
+ def __init__(self, doc, doclist=[]):
+ self.doc = doc
+ self.doclist = doclist
+
+ def update_series(self):
+ series = sql("select name,current from `tabSeries` where name = %s", self.doc.prefix,as_dict = 1)
+ if series:
+ msgprint("This is going to update Series with Prefix : " + series[0]['name'] + " from Current : " + cstr(series[0]['current']) + " to Current : "+ cstr(self.doc.current))
+ sql("update `tabSeries` set current = '%s' where name = '%s'" % (self.doc.current,series[0]['name']))
+ msgprint("Series Updated Successfully")
+ else:
+ msgprint("Please Check Prefix as there is no such Prefix : "+ self.doc.prefix +" Or Try Insert Button")
+
+ def insert_series(self):
+ #sql("start transaction")
+ series = sql("select name,current from `tabSeries` where name = %s", self.doc.prefix, as_dict = 1)
+ if series:
+ msgprint("Series with Prefix : " + series[0]['name'] + "already in the system . Try Update Button")
+ else:
+ msgprint("This is going to Insert Series with Prefix : " + cstr(self.doc.prefix) + " Current: " + cstr(self.doc.current))
+ sql("insert into `tabSeries` (name,current) values ('%s','%s')" % (self.doc.prefix, self.doc.current))
+ msgprint("Series Inserted Successfully")
diff --git a/startup/startup.js b/startup/startup.js
deleted file mode 100644
index 13be705..0000000
--- a/startup/startup.js
+++ /dev/null
@@ -1,704 +0,0 @@
-if(user == 'Guest'){
- $dh(page_body.left_sidebar);
-}
-
-var current_module;
-var is_system_manager = 0;
-var module_content_dict = {};
-var user_full_nm = {};
-
-// check if session user is system manager
-if(inList(user_roles,'System Manager')) is_system_manager = 1;
-
-function startup_setup() {
- pscript.is_erpnext_saas = cint(locals['Control Panel']['Control Panel'].sync_with_gateway)
-
-
- if(get_url_arg('embed')) {
- // hide header, footer
- $dh(page_body.banner_area);
- $dh(page_body.wntoolbar);
- $dh(page_body.footer);
- return;
- }
-
- if(user=='Guest' && !get_url_arg('akey')) {
- if(pscript.is_erpnext_saas) {
- window.location.href = 'https://www.erpnext.com';
- return;
- }
- }
-
- // page structure
- // --------------
- $td(page_body.wntoolbar.body_tab,0,0).innerHTML = '<i><b>erp</b>next</i>';
- $y($td(page_body.wntoolbar.body_tab,0,0), {width:'140px', color:'#FFF', paddingLeft:'8px', paddingRight:'8px', fontSize:'14px'})
- $dh(page_body.banner_area);
-
- // sidebar
- // -------
- pscript.startup_make_sidebar();
-
- // border to the body
- // ------------------
- $dh(page_body.footer);
-
- // for logout and payment
- var callback = function(r,rt) {
- if(r.message){
- login_file = 'http://' + r.message;
- }
- else if(pscript.is_erpnext_saas) {
- login_file = 'http://www.erpnext.com';
- }
- // setup toolbar
- pscript.startup_setup_toolbar();
- }
- $c_obj('Home Control', 'get_login_url', '', callback);
-}
-
-// ====================================================================
-
-pscript.startup_make_sidebar = function() {
- $y(page_body.left_sidebar, {width:(100/6)+'%', paddingTop:'8px'});
-
- var callback = function(r,rt) {
- // menu
- var ml = r.message;
-
- // clear
- page_body.left_sidebar.innerHTML = '';
-
- for(var m=0; m<ml.length; m++){
- if(ml[m]) {
- new SidebarItem(ml[m]);
- }
- }
- if(in_list(user_roles, 'System Manager')) {
- var div = $a(page_body.left_sidebar, 'div', 'link_type', {padding:'8px', fontSize:'11px'});
- $(div).html('[edit]').click(pscript.startup_set_module_order)
- }
- nav_obj.observers.push({notify:function(t,dt,dn) { pscript.select_sidebar_menu(t, dt, dn); }});
-
- // select current
- var no = nav_obj.ol[nav_obj.ol.length-1];
- if(no && menu_item_map[decodeURIComponent(no[0])][decodeURIComponent(no[1])])
- pscript.select_sidebar_menu(decodeURIComponent(no[0]), decodeURIComponent(no[1]));
- }
- $c_obj('Home Control', 'get_modules', '', callback);
-}
-
-// ====================================================================
-// Menu observer
-// ====================================================================
-
-cur_menu_pointer = null;
-var menu_item_map = {'Form':{}, 'Page':{}, 'Report':{}, 'List':{}}
-
-pscript.select_sidebar_menu = function(t, dt, dn) {
- // get menu item
- if(menu_item_map[t][dt]) {
- // select
- menu_item_map[t][dt].select();
- } else {
- // none found :-( Unselect
- if(cur_menu_pointer)
- cur_menu_pointer.deselect();
- }
-}
-
-// ====================================================================
-// Menu pointer
-// ====================================================================
-
-var body_background = '#e2e2e2';
-
-MenuPointer = function(parent, label) {
-
- this.wrapper = $a(parent, 'div', '', {padding:'0px', cursor:'pointer', margin:'2px 0px'});
- $br(this.wrapper, '3px');
-
- this.tab = make_table($a(this.wrapper, 'div'), 1, 2, '100%', ['', '11px'], {height:'22px',
- verticalAlign:'middle', padding:'0px'}, {borderCollapse:'collapse', tableLayout:'fixed'});
-
- $y($td(this.tab, 0, 0), {padding:'0px 4px', color:'#444', whiteSpace:'nowrap'});
-
- // triangle border (?)
- this.tab.triangle_div = $a($td(this.tab, 0, 1), 'div','', {
- borderColor: body_background + ' ' + body_background + ' ' + body_background + ' ' + 'transparent',
- borderWidth:'11px', borderStyle:'solid', height:'0px', width:'0px', marginRight:'-11px'});
-
- this.label_area = $a($td(this.tab, 0, 0), 'span', '', '', label);
-
- $(this.wrapper)
- .hover(
- function() { if(!this.selected)$bg(this, '#eee'); } ,
- function() { if(!this.selected)$bg(this, body_background); }
- )
-
- $y($td(this.tab, 0, 0), {borderBottom:'1px solid #ddd'});
-
-}
-
-// ====================================================================
-
-MenuPointer.prototype.select = function(grey) {
- $y($td(this.tab, 0, 0), {color:'#fff', borderBottom:'0px solid #000'});
- //$gr(this.wrapper, '#F84', '#F63');
- $gr(this.wrapper, '#888', '#666');
- this.selected = 1;
-
- if(cur_menu_pointer && cur_menu_pointer != this)
- cur_menu_pointer.deselect();
-
- cur_menu_pointer = this;
-}
-
-// ====================================================================
-
-MenuPointer.prototype.deselect = function() {
- $y($td(this.tab, 0, 0), {color:'#444', borderBottom:'1px solid #ddd'});
- $gr(this.wrapper, body_background, body_background);
- this.selected = 0;
-}
-
-
-// ====================================================================
-// Sidebar Item
-// ====================================================================
-
-var cur_sidebar_item = null;
-
-SidebarItem = function(det) {
- var me = this;
- this.det = det;
- this.wrapper = $a(page_body.left_sidebar, 'div', '', {marginRight:'12px'});
-
- this.body = $a(this.wrapper, 'div');
- this.tab = make_table(this.body, 1, 2, '100%', ['24px', null], {verticalAlign:'middle'}, {tableLayout:'fixed'});
-
- // icon
- var ic = $a($td(this.tab, 0, 0), 'div', 'module-icons module-icons-' + det.module_label.toLowerCase(), {marginLeft:'3px', marginBottom:'-2px'});
-
- // pointer table
- this.pointer = new MenuPointer($td(this.tab, 0, 1), det.module_label);
- $y($td(this.pointer.tab, 0, 0), {fontWeight:'bold'});
-
- // for page type
- if(det.module_page) {
- menu_item_map.Page[det.module_page] = this.pointer;
- }
-
- // items area
- this.items_area = $a(this.wrapper, 'div');
-
- this.body.onclick = function() { me.onclick(); }
-}
-
-// ====================================================================
-
-SidebarItem.prototype.onclick = function() {
- var me = this;
-
- if(this.det.module_page) {
- // page type
- this.pointer.select();
-
- $item_set_working(me.pointer.label_area);
- loadpage(this.det.module_page, function() { $item_done_working(me.pointer.label_area); });
-
- } else {
- // show sub items
- this.toggle();
- }
-}
-
-// ====================================================================
-
-SidebarItem.prototype.collapse = function() {
- $(this.items_area).slideUp();
- this.is_open = 0;
- $fg(this.pointer.label_area, '#444')
-}
-
-// ====================================================================
-
-SidebarItem.prototype.toggle = function() {
- if(this.loading) return;
-
- if(this.is_open) {
- this.collapse();
- } else {
- if(this.loaded) $(this.items_area).slideDown();
- else this.show_items();
- this.is_open = 1;
- $fg(this.pointer.label_area, '#000')
- //this.pointer.select(1);
-
- // close existing open
- if(cur_sidebar_item && cur_sidebar_item != this) {
- cur_sidebar_item.collapse();
- }
- cur_sidebar_item = this;
- }
-}
-
-// ====================================================================
-
-SidebarItem.prototype.show_items = function() {
- this.loading = 1;
- var me = this;
-
- $item_set_working(this.pointer.label_area);
- var callback = function(r,rt){
- me.loaded = 1;
- me.loading = 0;
- var smi = null;
- var has_reports = 0;
- var has_tools = 0;
-
- // widget code
- $item_done_working(me.pointer.label_area);
-
- if(r.message.il) {
- me.il = r.message.il;
-
- // forms
- for(var i=0; i<me.il.length;i++){
- if(me.il[i].doc_type == 'Forms') {
- if(in_list(profile.can_read, me.il[i].doc_name)) {
- var smi = new SidebarModuleItem(me, me.il[i]);
-
- menu_item_map['Form'][me.il[i].doc_name] = smi.pointer;
- menu_item_map['List'][me.il[i].doc_name] = smi.pointer;
- }
- }
- if(me.il[i].doc_type=='Reports') has_reports = 1;
- if(in_list(['Single DocType', 'Pages', 'Setup Forms'], me.il[i].doc_type)) has_tools = 1;
- }
- // reports
- if(has_reports) {
- var smi = new SidebarModuleItem(me, {doc_name:'Reports', doc_type:'Reports'});
-
- // add to menu-item mapper
- menu_item_map['Page'][me.det.module_label + ' Reports'] = smi.pointer;
- }
-
- // tools
- if(has_tools) {
- var smi = new SidebarModuleItem(me, {doc_name:'Tools', doc_type:'Tools'});
-
- // add to menu-item mapper
- menu_item_map['Page'][me.det.module_label + ' Tools'] = smi.pointer;
- }
-
- // custom reports
- if(r.message.custom_reports.length) {
- me.il = add_lists(r.message.il, r.message.custom_reports);
- var smi = new SidebarModuleItem(me, {doc_name:'Custom Reports', doc_type:'Custom Reports'});
-
- // add to menu-item mapper
- menu_item_map['Page'][me.det.module_label + ' Custom Reports'] = smi.pointer;
-
- }
-
- }
- $(me.items_area).slideDown();
-
- // high light
- var no = nav_obj.ol[nav_obj.ol.length-1];
- if(no && menu_item_map[decodeURIComponent(no[0])][decodeURIComponent(no[1])])
- pscript.select_sidebar_menu(decodeURIComponent(no[0]), decodeURIComponent(no[1]));
-
- }
-
- $c_obj('Home Control', 'get_module_details', me.det.name, callback);
-}
-
-// ====================================================================
-// Show Reports
-// ====================================================================
-
-SidebarItem.prototype.show_section = function(sec_type) {
- var me = this;
- var label = this.det.module_label + ' ' + sec_type;
- var type_map = {'Reports':'Reports', 'Custom Reports':'Custom Reports', 'Pages':'Tools', 'Single DocType':'Tools', 'Setup Forms':'Tools'}
-
- if(page_body.pages[label]) {
- loadpage(label, null, 1);
- } else {
- // make the reports page
- var page = page_body.add_page(label);
- this.wrapper = $a(page,'div','layout_wrapper');
-
-
- // head
- this.head = new PageHeader(this.wrapper, label);
-
- // body
- this.body1 = $a(this.wrapper, 'div', '', {marginTop:'16px'});
-
- // add a report link
- var add_link = function(det) {
- var div = $a(me.body1, 'div', '', {marginBottom:'6px'});
- var span = $a(div, 'span', 'link_type');
-
- // tag the span
- span.innerHTML = det.display_name; span.det = det;
- if(sec_type=='Reports' || sec_type=='Custom Reports') {
- // Reports
- // -------
- span.onclick = function() { loadreport(this.det.doc_name, this.det.display_name); }
-
- } else {
- // Tools
- // -----
-
- if(det.doc_type=='Pages') {
- // Page
- if(det.click_function) {
- span.onclick = function() { eval(this.det.click_function) }
- span.click_function = det.click_function;
- } else {
- span.onclick = function() { loadpage(this.det.doc_name); }
- }
- } else if(det.doc_type=='Setup Forms') {
- // Doc Browser
- span.onclick = function() { loaddocbrowser(this.det.doc_name); }
- } else {
- // Single
- span.onclick = function() { loaddoc(this.det.doc_name, this.det.doc_name); }
- }
- }
- }
-
- // item list
- for(var i=0; i<me.il.length;i++){
- if(type_map[me.il[i].doc_type] == sec_type) {
- add_link(me.il[i]);
- }
- }
- loadpage(label, null, 1);
- }
-}
-
-
-// ====================================================================
-// Sidebar module item
-// ====================================================================
-
-SidebarModuleItem = function(si, det) {
- this.det = det;
- var me= this;
-
- this.pointer = new MenuPointer(si.items_area, get_doctype_label(det.doc_name));
- $y(si.items_area, {marginLeft:'32px'})
- $y($td(this.pointer.tab, 0, 0), {fontSize:'11px'});
-
- this.pointer.wrapper.onclick = function() {
- if(me.det.doc_type=='Forms')
- loaddocbrowser(det.doc_name);
- else
- si.show_section(me.det.doc_type);
- }
-}
-
-
-// ====================================================================
-// Drag & Drop order selection
-// ====================================================================
-
-pscript.startup_set_module_order = function() {
- var update_order= function(ml) {
- mdict = {};
- for(var i=0; i<ml.length; i++) {
- mdict[ml[i][3][3]] = {'module_seq':ml[i][1], 'is_hidden':(ml[i][2] ? 'No' : 'Yes')}
- }
- $c_obj('Home Control', 'set_module_order', JSON.stringify(mdict), function(r,rt) { pscript.startup_make_sidebar(); } )
- }
-
- var callback = function(r, rt) {
- var ml = [];
- for(var i=0; i<r.message.length; i++) {
- var det = r.message[i];
- ml.push([det[1], det[2], (det[3]!='No' ? 0 : 1), det[0]]);
- }
- new ListSelector('Set Module Sequence', 'Select items and set the order you want them to appear'+
- '<br><b>Note:</b> <i>These changes will apply to all users!</i>', ml, update_order, 1);
- }
- $c_obj('Home Control', 'get_module_order', '', callback)
-
-}
-
-// ====================================================================
-
-pscript.startup_setup_toolbar = function() {
- var menu_tab = page_body.wntoolbar.menu_table_right;
- // Profile
- // ---------
- $td(menu_tab,0,0).innerHTML = '<a style="font-weight: bold; color: #FFF" href="javascript:'+"loadpage('profile-settings')"+'">'+user_fullname+'</a>';
-
- if(pscript.is_erpnext_saas){
- // Help
- // --------------
- //var help_url = login_file + '#!helpdesk'
- $td(menu_tab,0,1).innerHTML = '<a style="font-weight: bold; color: #FFF" href="http://groups.google.com/group/erpnext-user-forum" target="_blank">Forum</a>';
-
- // Manage account
- // --------------
- if(is_system_manager) {
- $td(menu_tab,0,3).innerHTML = '<a style="font-weight: bold; color: #FFF;" href="#!billing">Billing</a>';
- }
- }
- else{
- $dh($td(menu_tab,0,1));
- $dh($td(menu_tab,0,3));
- }
-
- // Live Chat Help
- // --------------
- $td(menu_tab,0,2).innerHTML = '<a style="font-weight: bold; color: #FFF" href="http://www.providesupport.com?messenger=iwebnotes" target="_blank">Chat</a>';
-
- // help
- // ----
- var cell = menu_tab.rows[0].insertCell(3);
- cell.innerHTML = '<a style="font-weight: bold; color: #FFF" href="http://erpnext.blogspot.com/2011/03/erpnext-help.html" target="_blank">Help</a>';
- $y(cell, page_body.wntoolbar.right_table_style);
-
-}
-
-// chart of accounts
-// ====================================================================
-show_chart_browser = function(nm, chart_type){
-
- var call_back = function(){
- if(nm == 'Sales Browser'){
- var sb_obj = new SalesBrowser();
- sb_obj.set_val(chart_type);
- }
- else if(nm == 'Accounts Browser')
- pscript.make_chart(chart_type);
- }
- loadpage(nm,call_back);
-}
-
-
-// Module Page
-// ====================================================================
-
-ModulePage = function(parent, module_name, module_label, help_page, callback) {
- this.parent = parent;
-
- // add to current page
- page_body.cur_page.module_page = this;
-
- this.wrapper = $a(parent,'div');
- this.module_name = module_name;
- this.transactions = [];
- this.page_head = new PageHeader(this.wrapper, module_label);
-
- if(help_page) {
- var btn = this.page_head.add_button('Help', function() { loadpage(this.help_page) }, 1, 'ui-icon-help')
- btn.help_page = help_page;
- }
-
- if(callback) this.callback = function(){ callback(); }
-}
-
-
-// get plural
-// ====================================================================
-
-get_plural = function(str){
- if(str.charAt(str.length-1).toLowerCase() == 'y') return str.substr(0, str.length-1) + 'ies'
- else return str + 's';
-}
-
-// set user fullname
-// ====================================================================
-pscript.set_user_fullname = function(ele,username,get_latest){
-
- var set_it = function(){
- if(ele)
- ele.innerHTML = user_full_nm[username];
- }
-
- if(get_latest){
- $c_obj('Home Control','get_user_fullname',username, function(r,rt){ user_full_nm[username] = r.message; set_it(); });
- }
- else{
- if(user_full_nm[username]){
- set_it();
- }
-
- else
- $c_obj('Home Control','get_user_fullname',username, function(r,rt){ user_full_nm[username] = r.message; set_it(); });
- }
-}
-
-// ====================================================================
-startup_setup();
-
-/* features setup "Dictionary", "Script"
-Dictionary Format
- 'projects': {
- 'Sales Order': {
- 'fields':['project_name'],
- 'sales_order_details':['projected_qty']
- },
- 'Purchase Order': {
- 'fields':['project_name']
- }
- }
-// ====================================================================*/
-pscript.feature_dict = {
- 'projects': {
- 'Bill Of Materials': {'fields':['project_name']},
- 'Delivery Note': {'fields':['project_name']},
- 'Payable Voucher': {'fields':['project_name']},
- 'Production Order': {'fields':['project_name']},
- 'Purchase Order': {'fields':['project_name']},
- 'Purchase Receipt': {'fields':['project_name']},
- 'Receivable Voucher': {'fields':['project_name']},
- 'Sales Order': {'fields':['project_name']},
- 'Stock Entry': {'fields':['project_name']},
- 'Timesheet': {'timesheet_details':['project_name']}
- },
- 'packing_details': {
- 'Delivery Note': {'fields':['packing_details','print_packing_slip'],'delivery_note_details':['no_of_packs','pack_gross_wt','pack_nett_wt','pack_no','pack_unit']},
- 'Sales Order': {'fields':['packing_details']}
- },
- 'discounts': {
- 'Delivery Note': {'delivery_note_details':['adj_rate']},
- 'Quotation': {'quotation_details':['adj_rate']},
- 'Receivable Voucher': {'rv_details':['adj_rate']},
- 'Sales Order': {'sale_order_details':['adj_rate']}
- },
- 'brands': {
- 'Delivery Note': {'delivery_note_details':['brand']},
- 'Enquiry': {'enquiry_details':['brand']},
- 'Indent': {'indent_details':['brand']},
- 'Item': {'fields':['brand']},
- 'Purchase Order': {'po_details':['brand']},
- 'Purchase Receipt': {'purchase_receipt_details':['brand']},
- 'Payable Voucher': {'pv_details':['brand']},
- 'Quotation': {'quotation_details':['brand']},
- 'Receivable Voucher': {'rv_details':['brand']},
- 'Sales BOM': {'fields':['new_item_brand']},
- 'Sales Order': {'sales_order_details':['brand']},
- 'Serial No': {'fields':['brand']}
- },
- 'after_sale_installations': {
- 'Delivery Note': {'fields':['installation_status','per_installed'],'delivery_note_details':['installed_qty']}
- },
- 'item_batch_nos': {
- 'Delivery Note': {'delivery_note_details':['batch_no']},
- 'Item': {'fields':['has_batch_no']},
- 'Purchase Receipt': {'purchase_receipt_details':['batch_no']},
- 'QA Inspection Report': {'fields':['batch_no']},
- 'Sales and Pruchase Return Wizard': {'return_details':['batch_no']},
- 'Receivable Voucher': {'rv_details':['batch_no']},
- 'Stock Entry': {'stock_entry_details':['batch_no']},
- 'Stock Ledger Entry': {'fields':['batch_no']}
- },
- 'item_serial_nos': {
- 'Customer Issue': {'fields':['serial_no']},
- 'Delivery Note': {'delivery_note_details':['serial_no'],'delivery_note_packing_details':['serial_no']},
- 'Installation Note': {'installed_item_details':['serial_no']},
- 'Item': {'fields':['has_serial_no']},
- 'Maintenance Schedule': {'item_maintenance_details':['serial_no'],'maintenance_schedule_details':['serial_no']},
- 'Maintenance Visit': {'maintenance_visit_details':['serial_no']},
- 'Purchase Receipt': {'purchase_receipt_details':['serial_no']},
- 'QA Inspection Report': {'fields':['item_serial_no']},
- 'Sales and Pruchase Return Wizard': {'return_details':['serial_no']},
- 'Receivable Voucher': {'rv_details':['serial_no']},
- 'Stock Entry': {'stock_entry_details':['serial_no']},
- 'Stock Ledger Entry': {'fields':['serial_no']}
- },
- 'item_groups_in_details': {
- 'Delivery Note': {'delivery_note_details':['item_group']},
- 'Enquiry': {'enquiry_details':['item_group']},
- 'Indent': {'indent_details':['item_group']},
- 'Item': {'fields':['item_group']},
- 'Manage Account': {'fields':['default_item_group']},
- 'Purchase Order': {'po_details':['item_group']},
- 'Purchase Receipt': {'purchase_receipt_details':['item_group']},
- 'Purchase Voucher': {'pv_details':['item_group']},
- 'Quotation': {'quotation_details':['item_group']},
- 'Receivable Voucher': {'rv_details':['item_group']},
- 'Sales BOM': {'fields':['serial_no']},
- 'Sales Order': {'sales_order_details':['item_group']},
- 'Serial No': {'fields':['item_group']},
- 'Sales Partner': {'partner_target_details':['item_group']},
- 'Sales Person': {'target_details':['item_group']},
- 'Territory': {'target_details':['item_group']}
- },
- 'page_break': {
- 'Delivery Note': {'delivery_note_details':['page_break'],'delivery_note_packing_details':['page_break']},
- 'Indent': {'indent_details':['page_break']},
- 'Purchase Order': {'po_details':['page_break']},
- 'Purchase Receipt': {'purchase_receipt_details':['page_break']},
- 'Purchase Voucher': {'pv_details':['page_break']},
- 'Quotation': {'quotation_details':['page_break']},
- 'Receivable Voucher': {'rv_details':['page_break']},
- 'Sales Order': {'sales_order_details':['page_break']}
- },
- 'multi_currency': {
- 'Delivery Note': {'fields':['currency','conversion_rate']},
- 'Payable Voucher': {'fields':['currency','conversion_rate']},
- 'POS Setting': {'fields':['currency','conversion_rate']},
- 'Purchase Order': {'fields':['currency','conversion_rate']},
- 'Purchase Receipt': {'fields':['currency','conversion_rate']},
- 'Quotation': {'fields':['currency','conversion_rate']},
- 'Receivable Voucher': {'fields':['currency','conversion_rate']},
- 'Quotation': {'fields':['currency','conversion_rate']},
- 'Item': {'ref_rate_details':['currency']},
- 'Sales BOM': {'fields':['currency']},
- 'Sales Order': {'fields':['currency','conversion_rate']},
- 'Supplier Quotation': {'fields':['currency','conversion_rate']}
- },
- 'exports': {
- 'Delivery Note': {'fields':['currency','conversion_rate','Note','grand_total_export','in_words_export','rounded_total_export'],'delivery_note_details':['base_ref_rate','export_amount','export_rate',]},
- 'POS Setting': {'fields':['currency','conversion_rate']},
- 'Quotation': {'fields':['currency','conversion_rate']},
- 'Receivable Voucher': {'fields':['currency','conversion_rate']},
- 'Quotation': {'fields':['currency','conversion_rate']},
- 'Item': {'ref_rate_details':['currency']},
- 'Sales BOM': {'fields':['currency']},
- 'Sales Order': {'fields':['currency','conversion_rate']},
- 'Supplier Quotation': {'fields':['currency','conversion_rate']}
- },
- 'imports': {
- 'Payable Voucher': {'fields':['currency','conversion_rate']},
- 'Purchase Order': {'fields':['currency','conversion_rate']},
- 'Purchase Receipt': {'fields':['currency','conversion_rate']},
- 'Receivable Voucher': {'fields':['currency','conversion_rate']},
- 'Supplier Quotation': {'fields':['currency','conversion_rate']}
- }
-
-}
-
-$(document).bind('form_refresh', function() {
- for(sys_feat in sys_defaults)
- {
- if(sys_defaults[sys_feat]=='0' && (sys_feat in pscript.feature_dict)) //"Features to hide" exists
- {
- if(cur_frm.doc.doctype in pscript.feature_dict[sys_feat])
- {
- for(fort in pscript.feature_dict[sys_feat][cur_frm.doc.doctype])
- {
- if(fort=='fields')
- hide_field(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort]);
- else
- {
- for(grid_field in pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort])
- if(cur_frm.fields_dict[fort])
- cur_frm.fields_dict[fort].grid.set_column_disp(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort][grid_field], false);
- else
- alert('Grid "'+fort+'" does not exists');
- }
- }
- }
- }
- }
-})
diff --git a/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt b/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt
index ef9f0fc..e1579f9 100644
--- a/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt
+++ b/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt
@@ -14,7 +14,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Project',
- 'idx': 1,
'match_id': 0,
'name': '__common__',
'parent': 'Project-Delivery Note',
@@ -26,13 +25,16 @@
# These values are common for all Field Mapper Detail
{
+ 'checking_operator': '=',
'doctype': 'Field Mapper Detail',
+ 'from_field': 'customer',
'map': 'Yes',
'match_id': 0,
'name': '__common__',
'parent': 'Project-Delivery Note',
'parentfield': 'field_mapper_details',
- 'parenttype': 'DocType Mapper'
+ 'parenttype': 'DocType Mapper',
+ 'to_field': 'customer'
},
# These values are common for all DocType Mapper
@@ -52,67 +54,7 @@
# Field Mapper Detail
{
- 'checking_operator': '=',
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer',
- 'idx': 1,
- 'to_field': 'customer'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_name',
- 'idx': 2,
- 'to_field': 'customer_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
- 'idx': 3,
- 'to_field': 'customer_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 4,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_no',
- 'idx': 5,
- 'to_field': 'contact_no'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'email_id',
- 'idx': 6,
- 'to_field': 'email_id'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 7,
- 'to_field': 'territory'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_group',
- 'idx': 8,
- 'to_field': 'customer_group'
+ 'doctype': 'Field Mapper Detail'
},
# Table Mapper Detail
diff --git a/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt b/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
index ff00655..54e272a 100644
--- a/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
+++ b/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
@@ -6,7 +6,7 @@
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-05-13 12:42:57',
- 'modified_by': 'Administrator',
+ 'modified_by': 'umair@iwebnotes.com',
'owner': 'Administrator'
},
@@ -50,90 +50,24 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'supplier',
- 'idx': 1,
'match_id': 0,
'to_field': 'supplier'
},
# Field Mapper Detail
{
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'supplier_address',
- 'idx': 2,
- 'match_id': 0,
- 'to_field': 'supplier_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'supplier_name',
- 'idx': 4,
- 'match_id': 0,
- 'to_field': 'supplier_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address_display',
- 'idx': 5,
- 'match_id': 0,
- 'to_field': 'address_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_display',
- 'idx': 6,
- 'match_id': 0,
- 'to_field': 'contact_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_mobile',
- 'idx': 7,
- 'match_id': 0,
- 'to_field': 'contact_mobile'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_email',
- 'idx': 8,
- 'match_id': 0,
- 'to_field': 'contact_email'
- },
-
- # Field Mapper Detail
- {
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'company',
- 'idx': 9,
'match_id': 0,
'to_field': 'company'
},
# Field Mapper Detail
{
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'fiscal_year',
- 'idx': 10,
- 'match_id': 0,
- 'to_field': 'fiscal_year'
- },
-
- # Field Mapper Detail
- {
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'currency',
- 'idx': 11,
'match_id': 0,
'to_field': 'currency'
},
@@ -141,44 +75,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'warehouse',
- 'idx': 12,
- 'match_id': 1,
- 'to_field': 'warehouse'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'terms',
- 'idx': 13,
- 'match_id': 0,
- 'to_field': 'terms'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'conversion_factor',
- 'idx': 14,
- 'match_id': 1,
- 'to_field': 'conversion_factor'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'stock_uom',
- 'idx': 15,
- 'match_id': 1,
- 'to_field': 'stock_uom'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 16,
'match_id': 1,
'to_field': 'prevdoc_detail_docname'
},
@@ -187,7 +84,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 17,
'match_id': 1,
'to_field': 'prevdoc_docname'
},
@@ -196,26 +92,15 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
- 'idx': 18,
'match_id': 1,
'to_field': 'prevdoc_doctype'
},
# Field Mapper Detail
{
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'uom',
- 'idx': 19,
- 'match_id': 1,
- 'to_field': 'uom'
- },
-
- # Field Mapper Detail
- {
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'item_code',
- 'idx': 20,
'match_id': 1,
'to_field': 'item_code'
},
@@ -223,26 +108,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'brand',
- 'idx': 21,
- 'match_id': 1,
- 'to_field': 'brand'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 22,
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) ',
- 'idx': 23,
'match_id': 1,
'to_field': 'received_qty'
},
@@ -251,7 +117,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) ',
- 'idx': 24,
'match_id': 1,
'to_field': 'qty'
},
@@ -260,7 +125,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.conversion_factor)',
- 'idx': 25,
'match_id': 1,
'to_field': 'stock_qty'
},
@@ -268,44 +132,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'purchase_rate',
- 'idx': 26,
- 'match_id': 1,
- 'to_field': 'purchase_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 27,
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_group',
- 'idx': 28,
- 'match_id': 1,
- 'to_field': 'item_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'import_rate',
- 'idx': 29,
- 'match_id': 1,
- 'to_field': 'import_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.import_rate)',
- 'idx': 30,
'match_id': 1,
'to_field': 'import_amount'
},
@@ -313,144 +140,16 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'schedule_date',
- 'idx': 31,
- 'match_id': 1,
- 'to_field': 'schedule_date'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.purchase_rate)',
- 'idx': 32,
'match_id': 1,
'to_field': 'amount'
},
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_tax_rate',
- 'idx': 33,
- 'match_id': 1,
- 'to_field': 'item_tax_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'conversion_rate',
- 'idx': 34,
- 'match_id': 0,
- 'to_field': 'conversion_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'category',
- 'idx': 35,
- 'match_id': 2,
- 'to_field': 'category'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'add_deduct_tax',
- 'idx': 36,
- 'match_id': 2,
- 'to_field': 'add_deduct_tax'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge_type',
- 'idx': 37,
- 'match_id': 2,
- 'to_field': 'charge_type'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'row_id',
- 'idx': 38,
- 'match_id': 2,
- 'to_field': 'row_id'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_wise_tax_detail',
- 'idx': 39,
- 'match_id': 2,
- 'to_field': 'item_wise_tax_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 39,
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 40,
- 'match_id': 2,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'account_head',
- 'idx': 41,
- 'match_id': 2,
- 'to_field': 'account_head'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'cost_center',
- 'idx': 42,
- 'match_id': 2,
- 'to_field': 'cost_center'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rate',
- 'idx': 43,
- 'match_id': 2,
- 'to_field': 'rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'project_name',
- 'idx': 44,
- 'match_id': 0,
- 'to_field': 'project_name'
- },
-
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
'from_field': 'po_details',
'from_table': 'PO Detail',
- 'idx': 1,
'match_id': 1,
'reference_doctype_key': 'prevdoc_doctype',
'reference_key': 'prevdoc_detail_docname',
@@ -463,7 +162,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Purchase Order',
- 'idx': 2,
'match_id': 0,
'reference_key': 'prevdoc_docname',
'to_table': 'Purchase Receipt',
@@ -475,7 +173,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'purchase_tax_details',
'from_table': 'Purchase Tax Detail',
- 'idx': 3,
'match_id': 2,
'to_field': 'purchase_tax_details',
'to_table': 'Purchase Tax Detail',
diff --git a/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt b/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt
index f05a93b..6688f2b 100755
--- a/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt
+++ b/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt
@@ -48,134 +48,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'currency',
- 'idx': 1,
- 'match_id': 0,
- 'to_field': 'currency'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'company',
- 'idx': 2,
- 'match_id': 0,
- 'to_field': 'company'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'fiscal_year',
- 'idx': 3,
- 'match_id': 0,
- 'to_field': 'fiscal_year'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer',
- 'idx': 4,
- 'match_id': 0,
- 'to_field': 'customer'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_name',
- 'idx': 5,
- 'match_id': 0,
- 'to_field': 'customer_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'price_list_name',
- 'idx': 6,
- 'match_id': 0,
- 'to_field': 'price_list_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'conversion_rate',
- 'idx': 7,
- 'match_id': 0,
- 'to_field': 'conversion_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge',
- 'idx': 8,
- 'match_id': 0,
- 'to_field': 'charge'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'terms',
- 'idx': 9,
- 'match_id': 0,
- 'to_field': 'terms'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 10,
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 11,
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'brand',
- 'idx': 12,
- 'match_id': 1,
- 'to_field': 'brand'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 13,
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_group',
- 'idx': 14,
- 'match_id': 1,
- 'to_field': 'item_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.delivered_qty)',
- 'idx': 15,
'match_id': 1,
'to_field': 'qty'
},
@@ -183,44 +56,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'base_ref_rate',
- 'idx': 16,
- 'match_id': 1,
- 'to_field': 'base_ref_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'ref_rate',
- 'idx': 17,
- 'match_id': 1,
- 'to_field': 'ref_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'basic_rate',
- 'idx': 18,
- 'match_id': 1,
- 'to_field': 'basic_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'export_rate',
- 'idx': 19,
- 'match_id': 1,
- 'to_field': 'export_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 20,
'match_id': 1,
'to_field': 'prevdoc_docname'
},
@@ -229,7 +65,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
- 'idx': 21,
'match_id': 1,
'to_field': 'prevdoc_doctype'
},
@@ -238,7 +73,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 22,
'match_id': 1,
'to_field': 'prevdoc_detail_docname'
},
@@ -246,17 +80,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'export_rate',
- 'idx': 23,
- 'match_id': 1,
- 'to_field': 'export_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)',
- 'idx': 24,
'match_id': 1,
'to_field': 'amount'
},
@@ -265,7 +89,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)',
- 'idx': 25,
'match_id': 1,
'to_field': 'export_amount'
},
@@ -273,215 +96,15 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'adj_rate',
- 'idx': 26,
- 'match_id': 1,
- 'to_field': 'adj_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_tax_rate',
- 'idx': 27,
- 'match_id': 1,
- 'to_field': 'item_tax_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'warehouse',
- 'idx': 28,
- 'match_id': 1,
- 'to_field': 'warehouse'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge_type',
- 'idx': 29,
- 'match_id': 2,
- 'to_field': 'charge_type'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'row_id',
- 'idx': 30,
- 'match_id': 2,
- 'to_field': 'row_id'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_wise_tax_detail',
- 'idx': 31,
- 'match_id': 2,
- 'to_field': 'item_wise_tax_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 32,
- 'match_id': 2,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'account_head',
- 'idx': 33,
- 'match_id': 2,
- 'to_field': 'account_head'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rate',
- 'idx': 34,
- 'match_id': 2,
- 'to_field': 'rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'tax_amount',
- 'idx': 35,
- 'match_id': 2,
- 'to_field': 'tax_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'total',
- 'idx': 36,
- 'match_id': 2,
- 'to_field': 'total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'sales_person',
- 'idx': 37,
- 'match_id': 3,
- 'to_field': 'sales_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'allocated_percentage',
- 'idx': 38,
- 'match_id': 3,
- 'to_field': 'allocated_percentage'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'allocated_amount',
- 'idx': 39,
- 'match_id': 3,
- 'to_field': 'allocated_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'source',
- 'idx': 40,
- 'match_id': 0,
- 'to_field': 'source'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'campaign',
- 'idx': 41,
- 'match_id': 0,
- 'to_field': 'campaign'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'sales_partner',
- 'idx': 42,
- 'match_id': 0,
- 'to_field': 'sales_partner'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'customer_address',
- 'idx': 43,
- 'match_id': 0,
- 'to_field': 'customer_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
- 'idx': 44,
'match_id': 0,
'to_field': 'delivery_address'
},
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'net_total',
- 'idx': 45,
- 'match_id': 0,
- 'to_field': 'net_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'grand_total',
- 'idx': 46,
- 'match_id': 0,
- 'to_field': 'grand_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 47,
- 'match_id': 0,
- 'to_field': 'territory'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'project_name',
- 'idx': 48,
- 'match_id': 0,
- 'to_field': 'project_name'
- },
-
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
'from_table': 'Receivable Voucher',
- 'idx': 1,
'match_id': 0,
'to_table': 'Delivery Note',
'validation_logic': 'docstatus=1'
@@ -492,7 +115,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'entries',
'from_table': 'RV Detail',
- 'idx': 2,
'match_id': 1,
'to_field': 'delivery_note_details',
'to_table': 'Delivery Note Detail',
@@ -504,7 +126,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'other_charges',
'from_table': 'RV Tax Detail',
- 'idx': 3,
'match_id': 2,
'to_field': 'other_charges',
'to_table': 'RV Tax Detail',
@@ -516,7 +137,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'sales_team',
'from_table': 'Sales Team',
- 'idx': 4,
'match_id': 3,
'to_field': 'sales_team',
'to_table': 'Sales Team',
diff --git a/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt b/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
index dad93dd..f93fadf 100644
--- a/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
+++ b/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
@@ -6,7 +6,7 @@
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-05-16 11:48:19',
- 'modified_by': 'Administrator',
+ 'modified_by': 'umair@iwebnotes.com',
'owner': 'Administrator'
},
@@ -49,7 +49,6 @@
'checking_operator': '>=',
'doctype': 'Field Mapper Detail',
'from_field': 'transaction_date',
- 'idx': 1,
'map': 'No',
'match_id': 0,
'to_field': 'transaction_date'
@@ -58,18 +57,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'price_list_name',
- 'idx': 2,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'price_list_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 3,
'map': 'Yes',
'match_id': 0,
'to_field': 'sales_order_no'
@@ -80,7 +68,6 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'company',
- 'idx': 4,
'map': 'Yes',
'match_id': 0,
'to_field': 'company'
@@ -88,70 +75,9 @@
# Field Mapper Detail
{
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'fiscal_year',
- 'idx': 5,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'fiscal_year'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'po_date',
- 'idx': 6,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'po_date'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'po_no',
- 'idx': 7,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'po_no'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'sales_partner',
- 'idx': 8,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'sales_partner'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'commission_rate',
- 'idx': 9,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'commission_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'total_commission',
- 'idx': 10,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'total_commission'
- },
-
- # Field Mapper Detail
- {
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'currency',
- 'idx': 11,
'map': 'Yes',
'match_id': 0,
'to_field': 'currency'
@@ -160,18 +86,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'conversion_rate',
- 'idx': 12,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'conversion_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'shipping_address_name',
- 'idx': 14,
'map': 'Yes',
'match_id': 0,
'to_field': 'customer_address'
@@ -180,28 +95,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 15,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_name',
- 'idx': 16,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'customer_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'shipping_address',
- 'idx': 17,
'map': 'Yes',
'match_id': 0,
'to_field': 'address_display'
@@ -210,58 +104,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_display',
- 'idx': 18,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'contact_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_mobile',
- 'idx': 19,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'contact_mobile'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_email',
- 'idx': 20,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'contact_email'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_group',
- 'idx': 22,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'customer_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge',
- 'idx': 23,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'charge'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 24,
'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_docname'
@@ -271,7 +114,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
- 'idx': 25,
'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_doctype'
@@ -281,7 +123,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 26,
'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_detail_docname'
@@ -290,18 +131,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'export_rate',
- 'idx': 27,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'export_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)',
- 'idx': 28,
'map': 'Yes',
'match_id': 1,
'to_field': 'export_amount'
@@ -309,90 +139,9 @@
# Field Mapper Detail
{
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 29,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 30,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 31,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_group',
- 'idx': 32,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'item_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'stock_uom',
- 'idx': 33,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'stock_uom'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'base_ref_rate',
- 'idx': 34,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'base_ref_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'ref_rate',
- 'idx': 35,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'ref_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'adj_rate',
- 'idx': 36,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'adj_rate'
- },
-
- # Field Mapper Detail
- {
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'basic_rate',
- 'idx': 37,
'map': 'Yes',
'match_id': 1,
'to_field': 'basic_rate'
@@ -402,7 +151,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.delivered_qty)',
- 'idx': 38,
'map': 'Yes',
'match_id': 1,
'to_field': 'qty'
@@ -412,7 +160,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)',
- 'idx': 39,
'map': 'Yes',
'match_id': 1,
'to_field': 'amount'
@@ -422,7 +169,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'reserved_warehouse',
- 'idx': 40,
'map': 'Yes',
'match_id': 1,
'to_field': 'warehouse'
@@ -431,188 +177,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'item_tax_rate',
- 'idx': 41,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'item_tax_rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'charge_type',
- 'idx': 42,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'charge_type'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'row_id',
- 'idx': 43,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'row_id'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_wise_tax_detail',
- 'idx': 44,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'item_wise_tax_detail'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 45,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'account_head',
- 'idx': 46,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'account_head'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rate',
- 'idx': 47,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'rate'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'tax_amount',
- 'idx': 48,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'tax_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'total',
- 'idx': 49,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'idx',
- 'idx': 50,
- 'map': 'Yes',
- 'match_id': 2,
- 'to_field': 'idx'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'net_total',
- 'idx': 51,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'net_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'other_charges_total',
- 'idx': 52,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'other_charges_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'grand_total',
- 'idx': 53,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'grand_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rounded_total',
- 'idx': 54,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'rounded_total'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'in_words',
- 'idx': 55,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'in_words'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'grand_total_export',
- 'idx': 56,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'grand_total_export'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'rounded_total_export',
- 'idx': 57,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'rounded_total_export'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'in_words_export',
- 'idx': 58,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'in_words_export'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'allocated_amount',
- 'idx': 59,
'map': 'Yes',
'match_id': 0,
'to_field': 'customer_mobile_no'
@@ -620,100 +185,9 @@
# Field Mapper Detail
{
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'allocated_amount',
- 'idx': 60,
- 'map': 'Yes',
- 'match_id': 3,
- 'to_field': 'allocated_amount'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'allocated_percentage',
- 'idx': 60,
- 'map': 'Yes',
- 'match_id': 3,
- 'to_field': 'allocated_percentage'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'sales_person',
- 'idx': 61,
- 'map': 'Yes',
- 'match_id': 3,
- 'to_field': 'sales_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'source',
- 'idx': 62,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'source'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'campaign',
- 'idx': 63,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'campaign'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'brand',
- 'idx': 64,
- 'map': 'Yes',
- 'match_id': 1,
- 'to_field': 'brand'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'terms',
- 'idx': 65,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'terms'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 66,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'territory'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'tc_name',
- 'idx': 66,
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'tc_name'
- },
-
- # Field Mapper Detail
- {
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'project_name',
- 'idx': 67,
'map': 'Yes',
'match_id': 0,
'to_field': 'project_name'
@@ -724,7 +198,6 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
- 'idx': 70,
'map': 'Yes',
'match_id': 0,
'to_field': 'customer'
@@ -735,7 +208,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'sales_team',
'from_table': 'Sales Team',
- 'idx': 1,
'match_id': 3,
'to_field': 'sales_team',
'to_table': 'Sales Team',
@@ -747,7 +219,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'other_charges',
'from_table': 'RV Tax Detail',
- 'idx': 2,
'match_id': 2,
'to_field': 'other_charges',
'to_table': 'RV Tax Detail',
@@ -759,7 +230,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'sales_order_details',
'from_table': 'Sales Order Detail',
- 'idx': 3,
'match_id': 1,
'reference_doctype_key': 'prevdoc_doctype',
'reference_key': 'prevdoc_detail_docname',
@@ -772,7 +242,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Sales Order',
- 'idx': 4,
'match_id': 0,
'reference_key': 'prevdoc_docname',
'to_table': 'Delivery Note',
diff --git a/stock/doctype/bin/bin.py b/stock/doctype/bin/bin.py
index fc51d76..cd2fa28 100644
--- a/stock/doctype/bin/bin.py
+++ b/stock/doctype/bin/bin.py
@@ -61,8 +61,8 @@
sr_count = sql("select count(name) from `tabSerial No` where item_code = '%s' and warehouse = '%s' and status ='In Store' and docstatus != 2" % (self.doc.item_code, self.doc.warehouse))[0][0]
if sr_count != self.doc.actual_qty:
msg = "Actual Qty(%s) in Bin is mismatched with total number(%s) of serial no in store for item: '%s' and warehouse: '%s'" % (self.doc.actual_qty, sr_count, self.doc.item_code, self.doc.warehouse)
- msgprint(msg, raise_exception=1)
sendmail(['developer@iwebnotes.com'], sender='automail@webnotestech.com', subject='Serial No Count vs Bin Actual Qty', parts=[['text/plain', msg]])
+ msgprint(msg, raise_exception=1)
# --------------------------------
# get first stock ledger entry
diff --git a/stock/doctype/serial_no/serial_no.py b/stock/doctype/serial_no/serial_no.py
index cf7fd50..b242edb 100644
--- a/stock/doctype/serial_no/serial_no.py
+++ b/stock/doctype/serial_no/serial_no.py
@@ -59,7 +59,7 @@
# ------------------------
# make stock ledger entry
# ------------------------
- def make_stock_ledger_entry(self, update_stock):
+ def make_stock_ledger_entry(self, qty):
from webnotes.model.code import get_obj
values = [{
'item_code' : self.doc.item_code,
@@ -70,12 +70,12 @@
'voucher_type' : 'Serial No',
'voucher_no' : self.doc.name,
'voucher_detail_no' : '',
- 'actual_qty' : 1,
+ 'actual_qty' : qty,
'stock_uom' : webnotes.conn.get_value('Item', self.doc.item_code, 'stock_uom'),
'incoming_rate' : self.doc.purchase_rate,
'company' : self.doc.company,
'fiscal_year' : self.doc.fiscal_year,
- 'is_cancelled' : update_stock and 'No' or 'Yes',
+ 'is_cancelled' : 'No', # is_cancelled is always 'No' because while deleted it can not find creation entry if it not created directly, voucher no != serial no.
'batch_no' : '',
'serial_no' : self.doc.name
}]
@@ -87,7 +87,7 @@
# ----------
def on_update(self):
if self.doc.localname and self.doc.warehouse and self.doc.status == 'In Store' and not sql("select name from `tabStock Ledger Entry` where serial_no = '%s' and ifnull(is_cancelled, 'No') = 'No'" % (self.doc.name)):
- self.make_stock_ledger_entry(update_stock = 1)
+ self.make_stock_ledger_entry(1)
# ---------
@@ -98,7 +98,7 @@
msgprint("Cannot trash Serial No : %s as it is already Delivered" % (self.doc.name), raise_exception = 1)
else:
webnotes.conn.set(self.doc, 'status', 'Not in Use')
- self.make_stock_ledger_entry(update_stock = 0)
+ self.make_stock_ledger_entry(-1)
def on_cancel(self):
@@ -108,4 +108,4 @@
# on restore
# -----------
def on_restore(self):
- self.make_stock_ledger_entry(update_stock = 1)
+ self.make_stock_ledger_entry(1)
diff --git a/stock/doctype/warehouse/warehouse.py b/stock/doctype/warehouse/warehouse.py
index 51c615c..f3d600d 100644
--- a/stock/doctype/warehouse/warehouse.py
+++ b/stock/doctype/warehouse/warehouse.py
@@ -68,7 +68,7 @@
bl = sql("select name from tabBin where warehouse=%s", self.doc.name)
for b in bl:
bobj = get_obj('Bin',b[0])
- bobj.update_item_valuation()
+ bobj.update_item_valuation(posting_date = '2000-01-01', posting_time = '12:00')
sql("COMMIT")
sql("START TRANSACTION")
diff --git a/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt b/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt
index 5d2e6a1..75244de 100644
--- a/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt
+++ b/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt
@@ -6,7 +6,7 @@
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
'modified': '2011-05-18 13:37:43',
- 'modified_by': 'Administrator',
+ 'modified_by': 'umair@iwebnotes.com',
'owner': 'ashwini@webnotestech.com'
},
@@ -53,7 +53,6 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
- 'idx': 1,
'match_id': 0,
'to_field': 'customer'
},
@@ -61,107 +60,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
- 'idx': 2,
- 'match_id': 0,
- 'to_field': 'customer_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 3,
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_name',
- 'idx': 4,
- 'match_id': 0,
- 'to_field': 'customer_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address_display',
- 'idx': 5,
- 'match_id': 0,
- 'to_field': 'address_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_display',
- 'idx': 6,
- 'match_id': 0,
- 'to_field': 'contact_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_mobile',
- 'idx': 7,
- 'match_id': 0,
- 'to_field': 'contact_mobile'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_email',
- 'idx': 8,
- 'match_id': 0,
- 'to_field': 'contact_email'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 9,
- 'match_id': 0,
- 'to_field': 'territory'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_group',
- 'idx': 10,
- 'match_id': 0,
- 'to_field': 'customer_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'company',
- 'idx': 11,
- 'match_id': 0,
- 'to_field': 'company'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'fiscal_year',
- 'idx': 12,
- 'match_id': 0,
- 'to_field': 'fiscal_year'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 13,
'match_id': 0,
'to_field': 'customer_issue_no'
},
@@ -171,7 +70,6 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'complaint',
- 'idx': 14,
'match_id': 1,
'to_field': 'description'
},
@@ -179,26 +77,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 15,
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 16,
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'doctype',
- 'idx': 17,
'match_id': 1,
'to_field': 'prevdoc_doctype'
},
@@ -207,7 +86,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 18,
'match_id': 1,
'to_field': 'prevdoc_docname'
},
@@ -215,7 +93,6 @@
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
- 'idx': 1,
'match_id': 1,
'reference_doctype_key': 'prevdoc_doctype',
'to_field': 'maintenance_visit_details',
@@ -225,7 +102,6 @@
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
- 'idx': 2,
'match_id': 0,
'to_table': 'Maintenance Visit'
}
diff --git a/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt b/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt
index 9cc6c58..e56c4bd 100644
--- a/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt
+++ b/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt
@@ -6,7 +6,7 @@
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-05-18 11:05:26',
- 'modified_by': 'Administrator',
+ 'modified_by': 'umair@iwebnotes.com',
'owner': 'Administrator'
},
@@ -50,7 +50,6 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
- 'idx': 1,
'match_id': 0,
'to_field': 'customer'
},
@@ -58,98 +57,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
- 'idx': 2,
- 'match_id': 0,
- 'to_field': 'customer_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 3,
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_name',
- 'idx': 4,
- 'match_id': 0,
- 'to_field': 'customer_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address_display',
- 'idx': 5,
- 'match_id': 0,
- 'to_field': 'address_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_display',
- 'idx': 6,
- 'match_id': 0,
- 'to_field': 'contact_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_mobile',
- 'idx': 7,
- 'match_id': 0,
- 'to_field': 'contact_mobile'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_email',
- 'idx': 8,
- 'match_id': 0,
- 'to_field': 'contact_email'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 9,
- 'match_id': 0,
- 'to_field': 'territory'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_group',
- 'idx': 10,
- 'match_id': 0,
- 'to_field': 'customer_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'company',
- 'idx': 11,
- 'match_id': 0,
- 'to_field': 'company'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 12,
'match_id': 0,
'to_field': 'sales_order_no'
},
@@ -159,7 +67,6 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'item_code',
- 'idx': 13,
'match_id': 1,
'to_field': 'item_code'
},
@@ -167,26 +74,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 14,
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 15,
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 16,
'match_id': 1,
'to_field': 'prevdoc_docname'
},
@@ -196,7 +84,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'sales_order_details',
'from_table': 'Sales Order Detail',
- 'idx': 1,
'match_id': 1,
'to_field': 'item_maintenance_detail',
'to_table': 'Item Maintenance Detail',
@@ -207,7 +94,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Sales Order',
- 'idx': 2,
'match_id': 0,
'to_table': 'Maintenance Schedule',
'validation_logic': 'docstatus=1'
diff --git a/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt b/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt
index 32de61a..26a48f8 100644
--- a/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt
+++ b/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt
@@ -6,7 +6,7 @@
'creation': '2010-08-08 17:09:36',
'docstatus': 0,
'modified': '2011-05-18 13:35:55',
- 'modified_by': 'Administrator',
+ 'modified_by': 'umair@iwebnotes.com',
'owner': 'ashwini@webnotestech.com'
},
@@ -51,7 +51,6 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
- 'idx': 1,
'match_id': 0,
'to_field': 'customer'
},
@@ -59,107 +58,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
- 'idx': 2,
- 'match_id': 0,
- 'to_field': 'customer_address'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_person',
- 'idx': 3,
- 'match_id': 0,
- 'to_field': 'contact_person'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_name',
- 'idx': 4,
- 'match_id': 0,
- 'to_field': 'customer_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'address_display',
- 'idx': 5,
- 'match_id': 0,
- 'to_field': 'address_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_display',
- 'idx': 6,
- 'match_id': 0,
- 'to_field': 'contact_display'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_mobile',
- 'idx': 7,
- 'match_id': 0,
- 'to_field': 'contact_mobile'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_email',
- 'idx': 8,
- 'match_id': 0,
- 'to_field': 'contact_email'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'territory',
- 'idx': 9,
- 'match_id': 0,
- 'to_field': 'territory'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_group',
- 'idx': 10,
- 'match_id': 0,
- 'to_field': 'customer_group'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'company',
- 'idx': 11,
- 'match_id': 0,
- 'to_field': 'company'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'fiscal_year',
- 'idx': 12,
- 'match_id': 0,
- 'to_field': 'fiscal_year'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'name',
- 'idx': 13,
'match_id': 0,
'to_field': 'sales_order_no'
},
@@ -167,35 +66,7 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'item_code',
- 'idx': 14,
- 'match_id': 1,
- 'to_field': 'item_code'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'item_name',
- 'idx': 15,
- 'match_id': 1,
- 'to_field': 'item_name'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'description',
- 'idx': 16,
- 'match_id': 1,
- 'to_field': 'description'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
'from_field': 'parent',
- 'idx': 17,
'match_id': 1,
'to_field': 'prevdoc_docname'
},
@@ -204,7 +75,6 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
- 'idx': 18,
'match_id': 1,
'to_field': 'prevdoc_doctype'
},
@@ -214,7 +84,6 @@
'doctype': 'Table Mapper Detail',
'from_field': 'sales_order_details',
'from_table': 'Sales Order Detail',
- 'idx': 1,
'match_id': 1,
'to_field': 'maintenance_visit_details',
'to_table': 'Maintenance Visit Detail'
@@ -224,7 +93,6 @@
{
'doctype': 'Table Mapper Detail',
'from_table': 'Sales Order',
- 'idx': 2,
'match_id': 0,
'to_table': 'Maintenance Visit'
}