Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transaction date issue in mapper

Browse Source
This commit is contained in:
Nabin Hait 2012-03-01 18:03:47 +05:30
parent e3ce5b4e0c
commit f237a67183
4 changed files with 131 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/stock/DocType Mapper/Purchase Order-Purchase Receipt/Purchase Order-Purchase Receipt.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2010-09-20 12:33:34', 'creation': '2010-08-08 17:09:35',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-01 14:01:03', 'modified': '2012-03-01 17:58:16',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -22,6 +22,7 @@
# These values are common for all Field Mapper Detail # These values are common for all Field Mapper Detail
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'map': u'Yes',
'name': '__common__', 'name': '__common__',
'parent': u'Purchase Order-Purchase Receipt', 'parent': u'Purchase Order-Purchase Receipt',
'parentfield': u'field_mapper_details', 'parentfield': u'field_mapper_details',
@ -49,7 +50,6 @@
'checking_operator': u'=', 'checking_operator': u'=',
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'supplier', 'from_field': u'supplier',
'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': u'supplier' 'to_field': u'supplier'
}, },
@ -59,7 +59,6 @@
'checking_operator': u'=', 'checking_operator': u'=',
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'company', 'from_field': u'company',
'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': u'company' 'to_field': u'company'
}, },
@ -69,7 +68,6 @@
'checking_operator': u'=', 'checking_operator': u'=',
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'currency', 'from_field': u'currency',
'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': u'currency' 'to_field': u'currency'
}, },
@ -78,7 +76,6 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'name', 'from_field': u'name',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'prevdoc_detail_docname' 'to_field': u'prevdoc_detail_docname'
}, },
@ -87,7 +84,6 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'parent', 'from_field': u'parent',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'prevdoc_docname' 'to_field': u'prevdoc_docname'
}, },
@ -96,7 +92,6 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'parenttype', 'from_field': u'parenttype',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'prevdoc_doctype' 'to_field': u'prevdoc_doctype'
}, },
@ -106,7 +101,6 @@
'checking_operator': u'=', 'checking_operator': u'=',
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'item_code', 'from_field': u'item_code',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'item_code' 'to_field': u'item_code'
}, },
@ -115,7 +109,6 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'eval:(flt(obj.qty) - flt(obj.received_qty)) ', 'from_field': u'eval:(flt(obj.qty) - flt(obj.received_qty)) ',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'received_qty' 'to_field': u'received_qty'
}, },
@ -124,7 +117,6 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'eval:(flt(obj.qty) - flt(obj.received_qty)) ', 'from_field': u'eval:(flt(obj.qty) - flt(obj.received_qty)) ',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'qty' 'to_field': u'qty'
}, },
@ -133,7 +125,6 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.conversion_factor)', 'from_field': u'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.conversion_factor)',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'stock_qty' 'to_field': u'stock_qty'
}, },
@ -142,7 +133,6 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.import_rate)', 'from_field': u'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.import_rate)',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'import_amount' 'to_field': u'import_amount'
}, },
@ -151,7 +141,6 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.purchase_rate)', 'from_field': u'eval:(flt(obj.qty) - flt(obj.received_qty)) * flt(obj.purchase_rate)',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'amount' 'to_field': u'amount'
}, },
@ -160,7 +149,6 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'schedule_date', 'from_field': u'schedule_date',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'schedule_date' 'to_field': u'schedule_date'
}, },
@ -169,7 +157,6 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'net_total', 'from_field': u'net_total',
'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': u'net_total' 'to_field': u'net_total'
}, },
@ -178,7 +165,6 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'grand_total', 'from_field': u'grand_total',
'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': u'grand_total' 'to_field': u'grand_total'
}, },
@ -187,25 +173,14 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'total_tax', 'from_field': u'total_tax',
'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': u'total_tax' 'to_field': u'total_tax'
}, },
# Field Mapper Detail
{
'doctype': u'Field Mapper Detail',
'from_field': u'transaction_date',
'map': u'No',
'match_id': 0,
'to_field': u'transaction_date'
},
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'conversion_rate', 'from_field': u'conversion_rate',
'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': u'conversion_rate' 'to_field': u'conversion_rate'
}, },

252
erpnext/stock/DocType Mapper/Sales Order-Delivery Note/Sales Order-Delivery Note.txt
View File

@ -5,273 +5,263 @@
{ {
'creation': '2010-08-08 17:09:35', 'creation': '2010-08-08 17:09:35',
'docstatus': 0, 'docstatus': 0,
'modified': '2011-09-14 12:36:25', 'modified': '2012-03-01 17:58:16',
'modified_by': 'Administrator', 'modified_by': u'Administrator',
'owner': 'Administrator' 'owner': u'Administrator'
}, },
# These values are common for all Table Mapper Detail # These values are common for all Table Mapper Detail
{ {
'doctype': 'Table Mapper Detail', 'doctype': u'Table Mapper Detail',
'name': '__common__', 'name': '__common__',
'parent': 'Sales Order-Delivery Note', 'parent': u'Sales Order-Delivery Note',
'parentfield': 'table_mapper_details', 'parentfield': u'table_mapper_details',
'parenttype': 'DocType Mapper' 'parenttype': u'DocType Mapper'
}, },
# These values are common for all Field Mapper Detail # These values are common for all Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'name': '__common__', 'name': '__common__',
'parent': 'Sales Order-Delivery Note', 'parent': u'Sales Order-Delivery Note',
'parentfield': 'field_mapper_details', 'parentfield': u'field_mapper_details',
'parenttype': 'DocType Mapper' 'parenttype': u'DocType Mapper'
}, },
# These values are common for all DocType Mapper # These values are common for all DocType Mapper
{ {
'doctype': u'DocType Mapper', 'doctype': u'DocType Mapper',
'from_doctype': 'Sales Order', 'from_doctype': u'Sales Order',
'module': 'Stock', 'module': u'Stock',
'name': '__common__', 'name': '__common__',
'ref_doc_submitted': 1, 'ref_doc_submitted': 1,
'to_doctype': 'Delivery Note' 'to_doctype': u'Delivery Note'
}, },
# DocType Mapper, Sales Order-Delivery Note # DocType Mapper, Sales Order-Delivery Note
{ {
'doctype': u'DocType Mapper', 'doctype': u'DocType Mapper',
'name': 'Sales Order-Delivery Note' 'name': u'Sales Order-Delivery Note'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'checking_operator': '>=', 'doctype': u'Field Mapper Detail',
'doctype': 'Field Mapper Detail', 'from_field': u'name',
'from_field': 'transaction_date', 'map': u'Yes',
'map': 'No',
'match_id': 0, 'match_id': 0,
'to_field': 'transaction_date' 'to_field': u'sales_order_no'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'checking_operator': u'=',
'from_field': 'name', 'doctype': u'Field Mapper Detail',
'map': 'Yes', 'from_field': u'company',
'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': 'sales_order_no' 'to_field': u'company'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'checking_operator': '=', 'checking_operator': u'=',
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'company', 'from_field': u'currency',
'map': 'Yes', 'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': 'company' 'to_field': u'currency'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'checking_operator': '=', 'doctype': u'Field Mapper Detail',
'doctype': 'Field Mapper Detail', 'from_field': u'shipping_address_name',
'from_field': 'currency', 'map': u'Yes',
'map': 'Yes',
'match_id': 0, 'match_id': 0,
'to_field': 'currency' 'to_field': u'customer_address'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'shipping_address_name', 'from_field': u'shipping_address',
'map': 'Yes', 'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': 'customer_address' 'to_field': u'address_display'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'shipping_address', 'from_field': u'parent',
'map': 'Yes', 'map': u'Yes',
'match_id': 0,
'to_field': 'address_display'
},
# Field Mapper Detail
{
'doctype': 'Field Mapper Detail',
'from_field': 'parent',
'map': 'Yes',
'match_id': 1, 'match_id': 1,
'to_field': 'prevdoc_docname' 'to_field': u'prevdoc_docname'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'parenttype', 'from_field': u'parenttype',
'map': 'Yes', 'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': 'prevdoc_doctype' 'to_field': u'prevdoc_doctype'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'name', 'from_field': u'name',
'map': 'Yes', 'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': 'prevdoc_detail_docname' 'to_field': u'prevdoc_detail_docname'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)', 'from_field': u'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.export_rate)',
'map': 'Yes', 'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': 'export_amount' 'to_field': u'export_amount'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'checking_operator': '=', 'checking_operator': u'=',
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'basic_rate', 'from_field': u'basic_rate',
'map': 'Yes', 'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': 'basic_rate' 'to_field': u'basic_rate'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'eval: flt(obj.qty) - flt(obj.delivered_qty)', 'from_field': u'eval: flt(obj.qty) - flt(obj.delivered_qty)',
'map': 'Yes', 'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': 'qty' 'to_field': u'qty'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)', 'from_field': u'eval: (flt(obj.qty) - flt(obj.delivered_qty)) * flt(obj.basic_rate)',
'map': 'Yes', 'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': 'amount' 'to_field': u'amount'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'reserved_warehouse', 'from_field': u'reserved_warehouse',
'map': 'Yes', 'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': 'warehouse' 'to_field': u'warehouse'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'checking_operator': '=', 'checking_operator': u'=',
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'project_name', 'from_field': u'project_name',
'map': 'Yes', 'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': 'project_name' 'to_field': u'project_name'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'checking_operator': '=', 'checking_operator': u'=',
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'customer', 'from_field': u'customer',
'map': 'Yes', 'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': 'customer' 'to_field': u'customer'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'naming_series', 'from_field': u'naming_series',
'map': 'No', 'map': u'No',
'match_id': 0, 'match_id': 0,
'to_field': 'naming_series' 'to_field': u'naming_series'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'status', 'from_field': u'status',
'map': 'No', 'map': u'No',
'match_id': 0, 'match_id': 0,
'to_field': 'status' 'to_field': u'status'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'incentives', 'from_field': u'incentives',
'map': 'No', 'map': u'No',
'match_id': 3, 'match_id': 3,
'to_field': 'incentives' 'to_field': u'incentives'
}, },
# Field Mapper Detail # Field Mapper Detail
{ {
'doctype': 'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': 'allocated_amount', 'from_field': u'allocated_amount',
'map': 'Yes', 'map': u'Yes',
'match_id': 0, 'match_id': 0,
'to_field': 'customer_mobile_no' 'to_field': u'customer_mobile_no'
}, },
# Table Mapper Detail # Table Mapper Detail
{ {
'doctype': 'Table Mapper Detail', 'doctype': u'Table Mapper Detail',
'from_field': 'sales_team', 'from_field': u'sales_team',
'from_table': 'Sales Team', 'from_table': u'Sales Team',
'match_id': 3, 'match_id': 3,
'to_field': 'sales_team', 'to_field': u'sales_team',
'to_table': 'Sales Team', 'to_table': u'Sales Team',
'validation_logic': 'name is not null' 'validation_logic': u'name is not null'
}, },
# Table Mapper Detail # Table Mapper Detail
{ {
'doctype': 'Table Mapper Detail', 'doctype': u'Table Mapper Detail',
'from_field': 'other_charges', 'from_field': u'other_charges',
'from_table': 'RV Tax Detail', 'from_table': u'RV Tax Detail',
'match_id': 2, 'match_id': 2,
'to_field': 'other_charges', 'to_field': u'other_charges',
'to_table': 'RV Tax Detail', 'to_table': u'RV Tax Detail',
'validation_logic': 'name is not null' 'validation_logic': u'name is not null'
}, },
# Table Mapper Detail # Table Mapper Detail
{ {
'doctype': 'Table Mapper Detail', 'doctype': u'Table Mapper Detail',
'from_field': 'sales_order_details', 'from_field': u'sales_order_details',
'from_table': 'Sales Order Detail', 'from_table': u'Sales Order Detail',
'match_id': 1, 'match_id': 1,
'reference_doctype_key': 'prevdoc_doctype', 'reference_doctype_key': u'prevdoc_doctype',
'reference_key': 'prevdoc_detail_docname', 'reference_key': u'prevdoc_detail_docname',
'to_field': 'delivery_note_details', 'to_field': u'delivery_note_details',
'to_table': 'Delivery Note Detail', 'to_table': u'Delivery Note Detail',
'validation_logic': 'qty > ifnull(delivered_qty,0) and docstatus = 1' 'validation_logic': u'qty > ifnull(delivered_qty,0) and docstatus = 1'
}, },
# Table Mapper Detail # Table Mapper Detail
{ {
'doctype': 'Table Mapper Detail', 'doctype': u'Table Mapper Detail',
'from_table': 'Sales Order', 'from_table': u'Sales Order',
'match_id': 0, 'match_id': 0,
'reference_key': 'prevdoc_docname', 'reference_key': u'prevdoc_docname',
'to_table': 'Delivery Note', 'to_table': u'Delivery Note',
'validation_logic': 'docstatus = 1' 'validation_logic': u'docstatus = 1'
} }
] ]

