Merge lp:~openerp-commiter/openobject-addons/bug_760813 into lp:openobject-addons/6.0

[Lorenzo Battistini]

This fixes bug https://bugs.launchpad.net/openobject-addons/+bug/760813
for 6.0 series

[lp:~openerp-commiter/openobject-addons/bug_760813]

4550. By Olivier Dony (Odoo) on 2011-04-30

[MERGE] report_webkit: fixes (mainly UTF8 issues), courtesy of Nicolas Bessi, C2C

4551. By Launchpad Translations on behalf of openerp on 2011-04-30

Launchpad automatic translations update.

4552. By Launchpad Translations on behalf of openerp on 2011-05-01

Launchpad automatic translations update.

4553. By Launchpad Translations on behalf of openerp on 2011-05-02

Launchpad automatic translations update.

4554. By xrg on 2011-05-02

[MERGE] base_crypt: missing import and better check for active users

4555. By Jay Vora (Serpent Consulting Services) on 2011-05-02

[MERGE] Merged Dhruti's branch for the fix on decimal accuracy

4556. By Jay Vora (Serpent Consulting Services) on 2011-05-02

[MERGE] Merged Marco's branch for the fix of lp:718609

4557. By Launchpad Translations on behalf of openerp on 2011-05-03

Launchpad automatic translations update.

4558. By Launchpad Translations on behalf of openerp on 2011-05-04

Launchpad automatic translations update.

4559. By Launchpad Translations on behalf of openerp on 2011-05-05

Launchpad automatic translations update.

4560. By Launchpad Translations on behalf of openerp on 2011-05-06

Launchpad automatic translations update.

4561. By Jay Vora (Serpent Consulting Services) on 2011-05-06

[FIX] l10n_fr : Corrected Template definitions (Ref: Case 5481)

4562. By Jay Vora (Serpent Consulting Services) on 2011-05-06

[MERGE] Merged Anup's branch for the fix of task created from Procurement

4563. By Jay Vora (Serpent Consulting Services) on 2011-05-06

[MERGE] Merged Jagdish' branch for the fix of bug lp:767058

4564. By Jay Vora (Serpent Consulting Services) on 2011-05-06

[FIX] Account : default_get() corrected in order to be compatible with web client

4565. By Jay Vora (Serpent Consulting Services) on 2011-05-06

[FIX] Account : Corrected _sum() of account.tax.code()

4566. By Jay Vora (Serpent Consulting Services) on 2011-05-06

[MERGE] Merged Dhruti's branch for the fix of lp:741457

4567. By Jay Vora (Serpent Consulting Services) on 2011-05-07

[FIX] Fixed warnings and test failures suggested by Buildbot

4568. By Jay Vora (Serpent Consulting Services) on 2011-05-07

[Merge]

4569. By Launchpad Translations on behalf of openerp on 2011-05-08

Launchpad automatic translations update.

4570. By Launchpad Translations on behalf of openerp on 2011-05-09

Launchpad automatic translations update.

4571. By Jay Vora (Serpent Consulting Services) on 2011-05-09

[FIX] Account_voucher : Added missing context to onchange_date() of voucher

4572. By Olivier Dony (Odoo) on 2011-05-09

[I18N] all: updated translation templates

4573. By Launchpad Translations on behalf of openerp on 2011-05-10

Launchpad automatic translations update.

4574. By Launchpad Translations on behalf of openerp on 2011-05-11

Launchpad automatic translations update.

4575. By Olivier Laurent (Open ERP) on 2011-05-11

[FIX] document: when updating attachment file size, exclude attachments having NULL db_datas (otherwise len() raises an exception)

4576. By Jay Vora (Serpent Consulting Services) on 2011-05-11

[MERGE] Merged Amit Dodiya's branch for the fix of account_followup rules issue

4577. By Launchpad Translations on behalf of openerp on 2011-05-12

Launchpad automatic translations update.

