Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
index acbd72c..a3412dd 100644
--- a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
+++ b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py
@@ -66,11 +66,11 @@
for i in lst:
val = pos and pos[0][i] or ''
- webnotes.conn.set(self.doc,i,val)
+ self.doc.fields[i] = val
self.set_pos_item_values()
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
if self.doc.tc_name: self.get_tc_details()
diff --git a/erpnext/accounts/doctype/rv_detail/rv_detail.txt b/erpnext/accounts/doctype/rv_detail/rv_detail.txt
index a4bf824..f133874 100644
--- a/erpnext/accounts/doctype/rv_detail/rv_detail.txt
+++ b/erpnext/accounts/doctype/rv_detail/rv_detail.txt
@@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:20',
'docstatus': 0,
- 'modified': '2012-02-24 16:14:38',
+ 'modified': '2012-03-01 18:43:30',
'modified_by': u'Administrator',
'owner': u'Administrator'
},
@@ -22,7 +22,7 @@
'section_style': u'Tray',
'server_code_error': u' ',
'show_in_menu': 0,
- 'version': 25
+ 'version': 26
},
# These values are common for all DocField
@@ -264,7 +264,7 @@
'oldfieldname': u'serial_no',
'oldfieldtype': u'Small Text',
'permlevel': 0,
- 'print_hide': 1
+ 'print_hide': 0
},
# DocField