Merge lp:~openerp-dev/openobject-addons/6.1-opw-573823-rha into lp:openobject-addons/6.1

[Rifakat Husen (OpenERP)]

Hello,

In Point of Sale, for PoS Order when we don't fill field 'Connected Salesman' and try to
post accounting entries through button 'Post Entries' then we get the error.

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.

Solved this problem, please review it.

Thanks,
Rifakat Haradwala

[lp:~openerp-dev/openobject-addons/6.1-opw-573823-rha]

6750. By Quentin (OpenERP) <email address hidden> on 2012-04-23

[IMP] portal: improved inheritancy when creating a new portal user

6751. By Quentin (OpenERP) <email address hidden> on 2012-04-23

[REF] l10n_be: added some comments

6752. By Quentin (OpenERP) <email address hidden> on 2012-04-23

[FIX] portal: moved the prepare_user_data on wizard rather than on the user

6753. By Antony Lesuisse (OpenERP) on 2012-04-23

[FIX] home action

6754. By Launchpad Translations on behalf of openerp on 2012-04-24

Launchpad automatic translations update.

6755. By nel on 2012-04-24

[FIX] stock: check if the move exists to avoid the key error

6756. By nel on 2012-04-24

[FIX] stock: small important fix

6757. By Launchpad Translations on behalf of openerp on 2012-04-25

Launchpad automatic translations update.

6758. By nel on 2012-04-25

[FIX] stock: check if currency on product or picking exists

6759. By Olivier Laurent (Open ERP) on 2012-04-24

[FIX] l10n_multilang should be certified since it's a dependancy for a certified module (l10n_ch)

6760. By Olivier Laurent (Open ERP) on 2012-04-25

[FIX] raise clear except_osv instead of traceback

6761. By Olivier Laurent (Open ERP) on 2012-04-25

[FIX] added missing certificate number

6762. By Olivier Dony (Odoo) on 2012-04-25

[MERGE] crm: multiple bugfixes for mass-conversion wizards

6763. By Olivier Dony (Odoo) on 2012-04-25

[MERGE] crm.lead: bugfixes for saleman allocation and convert to opportunity

6764. By Quentin (OpenERP) <email address hidden> on 2012-04-25

[MERGE] some fixes in constraints in account_coda

6765. By Launchpad Translations on behalf of openerp on 2012-04-26

Launchpad automatic translations update.

6766. By Xavier ALT on 2012-04-26

[MERGE] server action: fix missing active_model in context when calling server action run()

6767. By Xavier ALT on 2012-04-26

[MERGE] project_gtd: fix UnicodeDecodeError on GTD Task search view when user language is different than English

6768. By Xavier ALT on 2012-04-26

[MERGE] OPW 573248: crm: do not round localized user value as this will display NaN of kanban view (ex: decimal separator <> '.')

6769. By Rifakat Husen (OpenERP) on 2012-04-26

[FIX] point_of_sale: fix problem for default product account in case tax doesn't have tax account

[Vinay Rana (OpenERP) (vra-openerp)]

The propose patch wil fix the issue.

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed(technically) on Trunk (means still existing).as 'Post Entries' button is removed from 7.0 but patch proposed is a genuine technically looking at the code, A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-573823-port-mma/+merge/132288 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Unmerged revisions

6769. By Rifakat Husen (OpenERP) on 2012-04-26

[FIX] point_of_sale: fix problem for default product account in case tax doesn't have tax account

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2012-02-13 16:12:01 +0000
+++ point_of_sale/point_of_sale.py	2012-04-26 10:02:42 +0000
@@ -445,8 +445,9 @@
             if order.state<>'paid': continue
 
             curr_c = res_obj.browse(cr, uid, uid).company_id
-            comp_id = res_obj.browse(cr, order.user_id.id, order.user_id.id).company_id
-            comp_id = comp_id and comp_id.id or False
+            comp_id = False
+            if order.user_id:
+                comp_id = res_obj.browse(cr, order.user_id.id, order.user_id.id).company_id.id
             to_reconcile = []
             group_tax = {}
             account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context).id
@@ -464,12 +465,16 @@
                 taxes = [t for t in line.product_id.taxes_id]
                 computed = account_tax_obj.compute_all(cr, uid, taxes, line.price_unit * (100.0-line.discount) / 100.0, line.qty)
                 computed_taxes = computed['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['account_collected_id'] or product_income_acc)
 
                     if group_key in group_tax:
                         group_tax[group_key] += round(tax['amount'], 2)