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

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

Browse Source
This commit is contained in:
Rushabh Mehta 2012-03-01 18:53:50 +05:30
commit 97ceffccce
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
View File

@ -66,11 +66,11 @@ class DocType(TransactionBase):
for i in lst: for i in lst:
val = pos and pos[0][i] or '' val = pos and pos[0][i] or ''
webnotes.conn.set(self.doc,i,val) self.doc.fields[i] = val
self.set_pos_item_values() self.set_pos_item_values()
val = pos and flt(pos[0]['conversion_rate']) or 0 val = pos and flt(pos[0]['conversion_rate']) or 0
webnotes.conn.set(self.doc,'conversion_rate',val) self.doc.conversion_rate = val
#fetch terms #fetch terms
if self.doc.tc_name: self.get_tc_details() if self.doc.tc_name: self.get_tc_details()

6
erpnext/accounts/doctype/rv_detail/rv_detail.txt
View File

@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:20', 'creation': '2010-08-08 17:09:20',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-02-24 16:14:38', 'modified': '2012-03-01 18:43:30',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -22,7 +22,7 @@
'section_style': u'Tray', 'section_style': u'Tray',
'server_code_error': u' ', 'server_code_error': u' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 25 'version': 26
}, },
# These values are common for all DocField # These values are common for all DocField
@ -264,7 +264,7 @@
'oldfieldname': u'serial_no', 'oldfieldname': u'serial_no',
'oldfieldtype': u'Small Text', 'oldfieldtype': u'Small Text',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1 'print_hide': 0
}, },
# DocField # DocField