4578. By Jay Vora (Serpent Consulting Services) on 2011-05-12

[MERGE] Merged the branch for the fix of lp:763439

4579. By Anup(SerpentCS) on 2011-05-12

[FIX] account : Move lines take the Journal and Period from the Move itself(Maintenance Case 5598)

4580. By Launchpad Translations on behalf of openerp on 2011-05-13

Launchpad automatic translations update.

4581. By Launchpad Translations on behalf of openerp on 2011-05-14

Launchpad automatic translations update.

4582. By Launchpad Translations on behalf of openerp on 2011-05-15

Launchpad automatic translations update.

4583. By Tristan Hill (credativ) on 2011-05-15

[MERGE] Merged Tristan Hill (credativ)'s branch for the fix of bug lp:733799

4584. By Launchpad Translations on behalf of openerp on 2011-05-16

Launchpad automatic translations update.

4585. By Jay Vora (Serpent Consulting Services) on 2011-05-16

[MERGE] Merged Rifakat's branch for the fix of onchange call

4586. By Jay Vora (Serpent Consulting Services) on 2011-05-16

[FIX] Purchase_requisition : Corrections and removed the unnecessary dependency of mrp

4587. By Launchpad Translations on behalf of openerp on 2011-05-17

Launchpad automatic translations update.

4588. By Jay Vora (Serpent Consulting Services) on 2011-05-17

[MERGE] Merged Valencia's branch for the fix of __compute method on account correctiosn when account is set to inActive

[Jay Vora (Serpent Consulting Services) (jayvora)]

Lorenzo,

It is not advisable to use the User's language here instead of Customer's.

The Partner's language has been set because the name of the sale order line(description) should be shown in customer's language.

Thanks.

review: Disapprove

[Lorenzo Battistini (elbati)]

Hello Jay,
did you read this bug? https://bugs.launchpad.net/openobject-addons/+bug/760813
it was rightly fixed this way: http://bazaar.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-760813-pso/revision/4641

Also, why should the line's name be displayed in customer's language?
User could be unable to understand it.
Customer's language should be used in report only

[lp:~openerp-commiter/openobject-addons/bug_760813]

4589. By Jay Vora (Serpent Consulting Services) on 2011-05-17

[MERGE] Merged Dhruti's branch for the fix of the problem when base_contact disturbs the thunderbird

4590. By Launchpad Translations on behalf of openerp on 2011-05-18

Launchpad automatic translations update.

4591. By Jay Vora (Serpent Consulting Services) on 2011-05-18

[MERGE] Merged Anup's branch for the fix of invoice creation from repairs

4592. By Jay Vora (Serpent Consulting Services) on 2011-05-18

[REF] Stock : Improvements

4593. By Jay Vora (Serpent Consulting Services) on 2011-05-18

[MERGE] Merged Rifakat's branch which contains the fix of invoice progressbar which was showing wrong value by not considering the residual amount(It could have failed when the invoice is partially paid)

4594. By Launchpad Translations on behalf of openerp on 2011-05-19

Launchpad automatic translations update.

4595. By Launchpad Translations on behalf of openerp on 2011-05-20

Launchpad automatic translations update.

4596. By Jay Vora (Serpent Consulting Services) on 2011-05-20

Merged Tejas' branch for the fix of wrong reporting of product margin(Thanks to Rifakat for review)

4597. By Jay Vora (Serpent Consulting Services) on 2011-05-20

[MERGE] Merged Somesh' branch for the fix of domain correction for Sale Order's 'Invoice On' Policy

4598. By Jay Vora (Serpent Consulting Services) on 2011-05-20

[MERGE] Merged Amit Dodiya's branch for the fix of fields_view_get() failing on list view display of account.voucher

4599. By Anup(SerpentCS) on 2011-05-20

[MERGE] Merged RGO's branch for Query fix in Sale Manager Analysis Report(Case:5689)

