pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] point_of_sale: some wizards not working because IDs were automatically casted into string because the database type was wrongly chosen at the isntallation time

Browse Source 
lp bug: https://launchpad.net/bugs/897159 fixed

bzr revid: qdp-launchpad@openerp.com-20120103101930-ctulz47zarnpdujf
This commit is contained in:
Quentin (OpenERP)
2012-01-03 11:19:30 +01:00
parent 38bde2f9a5
commit f19ad8eaf4
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/wizard/pos_box_entries.py
+2 -3
View File
@@ -44,7 +44,6 @@ def get_journal(self, cr, uid, context=None):
res = [(r['journal_id']) for r in res]
if not len(res):
raise osv.except_osv(_('Error !'), _('You do not have any open cash register. You must create a payment method or open a cash register.'))
res.insert(0, ('', ''))
return res
class pos_box_entries(osv.osv_memory):
@@ -70,8 +69,8 @@ class pos_box_entries(osv.osv_memory):
_columns = {
'name': fields.char('Reason', size=32, required=True),
'journal_id': fields.selection(get_journal, "Cash Register", required=True),
'product_id': fields.selection(_get_income_product, "Operation", required=True),
'journal_id': fields.selection(get_journal, "Cash Register", required=True, size=-1),
'product_id': fields.selection(_get_income_product, "Operation", required=True, size=-1),
'amount': fields.float('Amount', digits=(16, 2), required=True),
'ref': fields.char('Ref', size=32),
}
addons/point_of_sale/wizard/pos_box_out.py
+2 -3
View File
@@ -45,13 +45,12 @@ class pos_box_out(osv.osv_memory):
ids = product_obj.search(cr, uid, ['&', ('expense_pdt', '=', True), '|', ('company_id', '=', company_id), ('company_id', '=', None)], context=context)
res = product_obj.read(cr, uid, ids, ['id', 'name'], context=context)
res = [(r['id'], r['name']) for r in res]
res.insert(0, ('', ''))
return res
_columns = {
'name': fields.char('Description / Reason', size=32, required=True),
'journal_id': fields.selection(pos_box_entries.get_journal, "Cash Register", required=True),
'product_id': fields.selection(_get_expense_product, "Operation", required=True),
'journal_id': fields.selection(pos_box_entries.get_journal, "Cash Register", required=True, size=-1),
'product_id': fields.selection(_get_expense_product, "Operation", required=True, size=-1),
'amount': fields.float('Amount', digits=(16, 2), required=True),
}
_defaults = {