Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename

This commit is contained in:
Anand Doshi 2012-05-08 12:18:14 +05:30
commit e6906cff56

View File

@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:35', 'creation': '2010-08-08 17:09:35',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-04-02 13:05:03', 'modified': '2012-05-08 11:50:18',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -127,16 +127,6 @@
'to_field': u'export_amount' 'to_field': u'export_amount'
}, },
# Field Mapper Detail
{
'checking_operator': u'=',
'doctype': u'Field Mapper Detail',
'from_field': u'basic_rate',
'map': u'Yes',
'match_id': 1,
'to_field': u'basic_rate'
},
# Field Mapper Detail # Field Mapper Detail
{ {
'checking_operator': u'=', 'checking_operator': u'=',
@ -147,16 +137,6 @@
'to_field': u'export_rate' 'to_field': u'export_rate'
}, },
# Field Mapper Detail
{
'checking_operator': u'=',
'doctype': u'Field Mapper Detail',
'from_field': u'basic_rate',
'map': u'Yes',
'match_id': 1,
'to_field': u'basic_rate'
},
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
@ -231,15 +211,6 @@
'to_field': u'incentives' 'to_field': u'incentives'
}, },
# Field Mapper Detail
{
'doctype': u'Field Mapper Detail',
'from_field': u'allocated_amount',
'map': u'Yes',
'match_id': 0,
'to_field': u'customer_mobile_no'
},
# Table Mapper Detail # Table Mapper Detail
{ {
'doctype': u'Table Mapper Detail', 'doctype': u'Table Mapper Detail',
@ -262,30 +233,6 @@
'validation_logic': u'name is not null' 'validation_logic': u'name is not null'
}, },
# Table Mapper Detail
{
'doctype': u'Table Mapper Detail',
'from_field': u'other_charges',
'from_table': u'Sales Taxes and Charges',
'match_id': 2,
'to_field': u'other_charges',
'to_table': u'Sales Taxes and Charges',
'validation_logic': u'name is not null'
},
# Table Mapper Detail
{
'doctype': u'Table Mapper Detail',
'from_field': u'sales_order_details',
'from_table': u'Sales Order Item',
'match_id': 1,
'reference_doctype_key': u'prevdoc_doctype',
'reference_key': u'prevdoc_detail_docname',
'to_field': u'delivery_note_details',
'to_table': u'Delivery Note Item',
'validation_logic': u'qty > ifnull(delivered_qty,0) and docstatus = 1'
},
# Table Mapper Detail # Table Mapper Detail
{ {
'doctype': u'Table Mapper Detail', 'doctype': u'Table Mapper Detail',