nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-05 06:28:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

serial no added in mapper and considered mapping where amount=0

Browse Source
This commit is contained in:
Nabin Hait
2011-09-13 17:41:40 +05:30
parent 7272080eeb
commit 0a16631221
7 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
accounts/DocType Mapper/Delivery Note-Receivable Voucher/Delivery Note-Receivable Voucher.txt
View File

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

4
accounts/DocType Mapper/Purchase Order-Payable Voucher/Purchase Order-Payable Voucher.txt
View File

@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-09-07 12:10:30',
'modified': '2011-09-13 17:37:09',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -124,7 +124,7 @@
'match_id': 1,
'to_field': 'entries',
'to_table': 'PV Detail',
'validation_logic': 'ifnull(billed_qty,0) < qty'
'validation_logic': 'ifnull(billed_qty,0) < qty and docstatus = 1'
},
# Table Mapper Detail

2
accounts/DocType Mapper/Purchase Receipt-Payable Voucher/Purchase Receipt-Payable Voucher.txt
View File

@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:35',
'docstatus': 0,
'modified': '2011-09-07 12:09:55',
'modified': '2011-09-13 17:27:32',
'modified_by': 'Administrator',
'owner': 'Administrator'
},

6
accounts/DocType Mapper/Sales Order-Receivable Voucher/Sales Order-Receivable Voucher.txt
View File

@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:36',
'docstatus': 0,
'modified': '2011-09-13 13:23:04',
'modified': '2011-09-13 17:36:31',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@@ -57,7 +57,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'
@@ -153,7 +153,7 @@
'match_id': 1,
'to_field': 'entries',
'to_table': 'RV Detail',
'validation_logic': 'docstatus = 1'
'validation_logic': '(ifnull(amount, 0) = 0 or amount > ifnull(billed_amt, 0)) and docstatus = 1'
},
# Table Mapper Detail