8
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@ -240,9 +240,9 @@ class DocType(TransactionBase):
if prevdoc_docname and prevdoc: if prevdoc_docname and prevdoc:
# ::::::::::: Validates Transaction Date of DN and previous doc (i.e. SO , PO, PR) ********* # ::::::::::: Validates Transaction Date of DN and previous doc (i.e. SO , PO, PR) *********
trans_date = sql("select transaction_date from `tab%s` where name = '%s'" %(prevdoc,prevdoc_docname))[0][0] trans_date = sql("select posting_date from `tab%s` where name = '%s'" %(prevdoc,prevdoc_docname))[0][0]
if trans_date and getdate(self.doc.transaction_date) < (trans_date): if trans_date and getdate(self.doc.posting_date) < (trans_date):
msgprint("Your Voucher Date cannot be before "+cstr(prevdoc)+" Date.") msgprint("Your Posting Date cannot be before "+cstr(prevdoc)+" Date.")
raise Exception raise Exception
# ::::::::: Validates DN and previous doc details :::::::::::::::::: # ::::::::: Validates DN and previous doc details ::::::::::::::::::
get_name = sql("select name from `tab%s` where name = '%s'" % (prevdoc, prevdoc_docname)) get_name = sql("select name from `tab%s` where name = '%s'" % (prevdoc, prevdoc_docname))
@ -452,7 +452,7 @@ class DocType(TransactionBase):
self.values.append({ self.values.append({
'item_code' : d[1], 'item_code' : d[1],
'warehouse' : wh, 'warehouse' : wh,
'transaction_date' : self.doc.transaction_date, 'transaction_date' : getdate(self.doc.modified).strftime('%Y-%m-%d'),
'posting_date' : self.doc.posting_date, 'posting_date' : self.doc.posting_date,
'posting_time' : self.doc.posting_time, 'posting_time' : self.doc.posting_time,
'voucher_type' : 'Delivery Note', 'voucher_type' : 'Delivery Note',

6
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@ -57,7 +57,7 @@ class DocType(TransactionBase):
#-----------------Validation For Fiscal Year------------------------ #-----------------Validation For Fiscal Year------------------------
def validate_fiscal_year(self): def validate_fiscal_year(self):
get_obj(dt = 'Purchase Common').validate_fiscal_year(self.doc.fiscal_year,self.doc.transaction_date,'Transaction Date') get_obj(dt = 'Purchase Common').validate_fiscal_year(self.doc.fiscal_year,self.doc.posting_date,'Transaction Date')
# Get Item Details # Get Item Details
@ -226,7 +226,7 @@ class DocType(TransactionBase):
ord_qty = -flt(curr_qty) ord_qty = -flt(curr_qty)
# update order qty in bin # update order qty in bin
bin = get_obj('Warehouse', d.warehouse).update_bin(0, 0, (is_submit and 1 or -1) * flt(ord_qty), 0, 0, d.item_code, self.doc.transaction_date) bin = get_obj('Warehouse', d.warehouse).update_bin(0, 0, (is_submit and 1 or -1) * flt(ord_qty), 0, 0, d.item_code, self.doc.posting_date)
# UPDATE actual qty to warehouse by pr_qty # UPDATE actual qty to warehouse by pr_qty
self.make_sl_entry(d, d.warehouse, flt(pr_qty), d.valuation_rate, is_submit) self.make_sl_entry(d, d.warehouse, flt(pr_qty), d.valuation_rate, is_submit)
@ -245,7 +245,7 @@ class DocType(TransactionBase):
self.values.append({ self.values.append({
'item_code' : d.fields.has_key('item_code') and d.item_code or d.rm_item_code, 'item_code' : d.fields.has_key('item_code') and d.item_code or d.rm_item_code,
'warehouse' : wh, 'warehouse' : wh,
'transaction_date' : self.doc.transaction_date, 'transaction_date' : getdate(self.doc.modified).strftime('%Y-%m-%d'),
'posting_date' : self.doc.posting_date, 'posting_date' : self.doc.posting_date,
'posting_time' : self.doc.posting_time, 'posting_time' : self.doc.posting_time,
'voucher_type' : 'Purchase Receipt', 'voucher_type' : 'Purchase Receipt',