Merge lp:~openerp-dev/openobject-addons/trunk-bug-871684-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello Sir,

I have made some modification to make compatible for searching the selected journal in point_of_sale/wizard/pos_box_entries.py.

Thanks & Regards,
Devnani Bharat R.

[Raphael Collet (OpenERP) (rco-openerp)]

Have you tested it? I cannot believe it works without crashing...

Read carefully the spec of method read. data['journal_id'] should be a tuple like (id, name); this is why the domain was initially wrong. But invoking int() on it is not better: it will simply raise an exception (cannot convert tuple to int).

I will fix this.
Raphael

[Raphael Collet (OpenERP) (rco-openerp)]

Never mind, I was wrong. It works well!

Sorry,
Raphael

review: Approve

=== modified file 'point_of_sale/wizard/pos_box_entries.py'
--- point_of_sale/wizard/pos_box_entries.py	2011-10-02 17:31:16 +0000
+++ point_of_sale/wizard/pos_box_entries.py	2011-10-14 09:25:20 +0000
@@ -96,11 +96,11 @@
         for data in  self.read(cr, uid, ids, context=context):
             vals = {}
             curr_company = res_obj.browse(cr, uid, uid, context=context).company_id.id
-            statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context)
+            statement_id = statement_obj.search(cr, uid, [('journal_id', '=', int(data['journal_id'])), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')], context=context)
             if not statement_id:
                 raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
 
-            acc_id = product_obj.browse(cr, uid, data['product_id']).property_account_income
+            acc_id = product_obj.browse(cr, uid, int(data['product_id'])).property_account_income
             if not acc_id:
                 raise osv.except_osv(_('Error !'), _('Please check that income account is set to %s')%(product_obj.browse(cr, uid, data['product_id']).name))
             if statement_id: