Merge lp:~openerp-dev/openobject-addons/6.0-opw-50587-ira into lp:openobject-addons/6.0

[Ila Rana(Open ERP)]

Hello Priyesh,

I have checked the Xavier Fernandez's patch and its working properly as per the expectation.
So the issue of account taking from product.template id is resolved now through this branch.

Thanks,
Ila Rana.

[Serpent Consulting Services (serpent-consulting-services)]

Hello Ila Rana,

I see there are still the chances for optimization of this code.

The use of statement 'product_obj.browse(cr, uid, data['product_id'], context=context)' is many times rather than once.

Though it doesn't affect the fix, but its always better to prevent future optimization requests.

Moreover, 'res_obj.browse(cr, uid, uid, context=context)' is also ill-treated.

Hope this would surely help.

Thanks,
Serpent Consulting Services.

[lp:~openerp-dev/openobject-addons/6.0-opw-50587-ira]

4922. By Launchpad Translations on behalf of openerp on 2011-11-19

Launchpad automatic translations update.

4923. By Launchpad Translations on behalf of openerp on 2011-11-21

Launchpad automatic translations update.

[Ila Rana(Open ERP) (ira-openerp)]

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/6.0-opw-50587-ira]

4924. By Ila Rana(Open ERP) on 2011-11-21

[FIX]don't take income account from product's account inwizard pos.box.out:Case(50587)

Unmerged revisions

4924. By Ila Rana(Open ERP) on 2011-11-21

[FIX]don't take income account from product's account inwizard pos.box.out:Case(50587)

=== modified file 'point_of_sale/wizard/pos_box_out.py'
--- point_of_sale/wizard/pos_box_out.py	2011-10-03 14:13:57 +0000
+++ point_of_sale/wizard/pos_box_out.py	2011-11-21 12:54:09 +0000
@@ -73,44 +73,33 @@
         vals = {}
         statement_obj = self.pool.get('account.bank.statement')
         statement_line_obj = self.pool.get('account.bank.statement.line')
-        product_obj = self.pool.get('product.template')
-        productp_obj = self.pool.get('product.product')
+        product_obj = self.pool.get('product.product')
         res_obj = self.pool.get('res.users')
+        res_user = res_obj.browse(cr, uid, uid, context=context)
+        
         for data in  self.read(cr, uid, ids, context=context):
-            curr_company = res_obj.browse(cr, uid, uid, context=context).company_id.id
+            curr_company = res_user.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)
             monday = (datetime.today() + relativedelta(weekday=0)).strftime('%Y-%m-%d')
             sunday = (datetime.today() + relativedelta(weekday=6)).strftime('%Y-%m-%d')
             done_statmt = statement_obj.search(cr, uid, [('date', '>=', monday+' 00:00:00'), ('date', '<=', sunday+' 23:59:59'), ('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid)], context=context)
             stat_done = statement_obj.browse(cr, uid, done_statmt, context=context)
-            address_u = res_obj.browse(cr, uid, uid, context=context).address_id
+            address_u = res_user.address_id
             am = 0.0
 
-            amount_check = productp_obj.browse(cr, uid, data['product_id'], context=context).am_out or False
+            product = product_obj.browse(cr, uid, data['product_id'], context=context)
+            amount_check = product.am_out or False
             for st in stat_done:
                 for s in st.line_ids:
                     if address_u and s.partner_id == address_u.partner_id and s.am_out:
                         am += s.amount
-            if (-data['amount'] or 0.0) + am < -(res_obj.browse(cr, uid, uid, context=context).company_id.max_diff or 0.0) and amount_check:
-                val = (res_obj.browse(cr, uid, uid).company_id.max_diff or 0.0) + am
+            if (-data['amount'] or 0.0) + am < -(res_user.company_id.max_diff or 0.0) and amount_check:
+                val = (res_user.company_id.max_diff or 0.0) + am
                 precision = '%0.' + str(dp.get_precision('Point Of Sale Discount')(cr)[1] or 0) + 'f'
                 raise osv.except_osv(_('Error !'), _('The maximum value you can still withdraw is exceeded. \n Remaining value is equal to %s') % (precision % val,))
 
-            acc_id = product_obj.browse(cr, uid, data['product_id'], context=context).property_account_income
-            if not acc_id:
-                raise osv.except_osv(_('Error !'), _('please check that account is set to %s')%(product_obj.browse(cr, uid, data['product_id'], context=context).name))
-            if not statement_id:
-                raise osv.except_osv(_('Error !'), _('You have to open at least one cashbox'))
-            if statement_id:
-                statement_id = statement_id[0]
-            if not statement_id:
-                statement_id = statement_obj.create(cr, uid, {
-                                    'date': time.strftime('%Y-%m-%d 00:00:00'),
-                                    'journal_id': data['journal_id'],
-                                    'company_id': curr_company,
-                                    'user_id': uid,
-                                }, context=context)
-            vals['statement_id'] = statement_id
+            acc_id = product.property_account_income
+            vals['statement_id'] = statement_id[0]
             vals['journal_id'] = data['journal_id']
             if acc_id:
                 vals['account_id'] = acc_id.id
@@ -118,11 +107,10 @@
             if data['amount'] > 0:
                 amount = -data['amount']
             vals['amount'] = amount
-            if productp_obj.browse(cr, uid, data['product_id'], context=context).am_out:
+            if amount_check:
                 vals['am_out'] = True
             vals['ref'] = data['ref'] or ''
-            vals['name'] = "%s: %s " % (product_obj.browse(cr, uid, data['product_id'], context=context).name, data['name'].decode('utf8'))
-            address_u = res_obj.browse(cr, uid, uid, context=context).address_id
+            vals['name'] = "%s: %s " % (product.name, data['name'].decode('utf8'))
             if address_u:
                 vals['partner_id'] = address_u.partner_id and address_u.partner_id.id or None
             statement_line_obj.create(cr, uid, vals, context=context)