avanzosc team mailing list archive

[Daniel Stenlöv (XCLUDE) <daniel.stenlov@xxxxxxxxx>]

Daniel Stenlöv (XCLUDE) has proposed merging lp:~xclude/avanzosc/mrp-fix into lp:avanzosc/mrp-6.1.

Requested reviews:
  Avanzosc Manufacturing team (avanzosc-manufactuaring-team)

For more details, see:
https://code.launchpad.net/~xclude/avanzosc/mrp-fix/+merge/189341

Correct translation string in mrp_analytics_control. Corrected POT and PO files for the same module.
-- 
https://code.launchpad.net/~xclude/avanzosc/mrp-fix/+merge/189341
Your team Avanzosc Developers is subscribed to branch lp:avanzosc/mrp-6.1.

=== modified file 'mrp_analytics_control/i18n/es.po'
--- mrp_analytics_control/i18n/es.po	2013-08-08 14:27:28 +0000
+++ mrp_analytics_control/i18n/es.po	2013-10-04 15:06:04 +0000
@@ -199,11 +199,8 @@
 #: code:addons/mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py:432
 #: code:addons/openerp/addons/mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py:432
 #, python-format
-msgid ""
-"The analytic account of the operator is not created. Code:' + \" \" + ope_acc_code))\n"
-"         \n"
-"            man_journal_search = account_analytic_jour_obj.search(cr, uid,[('name', '=', 'Manufacturing"
-msgstr "La cuenta analítica del operario no se ha creado. Código:"
+msgid "The analytic account of the operator is not created. Code: %s"
+msgstr "La cuenta analítica del operario no se ha creado. Código: %s"
 
 #. module: mrp_analytics_control
 #: help:mrp.analytic.installer,operator_account:0

=== modified file 'mrp_analytics_control/i18n/eu.po'
--- mrp_analytics_control/i18n/eu.po	2012-10-15 09:01:48 +0000
+++ mrp_analytics_control/i18n/eu.po	2013-10-04 15:06:04 +0000
@@ -182,13 +182,8 @@
 #. module: mrp_analytics_control
 #: code:addons/mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py:432
 #, python-format
-msgid ""
-"The analytic account of the operator is not created. Code:' + \" \" + "
-"ope_acc_code))\n"
-"         \n"
-"            man_journal_search = account_analytic_jour_obj.search(cr, "
-"uid,[('name', '=', 'Manufacturing"
-msgstr "Langilearen kontu analitikoa ez da sortu. Kodea:"
+msgid "The analytic account of the operator is not created. Code: %s"
+msgstr "Langilearen kontu analitikoa ez da sortu. Kodea: %s"
 
 #. module: mrp_analytics_control
 #: help:mrp.analytic.installer,operator_account:0

=== modified file 'mrp_analytics_control/i18n/it.po'
--- mrp_analytics_control/i18n/it.po	2012-10-15 09:01:48 +0000
+++ mrp_analytics_control/i18n/it.po	2013-10-04 15:06:04 +0000
@@ -183,12 +183,7 @@
 #. module: mrp_analytics_control
 #: code:addons/mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py:432
 #, python-format
-msgid ""
-"The analytic account of the operator is not created. Code:' + \" \" + "
-"ope_acc_code))\n"
-"         \n"
-"            man_journal_search = account_analytic_jour_obj.search(cr, "
-"uid,[('name', '=', 'Manufacturing"
+msgid "The analytic account of the operator is not created. Code: %s"
 msgstr ""
 
 #. module: mrp_analytics_control

=== modified file 'mrp_analytics_control/i18n/mrp_analytics_control.pot'
--- mrp_analytics_control/i18n/mrp_analytics_control.pot	2013-08-08 14:27:28 +0000
+++ mrp_analytics_control/i18n/mrp_analytics_control.pot	2013-10-04 15:06:04 +0000
@@ -200,12 +200,8 @@
 #: code:addons/mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py:432
 #: code:addons/openerp/addons/mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py:432
 #, python-format
-msgid "The analytic account of the operator is not created. Code:' + \" \" + ope_acc_code))\n"
-"         \n"
-"            man_journal_search = account_analytic_jour_obj.search(cr, uid,[('name', '=', 'Manufacturing"
-msgstr "The analytic account of the operator is not created. Code:' + \" \" + ope_acc_code))\n"
-"         \n"
-"            man_journal_search = account_analytic_jour_obj.search(cr, uid,[('name', '=', 'Manufacturing"
+msgid "The analytic account of the operator is not created. Code: %s"
+msgstr "The analytic account of the operator is not created. Code: %s"
 
 #. module: mrp_analytics_control
 #: help:mrp.analytic.installer,operator_account:0

