Merge lp:~vauxoo/addons-vauxoo/7.0-purchase_requisition_contract_analyst-rev-1617-kty into lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa

[Katherine Zaoral (Vauxoo)]

[MERGE] change the purchase_requisiton.purhaser_id field string name from 'Contract Analyst' to 'P&C Analyst'.

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

waiting for runbot

[lp:~vauxoo/addons-vauxoo/7.0-purchase_requisition_contract_analyst-rev-1617-kty]

1056. By Katherine Zaoral (Vauxoo) on 2014-06-17

[ADD] change the grouo by filter name.

1057. By Katherine Zaoral (Vauxoo) on 2014-06-17

[FIX] view use of ampersand character. add the html ampersand character scape.

1058. By Katherine Zaoral (Vauxoo) on 2014-06-17

[ADD] generate the translation template.

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

Excelente, runbot is green.
Another visual changes was made (filters names and translation template).
I will proceed with the merge.

review: Approve

=== added file 'purchase_requisition_contract_analyst/i18n/purchase_requisition_contract_analyst.pot'
--- purchase_requisition_contract_analyst/i18n/purchase_requisition_contract_analyst.pot	1970-01-01 00:00:00 +0000
+++ purchase_requisition_contract_analyst/i18n/purchase_requisition_contract_analyst.pot	2014-06-17 16:14:30 +0000
@@ -0,0 +1,33 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_requisition_contract_analyst
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-17 16:12+0000\n"
+"PO-Revision-Date: 2014-06-17 16:12+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_requisition_contract_analyst
+#: help:purchase.requisition,purchaser_id:0
+msgid "Contract Analyst responsible to evaluate the current purchase requisition."
+msgstr ""
+
+#. module: purchase_requisition_contract_analyst
+#: view:purchase.requisition:0
+#: field:purchase.requisition,purchaser_id:0
+msgid "P&C Analyst"
+msgstr ""
+
+#. module: purchase_requisition_contract_analyst
+#: model:ir.model,name:purchase_requisition_contract_analyst.model_purchase_requisition
+msgid "Purchase Requisition"
+msgstr ""
+
 
=== modified file 'purchase_requisition_contract_analyst/model/purchase_requisition.py'
--- purchase_requisition_contract_analyst/model/purchase_requisition.py	2014-05-29 17:11:02 +0000
+++ purchase_requisition_contract_analyst/model/purchase_requisition.py	2014-06-17 16:14:30 +0000
@@ -33,7 +33,7 @@
     _columns = {
         'purchaser_id': fields.many2one(
             'res.users',
-            'Contract Analyst',
+            'P&C Analyst',
             help=('Contract Analyst responsible to evaluate the current'
                   ' purchase requisition.')),
     }
 
=== modified file 'purchase_requisition_contract_analyst/view/purchase_requisition_view.xml'
--- purchase_requisition_contract_analyst/view/purchase_requisition_view.xml	2014-05-29 19:13:06 +0000
+++ purchase_requisition_contract_analyst/view/purchase_requisition_view.xml	2014-06-17 16:14:30 +0000
@@ -35,7 +35,7 @@
                 </xpath>
 
                 <xpath expr="//group" position="inside">
-                    <filter string="Contract Analyst" icon="terp-personal" context="{'group_by':'purchaser_id'}"/>
+                    <filter string="P&amp;C Analyst" icon="terp-personal" context="{'group_by':'purchaser_id'}"/>
                 </xpath>
 
             </field>