Merge lp:~openerp-dev/openobject-addons/6.1-opw-579715-nep into lp:openobject-addons/6.1

[Nehal Panchal (OpenERP)]

Hello,

In automated action ,state field is not translated in user's language if crm module is installed.

This fixes the issue.

Thanks

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). 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-579715-port-mma/+merge/136580 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.

Thanks,
Naresh Soni

Unmerged revisions

7059. By Nehal Panchal (OpenERP) on 2012-11-07

[FIX] crm : State in automated actions are not translated in user's language

=== modified file 'crm/crm_action_rule.py'
--- crm/crm_action_rule.py	2012-08-28 07:41:39 +0000
+++ crm/crm_action_rule.py	2012-11-07 12:23:22 +0000
@@ -124,7 +124,7 @@
     def state_get(self, cr, uid, context=None):
         """Gets available states for crm"""
         res = super(base_action_rule, self).state_get(cr, uid, context=context)
-        return res + crm.AVAILABLE_STATES
+        return res + [(state[0], _(state[1])) for state in crm.AVAILABLE_STATES]
 
     def priority_get(self, cr, uid, context=None):
         res = super(base_action_rule, self).priority_get(cr, uid, context=context)

=== modified file 'crm/i18n/crm.pot'
--- crm/i18n/crm.pot	2012-02-08 01:08:30 +0000
+++ crm/i18n/crm.pot	2012-11-07 12:23:22 +0000
@@ -108,6 +108,36 @@
 msgstr ""
 
 #. module: crm
+#: code:addons/crm/crm_action_rule.py:128
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_action_rule.py:128
+#, python-format
+msgid "In Progress"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_action_rule.py:128
+#, python-format
+msgid "Cancelled"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_action_rule.py:128
+#, python-format
+msgid "Closed"
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/crm_action_rule.py:128
+#, python-format
+msgid "Pending"
+msgstr ""
+
+#. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:28
 #, python-format
 msgid "Can not add note!"