Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Nabin Hait
2011-09-15 15:40:53 +05:30
23 changed files with 87 additions and 40 deletions

View File

@@ -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',

View File

@@ -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'
},

View File

@@ -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',

View File

@@ -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'
},

View File

@@ -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',

View File

@@ -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'
},

View File

@@ -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'
},

View File

@@ -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'
},

View File

@@ -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'
},

View File

@@ -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'
},

View File

@@ -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'
},

View File

@@ -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'
},

View File

@@ -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'
},

View File

@@ -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'
},

View File

@@ -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'
},

View File

@@ -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',

View File

@@ -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'
},

View File

@@ -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'
},

View File

@@ -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'
},