Merge lp:~openerp-dev/openobject-addons/6.0-opw-382010-rha into lp:openobject-addons/6.0

[Rifakat Husen (OpenERP)]

Hello,

It raises encoding error while Regex has non string character in "Automated Actions" (base_action_rule).

Kindly review this.

Thanks,
Rifakat

[lp:~openerp-dev/openobject-addons/6.0-opw-382010-rha]

5031. By Olivier Laurent (Open ERP) on 2012-02-02

[FIX] opw 50985

5032. By Olivier Laurent (Open ERP) on 2012-02-02

[FIX] opw 50985

5033. By Launchpad Translations on behalf of openerp on 2012-02-03

Launchpad automatic translations update.

5034. By Launchpad Translations on behalf of openerp on 2012-02-04

Launchpad automatic translations update.

5035. By Launchpad Translations on behalf of openerp on 2012-02-05

Launchpad automatic translations update.

5036. By Launchpad Translations on behalf of openerp on 2012-02-06

Launchpad automatic translations update.

5037. By tfr (Openerp) on 2012-02-06

[FIX] use employee id to lookup into the user table, now use the corresponding user_id

5038. By Launchpad Translations on behalf of openerp on 2012-02-07

Launchpad automatic translations update.

5040. By Launchpad Translations on behalf of openerp on 2012-02-08

Launchpad automatic translations update.

5041. By nel on 2012-02-08

[MERGE]

5042. By Launchpad Translations on behalf of openerp on 2012-02-09

Launchpad automatic translations update.

5043. By Stephane Wirtel (OpenERP) on 2012-02-09

[FIX] web_uservoice: Fix the reference about the translation

5044. By Launchpad Translations on behalf of openerp on 2012-02-10

Launchpad automatic translations update.

5045. By Olivier Laurent (Open ERP) on 2012-02-10

[FIX] opw 382100

5046. By tfr (Openerp) on 2012-02-10

[MERGE] opw 18200 : don't erase unit price when erasing the product in invoice line

5047. By Launchpad Translations on behalf of openerp on 2012-02-11

Launchpad automatic translations update.

5048. By Launchpad Translations on behalf of openerp on 2012-02-12

Launchpad automatic translations update.

5049. By Launchpad Translations on behalf of openerp on 2012-02-13

Launchpad automatic translations update.

5050. By tfr (Openerp) on 2012-02-13

[FIX] OPW 17161 : don't use the same relational field for two different osv_memory, avoid to mess up 'foreign key'

5051. By tfr (Openerp) on 2012-02-13

[REVERT] 5050

5052. By tfr (Openerp) on 2012-02-13

[FIX] mess up relation filled in picking wizard + solve key error 'wizard_pick_id', this error is due to the implementation of the read for one2many field in osv_memory, if a field in osv_memory is never written, the key is not present in the dict (representation of osv_memory) then we get the error key Error,
the workarount is defining default value for missing key (fields) in the osv_memory during the read, the correct fix should be done in the orm

5053. By nel on 2012-02-13

[MERGE]

5054. By nel on 2012-02-13

[MERGE]

5055. By Launchpad Translations on behalf of openerp on 2012-02-14

Launchpad automatic translations update.

5056. By Olivier Laurent (Open ERP) on 2012-02-14

[FIX] fix needed for opw 51206. Is linked to a server fix for csv import

5057. By Launchpad Translations on behalf of openerp on 2012-02-15

Launchpad automatic translations update.

[Naresh(OpenERP) (nch-openerp)]

Hello

instead of removing the str you could use tools.ustr.

secondly there still other places where you need to change like in crm/crm_action_rule.py

Thanks,

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/6.0-opw-382010-rha]

5058. By Rifakat Husen (OpenERP) on 2012-02-15

[FIX] crm, base_action_rule: fix for the regex conversion

[Rifakat Husen (OpenERP) (rha-openerp)]

Improved code as per your suggestion.

Please review it,
Rifakat

review: Needs Resubmitting

[Naresh(OpenERP) (nch-openerp)]

review: Approve

=== modified file 'base_action_rule/base_action_rule.py'
--- base_action_rule/base_action_rule.py	2012-01-24 10:00:44 +0000
+++ base_action_rule/base_action_rule.py	2012-02-15 11:06:20 +0000
@@ -356,8 +356,8 @@
         reg_name = action.regex_name
         result_name = True
         if reg_name:
-            ptrn = re.compile(str(reg_name))
-            _result = ptrn.search(str(obj.name))
+            ptrn = re.compile(tools.ustr(reg_name))
+            _result = ptrn.search(tools.ustr(obj.name))
             if not _result:
                 result_name = False
         regex_n = not reg_name or result_name

=== modified file 'crm/crm_action_rule.py'
--- crm/crm_action_rule.py	2011-01-14 00:11:01 +0000
+++ crm/crm_action_rule.py	2012-02-15 11:06:20 +0000
@@ -84,9 +84,9 @@
         result_history = True
         if regex:
             res = False
-            ptrn = re.compile(str(regex))
+            ptrn = re.compile(tools.ustr(regex))
             for history in obj.message_ids:
-                _result = ptrn.search(str(history.name))
+                _result = ptrn.search(tools.ustr(history.name))
                 if _result:
                     res = True
                     break