Merge lp:~anna-g/micronaet-quality/anna into lp:micronaet-quality

Proposed by Anna Micronaet
Status: Merged
Approved by: Nicola Riolini - Micronaet
Approved revision: 121
Merged at revision: 244
Proposed branch: lp:~anna-g/micronaet-quality/anna
Merge into: lp:micronaet-quality
Diff against target: 40 lines (+8/-2)
2 files modified
quality/i18n/it.po (+7/-1)
quality/quality.py (+1/-1)
To merge this branch: bzr merge lp:~anna-g/micronaet-quality/anna
Reviewer Review Type Date Requested Status
Nicola Riolini - Micronaet Pending
Review via email: mp+236357@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed symlink 'odoo8.sh'
=== target was u'/home/thebrush/lp7/micronaet/odoo8.sh'
=== modified file 'quality/i18n/it.po'
--- quality/i18n/it.po 2014-09-26 14:56:08 +0000
+++ quality/i18n/it.po 2014-09-29 14:45:40 +0000
@@ -553,6 +553,12 @@
553msgstr "Totale non conformità"553msgstr "Totale non conformità"
554554
555#. module: quality555#. module: quality
556#: code:addons/quality/quality.py:2008
557#, python-format
558msgid "Total conformed"
559msgstr "Totale non conformità"
560
561#. module: quality
556#: model:res.groups,comment:quality.group_quality_SAQ562#: model:res.groups,comment:quality.group_quality_SAQ
557msgid "Quality Service Manager user"563msgid "Quality Service Manager user"
558msgstr "Utente servizio qualità"564msgstr "Utente servizio qualità"
@@ -1785,7 +1791,7 @@
1785#. module: quality1791#. module: quality
1786#: selection:quality.action,origin:01792#: selection:quality.action,origin:0
1787msgid "Audit"1793msgid "Audit"
1788msgstr "Audit"1794msgstr "Audit interno"
17891795
1790#. module: quality1796#. module: quality
1791#: code:addons/quality/quality.py:320 code:addons/quality/quality.py:3371797#: code:addons/quality/quality.py:320 code:addons/quality/quality.py:337
17921798
=== modified file 'quality/quality.py'
--- quality/quality.py 2014-09-26 15:22:53 +0000
+++ quality/quality.py 2014-09-29 14:45:40 +0000
@@ -1485,7 +1485,7 @@
1485 _description = 'Action intervent'1485 _description = 'Action intervent'
14861486
1487 _columns = {1487 _columns = {
1488 'name': fields.text('Proposed activity', size=100),1488 'name': fields.text('Proposed activity'),
1489 'manager_id': fields.many2one('res.users', 'Manager'),1489 'manager_id': fields.many2one('res.users', 'Manager'),
1490 'deadline': fields.date('Deadline'),1490 'deadline': fields.date('Deadline'),
1491 'action_id': fields.many2one('quality.action', 'Action', 1491 'action_id': fields.many2one('quality.action', 'Action',

Subscribers

People subscribed via source and target branches