4600. By Launchpad Translations on behalf of openerp on 2011-05-21

Launchpad automatic translations update.

4601. By Launchpad Translations on behalf of openerp on 2011-05-22

Launchpad automatic translations update.

4602. By Launchpad Translations on behalf of openerp on 2011-05-23

Launchpad automatic translations update.

4603. By Conexus.at on 2011-05-23

[ADD] l10n_at: added localization module for austria. Thanks Conexus.at

4604. By Launchpad Translations on behalf of openerp on 2011-05-24

Launchpad automatic translations update.

4605. By Launchpad Translations on behalf of openerp on 2011-05-25

Launchpad automatic translations update.

4606. By Launchpad Translations on behalf of openerp on 2011-05-26

Launchpad automatic translations update.

4607. By Priyesh (OpenERP) on 2011-05-26

[MERGE] Merge SKH's branch to remove duplicates on name_search (case:5861) branch: lp:~openerp-dev/openobject-addons/6.0-opw-5861-skh

4608. By Launchpad Translations on behalf of openerp on 2011-05-27

Launchpad automatic translations update.

4609. By Anup(SerpentCS) on 2011-05-27

[MERGE] purchase : Merged Ravi's Branch for the purchase report query fix. (Case:5943)

4610. By Launchpad Translations on behalf of openerp on 2011-05-28

Launchpad automatic translations update.

4611. By Launchpad Translations on behalf of openerp on 2011-05-29

Launchpad automatic translations update.

4612. By Launchpad Translations on behalf of openerp on 2011-05-30

Launchpad automatic translations update.

4613. By Jay Vora (Serpent Consulting Services) on 2011-05-30

[MERGE] Merged ADO's branch for the fix of partial picking getting failed while product has no company configured

4614. By Launchpad Translations on behalf of openerp on 2011-05-31

Launchpad automatic translations update.

4615. By Jay Vora (Serpent Consulting Services) on 2011-05-31

[FIX] Corrected the context for the act_window of Phonecall from Partner

4616. By Jay Vora (Serpent Consulting Services) on 2011-05-31

[MERGE] Merged RGO's branch for the fix of wrong _defaults on stock module

4617. By Jay Vora (Serpent Consulting Services) on 2011-05-31

[FIX] Successive fix over the bug lp:777347

4618. By Jay Vora (Serpent Consulting Services) on 2011-05-31

[FIX] CRM/Project_planning : Corrected Yml tests,thanks to buildbot

4619. By Launchpad Translations on behalf of openerp on 2011-06-01

Launchpad automatic translations update.

[Leonardo Pistone (lepistone)]

Agreed with Lorenzo.

review: Approve

[xrg (xrg)]

On Wednesday 01 June 2011, you wrote:
> Review: Approve
> Agreed with Lorenzo.

Review: Disapprove

The 'context_lang' of res.users is never used directly. It only means to fill
the context of the client and then pushed back to the functions to use.

The proper solution would be to add 'context' to the arguments of that
function and update the view xml to pass that.
It is important to keep the same coding convention in all cases, rather than
having different hacks each time we need to chose the language or so.

--
Say NO to spam and viruses. Stop using Microsoft Windows!

[Lorenzo Battistini (elbati)]

Hello xrg,

I just copied the bug solution committed here
http://bazaar.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-760813-pso/revision/4641
that should fix the bug for the trunk series.
So, I guess we need a different solution for trunk too.

Do you have any example of this coding convention?

Thanks

[Jay Vora (Serpent Consulting Services) (jayvora)]

Excuse me,

I have rechecked the whole scenario.

There are 2 things to note about:
1. Warning which is being shown to OpenERP User.
  - Warning is currently appearing in Partner's language. I admit I was wrong and Lorenzo seems right that warning should be readable to User. So, it should be in User's language.
  - Make sure ONLY THE WARNING MESSAGE should be translated to user's language. NOT THE WHOLE context should be used for further functions.
  - If this context is used globally, the descriptions,names,etc. textual fields will be translated to user's language,which is plain wrong.
  - As a part of the solution, follow what XRG says: add context in parameters.

