mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-13 02:01:21 +00:00
serial no added in mapper and considered mapping where amount=0
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
{
|
||||
'creation': '2010-08-08 17:09:34',
|
||||
'docstatus': 0,
|
||||
'modified': '2011-09-13 13:23:44',
|
||||
'modified': '2011-09-13 17:35:54',
|
||||
'modified_by': 'Administrator',
|
||||
'owner': 'Administrator'
|
||||
},
|
||||
@@ -47,7 +47,7 @@
|
||||
# Field Mapper Detail
|
||||
{
|
||||
'doctype': 'Field Mapper Detail',
|
||||
'from_field': 'eval: (flt(obj.amount) - flt(obj.billed_amt)) / flt(obj.basic_rate)',
|
||||
'from_field': 'eval: obj.basic_rate and (flt(obj.amount) - flt(obj.billed_amt)) / flt(obj.basic_rate) or obj.qty',
|
||||
'map': 'Yes',
|
||||
'match_id': 1,
|
||||
'to_field': 'qty'
|
||||
@@ -125,6 +125,15 @@
|
||||
'to_field': 'incentives'
|
||||
},
|
||||
|
||||
# Field Mapper Detail
|
||||
{
|
||||
'doctype': 'Field Mapper Detail',
|
||||
'from_field': 'serial_no',
|
||||
'map': 'Yes',
|
||||
'match_id': 1,
|
||||
'to_field': 'serial_no'
|
||||
},
|
||||
|
||||
# Table Mapper Detail
|
||||
{
|
||||
'doctype': 'Table Mapper Detail',
|
||||
@@ -142,7 +151,7 @@
|
||||
'match_id': 1,
|
||||
'to_field': 'entries',
|
||||
'to_table': 'RV Detail',
|
||||
'validation_logic': 'amount > ifnull(billed_amt, 0) and docstatus = 1'
|
||||
'validation_logic': '(ifnull(amount, 0) = 0 or amount > ifnull(billed_amt, 0)) and docstatus = 1'
|
||||
},
|
||||
|
||||
# Table Mapper Detail
|
||||
|
||||
Reference in New Issue
Block a user