synced timestamps
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/doctype/receivable_voucher/receivable_voucher.js b/accounts/doctype/receivable_voucher/receivable_voucher.js
index a25d311..e773a95 100644
--- a/accounts/doctype/receivable_voucher/receivable_voucher.js
+++ b/accounts/doctype/receivable_voucher/receivable_voucher.js
@@ -18,10 +18,10 @@
if(!doc.voucher_date) set_multiple(dt,dn,{voucher_date:get_today()});
if(!doc.due_date) set_multiple(dt,dn,{due_date:get_today()});
if(!doc.posting_date) set_multiple(dt,dn,{posting_date:get_today()});
-
+
//for previously created sales invoice, set required field related to pos
if(doc.is_pos ==1) cur_frm.cscript.is_pos(doc, dt, dn);
-
+
hide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
}
}
@@ -37,10 +37,10 @@
}
);
}
-
+
if(!doc.customer && doc.__islocal) {
// new -- load default taxes
- cur_frm.cscript.load_taxes(doc, cdt, cdn);
+ cur_frm.cscript.load_taxes(doc, cdt, cdn);
}
}
@@ -61,19 +61,19 @@
// Show / Hide button
cur_frm.clear_custom_buttons();
-
- if(doc.docstatus==1) {
+
+ if(doc.docstatus==1) {
cur_frm.add_custom_button('View Ledger', cur_frm.cscript['View Ledger Entry']);
cur_frm.add_custom_button('Send SMS', cur_frm.cscript['Send SMS']);
unhide_field('Repair Outstanding Amt');
-
+
if(doc.is_pos==1 && doc.update_stock!=1)
cur_frm.add_custom_button('Make Delivery', cur_frm.cscript['Make Delivery Note']);
-
+
if(doc.outstanding_amount!=0)
cur_frm.add_custom_button('Make Payment Entry', cur_frm.cscript['Make Bank Voucher']);
}
- else
+ else
hide_field('Repair Outstanding Amt');
cur_frm.cscript.is_opening(doc, dt, dn);
cur_frm.cscript.hide_fields(doc, cdt, cdn);
@@ -117,13 +117,13 @@
var doc = locals[cur_frm.doctype][cur_frm.docname];
get_server_fields('get_debit_to','','',doc, dt, dn, 0);
cur_frm.refresh();
- }
+ }
- if(doc.customer) $c_obj(make_doclist(doc.doctype, doc.name), 'get_default_customer_address', '', callback);
+ if(doc.customer) $c_obj(make_doclist(doc.doctype, doc.name), 'get_default_customer_address', '', callback);
if(doc.customer) unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
}
-cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc,dt,dn) {
+cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc,dt,dn) {
if(doc.customer) get_server_fields('get_customer_address', JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1);
}
@@ -152,15 +152,15 @@
var callback2 = function(r,rt) {
var doc = locals[cur_frm.doctype][cur_frm.docname];
cur_frm.refresh();
- }
-
+ }
+
var callback = function(r,rt) {
- var doc = locals[cur_frm.doctype][cur_frm.docname];
+ var doc = locals[cur_frm.doctype][cur_frm.docname];
if(doc.customer) $c_obj(make_doclist(dt,dn), 'get_default_customer_address', '', callback2);
if(doc.customer) unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
cur_frm.refresh();
}
-
+
if(doc.debit_to && doc.posting_date){
get_server_fields('get_cust_and_due_date','','',doc,dt,dn,1,callback);
}
@@ -187,13 +187,13 @@
//Set debit and credit to zero on adding new row
//----------------------------------------------
cur_frm.fields_dict['entries'].grid.onrowadd = function(doc, cdt, cdn){
-
+
cl = getchildren('RV Detail', doc.name, cur_frm.cscript.fname, doc.doctype);
acc = '';
cc = '';
for(var i = 0; i<cl.length; i++) {
-
+
if (cl[i].idx == 1){
acc = cl[i].income_account;
cc = cl[i].cost_center;
@@ -221,7 +221,7 @@
// Get Items based on SO or DN Selected
cur_frm.cscript['Get Items'] = function(doc, dt, dn) {
- var callback = function(r,rt) {
+ var callback = function(r,rt) {
unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
cur_frm.refresh();
}
@@ -335,10 +335,10 @@
// Delivery Note
// --------------
cur_frm.fields_dict.delivery_note_main.get_query = function(doc) {
- if (doc.customer)
- return 'SELECT DISTINCT `tabDelivery Note`.`name` FROM `tabDelivery Note` WHERE `tabDelivery Note`.company = "' + doc.company + '" and `tabDelivery Note`.`docstatus` = 1 and ifnull(`tabDelivery Note`.per_billed,0) < 100 and `tabDelivery Note`.`customer` = "' + doc.customer + '" and `tabDelivery Note`.%(key)s LIKE "%s" ORDER BY `tabDelivery Note`.`name` DESC LIMIT 50';
+ if (doc.customer)
+ return 'SELECT DISTINCT `tabDelivery Note`.`name` FROM `tabDelivery Note` WHERE `tabDelivery Note`.company = "' + doc.company + '" and `tabDelivery Note`.`docstatus` = 1 and ifnull(`tabDelivery Note`.per_billed,0) < 100 and `tabDelivery Note`.`customer` = "' + doc.customer + '" and `tabDelivery Note`.%(key)s LIKE "%s" ORDER BY `tabDelivery Note`.`name` DESC LIMIT 50';
else
- return 'SELECT DISTINCT `tabDelivery Note`.`name` FROM `tabDelivery Note` WHERE `tabDelivery Note`.company = "' + doc.company + '" and `tabDelivery Note`.`docstatus` = 1 and ifnull(`tabDelivery Note`.per_billed,0) < 100 and `tabDelivery Note`.%(key)s LIKE "%s" ORDER BY `tabDelivery Note`.`name` DESC LIMIT 50';
+ return 'SELECT DISTINCT `tabDelivery Note`.`name` FROM `tabDelivery Note` WHERE `tabDelivery Note`.company = "' + doc.company + '" and `tabDelivery Note`.`docstatus` = 1 and ifnull(`tabDelivery Note`.per_billed,0) < 100 and `tabDelivery Note`.%(key)s LIKE "%s" ORDER BY `tabDelivery Note`.`name` DESC LIMIT 50';
}
@@ -393,18 +393,18 @@
jv.company = doc.company;
jv.remark = repl('Payment received against invoice %(vn)s for %(rem)s', {vn:doc.name, rem:doc.remarks});
jv.fiscal_year = doc.fiscal_year;
-
+
// debit to creditor
var d1 = LocalDB.add_child(jv, 'Journal Voucher Detail', 'entries');
d1.account = doc.debit_to;
d1.credit = doc.outstanding_amount;
d1.against_invoice = doc.name;
-
+
// credit to bank
var d1 = LocalDB.add_child(jv, 'Journal Voucher Detail', 'entries');
d1.debit = doc.outstanding_amount;
-
+
loaddoc('Journal Voucher', jv.name);
}
diff --git a/accounts/search_criteria/general_ledger/general_ledger.py b/accounts/search_criteria/general_ledger/general_ledger.py
index 005038a..6cba6e4 100644
--- a/accounts/search_criteria/general_ledger/general_ledger.py
+++ b/accounts/search_criteria/general_ledger/general_ledger.py
@@ -11,8 +11,8 @@
from_date = filter_values['posting_date']
to_date = filter_values['posting_date1']
-ysd, from_date_year = sql("select year_start_date, name from `tabFiscal Year` where %s between year_start_date and date_sub(date_add(year_start_date,interval 1 year), interval 1 day)",from_date)[0]
-
+from_date_year = sql("select name from `tabFiscal Year` where %s between year_start_date and date_sub(date_add(year_start_date,interval 1 year), interval 1 day)",from_date)[0][0]
+#to_date_year = sql("select name from `tabFiscal Year` where %s between year_start_date and date_sub(date_add(year_start_date,interval 1 year), interval 1 day)",to_date)[0][0]
# define columns
#---------------
@@ -49,13 +49,25 @@
# opening
account = filter_values.get('account')
-if account:
- acc_det = sql("select debit_or_credit, is_pl_account, lft, rgt, group_or_ledger from tabAccount where name = '%s'" % account)
- closing_bal = get_obj('GL Control').get_as_on_balance(account, from_date_year, to_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2]
- if acc_det[0][0] == 'Credit':
- closing_bal = -1*closing_bal
+if not account:
+ msgprint('Select an account to proceed',raise_exception=0,small=1)
+
+
+acc_det = sql("select debit_or_credit, is_pl_account, lft, rgt, group_or_ledger from tabAccount where name = '%s'" % account)
+
+opening_bal = get_obj('GL Control').get_as_on_balance(account, from_date_year, from_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2]
+closing_bal = get_obj('GL Control').get_as_on_balance(account, from_date_year, to_date, acc_det[0][0], acc_det[0][2], acc_det[0][3])[2]
+if acc_det[0][0] == 'Credit':
+ closing_bal = -1*closing_bal
+ opening_bal = -1*opening_bal
out = []
+
+t_row = ['' for i in range(len(colnames))]
+t_row[1] = 'Opening as on '+formatdate(from_date)
+t_row[col_idx['Debit']-1] = opening_bal
+out.append(t_row)
+
count = 0
for r in res:
count +=1
@@ -71,24 +83,24 @@
# Total debit/credit
t_row = ['' for i in range(len(colnames))]
t_row[1] = 'Total'
- t_row[col_idx['Debit']-1] = total_debit
- t_row[col_idx['Credit']-1] = total_credit
+ t_row[col_idx['Debit']-1] = total_debit
+ t_row[col_idx['Credit']-1] = total_credit
out.append(t_row)
-
+
# diffrence (dr-cr)
t_row = ['' for i in range(len(colnames))]
t_row[1] = 'Total(Dr-Cr)'
- t_row[col_idx['Debit']-1] = total_diff
+ t_row[col_idx['Debit']-1] = total_diff
out.append(t_row)
# closing
if account:
t_row = ['' for i in range(len(colnames))]
- t_row[1] = 'Closing Balance on ' + to_date
+ t_row[1] = 'Closing Balance on ' + formatdate(to_date)
t_row[col_idx['Debit']-1] = flt(closing_bal)
out.append(t_row)
-
+
# Print Format
myheader = """<table width = '100%%'><tr><td>"""+l_head+"""</td>
</tr>
@@ -99,5 +111,5 @@
""" % {'acc':account,
'fdt':from_date,
'tdt':to_date}
-
+
page_template = myheader+"<div>%(table)s</div>"
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 bbb62bb..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 16:17:04',
+ 'creation': '2011-08-29 13:45:35',
'docstatus': 0,
- 'modified': '2011-07-27 16:17:04',
+ '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 3c63377..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 16:17:04',
+ 'creation': '2011-08-29 13:45:35',
'docstatus': 0,
- 'modified': '2011-07-27 16:17:04',
+ '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 44500cc..71c9b0e 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-27 16:17:04',
+ 'creation': '2011-08-29 13:45:36',
'docstatus': 0,
- 'modified': '2011-07-27 16:17:04',
+ '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 c64be0a..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 16:17:04',
+ 'creation': '2011-08-29 13:45:36',
'docstatus': 0,
- 'modified': '2011-07-27 16:17:04',
+ '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/home/doctype/company_control/company_control.py b/home/doctype/company_control/company_control.py
index cab8e7c..c789a57 100644
--- a/home/doctype/company_control/company_control.py
+++ b/home/doctype/company_control/company_control.py
@@ -63,10 +63,6 @@
p.fields[k] = arg[k]
p.save()
- def update_profile_image(self, fid, fname):
- sql("update tabProfile set file_list = '%s,%s' where name='%s'" % (fname, fid, session['user']))
-
-
def get_login_url(self):
return session['data']['login_from']
diff --git a/home/page/dashboard/dashboard.js b/home/page/dashboard/dashboard.js
index c5dd361..15e7cf3 100644
--- a/home/page/dashboard/dashboard.js
+++ b/home/page/dashboard/dashboard.js
@@ -10,12 +10,12 @@
pscript.dashboard_settings = {
company: sys_defaults.company,
- start: dateutil.obj_to_str(dateutil.add_days(new Date(), -60)),
+ start: dateutil.obj_to_str(dateutil.add_days(new Date(), -180)),
end: dateutil.obj_to_str(new Date()),
- interval: 7
+ interval: 30
}
- var ph = new PageHeader($('.dashboard .header').get(0), 'Dashboards');
+ var ph = new PageHeader($('.dashboard .header').get(0), 'Dashboard');
var db = new Dashboard();
ph.add_button('Settings', db.show_settings);
@@ -46,17 +46,19 @@
// give an id!
var cell = $td(t,ridx,cidx);
var title = $a(cell, 'div', 'dashboard-title', '', data[i][0].title);
- var parent = $a(cell, 'div', 'dashboard-graph')
+ var parent = $a(cell, 'div', 'dashboard-graph');
+ if(data[i][0].comment);
+ var comment = $a(cell, 'div', 'comment', '', data[i][0].comment)
parent.id = '_dashboard' + ridx + '-' + cidx;
// render graph
- me.render_graph(parent.id, data[i][1]);
+ me.render_graph(parent.id, data[i][1], data[i][0].fillColor);
cidx++;
}
},
- render_graph: function(parent, values) {
+ render_graph: function(parent, values, fillColor) {
var vl = [];
$.each(values, function(i,v) {
vl.push([dateutil.str_to_user(v[0]), v[1]]);
@@ -84,7 +86,8 @@
pad: 1.05,
tickOptions: {formatString: '%d'}
}
- }
+ },
+ seriesColors: [fillColor]
});
},
diff --git a/home/page/dashboard/dashboard.py b/home/page/dashboard/dashboard.py
index 2c76b15..9ead6d6 100644
--- a/home/page/dashboard/dashboard.py
+++ b/home/page/dashboard/dashboard.py
@@ -2,58 +2,63 @@
{
'type': 'account',
'account': 'Income',
- 'title': 'Income'
+ 'title': 'Income',
+ 'fillColor': '#90EE90'
},
{
'type': 'account',
'account': 'Expenses',
- 'title': 'Expenses'
+ 'title': 'Expenses',
+ 'fillColor': '#90EE90'
},
{
- 'type': 'from_company',
- 'account': 'receivables_group',
- 'title': 'Receivables'
+ 'type': 'receivables',
+ 'title': 'Receivables',
+ 'fillColor': '#FFE4B5'
},
{
- 'type': 'from_company',
- 'account': 'payables_group',
- 'title': 'Payables'
+ 'type': 'payables',
+ 'title': 'Payables',
+ 'fillColor': '#FFE4B5'
},
{
- 'type': 'cash',
- 'debit_or_credit': 'Debit',
- 'title': 'Cash Inflow'
+ 'type': 'collection',
+ 'title': 'Collection',
+ 'comment':'This info comes from the accounts your have marked as "Bank or Cash"',
+ 'fillColor': '#DDA0DD'
},
{
- 'type': 'cash',
- 'debit_or_credit': 'Credit',
- 'title': 'Cash Outflow'
+ 'type': 'payments',
+ 'title': 'Payments',
+ 'comment':'This info comes from the accounts your have marked as "Bank or Cash"',
+ 'fillColor': '#DDA0DD'
},
{
'type': 'creation',
'doctype': 'Quotation',
- 'title': 'New Quotations'
+ 'title': 'New Quotations',
+ 'fillColor': '#ADD8E6'
},
{
'type': 'creation',
'doctype': 'Sales Order',
- 'title': 'New Orders'
+ 'title': 'New Orders',
+ 'fillColor': '#ADD8E6'
}
]
-
class DashboardWidget:
def __init__(self, company, start, end, interval):
- import webnotes
from webnotes.utils import getdate
from webnotes.model.code import get_obj
+ import webnotes
self.company = company
self.abbr = webnotes.conn.get_value('Company', company, 'abbr')
@@ -61,17 +66,20 @@
self.end = getdate(end)
self.interval = interval
- self.fiscal_year = webnotes.conn.sql("""
- select name from `tabFiscal Year`
- where year_start_date <= %s and
- DATE_ADD(year_start_date, INTERVAL 1 YEAR) >= %s
- """, (start, start))[0][0]
+
self.glc = get_obj('GL Control')
self.cash_accounts = [d[0] for d in webnotes.conn.sql("""
select name from tabAccount
where account_type='Bank or Cash'
and company = %s and docstatus = 0
""", company)]
+
+ self.receivables_group = webnotes.conn.get_value('Company', company,'receivables_group')
+ self.payables_group = webnotes.conn.get_value('Company', company,'payables_group')
+
+ # list of bank and cash accounts
+ self.bc_list = [s[0] for s in webnotes.conn.sql("select name from tabAccount where account_type='Bank or Cash'")]
+
def timeline(self):
"""
@@ -99,11 +107,12 @@
"""
Generate the dasboard
"""
+ from webnotes.utils import flt
tl = self.timeline()
self.out = []
for i in range(len(tl)-1):
- self.out.append([tl[i+1].strftime('%Y-%m-%d'), self.value(opts, tl[i], tl[i+1]) or 0])
+ self.out.append([tl[i+1].strftime('%Y-%m-%d'), flt(self.value(opts, tl[i], tl[i+1])) or 0])
return self.out
@@ -125,8 +134,19 @@
print acc
raise e
- return self.glc.get_as_on_balance(acc, self.fiscal_year, start, debit_or_credit, lft, rgt)
+ return self.glc.get_as_on_balance(acc, self.get_fiscal_year(start), start, debit_or_credit, lft, rgt)
+ def get_fiscal_year(self, dt):
+ """
+ get fiscal year from date
+ """
+ import webnotes
+ return webnotes.conn.sql("""
+ select name from `tabFiscal Year`
+ where year_start_date <= %s and
+ DATE_ADD(year_start_date, INTERVAL 1 YEAR) >= %s
+ """, (dt, dt))[0][0]
+
def get_creation_trend(self, doctype, start, end):
"""
Get creation # of creations in period
@@ -158,6 +178,26 @@
return debit_or_credit=='Credit' and float(ret[1]-ret[0]) or float(ret[0]-ret[1])
+ def get_bank_amt(self, debit_or_credit, master_type, start, end):
+ """
+ Get collection (reduction in receivables over a period)
+ """
+ import webnotes
+
+ reg = '('+'|'.join(self.bc_list) + ')'
+
+ return webnotes.conn.sql("""
+ select sum(t1.%s)
+ from `tabGL Entry` t1, tabAccount t2
+ where t1.account = t2.name
+ and t2.master_type='%s'
+ and t1.%s > 0
+ and t1.against REGEXP '%s'
+ and ifnull(t1.is_cancelled, 'No')='No'
+ and t1.posting_date between '%s' and '%s'
+ """ % (debit_or_credit, master_type, debit_or_credit, reg, start, end))[0][0]
+
+
def value(self, opts, start, end):
"""
Value of the series on a particular date
@@ -170,17 +210,17 @@
return self.get_account_amt(opts['account'], start, end, debit_or_credit)
- elif opts['type']=='from_company':
- acc = webnotes.conn.get_value('Company', self.company, \
- opts['account'].split('.')[-1])
+ elif opts['type']=='receivables':
+ return self.get_account_balance(self.receivables_group, end)[2]
- return self.get_account_balance(acc, start)[2]
-
- elif opts['type']=='cash':
- if opts['debit_or_credit']=='Credit':
- return sum([self.get_account_amt(acc, start, end, opts['debit_or_credit']) for acc in self.cash_accounts]) or 0
- elif opts['debit_or_credit']=='Debit':
- return sum([self.get_account_amt(acc, start, end, opts['debit_or_credit']) for acc in self.cash_accounts]) or 0
+ elif opts['type']=='payables':
+ return self.get_account_balance(self.payables_group, end)[2]
+
+ elif opts['type']=='collection':
+ return self.get_bank_amt('credit', 'Customer', start, end)
+
+ elif opts['type']=='payments':
+ return self.get_bank_amt('debit', 'Supplier', start, end)
elif opts['type']=='creation':
return self.get_creation_trend(opts['doctype'], start, end)
diff --git a/home/page/event_updates/event_updates.js b/home/page/event_updates/event_updates.js
index 1574f53..9aa3da2 100644
--- a/home/page/event_updates/event_updates.js
+++ b/home/page/event_updates/event_updates.js
@@ -25,12 +25,7 @@
wrapper.banner_area = $a(wrapper.head, 'div');
- wrapper.setup_wizard_area = $a(wrapper.body, 'div', 'setup-wizard')
-
- wrapper.system_message_area = $a(wrapper.body, 'div', '',
- {marginBottom:'16px', padding:'8px', backgroundColor:'#FFD', border:'1px dashed #AA6', display:'none'})
-
-
+ wrapper.setup_wizard_area = $a(wrapper.body, 'div', 'setup-wizard');
}
// ==================================
@@ -436,8 +431,8 @@
// head
$a(this.head,'h1','', {display:'inline'}, 'Home');
- $a(this.head,'span','link_type', {marginLeft:'7px'}, '[?]', function() {
- msgprint('<b>What appears here?</b> This is where you get updates of everything you are allowed to access and generates an update')
+ $a(this.head,'span','link_type', {marginLeft:'7px'}, 'help', function() {
+ msgprint('<b>What appears here?</b> This is where you get updates of everything you are permitted to follow')
})
// refresh
@@ -445,6 +440,11 @@
{cursor:'pointer', marginLeft:'7px', fontSize:'11px'}, 'refresh',
function() { me.run(); }
);
+
+ if(has_common(user_roles, ['System Manager','Accounts Manager'])) {
+ $btn(this.head, 'Dashboard', function() {loadpage('dashboard'); }, {marginLeft:'7px'})
+
+ }
}
FeedList.prototype.run = function() {
@@ -594,14 +594,15 @@
this.render = function(r) {
this.wrapper.innerHTML = '';
- this.span = $a(this.wrapper, 'span', 'home-status-link')
+ this.span = $a(this.wrapper, 'span', 'link_type', {fontWeight:'bold'});
this.span.onclick = function() { loadpage('My Company') }
if(r.unread_messages) {
- this.span.innerHTML = '<span class="home-status-unread">' + r.unread_messages + '</span> unread message' + (cint(r.unread_messages) > 1 ? 's' : '');
+ this.span.innerHTML = '<span class="home-status-unread">' + r.unread_messages + '</span> unread';
} else {
- this.span.innerHTML = 'No unread messages.';
+ this.span.innerHTML = 'Team / Messages';
}
+
}
}
@@ -613,11 +614,7 @@
$c_page('home', 'event_updates', 'get_status_details', user,
function(r,rt) {
home_status_bar.render(r.message);
-
- // system_messages
- if(r.message.system_message)
- pscript.show_system_message(wrapper, r.message.system_message);
-
+
// render online users
pscript.online_users_obj.render(r.message.online_users);
pscript.online_users = r.message.online_users;
@@ -630,24 +627,6 @@
);
}
-// show system message
-// -------------------
-pscript.show_system_message = function(wrapper, msg) {
- $ds(wrapper.system_message_area);
- var txt = $a(wrapper.system_message_area, 'div', '', {lineHeight:'1.6em'});
- txt.innerHTML = msg;
-
- var span = $ln($a(wrapper.system_message_area, 'div', '', {textAlign:'right'}), 'Dismiss'.bold(),
- function(me) {
- me.set_working();
- $c_obj('Home Control', 'dismiss_message', '', function(r,rt) {
- me.done_working();
- $(wrapper.system_message_area).slideUp();
- });
- }, {fontSize:'11px'}
- )
-}
-
// complete my company registration
// --------------------------------
pscript.complete_registration = function()
diff --git a/home/page/event_updates/event_updates.py b/home/page/event_updates/event_updates.py
index 85a121b..1134273 100644
--- a/home/page/event_updates/event_updates.py
+++ b/home/page/event_updates/event_updates.py
@@ -28,18 +28,11 @@
online = get_online_users()
- # system messages
- msg_id = webnotes.conn.get_global('system_message_id')
- msg = ''
-
- if msg_id and msg_id != webnotes.conn.get_global('system_message_id', webnotes.session['user']):
- msg = webnotes.conn.get_global('system_message')
-
+ # system messages
ret = {
'user_count': len(online) or 0,
'unread_messages': get_unread_messages(),
'online_users': online or [],
- 'system_message':msg,
'is_trial': webnotes.conn.get_global('is_trial'),
'days_to_expiry': (webnotes.conn.get_global('days_to_expiry') or '0'),
'setup_status': get_setup_status()
@@ -56,9 +49,20 @@
percent = 20
ret = []
- header = webnotes.conn.get_value('Control Panel', None, 'client_name') or ''
- if header.startswith('<div style="padding:4px; font-size:20px;">'\
- +webnotes.conn.get_value('Control Panel', None, 'company_name')):
+ def is_header_set():
+ header = webnotes.conn.get_value('Control Panel', None, 'client_name') or ''
+
+ if header.startswith('<div style="padding:4px; font-size:20px;">'\
+ +webnotes.conn.get_value('Control Panel', None, 'company_name')):
+ return False
+
+ elif 'Banner Comes Here' in header:
+ return False
+
+ else:
+ return True
+
+ if not is_header_set():
ret.append('<a href="#!Form/Personalize/Personalize">Upload your company banner</a>')
else:
percent += 20
diff --git a/home/page/my_company/my_company.js b/home/page/my_company/my_company.js
index c2a55ea..9da7e9b 100644
--- a/home/page/my_company/my_company.js
+++ b/home/page/my_company/my_company.js
@@ -657,7 +657,7 @@
}
var st = (!det.docstatus ? {fontWeight: 'bold'} : null);
- this.msg = $a(this.comment, 'span', 'social', st, ': ' + det.creation);
+ this.msg = $a(this.comment, 'span', 'social', st, ': ' + det.comment);
if(det.full_name==user) {
$y(this.wrapper, {backgroundColor: '#D9D9F3'});
diff --git a/home/page/profile_settings/profile_settings.js b/home/page/profile_settings/profile_settings.js
index 10b06d4..425626b 100644
--- a/home/page/profile_settings/profile_settings.js
+++ b/home/page/profile_settings/profile_settings.js
@@ -97,7 +97,7 @@
]);
var w = d.widgets['wrapper'];
- me.uploader = new Uploader(w, {thumbnail:'80px', server_obj:'Company Control', method:'update_profile_image'}, pscript.user_image_upload)
+ me.uploader = new Uploader(w, {cmd:'home.page.profile_settings.profile_settings.set_user_image'}, pscript.user_image_upload, 1)
me.change_dialog = d;
}
me.change_dialog.show();
diff --git a/home/page/profile_settings/profile_settings.py b/home/page/profile_settings/profile_settings.py
index 56f7f15..d1e091c 100644
--- a/home/page/profile_settings/profile_settings.py
+++ b/home/page/profile_settings/profile_settings.py
@@ -2,7 +2,6 @@
from webnotes.utils import load_json, cint, nowdate
-
def change_password(arg):
"""
Change password
@@ -21,15 +20,40 @@
webnotes.msgprint('Password Updated');
def get_user_details(arg=None):
- "Returns user first name, last name and bio"
-
+ """
+ Returns user first name, last name and bio
+ """
return webnotes.conn.sql("select first_name, last_name, bio from tabProfile where name=%s", webnotes.user.name, as_dict=1)[0]
def set_user_details(arg=None):
- "updates user details given in argument"
+ """
+ updates user details given in argument
+ """
from webnotes.model.doc import Document
p = Document('Profile', webnotes.user.name)
p.fields.update(load_json(arg))
p.save()
webnotes.msgprint('Updated')
+
+def set_user_image(arg=None):
+ """
+ Set uploaded image as user image
+ """
+ from webnotes.utils.upload_handler import UploadHandler
+
+ uh = UploadHandler()
+ if not uh.file_name:
+ # do nothing - no file found
+ return
+ else:
+ # save the file
+ from webnotes.utils.file_manager import FileAttachments
+
+ fa = FileAttachments('Profile', webnotes.session['user'])
+ fa.delete_all()
+ fa.add(uh.file_name, uh.content)
+ fa.save()
+
+ uh.set_callback('window.parent.upload_callback("%s", "%s")' \
+ % (webnotes.form_dict['uploader_id'], fa.get_fid(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/hr/doctype/salary_manager/test_salary_manager.py b/hr/doctype/salary_manager/test_salary_manager.py
index e3df804..c7d0867 100644
--- a/hr/doctype/salary_manager/test_salary_manager.py
+++ b/hr/doctype/salary_manager/test_salary_manager.py
@@ -5,7 +5,7 @@
from webnotes.model.code import get_obj
sql = webnotes.conn.sql
-class TestSalarySlip(unittest.TestCase):
+class TestSalaryManager(unittest.TestCase):
def setUp(self):
webnotes.conn.begin()
for rec in [des1, dep1, branch1, grade1, comp1, emp1, emp2]:
diff --git a/hr/doctype/salary_slip/salary_slip.py b/hr/doctype/salary_slip/salary_slip.py
index 6a17050..3a42dca 100644
--- a/hr/doctype/salary_slip/salary_slip.py
+++ b/hr/doctype/salary_slip/salary_slip.py
@@ -182,24 +182,24 @@
earn_table = ''
ded_table = ''
if earn_ret:
- earn_table += "<table cellspacing= '5' cellpadding='5' >"
+ earn_table += "<table cellspacing=5px cellpadding=5px width='100%%'>"
for e in earn_ret:
if not e[1]:
- earn_table +='<tr><td>%s</td><td>0.00</td></tr>'%(cstr(e[0]))
+ earn_table +='<tr><td>%s</td><td align="right">0.00</td></tr>'%(cstr(e[0]))
else:
- earn_table +='<tr><td>%s</td><td>%s</td></tr>'%(cstr(e[0]),cstr(e[1]))
+ earn_table +='<tr><td>%s</td><td align="right">%s</td></tr>'%(cstr(e[0]),cstr(e[1]))
earn_table += '</table>'
if ded_ret:
- ded_table += "<table cellspacing= '5' cellpadding='5' >"
+ ded_table += "<table cellspacing=5px cellpadding=5px width='100%%'>"
for d in ded_ret:
if not d[1]:
- ded_table +='<tr><td>%s</td><td>0.00</td></tr>'%(cstr(d[0]))
+ ded_table +='<tr><td">%s</td><td align="right">0.00</td></tr>'%(cstr(d[0]))
else:
- ded_table +='<tr><td>%s</td><td>%s</td></tr>'%(cstr(d[0]),cstr(d[1]))
+ ded_table +='<tr><td>%s</td><td align="right">%s</td></tr>'%(cstr(d[0]),cstr(d[1]))
ded_table += '</table>'
letter_head = sql("select value from `tabSingles` where field = 'letter_head' and doctype = 'Control Panel'")
@@ -210,57 +210,58 @@
msg = '''<div> %s <br>
<table cellspacing= "5" cellpadding="5" width = "100%%">
<tr>
- <td colspan = 4 width = "100%%"><h4>Salary Slip</h4></td>
+ <td width = "100%%" colspan = "2"><h4>Salary Slip</h4></td>
</tr>
<tr>
- <td colspan = 2 width = "50%%"><b>Employee Code : %s</b></td>
- <td colspan = 2 width = "50%%"><b>Employee Name : %s</b></td>
+ <td width = "50%%"><b>Employee Code : %s</b></td>
+ <td width = "50%%"><b>Employee Name : %s</b></td>
</tr>
<tr>
- <td colspan = 2 width = "50%%">Month : %s</td>
- <td colspan = 2 width = "50%%">Fiscal Year : %s</td>
- </tr>
- </table>
- <table cellspacing= "5" cellpadding="5" >
- <tr>
- <td>Department : %s</td>
- <td>Branch : %s</td>
- <td colspan = 2>Designation : %s</td>
+ <td width = "50%%">Month : %s</td>
+ <td width = "50%%">Fiscal Year : %s</td>
</tr>
<tr>
- <td>Grade : %s</td>
- <td>Bank Account No. : %s</td>
- <td colspan = 2>Bank Name : %s</td>
+ <td width = "50%%">Department : %s</td>
+ <td width = "50%%">Branch : %s</td>
+ </tr>
+ <tr>
+ <td width = "50%%">Designation : %s</td>
+ <td width = "50%%">Grade : %s</td>
+ </tr>
+ <tr>
+ <td width = "50%%">Bank Account No. : %s</td>
+ <td width = "50%%">Bank Name : %s</td>
</tr>
<tr>
- <td colspan = 2>Arrear Amount : <b>%s</b></td>
- <td colspan = 2>Payment days : %s</td>
+ <td width = "50%%">Arrear Amount : <b>%s</b></td>
+ <td width = "50%%">Payment days : %s</td>
</tr>
</table>
- <table border="1px solid #CCC" width="100%%" cellpadding="0" cellspacing= "0" >
+ <table border="1px solid #CCC" width="100%%" cellpadding="0px" cellspacing="0px">
<tr>
- <td colspan = 2 width = "50%%"><b>Earning</b></td>
- <td colspan = 2 width = "50%%"><b>Deduction</b></td>
+ <td colspan = 2 width = "50%%" bgcolor="#CCC" align="center"><b>Earnings</b></td>
+ <td colspan = 2 width = "50%%" bgcolor="#CCC" align="center"><b>Deductions</b></td>
</tr>
<tr>
- <td colspan = 2 width = "50%%">%s</td>
- <td colspan = 2 width = "50%%">%s</td>
+ <td colspan = 2 width = "50%%" valign= "top">%s</td>
+ <td colspan = 2 width = "50%%" valign= "top">%s</td>
</tr>
</table>
- <table cellspacing= "5" cellpadding="5">
+ <table cellspacing= "5" cellpadding="5" width = '100%%'>
<tr>
- <td colspan = 2><b>Gross Pay :</b> %s</td>
- <td colspan = 2><b>Total Deduction :</b> %s</td>
+ <td width = '25%%'><b>Gross Pay :</b> </td><td width = '25%%' align='right'>%s</td>
+ <td width = '25%%'><b>Total Deduction :</b></td><td width = '25%%' align='right'> %s</td>
</tr>
<tr>
- <td><b>Net Pay : %s</b></td>
+ <tdwidth='25%%'><b>Net Pay : </b></td><td width = '25%%' align='right'><b>%s</b></td>
+ <td colspan = '2' width = '50%%'></td>
</tr>
<tr>
- <td><b>Net Pay(in words) : %s</b></td>
+ <td width='25%%'><b>Net Pay(in words) : </td><td colspan = '3' width = '50%%'>%s</b></td>
</tr>
- </table></div>'''%(cstr(letter_head[0][0]),cstr(self.doc.employee), cstr(self.doc.employee_name), cstr(self.doc.month), cstr(self.doc.fiscal_year), cstr(self.doc.department), cstr(self.doc.branch), cstr(self.doc.designation), cstr(self.doc.grade), cstr(self.doc.bank_account_no), cstr(self.doc.bank_name), cstr(self.doc.arrear_amount), cstr(self.doc.payment_days), earn_table, ded_table, cstr(self.doc.gross_pay), cstr(self.doc.total_deduction), cstr(self.doc.net_pay), cstr(self.doc.total_in_words))
+ </table></div>'''%(cstr(letter_head[0][0]),cstr(self.doc.employee), cstr(self.doc.employee_name), cstr(self.doc.month), cstr(self.doc.fiscal_year), cstr(self.doc.department), cstr(self.doc.branch), cstr(self.doc.designation), cstr(self.doc.grade), cstr(self.doc.bank_account_no), cstr(self.doc.bank_name), cstr(self.doc.arrear_amount), cstr(self.doc.payment_days), earn_table, ded_table, cstr(flt(self.doc.gross_pay)), cstr(flt(self.doc.total_deduction)), cstr(flt(self.doc.net_pay)), cstr(self.doc.total_in_words))
sendmail([receiver], sender='automail@erpnext.com', subject=subj, parts=[['text/plain', msg]])
else:
msgprint("Company Email ID not found.")
diff --git a/knowledge_base/doctype/question/question.py b/knowledge_base/doctype/question/question.py
new file mode 100644
index 0000000..5ddee6a
--- /dev/null
+++ b/knowledge_base/doctype/question/question.py
@@ -0,0 +1,8 @@
+class DocType:
+ def __init__(self, d, dl):
+ self.doc, self.doclist = d, dl
+
+ def on_trash(self):
+ import webnotes
+ webnotes.conn.sql("delete from tabAnswer where question=%s", self.doc.name)
+
\ No newline at end of file
diff --git a/knowledge_base/page/kb_common/kb_common.js b/knowledge_base/page/kb_common/kb_common.js
index 1826f05..3e17b6f 100644
--- a/knowledge_base/page/kb_common/kb_common.js
+++ b/knowledge_base/page/kb_common/kb_common.js
@@ -19,12 +19,25 @@
this.line1.innerHTML = repl('By %(name)s | %(when)s', {
name: wn.utils.full_name(this.det.first_name, this.det.last_name),
when: wn.datetime.comment_when(this.det.modified)
- })
+ });
+
+ // allow system manager to delete questions / answers
+ if(has_common(user_roles, ['Administrator', 'System Manager'])) {
+ this.line1.innerHTML += ' | '
+ $ln(this.line1, 'delete', me.del);
+ }
}
this.make_vote = function() {
new KBPoints(this.line2, this.det.points, this.det._users_voted, this.doctype, this.det.name, this.det.owner);
-
+ }
+
+ this.del = function() {
+ this.innerHTML = 'deleting...'; this.disabled = 1;
+ $c_page('knowledge_base', 'questions', 'delete', {dt:me.doctype, dn:me.det.name}, function(r,rt) {
+ // reload the list
+ kb.list.run()
+ });
}
this.make_tags = function() {
diff --git a/knowledge_base/page/question_view/question_view.js b/knowledge_base/page/question_view/question_view.js
index ed11efc..422fb30 100644
--- a/knowledge_base/page/question_view/question_view.js
+++ b/knowledge_base/page/question_view/question_view.js
@@ -128,7 +128,7 @@
as_dict: 1,
no_results_message: 'No answers yet, be the first one to answer!',
render_row: function(body, data) {
- new KBAnswer(body, data)
+ new KBAnswer(body, data, me)
},
get_query: function() {
return repl("SELECT t1.name, t1.owner, t1.answer, t1.points, t1._users_voted, t2.first_name, "
@@ -150,7 +150,7 @@
// answer
// by xxx | on xxx
// points yyy
-KBAnswer = function(body, data) {
+KBAnswer = function(body, data, ans_list) {
body.className = 'qv-answer';
new EditableText({
parent: body,
@@ -169,7 +169,7 @@
det: data,
with_tags: 0,
doctype: 'Answer'
- }, null)
+ }, ans_list)
}
diff --git a/knowledge_base/page/questions/questions.py b/knowledge_base/page/questions/questions.py
index cbb6a25..5f8b209 100644
--- a/knowledge_base/page/questions/questions.py
+++ b/knowledge_base/page/questions/questions.py
@@ -35,3 +35,11 @@
(p, cstr(res[1]) + ',' + webnotes.user.name, args['dn']))
return p
+
+def delete(arg):
+ """
+ delete a question or answer (called from kb toolbar)
+ """
+ args = load_json(arg)
+ from webnotes.model import delete_doc
+ delete_doc(args['dt'], args['dn'])
\ No newline at end of file
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..cf9774b 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -1,7 +1,8 @@
# REMEMBER to update this
# ========================
-last_patch = 346
+last_patch = 355
+
#-------------------------------------------
def execute(patch_no):
@@ -251,10 +252,55 @@
elif patch_no == 344:
sql("delete from `tabDocFormat` where ifnull(format, '') = '' and parent = 'Delivery Note'")
elif patch_no == 345:
+ # rerun 343 (merge confict)
+ reload_doc('stock','doctype','item_customer_detail')
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')
-
-
+ elif patch_no == 350:
+ reload_doc('stock', 'doctype', 'delivery_note_detail')
+ reload_doc('stock', 'doctype', 'item_customer_detail')
+ elif patch_no == 351:
+ reload_doc('home', 'page', 'dashboard')
+ elif patch_no == 352:
+ reload_doc('stock','doctype','delivery_note')
+ reload_doc('stock','doctype','item')
+ reload_doc('selling','doctype','quotation')
+ reload_doc('stock','Print Format','Delivery Note Packing List Wise')
+
+ if not sql("select format from `tabDocFormat` where name = 'Delivery Note Packing List Wise' and parent = 'Delivery Note'"):
+ from webnotes.model.doc import addchild
+ dt_obj = get_obj('DocType', 'Delivery Note', with_children = 1)
+ ch = addchild(dt_obj.doc, 'formats', 'DocFormat', 1)
+ ch.format = 'Delivery Note Packing List Wise'
+ ch.save(1)
+ elif patch_no == 353:
+ reload_doc('hr', 'doctype', 'salary_manager')
+ elif patch_no == 354:
+ reload_doc('setup', 'doctype','feature_setup')
+ reload_doc('stock','doctype','item')
+ sql("update tabDocField set label='Produced Qty',description='Updated after finished goods are transferred to FG Warehouse through Stock Entry' where parent='Production Order' and fieldname='produced_qty'")
+ rs = sql("select fieldname from tabDocField where parent='Features Setup' and fieldname is not null")
+ from webnotes.model.doc import Document
+ m = Document('Features Setup')
+ for d in rs:
+ m.fields[d[0]] = 1
+ m.save()
+ elif patch_no == 355:
+ reload_doc('hr', 'doctype', 'salary_slip')
+ delete_doc('DocType', 'Salary Control Panel')
+
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/production/doctype/production_order/production_order.py b/production/doctype/production_order/production_order.py
index 570c802..0cc64e5 100644
--- a/production/doctype/production_order/production_order.py
+++ b/production/doctype/production_order/production_order.py
@@ -13,7 +13,7 @@
get_value = webnotes.conn.get_value
in_transaction = webnotes.conn.in_transaction
convert_to_lists = webnotes.conn.convert_to_lists
-
+
# -----------------------------------------------------------------------------------------
@@ -21,7 +21,7 @@
def __init__(self, doc, doclist=[]):
self.doc = doc
self.doclist = doclist
-
+
# Autoname
def autoname(self):
p = self.doc.fiscal_year
@@ -35,7 +35,7 @@
'default_bom' : item and item[0]['default_bom'] or ''
}
return ret
-
+
def validate(self):
if not self.doc.production_item :
msgprint("Please enter Production Item")
@@ -62,7 +62,7 @@
if flt(bom_detail[0]['docstatus']) != 1:
msgprint("BOM := '%s' is not Submitted BOM." % self.doc.bom_no)
raise Exception
-
+
def update_status(self, status):
# Set Status
if status == 'Stopped':
@@ -78,7 +78,7 @@
# Update Planned Qty of Production Item
qty = (flt(self.doc.qty) - flt(self.doc.produced_qty)) * ((status == 'Stopped') and -1 or 1)
get_obj('Warehouse', self.doc.fg_warehouse).update_bin(0, 0, 0, 0, flt(qty), self.doc.production_item, now())
-
+
# Acknowledge user
msgprint(self.doc.doctype + ": " + self.doc.name + " has been %s and status has been updated as %s." % (cstr(status), cstr(self.doc.status)))
@@ -99,6 +99,6 @@
# Set Status AS "Submitted"
set(self.doc,'status', 'Cancelled')
-
+
# decrease Planned Qty of Prooduction Item by Qty
get_obj('Warehouse', self.doc.fg_warehouse).update_bin(0, 0, 0, 0,-flt(self.doc.qty), self.doc.production_item, now())
diff --git a/production/doctype/production_order/production_order.txt b/production/doctype/production_order/production_order.txt
index c927edf..9226fd0 100644
--- a/production/doctype/production_order/production_order.txt
+++ b/production/doctype/production_order/production_order.txt
@@ -5,13 +5,14 @@
{
'creation': '2010-08-08 17:09:14',
'docstatus': 0,
- 'modified': '2010-12-23 11:08:12',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-08-31 10:03:21',
+ 'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
+ '_last_update': '1313485457',
'colour': 'White:FFF',
'doctype': 'DocType',
'in_create': 0,
@@ -20,7 +21,7 @@
'section_style': 'Tabbed',
'server_code_error': ' ',
'show_in_menu': 0,
- 'version': 179
+ 'version': 180
},
# These values are common for all DocField
@@ -54,7 +55,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 1,
'permlevel': 0,
'role': 'System Manager',
'submit': 1,
@@ -64,7 +64,6 @@
# DocPerm
{
'doctype': 'DocPerm',
- 'idx': 2,
'permlevel': 1,
'role': 'All'
},
@@ -75,7 +74,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 3,
'permlevel': 0,
'role': 'Production Manager',
'submit': 1,
@@ -88,7 +86,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 4,
'permlevel': 0,
'role': 'Production User',
'submit': 1,
@@ -99,7 +96,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 1,
'label': 'Production Order',
'oldfieldtype': 'Section Break',
'permlevel': 0
@@ -112,7 +108,6 @@
'doctype': 'DocField',
'fieldname': 'transaction_date',
'fieldtype': 'Date',
- 'idx': 2,
'label': 'Transaction Date',
'oldfieldname': 'transaction_date',
'oldfieldtype': 'Date',
@@ -127,7 +122,6 @@
'doctype': 'DocField',
'fieldname': 'posting_date',
'fieldtype': 'Date',
- 'idx': 3,
'label': 'Posting Date',
'oldfieldname': 'posting_date',
'oldfieldtype': 'Date',
@@ -142,7 +136,6 @@
'doctype': 'DocField',
'fieldname': 'production_item',
'fieldtype': 'Link',
- 'idx': 4,
'in_filter': 1,
'label': 'Production Item',
'oldfieldname': 'production_item',
@@ -158,7 +151,6 @@
'doctype': 'DocField',
'fieldname': 'description',
'fieldtype': 'Text',
- 'idx': 5,
'label': 'Description',
'oldfieldname': 'description',
'oldfieldtype': 'Text',
@@ -173,14 +165,12 @@
'doctype': 'DocField',
'fieldname': 'bom_no',
'fieldtype': 'Link',
- 'idx': 7,
'label': 'BOM No',
'oldfieldname': 'bom_no',
'oldfieldtype': 'Link',
'options': 'Bill Of Materials',
'permlevel': 1,
'reqd': 1,
- 'search_index': 0,
'trigger': 'Client'
},
@@ -189,7 +179,6 @@
'doctype': 'DocField',
'fieldname': 'origin',
'fieldtype': 'Select',
- 'idx': 8,
'in_filter': 1,
'label': 'Origin',
'no_copy': 1,
@@ -207,7 +196,6 @@
'doctype': 'DocField',
'fieldname': 'qty',
'fieldtype': 'Currency',
- 'idx': 9,
'label': 'Qty',
'oldfieldname': 'qty',
'oldfieldtype': 'Currency',
@@ -221,7 +209,6 @@
'doctype': 'DocField',
'fieldname': 'project_name',
'fieldtype': 'Link',
- 'idx': 9,
'in_filter': 1,
'label': 'Project Name',
'oldfieldname': 'project_name',
@@ -236,7 +223,6 @@
'doctype': 'DocField',
'fieldname': 'amended_from',
'fieldtype': 'Data',
- 'idx': 10,
'label': 'Amended From',
'oldfieldname': 'amended_from',
'oldfieldtype': 'Data',
@@ -248,7 +234,6 @@
'doctype': 'DocField',
'fieldname': 'amendment_date',
'fieldtype': 'Date',
- 'idx': 11,
'label': 'Amendment Date',
'oldfieldname': 'amendment_date',
'oldfieldtype': 'Date',
@@ -259,7 +244,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 12,
'oldfieldtype': 'Column Break',
'permlevel': 0
},
@@ -269,7 +253,6 @@
'doctype': 'DocField',
'fieldname': 'stock_uom',
'fieldtype': 'Data',
- 'idx': 12,
'label': 'Stock UOM',
'oldfieldname': 'stock_uom',
'oldfieldtype': 'Data',
@@ -281,7 +264,6 @@
'doctype': 'DocField',
'fieldname': 'status',
'fieldtype': 'Select',
- 'idx': 13,
'in_filter': 1,
'label': 'Status',
'no_copy': 1,
@@ -300,15 +282,13 @@
'doctype': 'DocField',
'fieldname': 'fg_warehouse',
'fieldtype': 'Link',
- 'idx': 14,
'in_filter': 1,
'label': 'FG Warehouse',
'oldfieldname': 'fg_warehouse',
'oldfieldtype': 'Link',
'options': 'Warehouse',
'permlevel': 0,
- 'reqd': 1,
- 'search_index': 0
+ 'reqd': 1
},
# DocField
@@ -318,15 +298,13 @@
'doctype': 'DocField',
'fieldname': 'wip_warehouse',
'fieldtype': 'Link',
- 'idx': 15,
'in_filter': 1,
'label': 'WIP Warehouse',
'oldfieldname': 'wip_warehouse',
'oldfieldtype': 'Link',
'options': 'Warehouse',
'permlevel': 0,
- 'reqd': 1,
- 'search_index': 0
+ 'reqd': 1
},
# DocField
@@ -336,7 +314,6 @@
'doctype': 'DocField',
'fieldname': 'consider_sa_items',
'fieldtype': 'Select',
- 'idx': 16,
'in_filter': 1,
'label': 'Consider SA Items',
'oldfieldname': 'consider_sa_items',
@@ -349,11 +326,11 @@
# DocField
{
'colour': 'White:FFF',
+ 'description': 'Updated after finished goods are transferred to FG Warehouse through Stock Entry',
'doctype': 'DocField',
'fieldname': 'produced_qty',
'fieldtype': 'Currency',
- 'idx': 18,
- 'label': 'Produced Qty (Updated after finished goods are transferred to FG Warehouse through Stock Entry)',
+ 'label': 'Produced Qty',
'oldfieldname': 'produced_qty',
'oldfieldtype': 'Currency',
'permlevel': 1
@@ -364,14 +341,12 @@
'doctype': 'DocField',
'fieldname': 'company',
'fieldtype': 'Link',
- 'idx': 19,
'label': 'Company',
'oldfieldname': 'company',
'oldfieldtype': 'Link',
'options': 'Company',
'permlevel': 0,
- 'reqd': 1,
- 'search_index': 0
+ 'reqd': 1
},
# DocField
@@ -379,7 +354,6 @@
'doctype': 'DocField',
'fieldname': 'fiscal_year',
'fieldtype': 'Select',
- 'idx': 20,
'in_filter': 1,
'label': 'Fiscal Year',
'oldfieldname': 'fiscal_year',
@@ -393,7 +367,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 21,
'label': 'Next Steps',
'oldfieldtype': 'Section Break',
'permlevel': 0
@@ -405,7 +378,6 @@
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
- 'idx': 22,
'label': 'Material Transfer',
'oldfieldtype': 'Button',
'permlevel': 0,
@@ -416,7 +388,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 23,
'oldfieldtype': 'Column Break',
'permlevel': 0
},
@@ -427,7 +398,6 @@
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
- 'idx': 24,
'label': 'Backflush',
'oldfieldtype': 'Button',
'permlevel': 0,
@@ -438,7 +408,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 25,
'oldfieldtype': 'Column Break',
'permlevel': 0
},
@@ -449,7 +418,6 @@
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
- 'idx': 26,
'label': 'Stop Production Order',
'oldfieldtype': 'Button',
'permlevel': 0,
@@ -462,7 +430,6 @@
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
- 'idx': 27,
'label': 'Unstop Production Order',
'oldfieldtype': 'Button',
'permlevel': 0,
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/selling/doctype/sales_common/sales_common.py b/selling/doctype/sales_common/sales_common.py
index acdca50..78454ee 100644
--- a/selling/doctype/sales_common/sales_common.py
+++ b/selling/doctype/sales_common/sales_common.py
@@ -576,7 +576,7 @@
"""
Checks if there is overflow condering a relaxation tolerance
"""
-
+
# check if overflow is within tolerance
tolerance = self.get_tolerance_for(item['item_code'])
overflow_percent = ((item[args['compare_field']] - item[args['compare_ref_field']]) / item[args['compare_ref_field']] * 100)
@@ -606,12 +606,14 @@
select item_code, `%(compare_ref_field)s`, `%(compare_field)s`, parenttype, parent from `tab%(target_dt)s`
where `%(compare_ref_field)s` < `%(compare_field)s` and name="%(name)s" and docstatus=1
""" % args, as_dict=1)
-
if item:
item = item[0]
item['idx'] = d.idx
item['compare_ref_field'] = args['compare_ref_field']
- if no_tolerance:
+
+ if not item[args['compare_ref_field']]:
+ msgprint("As %(compare_ref_field)s for item: %(item_code)s in %(parenttype)s: %(parent)s is zero, system will not check over-delivery or over-billed" % item)
+ elif no_tolerance:
item['reduce_by'] = item[args['compare_field']] - item[args['compare_ref_field']]
msgprint("""
Row #%(idx)s: Max %(compare_ref_field)s allowed for <b>Item %(item_code)s</b> against
diff --git a/selling/doctype/sales_order/sales_order.js b/selling/doctype/sales_order/sales_order.js
index 587933c..e684bed 100644
--- a/selling/doctype/sales_order/sales_order.js
+++ b/selling/doctype/sales_order/sales_order.js
@@ -28,7 +28,7 @@
if(doc.quotation) cur_frm.cscript['Pull Quotation Details'](doc,cdt,cdn);
} else {
cur_frm.cscript.load_taxes(doc, cdt, cdn);
- }
+ }
}
// Refresh
@@ -70,7 +70,6 @@
} else {
hide_field(['Repair Sales Order', 'Send SMS', 'message', 'customer_mobile_no'])
}
-
}
//customer
diff --git a/setup/doctype/features_setup/__init__.py b/setup/doctype/features_setup/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/setup/doctype/features_setup/__init__.py
diff --git a/setup/doctype/features_setup/features_setup.py b/setup/doctype/features_setup/features_setup.py
new file mode 100644
index 0000000..3a549d9
--- /dev/null
+++ b/setup/doctype/features_setup/features_setup.py
@@ -0,0 +1,13 @@
+class DocType:
+ def __init__(self, d, dl):
+ self.doc, self.doclist = d, dl
+
+ def validate(self):
+ """
+ update settings in defaults
+ """
+ from webnotes.model import default_fields
+ from webnotes.utils import set_default
+ for key in self.doc.fields:
+ if key not in default_fields:
+ set_default(key, self.doc.fields[key])
diff --git a/setup/doctype/features_setup/features_setup.txt b/setup/doctype/features_setup/features_setup.txt
new file mode 100644
index 0000000..224d175
--- /dev/null
+++ b/setup/doctype/features_setup/features_setup.txt
@@ -0,0 +1,288 @@
+# DocType, Features Setup
+[
+
+ # These values are common in all dictionaries
+ {
+ 'creation': '2011-08-25 16:53:56',
+ 'docstatus': 0,
+ 'modified': '2011-08-31 15:05:53',
+ 'modified_by': 'Administrator',
+ 'owner': 'Administrator'
+ },
+
+ # These values are common for all DocType
+ {
+ '_last_update': '1314783102',
+ 'colour': 'White:FFF',
+ 'doctype': 'DocType',
+ 'issingle': 1,
+ 'module': 'Setup',
+ 'name': '__common__',
+ 'name_case': 'Title Case',
+ 'section_style': 'Simple',
+ 'show_in_menu': 1,
+ 'version': 16
+ },
+
+ # These values are common for all DocField
+ {
+ 'doctype': 'DocField',
+ 'name': '__common__',
+ 'parent': 'Features Setup',
+ 'parentfield': 'fields',
+ 'parenttype': 'DocType',
+ 'permlevel': 0
+ },
+
+ # These values are common for all DocPerm
+ {
+ 'create': 1,
+ 'doctype': 'DocPerm',
+ 'name': '__common__',
+ 'parent': 'Features Setup',
+ 'parentfield': 'permissions',
+ 'parenttype': 'DocType',
+ 'permlevel': 0,
+ 'read': 1,
+ 'write': 1
+ },
+
+ # DocType, Features Setup
+ {
+ 'doctype': 'DocType',
+ 'name': 'Features Setup'
+ },
+
+ # DocPerm
+ {
+ 'doctype': 'DocPerm',
+ 'role': 'System Manager'
+ },
+
+ # DocPerm
+ {
+ 'doctype': 'DocPerm',
+ 'role': 'Administrator'
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
+ 'fieldtype': 'Section Break',
+ 'label': 'Materials'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'To track item in sales and purchase documents based on their serial nos. This is can also used to track warranty details of the product.',
+ 'doctype': 'DocField',
+ 'fieldname': 'item_searial_nos',
+ 'fieldtype': 'Check',
+ 'label': 'Item Serial Nos'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>',
+ 'doctype': 'DocField',
+ 'fieldname': 'item_batch_nos',
+ 'fieldtype': 'Check',
+ 'label': 'Item Batch Nos'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'To track brand name in the following documents<br>\nDelivery Note, Enuiry, Indent, Item, Purchase Order, Purchase Voucher, Purchaser Receipt, Quotation, Receivable Voucher, Sales BOM, Sales Order, Serial No',
+ 'doctype': 'DocField',
+ 'fieldname': 'brands',
+ 'fieldtype': 'Check',
+ 'label': 'Brands'
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
+ 'fieldtype': 'Column Break'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': '1. To maintain the customer wise item code and to make them searchable based on their code use this option',
+ 'doctype': 'DocField',
+ 'fieldname': 'item_advanced',
+ 'fieldtype': 'Check',
+ 'label': 'Item Advanced'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'If Sale BOM is defined, the actual BOM of the Pack is displayed as table.\nAvailable in Delivery Note and Sales Order',
+ 'doctype': 'DocField',
+ 'fieldname': 'packing_details',
+ 'fieldtype': 'Check',
+ 'label': 'Packing Detials'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'To get Item Group in details table',
+ 'doctype': 'DocField',
+ 'fieldname': 'item_group_in_details',
+ 'fieldtype': 'Check',
+ 'label': 'Item Groups in Details'
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
+ 'fieldtype': 'Section Break',
+ 'label': 'Sales and Purchase'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'All export related fields like currency, conversion rate, export total, export grand total etc are available in <br>\nDelivery Note, POS, Quotation, Sales Invoice, Sales Order etc.',
+ 'doctype': 'DocField',
+ 'fieldname': 'exports',
+ 'fieldtype': 'Check',
+ 'label': 'Exports'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'All import related fields like currency, conversion rate, import total, import grand total etc are available in <br>\nPurchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.',
+ 'doctype': 'DocField',
+ 'fieldname': 'imports',
+ 'fieldtype': 'Check',
+ 'label': 'Imports'
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
+ 'fieldtype': 'Column Break'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'Field available in Delivery Note, Quotation, Receivable Voucher, Sales Order',
+ 'doctype': 'DocField',
+ 'fieldname': 'discounts',
+ 'fieldtype': 'Check',
+ 'label': 'Discounts'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'To track any installation or commissioning related work after sales',
+ 'doctype': 'DocField',
+ 'fieldname': 'after_sales_installations',
+ 'fieldtype': 'Check',
+ 'label': 'After Sale Installations'
+ },
+
+ # DocField
+ {
+ 'description': 'Available in \nBill Of Materials, Delivery Note, Payable Voucher, Production Order, Purchase Order, Purchase Receipt, Receivable Voucher, Sales Order, Stock Entry, Timesheet',
+ 'doctype': 'DocField',
+ 'fieldname': 'projects',
+ 'fieldtype': 'Check',
+ 'label': 'Projects'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'If you have Sales Team and Sale Partners (Channel Partners) they can be tagged and maintain their contribution in the sales activity',
+ 'doctype': 'DocField',
+ 'fieldname': 'sales_extras',
+ 'fieldtype': 'Check',
+ 'label': 'Sales Extras'
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
+ 'fieldtype': 'Section Break',
+ 'label': 'Production'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'If you involve in manufacturing activity<br>\nEnables item <b>Is Manufactured</b>',
+ 'doctype': 'DocField',
+ 'fieldname': 'manufacturing',
+ 'fieldtype': 'Check',
+ 'label': 'Manufacturing'
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
+ 'fieldtype': 'Column Break'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'If you follow Quality Inspection<br>\nEnables item QA Required and QA No in Purchase Receipt',
+ 'doctype': 'DocField',
+ 'fieldname': 'quality',
+ 'fieldtype': 'Check',
+ 'label': 'Quality'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'To enable <b>Point of Sale</b> features',
+ 'doctype': 'DocField',
+ 'fieldname': 'pos',
+ 'fieldtype': 'Check',
+ 'label': 'Point of Sale'
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
+ 'fieldtype': 'Section Break',
+ 'label': 'Miscelleneous'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'If you have long print formats, this feature can be used to split the page to be printed on multiple pages with all headers and footers on each page',
+ 'doctype': 'DocField',
+ 'fieldname': 'page_break',
+ 'fieldtype': 'Check',
+ 'label': 'Page Break'
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
+ 'fieldtype': 'Column Break'
+ },
+
+ # DocField
+ {
+ 'colour': 'White:FFF',
+ 'description': 'Enables <b>More Info.</b> in all documents',
+ 'doctype': 'DocField',
+ 'fieldname': 'more_info',
+ 'fieldtype': 'Check',
+ 'label': 'More Info'
+ }
+]
\ No newline at end of file
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/__init__.py b/startup/__init__.py
index 5fd6ccd..bdbde16 100644
--- a/startup/__init__.py
+++ b/startup/__init__.py
@@ -9,6 +9,7 @@
body, span, div, td, input, textarea, button, select {
font-family: Verdana, Arial, Sans Serif;
+ font-size: 12px
}
</style>
diff --git a/startup/startup.js b/startup/startup.js
index 5a2a816..942f4ef 100644
--- a/startup/startup.js
+++ b/startup/startup.js
@@ -12,8 +12,8 @@
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);
@@ -34,7 +34,7 @@
$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();
@@ -49,7 +49,7 @@
login_file = 'http://' + r.message;
}
else if(pscript.is_erpnext_saas) {
- login_file = 'http://www.erpnext.com';
+ login_file = 'https://www.erpnext.com';
}
// setup toolbar
pscript.startup_setup_toolbar();
@@ -65,10 +65,10 @@
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]);
@@ -79,13 +79,13 @@
$(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);
+ $c_obj('Home Control', 'get_modules', '', callback);
}
// ====================================================================
@@ -97,13 +97,13 @@
pscript.select_sidebar_menu = function(t, dt, dn) {
// get menu item
- if(menu_item_map[t][dt]) {
+ 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();
+ cur_menu_pointer.deselect();
}
}
@@ -115,19 +115,19 @@
MenuPointer = function(parent, label) {
- this.wrapper = $a(parent, 'div', '', {padding:'0px', cursor:'pointer', margin:'2px 0px'});
+ 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',
+
+ 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',
+ 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)
@@ -135,7 +135,7 @@
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'});
}
@@ -150,14 +150,14 @@
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'});
+ $y($td(this.tab, 0, 0), {color:'#444', borderBottom:'1px solid #ddd'});
$gr(this.wrapper, body_background, body_background);
this.selected = 0;
}
@@ -176,19 +176,19 @@
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);
+ 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');
@@ -203,14 +203,14 @@
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();
- }
+ }
}
// ====================================================================
@@ -225,7 +225,7 @@
SidebarItem.prototype.toggle = function() {
if(this.loading) return;
-
+
if(this.is_open) {
this.collapse();
} else {
@@ -234,7 +234,7 @@
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();
@@ -248,7 +248,7 @@
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;
@@ -256,10 +256,10 @@
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;
@@ -268,13 +268,13 @@
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;
+ if(in_list(['Single DocType', 'Pages', 'Setup Forms'], me.il[i].doc_type)) has_tools = 1;
}
// reports
if(has_reports) {
@@ -291,7 +291,7 @@
// 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);
@@ -301,7 +301,7 @@
menu_item_map['Page'][me.det.module_label + ' Custom Reports'] = smi.pointer;
}
-
+
}
$(me.items_area).slideDown();
@@ -309,9 +309,9 @@
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);
}
@@ -323,7 +323,7 @@
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 {
@@ -331,10 +331,10 @@
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'});
@@ -342,18 +342,18 @@
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) {
@@ -364,18 +364,18 @@
}
} else if(det.doc_type=='Setup Forms') {
// Doc Browser
- span.onclick = function() { loaddocbrowser(this.det.doc_name); }
+ span.onclick = function() { loaddocbrowser(this.det.doc_name); }
} else {
// Single
- span.onclick = function() { loaddoc(this.det.doc_name, this.det.doc_name); }
+ 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]);
+ add_link(me.il[i]);
}
}
loadpage(label, null, 1);
@@ -390,11 +390,11 @@
SidebarModuleItem = function(si, det) {
this.det = det;
var me= this;
-
- this.pointer = new MenuPointer(si.items_area, get_doctype_label(det.doc_name));
+
+ 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);
@@ -416,10 +416,10 @@
}
$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++) {
+ 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]]);
}
@@ -427,7 +427,7 @@
'<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)
-
+
}
// ====================================================================
@@ -437,7 +437,7 @@
// 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
// --------------
@@ -474,7 +474,7 @@
var call_back = function(){
if(nm == 'Sales Browser'){
var sb_obj = new SalesBrowser();
- sb_obj.set_val(chart_type);
+ sb_obj.set_val(chart_type);
}
else if(nm == 'Accounts Browser')
pscript.make_chart(chart_type);
@@ -501,7 +501,7 @@
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(); }
}
@@ -517,12 +517,12 @@
// 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(); });
}
@@ -530,7 +530,7 @@
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(); });
}
@@ -539,4 +539,182 @@
// ====================================================================
startup_setup();
-$(document).bind('form_refresh', function() { })
\ No newline at end of file
+/* 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': {'entries':['adj_rate']},
+ 'Sales Order': {'sales_order_details':['adj_rate','ref_rate']}
+ },
+ 'brands': {
+ 'Delivery Note': {'delivery_note_details':['brand']},
+ 'Indent': {'indent_details':['brand']},
+ 'Item': {'fields':['brand']},
+ 'Purchase Order': {'po_details':['brand']},
+ 'Payable Voucher': {'entries':['brand']},
+ 'Quotation': {'quotation_details':['brand']},
+ 'Receivable Voucher': {'entries':['brand']},
+ 'Sales BOM': {'fields':['new_item_brand']},
+ 'Sales Order': {'sales_order_details':['brand']},
+ 'Serial No': {'fields':['brand']}
+ },
+ 'after_sales_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': {'entries':['batch_no']},
+ 'Stock Entry': {'mtn_details':['batch_no']},
+ 'Stock Ledger Entry': {'fields':['batch_no']}
+ },
+ 'item_serial_nos': {
+ 'Customer Issue': {'fields':['serial_no']},
+ 'Delivery Note': {'delivery_note_details':['serial_no'],'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': {'entries':['serial_no']},
+ 'Stock Entry': {'mtn_details':['serial_no']},
+ 'Stock Ledger Entry': {'fields':['serial_no']}
+ },
+ 'item_group_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': {'entries':['item_group']},
+ 'Quotation': {'quotation_details':['item_group']},
+ 'Receivable Voucher': {'entries':['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'],'packing_details':['page_break']},
+ 'Indent': {'indent_details':['page_break']},
+ 'Purchase Order': {'po_details':['page_break']},
+ 'Purchase Receipt': {'purchase_receipt_details':['page_break']},
+ 'Purchase Voucher': {'entries':['page_break']},
+ 'Quotation': {'quotation_details':['page_break']},
+ 'Receivable Voucher': {'entries':['page_break']},
+ 'Sales Order': {'sales_order_details':['page_break']}
+ },
+ 'exports': {
+ 'Delivery Note': {'fields':['Note','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'delivery_note_details':['base_ref_rate','export_amount','export_rate']},
+ 'POS Setting': {'fields':['conversion_rate','currency']},
+ 'Quotation': {'fields':['Note HTML','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'quotation_details':['base_ref_rate','export_amount','export_rate']},
+ 'Receivable Voucher': {'fields':['conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'entries':['base_ref_rate','export_amount','export_rate']},
+ 'Item': {'ref_rate_details':['ref_currency']},
+ 'Sales BOM': {'fields':['currency']},
+ 'Sales Order': {'fields':['Note1','OT Notes','conversion_rate','currency','grand_total_export','in_words_export','rounded_total_export'],'sales_order_details':['base_ref_rate','export_amount','export_rate']}
+ },
+ 'imports': {
+ 'Payable Voucher': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'entries':['import_amount','import_rate']},
+ 'Purchase Order': {'fields':['Note HTML','conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'po_details':['import_amount','import_rate']},
+ 'Purchase Receipt': {'fields':['conversion_rate','currency','grand_total_import','in_words_import','net_total_import','other_charges_added_import','other_charges_deducted_import'],'purchase_receipt_details':['import_amount','import_rate']},
+ 'Supplier Quotation': {'fields':['conversion_rate','currency']}
+ },
+ 'item_advanced': {
+ 'Item': {'fields':['item_customer_details']}
+ },
+ 'sales_extras': {
+ 'Address': {'fields':['sales_partner']},
+ 'Contact': {'fields':['sales_partner']},
+ 'Customer': {'fields':['sales_team']},
+ 'Delivery Note': {'fields':['sales_team','Packing List']},
+ 'Item': {'fields':['item_customer_details']},
+ 'Receivable Voucher': {'fields':['sales_team']},
+ 'Sales Order': {'fields':['sales_team','Packing List']}
+ },
+ 'more_info': {
+ 'Customer': {'fields':['More Info']},
+ 'Delivery Note': {'fields':['More Info']},
+ 'Enquiry': {'fields':['More Info']},
+ 'Indent': {'fields':['More Info']},
+ 'Lead': {'fields':['More Info']},
+ 'Payable Voucher': {'fields':['More Info']},
+ 'Purchase Order': {'fields':['More Info']},
+ 'Purchase Receipt': {'fields':['More Info']},
+ 'Quotation': {'fields':['More Info']},
+ 'Receivable Voucher': {'fields':['More Info']},
+ 'Sales Order': {'fields':['More Info']},
+ 'Serial No': {'fields':['More Info']},
+ 'Supplier': {'fields':['More Info']}
+ },
+ 'quality': {
+ 'Item': {'fields':['Item Inspection Criteria','inspection_required']},
+ 'Purchase Receipt': {'purchase_receipt_details':['qa_no']}
+ },
+ 'manufacturing': {
+ 'Item': {'fields':['Manufacturing']}
+ },
+ 'pos': {
+ 'Receivable Voucher': {'fields':['is_pos']}
+ }
+}
+
+$(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 if(cur_frm.fields_dict[fort])
+ {
+ for(grid_field in pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort])
+ cur_frm.fields_dict[fort].grid.set_column_disp(pscript.feature_dict[sys_feat][cur_frm.doc.doctype][fort][grid_field], false);
+ }
+ else
+ msgprint('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..65b8686 100644
--- a/stock/doctype/bin/bin.py
+++ b/stock/doctype/bin/bin.py
@@ -61,8 +61,9 @@
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)
+ if getattr(webnotes.defs,'admin_email_notification',1):
+ sendmail(['developers@iwebnotes.com'], sender='automail@webnotestech.com', subject='Serial No Count vs Bin Actual Qty', parts=[['text/plain', msg]])
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]])
# --------------------------------
# get first stock ledger entry
diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js
index 6dd7377..691e259 100644
--- a/stock/doctype/item/item.js
+++ b/stock/doctype/item/item.js
@@ -110,3 +110,9 @@
cur_frm.cscript.validate = function(doc,cdt,cdn){
cur_frm.cscript.weight_to_validate(doc,cdt,cdn);
}
+
+//===========Fill Default Currency in "Ref Rate Details====================
+cur_frm.fields_dict['ref_rate_details'].grid.onrowadd = function(doc, cdt, cdn){
+ locals[cdt][cdn].ref_currency = sys_defaults.currency;
+ refresh_field('ref_currency',cdn,'ref_rate_details');
+}
\ No newline at end of file
diff --git a/stock/doctype/ref_rate_detail/ref_rate_detail.txt b/stock/doctype/ref_rate_detail/ref_rate_detail.txt
index 1774b08..3f9b5a7 100644
--- a/stock/doctype/ref_rate_detail/ref_rate_detail.txt
+++ b/stock/doctype/ref_rate_detail/ref_rate_detail.txt
@@ -5,8 +5,8 @@
{
'creation': '2010-08-08 17:09:19',
'docstatus': 0,
- 'modified': '2010-09-20 14:06:57',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-08-31 11:36:41',
+ 'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -23,7 +23,7 @@
'section_style': 'Tray',
'server_code_error': ' ',
'show_in_menu': 0,
- 'version': 2
+ 'version': 3
},
# These values are common for all DocField
@@ -34,7 +34,8 @@
'parent': 'Ref Rate Detail',
'parentfield': 'fields',
'parenttype': 'DocType',
- 'permlevel': 0
+ 'permlevel': 0,
+ 'search_index': 1
},
# DocType, Ref Rate Detail
@@ -48,13 +49,12 @@
'doctype': 'DocField',
'fieldname': 'price_list_name',
'fieldtype': 'Select',
- 'idx': 1,
'label': 'Price List Name',
'oldfieldname': 'price_list_name',
'oldfieldtype': 'Select',
'options': 'link:Price List',
'reqd': 1,
- 'search_index': 1
+ 'trigger': 'Client'
},
# DocField
@@ -62,12 +62,10 @@
'doctype': 'DocField',
'fieldname': 'ref_rate',
'fieldtype': 'Currency',
- 'idx': 2,
'label': 'Ref Rate',
'oldfieldname': 'ref_rate',
'oldfieldtype': 'Currency',
- 'reqd': 0,
- 'search_index': 0
+ 'reqd': 0
},
# DocField
@@ -75,12 +73,10 @@
'doctype': 'DocField',
'fieldname': 'ref_currency',
'fieldtype': 'Select',
- 'idx': 3,
'label': 'Currency',
'oldfieldname': 'ref_currency',
'oldfieldtype': 'Select',
'options': 'link:Currency',
- 'reqd': 1,
- 'search_index': 1
+ 'reqd': 1
}
]
\ No newline at end of file
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'
}