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

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

Browse Source
This commit is contained in:
Anand Doshi 2012-07-02 14:44:05 +05:30
commit 8c7cd2c407
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/buying/DocType Mapper/Purchase Request-Purchase Order/Purchase Request-Purchase Order.txt
View File

@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:34', 'creation': '2010-08-08 17:09:34',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-04-03 12:49:50', 'modified': '2012-07-02 11:12:28',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -22,7 +22,6 @@
# 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 Request-Purchase Order', 'parent': u'Purchase Request-Purchase Order',
'parentfield': u'field_mapper_details', 'parentfield': u'field_mapper_details',
@ -50,6 +49,7 @@
'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'
}, },
@ -58,6 +58,7 @@
{ {
'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'
}, },
@ -66,6 +67,7 @@
{ {
'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'
}, },
@ -74,6 +76,7 @@
{ {
'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'
}, },
@ -82,6 +85,7 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'uom', 'from_field': u'uom',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'stock_uom' 'to_field': u'stock_uom'
}, },
@ -90,6 +94,7 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'eval:flt(1)', 'from_field': u'eval:flt(1)',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'conversion_factor' 'to_field': u'conversion_factor'
}, },
@ -98,6 +103,7 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'eval:flt(obj.qty) - flt(obj.ordered_qty)', 'from_field': u'eval:flt(obj.qty) - flt(obj.ordered_qty)',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'stock_qty' 'to_field': u'stock_qty'
}, },
@ -106,6 +112,7 @@
{ {
'doctype': u'Field Mapper Detail', 'doctype': u'Field Mapper Detail',
'from_field': u'eval:flt(obj.qty) - flt(obj.ordered_qty)', 'from_field': u'eval:flt(obj.qty) - flt(obj.ordered_qty)',
'map': u'Yes',
'match_id': 1, 'match_id': 1,
'to_field': u'qty' 'to_field': u'qty'
}, },
@ -114,10 +121,21 @@
{ {
'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'
}, },
# Field Mapper Detail
{
'checking_operator': u'>=',
'doctype': u'Field Mapper Detail',
'from_field': u'transaction_date',
'map': u'No',
'match_id': 0,
'to_field': u'transaction_date'
},
# Table Mapper Detail # Table Mapper Detail
{ {
'doctype': u'Table Mapper Detail', 'doctype': u'Table Mapper Detail',

0
erpnext/patches/july_2012/__init__.py Normal file
View File

4
erpnext/patches/july_2012/reload_pr_po_mapper.py Normal file
View File

@ -0,0 +1,4 @@
def execute():
import webnotes
from webnotes.modules import reload_doc
reload_doc('buying', 'DocType Mapper', 'Purchase Request-Purchase Order')

5
erpnext/patches/patch_list.py
View File

@ -467,4 +467,9 @@ patch_list = [
'patch_file': 'cache_item_table', 'patch_file': 'cache_item_table',
'description': "create cache item table again" 'description': "create cache item table again"
}, },
{
'patch_module': 'patches.july_2012',
'patch_file': 'reload_pr_po_mapper',
'description': "order date should be greater than equal to request date"
},
] ]