From 53ba83158c59c5dee019d96858f8e52a77da397d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 15 Sep 2011 15:06:23 +0530 Subject: [PATCH 1/2] fixes to startup --- .../Delivery Note-Receivable Voucher.txt | 13 ++++++++++++- .../Project-Receivable Voucher.txt | 4 ++-- .../Purchase Order-Payable Voucher.txt | 13 ++++++++++++- .../Purchase Receipt-Payable Voucher.txt | 2 +- .../Sales Order-Receivable Voucher.txt | 13 ++++++++++++- .../Indent-Purchase Order.txt | 2 +- .../KRA Template-Appraisal.txt | 4 ++-- .../Salary Structure-Salary Slip.txt | 6 +++--- .../Production Forecast-Production Plan.txt | 2 +- ...tion Forecast-Production Planning Tool.txt | 2 +- .../Sales Order-Production Plan.txt | 2 +- .../Delivery Note-Installation Note.txt | 2 +- .../Project-Sales Order.txt | 4 ++-- .../Project-Delivery Note.txt | 4 ++-- .../Purchase Order-Purchase Receipt.txt | 2 +- .../Receivable Voucher-Delivery Note.txt | 13 +++++++++++-- .../Customer Issue-Maintenance Visit.txt | 4 ++-- .../Sales Order-Maintenance Schedule.txt | 4 ++-- .../Sales Order-Maintenance Visit.txt | 4 ++-- index.html | 2 +- js/app.js | 8 +------- versions-master.db | Bin 404480 -> 461824 bytes 22 files changed, 73 insertions(+), 37 deletions(-) diff --git a/erpnext/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt b/erpnext/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt index 40cdad38f22..9ed756f0235 100644 --- a/erpnext/accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt +++ b/erpnext/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-09-13 17:35:54', + 'modified': '2011-09-15 15:04:42', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -143,6 +143,17 @@ 'validation_logic': 'docstatus=1' }, + # Table Mapper Detail + { + 'doctype': 'Table Mapper Detail', + 'from_field': 'delivery_note_details', + 'from_table': 'Delivery Note Detail', + 'match_id': 1, + 'to_field': 'entries', + 'to_table': 'RV Detail', + 'validation_logic': 'amount > ifnull(billed_amt, 0) and docstatus = 1' + }, + # Table Mapper Detail { 'doctype': 'Table Mapper Detail', diff --git a/erpnext/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt b/erpnext/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt index 0854802f0d8..e88f45250fd 100644 --- a/erpnext/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt +++ b/erpnext/accounts/DocType Mapper/Project-Receivable Voucher/Project-Receivable Voucher.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-09-01 15:48:10', + 'creation': '2010-09-01 15:47:59', 'docstatus': 0, - 'modified': '2010-09-01 14:24:38', + 'modified': '2011-09-15 15:04:43', 'modified_by': 'Administrator', 'owner': 'ashwini@webnotestech.com' }, diff --git a/erpnext/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt b/erpnext/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt index 61ee9b6d649..19491102743 100644 --- a/erpnext/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt +++ b/erpnext/accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:35', 'docstatus': 0, - 'modified': '2011-09-13 17:37:09', + 'modified': '2011-09-15 15:04:43', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -116,6 +116,17 @@ 'validation_logic': 'docstatus =1' }, + # Table Mapper Detail + { + 'doctype': 'Table Mapper Detail', + 'from_field': 'po_details', + 'from_table': 'PO Detail', + 'match_id': 1, + 'to_field': 'entries', + 'to_table': 'PV Detail', + 'validation_logic': 'ifnull(billed_qty,0) < qty' + }, + # Table Mapper Detail { 'doctype': 'Table Mapper Detail', diff --git a/erpnext/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt b/erpnext/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt index b2baa57c62b..94408e7a2b3 100644 --- a/erpnext/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt +++ b/erpnext/accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:35', 'docstatus': 0, - 'modified': '2011-09-13 17:27:32', + 'modified': '2011-09-15 15:04:44', 'modified_by': 'Administrator', 'owner': 'Administrator' }, diff --git a/erpnext/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt b/erpnext/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt index ebbdbcd0b57..630fb1502ab 100644 --- a/erpnext/accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt +++ b/erpnext/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-09-13 17:36:31', + 'modified': '2011-09-15 15:04:45', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -145,6 +145,17 @@ 'validation_logic': 'docstatus=1' }, + # Table Mapper Detail + { + 'doctype': 'Table Mapper Detail', + 'from_field': 'sales_order_detail', + 'from_table': 'Sales Order Detail', + 'match_id': 1, + 'to_field': 'entries', + 'to_table': 'RV Detail', + 'validation_logic': 'docstatus = 1' + }, + # Table Mapper Detail { 'doctype': 'Table Mapper Detail', diff --git a/erpnext/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt b/erpnext/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt index 30412182fd3..fe49f4901e8 100644 --- a/erpnext/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt +++ b/erpnext/buying/DocType Mapper/Indent-Purchase Order/Indent-Purchase Order.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:34', 'docstatus': 0, - 'modified': '2009-12-30 16:55:33', + 'modified': '2011-09-15 15:04:42', 'modified_by': 'Administrator', 'owner': 'Administrator' }, diff --git a/erpnext/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt b/erpnext/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt index b3081bfb52d..aed40029e23 100644 --- a/erpnext/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt +++ b/erpnext/hr/DocType Mapper/KRA Template-Appraisal/KRA Template-Appraisal.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-09-01 15:48:10', + 'creation': '2010-09-01 15:47:59', 'docstatus': 0, - 'modified': '2010-09-01 14:25:40', + 'modified': '2011-09-15 15:04:42', 'modified_by': 'Administrator', 'owner': 'ashwini@webnotestech.com' }, diff --git a/erpnext/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt b/erpnext/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt index 03318a1c2d3..0a365d10aa6 100644 --- a/erpnext/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt +++ b/erpnext/hr/DocType Mapper/Salary Structure-Salary Slip/Salary Structure-Salary Slip.txt @@ -3,10 +3,10 @@ # These values are common in all dictionaries { - 'creation': '2010-12-14 10:23:25', + 'creation': '2010-12-14 10:33:11', 'docstatus': 0, - 'modified': '2011-02-12 18:31:40', - 'modified_by': 'umair@iwebnotes.com', + 'modified': '2011-09-15 15:04:44', + 'modified_by': 'Administrator', 'owner': 'harshada@webnotestech.com' }, diff --git a/erpnext/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt b/erpnext/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt index dfbef85dfcc..7065fa6ecc5 100644 --- a/erpnext/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt +++ b/erpnext/production/DocType Mapper/Production Forecast-Production Plan/Production Forecast-Production Plan.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:35', 'docstatus': 0, - 'modified': '2010-01-27 16:03:20', + 'modified': '2011-09-15 15:04:42', 'modified_by': 'Administrator', 'owner': 'Administrator' }, diff --git a/erpnext/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt b/erpnext/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt index 6125d981922..3d6281195d5 100644 --- a/erpnext/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt +++ b/erpnext/production/DocType Mapper/Production Forecast-Production Planning Tool/Production Forecast-Production Planning Tool.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:35', 'docstatus': 0, - 'modified': '2010-02-12 12:41:03', + 'modified': '2011-09-15 15:04:43', 'modified_by': 'Administrator', 'owner': 'jai@webnotestech.com' }, diff --git a/erpnext/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt b/erpnext/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt index 41c517376f5..780b841208d 100644 --- a/erpnext/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt +++ b/erpnext/production/DocType Mapper/Sales Order-Production Plan/Sales Order-Production Plan.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:36', 'docstatus': 0, - 'modified': '2009-12-21 13:16:59', + 'modified': '2011-09-15 15:04:45', 'modified_by': 'Administrator', 'owner': 'Administrator' }, diff --git a/erpnext/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt b/erpnext/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt index e45c48767d4..da8762deab6 100644 --- a/erpnext/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt +++ b/erpnext/selling/DocType Mapper/Delivery Note-Installation Note/Delivery Note-Installation Note.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:34', 'docstatus': 0, - 'modified': '2011-09-13 17:28:37', + 'modified': '2011-09-15 15:04:42', 'modified_by': 'Administrator', 'owner': 'Administrator' }, diff --git a/erpnext/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt b/erpnext/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt index 04f70ad94c1..ee8f8b01675 100644 --- a/erpnext/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt +++ b/erpnext/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-09-01 15:48:10', + 'creation': '2010-09-01 15:47:59', 'docstatus': 0, - 'modified': '2010-09-01 14:23:28', + 'modified': '2011-09-15 15:04:43', 'modified_by': 'Administrator', 'owner': 'ashwini@webnotestech.com' }, diff --git a/erpnext/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt b/erpnext/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt index e1579f93f6e..69c4fe21f1d 100644 --- a/erpnext/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt +++ b/erpnext/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-09-01 15:48:10', + 'creation': '2010-09-01 15:47:59', 'docstatus': 0, - 'modified': '2010-09-01 14:25:08', + 'modified': '2011-09-15 15:04:43', 'modified_by': 'Administrator', 'owner': 'harshada@webnotestech.com' }, diff --git a/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt b/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt index f561c157d97..3e65b2eaefd 100644 --- a/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt +++ b/erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:35', 'docstatus': 0, - 'modified': '2011-09-13 17:26:55', + 'modified': '2011-09-15 15:04:43', 'modified_by': 'Administrator', 'owner': 'Administrator' }, diff --git a/erpnext/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt b/erpnext/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt index 74437311e04..61b33ee9506 100755 --- a/erpnext/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt +++ b/erpnext/stock/DocType Mapper/Receivable Voucher-Delivery Note/Receivable Voucher-Delivery Note.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2010-12-15 08:39:22', + 'creation': '2010-12-14 17:56:41', 'docstatus': 0, - 'modified': '2011-09-13 17:26:01', + 'modified': '2011-09-15 15:04:44', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -107,6 +107,15 @@ 'to_field': 'naming_series' }, + # Field Mapper Detail + { + 'doctype': 'Field Mapper Detail', + 'from_field': 'customer_address', + 'map': 'Yes', + 'match_id': 0, + 'to_field': 'delivery_address' + }, + # Field Mapper Detail { 'doctype': 'Field Mapper Detail', diff --git a/erpnext/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt b/erpnext/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt index 75244dea9d0..55060ea75f9 100644 --- a/erpnext/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt +++ b/erpnext/support/DocType Mapper/Customer Issue-Maintenance Visit/Customer Issue-Maintenance Visit.txt @@ -5,8 +5,8 @@ { 'creation': '2010-08-08 17:09:34', 'docstatus': 0, - 'modified': '2011-05-18 13:37:43', - 'modified_by': 'umair@iwebnotes.com', + 'modified': '2011-09-15 15:04:41', + 'modified_by': 'Administrator', 'owner': 'ashwini@webnotestech.com' }, diff --git a/erpnext/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt b/erpnext/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt index e56c4bdf976..ccd0e60c9b0 100644 --- a/erpnext/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt +++ b/erpnext/support/DocType Mapper/Sales Order-Maintenance Schedule/Sales Order-Maintenance Schedule.txt @@ -5,8 +5,8 @@ { 'creation': '2010-08-08 17:09:35', 'docstatus': 0, - 'modified': '2011-05-18 11:05:26', - 'modified_by': 'umair@iwebnotes.com', + 'modified': '2011-09-15 15:04:44', + 'modified_by': 'Administrator', 'owner': 'Administrator' }, diff --git a/erpnext/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt b/erpnext/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt index 26a48f8a670..e4bd45bd17b 100644 --- a/erpnext/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt +++ b/erpnext/support/DocType Mapper/Sales Order-Maintenance Visit/Sales Order-Maintenance Visit.txt @@ -5,8 +5,8 @@ { 'creation': '2010-08-08 17:09:36', 'docstatus': 0, - 'modified': '2011-05-18 13:35:55', - 'modified_by': 'umair@iwebnotes.com', + 'modified': '2011-09-15 15:04:45', + 'modified_by': 'Administrator', 'owner': 'ashwini@webnotestech.com' }, diff --git a/index.html b/index.html index e28f0069849..5d45b5f795a 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ ERPNext -