fixed conflict in patch
diff --git a/README b/README
index 3796729..5f3ecd6 100644
--- a/README
+++ b/README
@@ -1 +1,3 @@
-erpnext
+For more info, download, install
+
+http://erpnext.org
\ No newline at end of file
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 981e64a..ee94be8 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-08-09 11:14:09',
+ 'modified': '2011-09-13 13:23:44',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -22,8 +22,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'map': 'Yes',
- 'match_id': 1,
'name': '__common__',
'parent': 'Delivery Note-Receivable Voucher',
'parentfield': 'field_mapper_details',
@@ -32,7 +30,7 @@
# These values are common for all DocType Mapper
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'from_doctype': 'Delivery Note',
'module': 'Accounts',
'name': '__common__',
@@ -42,7 +40,7 @@
# DocType Mapper, Delivery Note-Receivable Voucher
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'name': 'Delivery Note-Receivable Voucher'
},
@@ -50,6 +48,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt)) / flt(obj.basic_rate)',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'qty'
},
@@ -57,6 +57,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'delivery_note'
},
@@ -64,6 +66,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'dn_detail'
},
@@ -71,6 +75,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_docname',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'sales_order'
},
@@ -78,6 +84,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_detail_docname',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'so_detail'
},
@@ -85,6 +93,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.amount) - flt(obj.billed_amt)',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'amount'
},
@@ -92,9 +102,29 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt)) * flt(obj.export_rate)/flt(obj.basic_rate)',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'export_amount'
},
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'naming_series',
+ 'map': 'No',
+ 'match_id': 0,
+ 'to_field': 'naming_series'
+ },
+
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'incentives',
+ 'map': 'No',
+ 'match_id': 3,
+ 'to_field': 'incentives'
+ },
+
# Table Mapper Detail
{
'doctype': '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 aa4e787..17b6363 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
@@ -5,8 +5,8 @@
{
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
- 'modified': '2011-05-13 11:26:20',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-09-07 12:10:30',
+ 'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -22,8 +22,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'map': 'Yes',
- 'match_id': 1,
'name': '__common__',
'parent': 'Purchase Order-Payable Voucher',
'parentfield': 'field_mapper_details',
@@ -32,7 +30,7 @@
# These values are common for all DocType Mapper
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'from_doctype': 'Purchase Order',
'module': 'Accounts',
'name': '__common__',
@@ -42,7 +40,7 @@
# DocType Mapper, Purchase Order-Payable Voucher
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'name': 'Purchase Order-Payable Voucher'
},
@@ -50,6 +48,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'qty'
},
@@ -57,6 +57,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'purchase_rate',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'rate'
},
@@ -64,6 +66,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'amount'
},
@@ -71,6 +75,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'import_amount'
},
@@ -78,6 +84,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'purchase_order'
},
@@ -85,9 +93,20 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'po_detail'
},
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'naming_series',
+ 'map': 'No',
+ 'match_id': 0,
+ 'to_field': 'naming_series'
+ },
+
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
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 d363acb..d755954 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
@@ -5,8 +5,8 @@
{
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
- 'modified': '2011-05-13 12:18:34',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-09-07 12:09:55',
+ 'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -22,8 +22,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'map': 'Yes',
- 'match_id': 1,
'name': '__common__',
'parent': 'Purchase Receipt-Payable Voucher',
'parentfield': 'field_mapper_details',
@@ -32,7 +30,7 @@
# These values are common for all DocType Mapper
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'from_doctype': 'Purchase Receipt',
'module': 'Accounts',
'name': '__common__',
@@ -42,7 +40,7 @@
# DocType Mapper, Purchase Receipt-Payable Voucher
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'name': 'Purchase Receipt-Payable Voucher'
},
@@ -50,6 +48,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.billed_qty)',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'qty'
},
@@ -57,6 +57,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'purchase_rate',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'rate'
},
@@ -64,6 +66,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.purchase_rate)',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'amount'
},
@@ -71,6 +75,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.billed_qty)) * flt(obj.import_rate)',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'import_amount'
},
@@ -78,6 +84,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'purchase_receipt'
},
@@ -85,6 +93,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_docname',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'purchase_order'
},
@@ -92,6 +102,8 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'pr_detail'
},
@@ -99,9 +111,20 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'prevdoc_detail_docname',
+ 'map': 'Yes',
+ 'match_id': 1,
'to_field': 'po_detail'
},
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'naming_series',
+ 'map': 'No',
+ 'match_id': 0,
+ 'to_field': 'naming_series'
+ },
+
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
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 78431f5..97b1cb2 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-08-31 16:53:11',
+ 'modified': '2011-09-13 13:23:04',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -22,7 +22,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'map': 'Yes',
'name': '__common__',
'parent': 'Sales Order-Receivable Voucher',
'parentfield': 'field_mapper_details',
@@ -50,6 +49,7 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'customer',
+ 'map': 'Yes',
'match_id': 0,
'to_field': 'customer'
},
@@ -58,6 +58,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt))/flt(obj.basic_rate)',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'qty'
},
@@ -66,6 +67,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'sales_order'
},
@@ -74,6 +76,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'so_detail'
},
@@ -82,6 +85,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval:flt(obj.amount) - flt(obj.billed_amt)',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'amount'
},
@@ -90,6 +94,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt))* flt(obj.export_rate)/flt(obj.basic_rate)',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'export_amount'
},
@@ -99,6 +104,7 @@
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'project_name',
+ 'map': 'Yes',
'match_id': 0,
'to_field': 'project_name'
},
@@ -107,10 +113,29 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'reserved_warehouse',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'warehouse'
},
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'naming_series',
+ 'map': 'No',
+ 'match_id': 0,
+ 'to_field': 'naming_series'
+ },
+
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'incentives',
+ 'map': 'No',
+ 'match_id': 3,
+ 'to_field': 'incentives'
+ },
+
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
diff --git a/accounts/Module Def/Accounts/Accounts.txt b/accounts/Module Def/Accounts/Accounts.txt
index 512b460..50a7ac9 100644
--- a/accounts/Module Def/Accounts/Accounts.txt
+++ b/accounts/Module Def/Accounts/Accounts.txt
@@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
- 'creation': '2010-09-25 10:50:34',
+ 'creation': '2010-09-25 10:50:37',
'docstatus': 0,
- 'modified': '2011-07-28 12:01:10',
+ 'modified': '2011-09-12 13:22:15',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -31,7 +31,7 @@
# These values are common for all Module Def
{
'disabled': 'No',
- 'doctype': 'Module Def',
+ 'doctype': u'Module Def',
'doctype_list': 'GL Mapper, Journal Voucher\nGL Mapper, Payable Voucher\nGL Mapper, Receivable Voucher\nDocType Label, Receivable Voucher\nDocType Label, Payable Voucher',
'file_list': 'finance.gif,FileData/00210',
'is_hidden': 'No',
@@ -40,13 +40,13 @@
'module_icon': 'Accounts.gif',
'module_label': 'Accounts',
'module_name': 'Accounts',
- 'module_seq': 3,
+ 'module_seq': 5,
'name': '__common__'
},
# Module Def, Accounts
{
- 'doctype': 'Module Def',
+ 'doctype': u'Module Def',
'name': 'Accounts'
},
@@ -57,8 +57,7 @@
'display_name': 'Chart of Accounts',
'doc_name': 'Accounts Browser',
'doc_type': 'Pages',
- 'doctype': 'Module Def Item',
- 'idx': 1
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -68,8 +67,7 @@
'display_name': 'Chart of Cost Centers',
'doc_name': 'Accounts Browser',
'doc_type': 'Pages',
- 'doctype': 'Module Def Item',
- 'idx': 2
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -79,8 +77,7 @@
'doc_name': 'Journal Voucher',
'doc_type': 'Forms',
'doctype': 'Module Def Item',
- 'fields': 'voucher_type\nvoucher_date\nfiscal_year\ntotal_debit\ntotal_credit',
- 'idx': 3
+ 'fields': 'voucher_type\nvoucher_date\nfiscal_year\ntotal_debit\ntotal_credit'
},
# Module Def Item
@@ -90,8 +87,7 @@
'doc_name': 'Receivable Voucher',
'doc_type': 'Forms',
'doctype': 'Module Def Item',
- 'fields': 'voucher_date\ndue_date\ndebit_to\ngrand_total\noutstanding_amount',
- 'idx': 4
+ 'fields': 'voucher_date\ndue_date\ndebit_to\ngrand_total\noutstanding_amount'
},
# Module Def Item
@@ -101,8 +97,7 @@
'doc_name': 'Payable Voucher',
'doc_type': 'Forms',
'doctype': 'Module Def Item',
- 'fields': 'voucher_date\ncredit_to\nbill_no\ngrand_total\noutstanding_amount',
- 'idx': 5
+ 'fields': 'voucher_date\ncredit_to\nbill_no\ngrand_total\noutstanding_amount'
},
# Module Def Item
@@ -111,8 +106,7 @@
'display_name': 'Lease Agreement',
'doc_name': 'Lease Agreement',
'doc_type': 'Forms',
- 'doctype': 'Module Def Item',
- 'idx': 6
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -122,8 +116,7 @@
'doc_name': 'Financial Statements',
'doc_type': 'Pages',
'doctype': 'Module Def Item',
- 'icon': 'table.gif',
- 'idx': 7
+ 'icon': 'table.gif'
},
# Module Def Item
@@ -132,8 +125,7 @@
'display_name': 'Bank Reconciliation',
'doc_name': 'Bank Reconciliation',
'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item',
- 'idx': 8
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -141,8 +133,7 @@
'display_name': 'TDS Payment',
'doc_name': 'TDS Payment',
'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item',
- 'idx': 9
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -150,8 +141,7 @@
'display_name': 'TDS Return Acknowledgement',
'doc_name': 'TDS Return Acknowledgement',
'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item',
- 'idx': 10
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -159,8 +149,7 @@
'display_name': 'Form 16A',
'doc_name': 'Form 16A',
'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item',
- 'idx': 11
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -169,8 +158,7 @@
'display_name': 'Period Closing Voucher',
'doc_name': 'Period Closing Voucher',
'doc_type': 'Setup Forms',
- 'doctype': 'Module Def Item',
- 'idx': 12
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -179,8 +167,7 @@
'display_name': 'Ledger Balance Export',
'doc_name': 'Ledger Balance Export',
'doc_type': 'Single DocType',
- 'doctype': 'Module Def Item',
- 'idx': 13
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -188,8 +175,7 @@
'display_name': 'General Ledger',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 14
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -197,8 +183,7 @@
'display_name': 'Accounts Receivable',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 15
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -206,8 +191,7 @@
'display_name': 'Accounts Payable',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 16
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -215,8 +199,7 @@
'display_name': 'Bank Reconciliation Statement',
'doc_name': 'Journal Voucher Detail',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 17
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -224,8 +207,7 @@
'display_name': 'Trial Balance',
'doc_name': 'Account',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 18
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -233,8 +215,7 @@
'display_name': 'Sales Register',
'doc_name': 'Receivable Voucher',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 19
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -242,8 +223,7 @@
'display_name': 'Purchase Register',
'doc_name': 'Payable Voucher',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 20
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -251,8 +231,7 @@
'display_name': 'Bank Clearance report',
'doc_name': 'Journal Voucher Detail',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 21
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -260,8 +239,7 @@
'display_name': 'Monthly Ledger Summary Report',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 22
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -269,8 +247,7 @@
'display_name': 'Collection Report',
'doc_name': 'Journal Voucher Detail',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 23
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -278,8 +255,7 @@
'display_name': 'Total amout collection for a period - Customerwise',
'doc_name': 'Account',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 24
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -287,8 +263,7 @@
'display_name': 'Payment Report',
'doc_name': 'Journal Voucher Detail',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 25
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -296,8 +271,7 @@
'display_name': 'Itemwise Sales Register',
'doc_name': 'RV Detail',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 26
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -305,8 +279,7 @@
'display_name': 'Itemwise Purchase Register',
'doc_name': 'PV Detail',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 27
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -314,8 +287,7 @@
'display_name': 'Cost Center wise Expense',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 28
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -323,8 +295,7 @@
'display_name': 'TDS Return',
'doc_name': 'TDS Payment Detail',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 29
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -332,8 +303,7 @@
'display_name': 'Budget Variance Report',
'doc_name': 'Budget Detail',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 30
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -341,8 +311,7 @@
'display_name': 'Payment Receipt Report',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 31
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -351,8 +320,7 @@
'display_name': 'Business Associate Commission Report',
'doc_name': 'Receivable Voucher',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 32
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -360,8 +328,7 @@
'display_name': 'Lease Agreement List',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 33
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -369,8 +336,7 @@
'display_name': 'Lease Monthly Future Installment Inflows',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 34
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -378,8 +344,7 @@
'display_name': 'Lease Overdue Age Wise',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 35
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -387,8 +352,7 @@
'display_name': 'Lease Overdue List',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 36
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -396,17 +360,7 @@
'display_name': 'Lease Receipts Client Wise',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 37
- },
-
- # Module Def Item
- {
- 'display_name': 'Lease Receipt Summary Month Wise',
- 'doc_name': 'GL Entry',
- 'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 38
+ 'doctype': 'Module Def Item'
},
# Module Def Item
@@ -414,28 +368,26 @@
'display_name': 'Lease Yearly Future Installment Inflows',
'doc_name': 'GL Entry',
'doc_type': 'Reports',
- 'doctype': 'Module Def Item',
- 'idx': 39
+ 'doctype': 'Module Def Item'
+ },
+
+ # Module Def Item
+ {
+ 'display_name': 'Voucher wise tax details',
+ 'doc_name': 'RV Tax Detail',
+ 'doc_type': 'Reports',
+ 'doctype': 'Module Def Item'
},
# Module Def Role
{
'doctype': 'Module Def Role',
- 'idx': 1,
'role': 'Accounts Manager'
},
# Module Def Role
{
'doctype': 'Module Def Role',
- 'idx': 2,
'role': 'Accounts User'
- },
-
- # Module Def Role
- {
- 'doctype': 'Module Def Role',
- 'idx': 3,
- 'role': 'Administrator'
}
]
\ No newline at end of file
diff --git a/accounts/search_criteria/voucher_wise_tax_details/__init__.py b/accounts/search_criteria/voucher_wise_tax_details/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/accounts/search_criteria/voucher_wise_tax_details/__init__.py
diff --git a/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.js b/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.js
new file mode 100644
index 0000000..a89fa86
--- /dev/null
+++ b/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.js
@@ -0,0 +1,47 @@
+report.customize_filters = function() {
+ this.hide_all_filters();
+
+ //Add filter
+ this.add_filter({fieldname:'based_on', label:'Based On', fieldtype:'Select', options:'Sales Order'+NEWLINE+'Delivery Note'+NEWLINE+'Sales Invoice', report_default:'Sales Invoice', ignore : 1,parent:'RV Tax Detail', single_select :1, in_first_page:1});
+
+ this.add_filter({fieldname:'posting_date', label:'Date', fieldtype:'Date', options:'', ignore : 1,parent:'RV Tax Detail', in_first_page:1});
+
+ this.add_filter({fieldname:'voucher_id', label:'Voucher Id', fieldtype:'Data', options:'', ignore : 1,parent:'RV Tax Detail', in_first_page:1});
+
+ this.add_filter({fieldname:'tax_account', label:'Tax Account', fieldtype:'Link', options:'Account', ignore : 1,parent:'RV Tax Detail', in_first_page:1});
+}
+
+
+// hide sections
+//--------------------------------------
+this.mytabs.items['More Filters'].hide();
+this.mytabs.items['Select Columns'].hide();
+
+// Get query
+//--------------------------------------
+report.get_query = function() {
+ based_on = this.get_filter('RV Tax Detail', 'Based On').get_value();
+ from_date = this.get_filter('RV Tax Detail', 'From Date').get_value();
+ to_date = this.get_filter('RV Tax Detail', 'To Date').get_value();
+ vid = this.get_filter('RV Tax Detail', 'Voucher Id').get_value();
+ acc = this.get_filter('RV Tax Detail', 'Tax Account').get_value();
+
+ date_fld = 'transaction_date';
+ if(based_on == 'Sales Invoice') {
+ based_on = 'Receivable Voucher';
+ date_fld = 'voucher_date';
+ }
+
+ sp_cond = '';
+ if (from_date) sp_cond += repl(' AND t1.%(dt)s >= "%(from_date)s"', {dt:date_fld, from_date:from_date});
+ if (to_date) sp_cond += repl(' AND t1.%(dt)s <= "%(to_date)s"', {dt:date_fld, to_date:to_date});
+ if (vid) sp_cond += repl(' AND t1.name LIKE "%%(voucher)s%"', {voucher:vid});
+ if (acc) sp_cond += repl(' AND t2.account_head = "%(acc)s"', {acc:acc});
+
+ return repl('SELECT t1.`name`, t1.`%(dt)s`, t1.`customer_name`, t1.net_total, t2.account_head, t2.description, t2.rate, t2.tax_amount \
+ FROM `tab%(parent)s` t1, `tabRV Tax Detail` t2 \
+ WHERE t1.docstatus=1 AND t2.`parenttype` = "%(parent)s" \
+ AND t2.`parent` = t1.`name` \
+ %(cond)s ORDER BY t1.`name` DESC, t1.%(dt)s DESC', {parent:based_on, cond:sp_cond, dt:date_fld});
+}
+
diff --git a/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.py b/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.py
new file mode 100644
index 0000000..91e90f2
--- /dev/null
+++ b/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.py
@@ -0,0 +1,22 @@
+if filter_values.get('based_on') == 'Sales Invoice':
+ based_on_dt = 'Receivable Voucher'
+else:
+ based_on_dt = filter_values.get('based_on')
+
+cols = [
+ [filter_values.get('based_on'), 'Link','150px', based_on_dt],
+ ['Transaction Date', 'Date', '120px', ''],
+ ['Customer', 'Link','150px','Customer'],
+ ['Net Total', 'Currency', '80px', ''],
+ ['Tax Account', 'Link','150px','Account'],
+ ['Description', 'Text','120px',''],
+ ['Tax Rate', 'Currency', '80px', ''],
+ ['Tax Amount', 'Currency', '80px', '']
+]
+
+for c in cols:
+ colnames.append(c[0])
+ coltypes.append(c[1])
+ colwidths.append(c[2])
+ coloptions.append(c[3])
+ col_idx[c[0]] = len(colnames)-1
diff --git a/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.txt b/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.txt
new file mode 100644
index 0000000..c152c79
--- /dev/null
+++ b/accounts/search_criteria/voucher_wise_tax_details/voucher_wise_tax_details.txt
@@ -0,0 +1,34 @@
+# Search Criteria, voucher_wise_tax_details
+[
+
+ # These values are common in all dictionaries
+ {
+ 'creation': '2011-09-06 15:36:58',
+ 'docstatus': 0,
+ 'modified': '2011-09-06 15:50:28',
+ 'modified_by': 'Administrator',
+ 'owner': 'Administrator'
+ },
+
+ # These values are common for all Search Criteria
+ {
+ 'columns': 'RV Tax Detail\x01Type,RV Tax Detail\x01Account Head,RV Tax Detail\x01Cost Center,RV Tax Detail\x01Description,RV Tax Detail\x01Rate,RV Tax Detail\x01Amount*,RV Tax Detail\x01Total*',
+ 'criteria_name': 'Voucher wise tax details',
+ 'doc_type': 'RV Tax Detail',
+ 'doctype': 'Search Criteria',
+ 'filters': "{'Delivery Note\x01Submitted':1,'Delivery Note\x01Status':'','Delivery Note\x01Fiscal Year':''}",
+ 'module': 'Accounts',
+ 'name': '__common__',
+ 'page_len': 50,
+ 'parent_doc_type': 'Delivery Note',
+ 'sort_by': '`tabRV Tax Detail`.`parent`',
+ 'sort_order': 'DESC',
+ 'standard': 'Yes'
+ },
+
+ # Search Criteria, voucher_wise_tax_details
+ {
+ 'doctype': 'Search Criteria',
+ 'name': 'voucher_wise_tax_details'
+ }
+]
\ No newline at end of file
diff --git a/patches/patch.py b/patches/patch.py
index 88f4b53..f419204 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -1,7 +1,7 @@
# REMEMBER to update this
# ========================
-last_patch = 360
+last_patch = 362
#-------------------------------------------
@@ -317,3 +317,7 @@
delete_doc('DocType', 'Salary Control Panel')
elif patch_no == 360:
sql("delete from `tabDocField` where (fieldname in ('client_string', 'server_code_error', 'server_code_compiled', 'server_code', 'server_code_core', 'client_script', 'client_script_core', 'dt_template', 'change_log') or label = 'Template') and parent = 'DocType'")
+ elif patch_no == 361:
+ sql("update `tabModule Def Item` set doc_name = 'GL Entry' where display_name in ('Lease Agreement List', 'Lease Monthly Future Installment Inflows', 'Lease Overdue Age Wise', 'Lease Overdue List', 'Lease Receipts Client Wise', 'Lease Receipt Summary Month Wise', 'Lease Yearly Future Installment Inflows') and parent = 'Accounts'")
+ elif patch_no == 362:
+ sql("update `tabDocField` set no_copy = 1 where fieldname in ('amended_from', 'amendment_date', 'file_list', 'naming_series', 'status')")
diff --git a/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt b/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
index 4db092d..807a057 100644
--- a/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
+++ b/selling/DocType Mapper/Enquiry-Quotation/Enquiry-Quotation.txt
@@ -5,8 +5,8 @@
{
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
- 'modified': '2011-05-10 16:04:40',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-09-07 12:12:30',
+ 'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -23,7 +23,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'map': 'Yes',
'name': '__common__',
'parent': 'Enquiry-Quotation',
'parentfield': 'field_mapper_details',
@@ -32,7 +31,7 @@
# These values are common for all DocType Mapper
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'from_doctype': 'Enquiry',
'module': 'Selling',
'name': '__common__',
@@ -42,7 +41,7 @@
# DocType Mapper, Enquiry-Quotation
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'name': 'Enquiry-Quotation'
},
@@ -50,6 +49,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'uom',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'stock_uom'
},
@@ -58,6 +58,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
+ 'map': 'Yes',
'match_id': 0,
'to_field': 'enq_no'
},
@@ -66,6 +67,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_docname'
},
@@ -74,6 +76,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_doctype'
},
@@ -82,6 +85,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'enquiry_from',
+ 'map': 'Yes',
'match_id': 0,
'to_field': 'quotation_to'
},
@@ -90,10 +94,38 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'enquiry_type',
+ 'map': 'Yes',
'match_id': 0,
'to_field': 'order_type'
},
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'transaction_date',
+ 'map': 'No',
+ 'match_id': 0,
+ 'to_field': 'transaction_date'
+ },
+
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'status',
+ 'map': 'No',
+ 'match_id': 0,
+ 'to_field': 'status'
+ },
+
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'naming_series',
+ 'map': 'No',
+ 'match_id': 0,
+ 'to_field': 'naming_series'
+ },
+
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
diff --git a/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt b/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
index 2b7a15a..19a9f8a 100644
--- a/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
+++ b/selling/DocType Mapper/Lead-Customer/Lead-Customer.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
- 'modified': '2010-10-14 13:39:44',
+ 'modified': '2011-09-07 12:11:39',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -36,7 +36,7 @@
# These values are common for all DocType Mapper
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'from_doctype': 'Lead',
'module': 'Selling',
'name': '__common__',
@@ -45,7 +45,7 @@
# DocType Mapper, Lead-Customer
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'name': 'Lead-Customer'
},
@@ -63,20 +63,6 @@
'to_field': 'customer_name'
},
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'contact_no',
- 'to_field': 'phone_1'
- },
-
- # Field Mapper Detail
- {
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'fax',
- 'to_field': 'fax_1'
- },
-
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail'
diff --git a/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt b/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
index 4b32723..742215b 100644
--- a/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
+++ b/selling/DocType Mapper/Lead-Enquiry/Lead-Enquiry.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:34',
'docstatus': 0,
- 'modified': '2010-08-05 20:21:54',
+ 'modified': '2011-09-07 12:11:00',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -26,7 +26,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'map': 'Yes',
'match_id': 0,
'name': '__common__',
'parent': 'Lead-Enquiry',
@@ -36,7 +35,7 @@
# These values are common for all DocType Mapper
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'from_doctype': 'Lead',
'module': 'Selling',
'name': '__common__',
@@ -45,7 +44,7 @@
# DocType Mapper, Lead-Enquiry
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'name': 'Lead-Enquiry'
},
@@ -53,6 +52,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'campaign_name',
+ 'map': 'Yes',
'to_field': 'campaign'
},
@@ -60,6 +60,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'doctype',
+ 'map': 'Yes',
'to_field': 'enquiry_from'
},
@@ -67,9 +68,18 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
+ 'map': 'Yes',
'to_field': 'lead'
},
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'status',
+ 'map': 'No',
+ 'to_field': 'status'
+ },
+
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail'
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 4d493a6..5a529dd 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-08-25 18:25:02',
+ 'modified': '2011-09-07 12:08:48',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -30,7 +30,7 @@
# These values are common for all DocType Mapper
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'from_doctype': 'Quotation',
'module': 'Selling',
'name': '__common__',
@@ -40,7 +40,7 @@
# DocType Mapper, Quotation-Sales Order
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'name': 'Quotation-Sales Order'
},
@@ -110,6 +110,15 @@
'to_field': 'naming_series'
},
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'status',
+ 'map': 'No',
+ 'match_id': 0,
+ 'to_field': 'status'
+ },
+
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',
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 6688f2b..3fd88db 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
@@ -5,7 +5,7 @@
{
'creation': '2010-12-15 08:39:22',
'docstatus': 0,
- 'modified': '2010-12-14 20:43:41',
+ 'modified': '2011-09-07 12:08:19',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -22,7 +22,6 @@
# These values are common for all Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'map': 'Yes',
'name': '__common__',
'parent': 'Receivable Voucher-Delivery Note',
'parentfield': 'field_mapper_details',
@@ -31,7 +30,7 @@
# These values are common for all DocType Mapper
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'from_doctype': 'Receivable Voucher',
'module': 'Stock',
'name': '__common__',
@@ -41,7 +40,7 @@
# DocType Mapper, Receivable Voucher-Delivery Note
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'name': 'Receivable Voucher-Delivery Note'
},
@@ -49,6 +48,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.delivered_qty)',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'qty'
},
@@ -57,6 +57,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_docname'
},
@@ -65,6 +66,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'parenttype',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_doctype'
},
@@ -73,6 +75,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'name',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'prevdoc_detail_docname'
},
@@ -81,6 +84,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'amount'
},
@@ -89,6 +93,7 @@
{
'doctype': 'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)',
+ 'map': 'Yes',
'match_id': 1,
'to_field': 'export_amount'
},
@@ -96,9 +101,10 @@
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
- 'from_field': 'customer_address',
+ 'from_field': 'naming_series',
+ 'map': 'No',
'match_id': 0,
- 'to_field': 'delivery_address'
+ 'to_field': 'naming_series'
},
# Table Mapper Detail
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 f93fadf..9b08913 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
@@ -5,8 +5,8 @@
{
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
- 'modified': '2011-05-16 11:48:19',
- 'modified_by': 'umair@iwebnotes.com',
+ 'modified': '2011-09-13 13:23:26',
+ 'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -30,7 +30,7 @@
# These values are common for all DocType Mapper
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'from_doctype': 'Sales Order',
'module': 'Stock',
'name': '__common__',
@@ -40,7 +40,7 @@
# DocType Mapper, Sales Order-Delivery Note
{
- 'doctype': 'DocType Mapper',
+ 'doctype': u'DocType Mapper',
'name': 'Sales Order-Delivery Note'
},
@@ -176,15 +176,6 @@
# Field Mapper Detail
{
- 'doctype': 'Field Mapper Detail',
- 'from_field': 'allocated_amount',
- 'map': 'Yes',
- 'match_id': 0,
- 'to_field': 'customer_mobile_no'
- },
-
- # Field Mapper Detail
- {
'checking_operator': '=',
'doctype': 'Field Mapper Detail',
'from_field': 'project_name',
@@ -203,6 +194,33 @@
'to_field': 'customer'
},
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'naming_series',
+ 'map': 'No',
+ 'match_id': 0,
+ 'to_field': 'naming_series'
+ },
+
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'status',
+ 'map': 'No',
+ 'match_id': 0,
+ 'to_field': 'status'
+ },
+
+ # Field Mapper Detail
+ {
+ 'doctype': 'Field Mapper Detail',
+ 'from_field': 'incentives',
+ 'map': 'No',
+ 'match_id': 3,
+ 'to_field': 'incentives'
+ },
+
# Table Mapper Detail
{
'doctype': 'Table Mapper Detail',