=== modified file 'mrp_analytics_control/i18n/sv.po'
--- mrp_analytics_control/i18n/sv.po	2012-10-15 09:01:48 +0000
+++ mrp_analytics_control/i18n/sv.po	2013-10-04 15:06:04 +0000
@@ -186,13 +186,8 @@
 #. module: mrp_analytics_control
 #: code:addons/mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py:432
 #, python-format
-msgid ""
-"The analytic account of the operator is not created. Code:' + \" \" + "
-"ope_acc_code))\n"
-"         \n"
-"            man_journal_search = account_analytic_jour_obj.search(cr, "
-"uid,[('name', '=', 'Manufacturing"
-msgstr ""
+msgid "The analytic account of the operator is not created. Code: %s"
+msgstr "Analyskonto för operatör är inte skapad. Kod: %s"
 
 #. module: mrp_analytics_control
 #: help:mrp.analytic.installer,operator_account:0
@@ -203,8 +198,7 @@
 #. module: mrp_analytics_control
 #: model:ir.module.module,description:mrp_analytics_control.module_meta_information
 msgid "This module adds new features to the actual OpenERP manufacturing"
-msgstr ""
-"Denna modul tillför nya funktioner till det faktiska OpenERP tillverkning"
+msgstr "Denna modul tillför nya funktioner till det faktiska OpenERP tillverkning"
 
 #. module: mrp_analytics_control
 #: field:mrp.analytic.wizard,company_id:0

=== modified file 'mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py'
--- mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py	2013-09-16 13:38:08 +0000
+++ mrp_analytics_control/wizard/mrp_analytic_schema_wizard.py	2013-10-04 15:06:04 +0000
@@ -111,7 +111,7 @@
         for aux_var in account_search:
             ope_account_id = aux_var
         if not ope_account_id:
-            raise osv.except_osv(_('End Operation Error'), _('Analytic account: %s NOT FOUND')%(ope_acc_code))                       
+            raise osv.except_osv(_('End Operation Error'), _('Analytic account: %s NOT FOUND') %(ope_acc_code))                       
         man_journal_search = account_analytic_jour_obj.search(cr, uid,[('name', '=', 'Manufacturing')])        
         man_journal = account_analytic_jour_obj.browse(cr, uid, man_journal_search[0])
         w_amount = real.delay * real.workcenter_id.costs_hour
@@ -366,7 +366,7 @@
                             user_employer = self.pool.get('hr.employee').browse(cr, uid, self.pool.get('hr.employee').search(cr, uid, [('user_id','=',manufact_worker.name.id)]))
                             if user_employer:
                                 if not user_employer[0].product_id:
-                                    raise osv.except_osv(_('Unable to perform action'), _('%s haven\'t got product assigned!') % (user_employer[0].name))
+                                    raise osv.except_osv(_('Unable to perform action'), _('%s haven\'t got product assigned!') %(user_employer[0].name))
                                 user_product = self.pool.get('product.product').browse(cr, uid, user_employer[0].product_id.id)
                                 total_estimated=0
                                 
@@ -449,7 +449,7 @@
                     wc_account_id =  aux_result['parent_id']
                     
             if not wc_account_id:
-                raise osv.except_osv(_('Programing Error'), _('The analytic account of the machine is not created. Code:' + " " + wc_acc_code))
+                raise osv.except_osv(_('Programing Error'), _('The analytic account of the machine is not created. Code: %s') %(wc_acc_code)))
             
             # TODO: Change this to use code instead for translational option
             # man_journal_search = account_analytic_jour_obj.search(cr, uid,[('code', '=', 'MRP')]) 
@@ -483,7 +483,7 @@
                 if str(aux_result['code']) == (ope_acc_code):
                     ope_account_id =  aux_result['parent_id']
             if not ope_account_id:
-                raise osv.except_osv(_('Programing Error'), _('The analytic account of the operator is not created. Code:' + " " + ope_acc_code))
+                raise osv.except_osv(_('Programing Error'), _('The analytic account of the operator is not created. Code: %s') %(ope_acc_code)))
             
             # TODO: Change this to use code instead for translational option
             # man_journal_search = account_analytic_jour_obj.search(cr, uid,[('code', '=', 'MRP')])