2. Report being shown to User's Customer.
  - This is being handled well over the reports by the use of setLang(customer's lang).

review: Needs Fixing

[lp:~openerp-commiter/openobject-addons/bug_760813]

4620. By Jay Vora (Serpent Consulting Services) on 2011-05-31

[FIX] HR_Payroll/Hr_recruitment/Membership/Point_of_sale/Project_timesheet : Corrected Yml tests,thanks to buildbot

4621. By Jay Vora (Serpent Consulting Services) on 2011-06-01

[FIX] HR_Payroll/Hr_recruitment/Membership/Point_of_sale/Project_timesheet : Corrected Yml tests,thanks to buildbot

[Lorenzo Battistini (elbati)]

xrg, Jay
I got the point. I'll update the context passed as parameter

review: Needs Fixing

[Jay Vora (Serpent Consulting Services) (jayvora)]

Thanks.

[lp:~openerp-commiter/openobject-addons/bug_760813]

4622. By Jay Vora (Serpent Consulting Services) on 2011-06-01

[FIX] Product_visible_discount : Correction in the __openerp__.py for the dependency module and fix the onchange methods for sale order line and invoice line(Ref : Case 5998)

4623. By Jay Vora (Serpent Consulting Services) on 2011-06-01

[MERGE] Merged RGO's branch for the fix of Stock : Corrected _defaults for date/time fields

4624. By Jay Vora (Serpent Consulting Services) on 2011-06-01

[FIX] Project_scrum/Purchase_requisition : Corrected _defaults for date/datetime values

4625. By Jay Vora (Serpent Consulting Services) on 2011-06-02

[FIX/REF] Minor but Important fixes

4626. By Launchpad Translations on behalf of openerp on 2011-06-02

Launchpad automatic translations update.

[digitalsatori(Shine IT) (digitalsatori)]

> - Make sure ONLY THE WARNING MESSAGE should be translated to user's
> language. NOT THE WHOLE context should be used for further functions.
> - If this context is used globally, the descriptions,names,etc. textual
> fields will be translated to user's language,which is plain wrong.

Goods name and descriptions, etc textual fields in user's language is NOT wrong, user should understand the goods he/she ordered for the customer. Can you imagine you have to choose a product that is showing in Chinese (assumed you don't read Chinese) if the customer is from China.

the pdf report in customer's language is correct, as it probably will send to the customer.

[Lorenzo Battistini (elbati)]

Hi all,
I updated the code.
Please review

[Anup(SerpentCS) (anup-serpent)]

Hello Lorenzo,Leonardo,Jay

  Removing the partner language in context removes the facility to translate the data in partner format when sent to a partner. Partner lang is kept in sale order so that whenever a report is sent to partner it should be sent in the partner's language. IMHO We have made it convenient for the partners and we should not remove this.

   I have found a solution by which both the things are cleared out. The information would come in the partner's lang whereas the warning message will come in user's lang.

  Hope this clears the issue.

@jay

   Can you please check it and share your views regarding the fix?

Thanks.

[lp:~openerp-commiter/openobject-addons/bug_760813]

4627. By Anup(SerpentCS) on 2011-06-03

[FIX] sale : Wrong context being passed for translation in the method when raising a warning,fixed(Case :6046)

[Lorenzo Battistini (elbati)]

Hello Anup,
your changes fix the problem as well.

Still I can't understand why partner's language should be kept in context.
Where is it needed?
Within the reports, language is set by 'setLang(o.partner_id.lang)', so, I can't see any reason of using partner language instead of user language within the system

[Anup(SerpentCS) (anup-serpent)]

Hello Lorenzo,

  I know we can have the translations in report using the setLang().

