Merge lp:~openerp-dev/openobject-addons/trunk-opw-573823-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

In Point of Sale, for PoS Order when we don't fill field 'Salesman' and try to set the company based on salesman's company then there will be a traceback so improve the code for it.

also solved problem for tax account, we any product has default tax configured and tax is not configured with tax account then in that case product's account should be used.

Code is forward port from 6.1

Thanks,
Mayur

[Purnendu Singh (OpenERP) (purnendu-singh)]

right now the Post entries button not there as it was in 6.1!! SO, it is not reproducing but if system tries to set the company based on salesman and as the salesman field is not required it may be possible to get tracback!!

patch proposed is a genuine technically looking at the code.

Thanks,
purnendu Singh

review: Approve

[Fabien (Open ERP) (fp-tinyerp)]

user_company = order.user_id and user_proxy.browse(cr, order.user_id.id, order.user_id.id).company_id or False

should be:

user_company = order.user_id and order.user_id.company_id or False

review: Disapprove

[Mayur Maheshwari(OpenERP) (mma-openerp)]

Hello,

    I Have improve a code of as par specification

review: Needs Resubmitting

[Fabien (Open ERP) (fp-tinyerp)]

several issues:
   user_proxy.browse(cr, order.user_id.id, order.user_id.id).company_id
should be:
   order.user_id.company_id

review: Disapprove

[Mayur Maheshwari(OpenERP) (mma-openerp)]

Hello,

     Sorry for the inconveniences of Resubmit
     Code improve as per specification
     Resubmit again now diff changes more clean as before

Thanks

review: Needs Resubmitting

Unmerged revisions

7900. By Mayur Maheshwari(OpenERP) on 2012-12-06

[IMP]point_of_sale: improve a code of as par specification

7899. By Mayur Maheshwari(OpenERP) on 2012-10-31

[FIX]point_of_sale : fix problem for default product account in case tax does not have tax account

7898. By Launchpad Translations on behalf of openerp on 2012-10-31

Launchpad automatic translations update.

7897. By Olivier Dony (Odoo) on 2012-10-30

[FIX] account: currency_id must be passed to the chart installation wizard

Otherwise the installation of a chart of account
via the settings page fails miserably.

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2012-11-29 22:26:45 +0000
+++ point_of_sale/point_of_sale.py	2012-12-18 07:13:29 +0000
@@ -913,14 +913,12 @@
                 tax_amount = line.price_subtotal * tax['ref_base_sign']
 
             return (tax_code_id, tax_amount,)
-
         for order in self.browse(cr, uid, ids, context=context):
             if order.account_move:
                 continue
             if order.state != 'paid':
                 continue
-
-            user_company = user_proxy.browse(cr, order.user_id.id, order.user_id.id).company_id
+            user_company = order.user_id and order.user_id.company_id or False
 
             group_tax = {}
             account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context).id
@@ -986,10 +984,14 @@
                 tax_amount = 0
                 taxes = [t for t in line.product_id.taxes_id]
                 computed_taxes = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit * (100.0-line.discount) / 100.0, line.qty)['taxes']
+                product_income_acc = line.product_id.product_tmpl_id.property_account_income and \
+                                     line.product_id.product_tmpl_id.property_account_income.id or \
+                                     line.product_id.categ_id.property_account_income_categ and \
+                                     line.product_id.categ_id.property_account_income_categ.id
 
                 for tax in computed_taxes:
                     tax_amount += round(tax['amount'], 2)
-                    group_key = (tax['tax_code_id'], tax['base_code_id'], tax['account_collected_id'], tax['id'])
+                    group_key = (tax['tax_code_id'], tax['base_code_id'], tax['account_collected_id'] or product_income_acc, tax['id'])
 
                     group_tax.setdefault(group_key, 0)
                     group_tax[group_key] += round(tax['amount'], 2)