But here there is another issue that in the report a product is not being displayed. It's the Description that is being translated. This field is not a translatable field and it's translations are not available always.

So to see the Description in Partner Lang we are keeping the partner lang in the method.

Hope this clears the issue.

Thanks.

[Lorenzo Battistini (elbati)]

Hello Anup,

could you kindly show me a piece of code where the partner's language is being used to translate the description?

I just want to be sure I understood

Thanks

[Anup(SerpentCS) (anup-serpent)]

Hello Lorenzo,

 I would surely show you. Kindly follow the below steps.

1. Select a customer language(Other than english).
2. Create a sale order and select the customer that has a different langauge.
3. Create a new sale order line.
4. Select a product and you'll see that the field "Description" comes translated.
5. View the sale order report and you'll see the same translated field on the report.
6. The Description field is sent to the report not the product that's why the partner lang is there in the on_change method.

Hope this clears the issue.

Thanks.

[Lorenzo Battistini (elbati)]

So, system user will see the list of order lines without understanding what they mean.
I don't think this is very usable.

Maybe better if we make the description of sale.order.line translatable?

[Anup(SerpentCS) (anup-serpent)]

Hello Lorenzo,

   It is not feasible to do so as the description is coming from the product itself and it's merged from product's name and reference. If we keep the field translatable it would have duplicate translations for the same src. Hope you can understand.

Thanks.

[Olivier Dony (Odoo) (odo-openerp)]

Note: a similar patch has landed in trunk at revision 5028 revid:<email address hidden>, you might want to look at it.

Unmerged revisions

4627. By Anup(SerpentCS) on 2011-06-03

[FIX] sale : Wrong context being passed for translation in the method when raising a warning,fixed(Case :6046)

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-05-17 11:44:45 +0000
+++ sale/sale.py	2011-06-03 06:53:46 +0000
@@ -1009,16 +1009,20 @@
 
     def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
-            lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False):
+            lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False, context=None):
+        if context is None:
+            context = {}
+        context['lang'] = lang or 'en_US'
         if not  partner_id:
             raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sales form !\nPlease set one customer before choosing a product.'))
         warning = {}
         product_uom_obj = self.pool.get('product.uom')
         partner_obj = self.pool.get('res.partner')
         product_obj = self.pool.get('product.product')
+        ctx = context.copy()
         if partner_id:
             lang = partner_obj.browse(cr, uid, partner_id).lang
-        context = {'lang': lang, 'partner_id': partner_id}
+        ctx.update({'lang': lang, 'partner_id': partner_id})
 
         if not product:
             return {'value': {'th_weight': 0, 'product_packaging': False,
@@ -1028,14 +1032,14 @@
             date_order = time.strftime('%Y-%m-%d')
 
         result = {}
-        product_obj = product_obj.browse(cr, uid, product, context=context)
+        product_obj = product_obj.browse(cr, uid, product, context=ctx)
         if not packaging and product_obj.packaging:
             packaging = product_obj.packaging[0].id
             result['product_packaging'] = packaging
 
         if packaging:
             default_uom = product_obj.uom_id and product_obj.uom_id.id
-            pack = self.pool.get('product.packaging').browse(cr, uid, packaging, context=context)
+            pack = self.pool.get('product.packaging').browse(cr, uid, packaging, context=ctx)
             q = product_uom_obj._compute_qty(cr, uid, uom, pack.qty, default_uom)
 #            qty = qty - qty % q + q
             if qty and (q and not (qty % q) == 0):
@@ -1074,7 +1078,7 @@
             result.update({'type': product_obj.procure_method})
 
         if not flag:
-            result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=context)[0][1]
+            result['name'] = self.pool.get('product.product').name_get(cr, uid, [product_obj.id], context=ctx)[0][1]
         domain = {}
         if (not uom) and (not uos):
             result['product_uom'] = product_obj.uom_id.id