Micronaet - Quality

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

  1. anna
  2. Merge into trunk
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
1=== removed symlink 'odoo8.sh'
2=== target was u'/home/thebrush/lp7/micronaet/odoo8.sh'
3=== modified file 'quality/i18n/it.po'
4--- quality/i18n/it.po 2014-09-26 14:56:08 +0000
5+++ quality/i18n/it.po 2014-09-29 14:45:40 +0000
6@@ -553,6 +553,12 @@
7 msgstr "Totale non conformità"
8
9 #. module: quality
10+#: code:addons/quality/quality.py:2008
11+#, python-format
12+msgid "Total conformed"
13+msgstr "Totale non conformità"
14+
15+#. module: quality
16 #: model:res.groups,comment:quality.group_quality_SAQ
17 msgid "Quality Service Manager user"
18 msgstr "Utente servizio qualità"
19@@ -1785,7 +1791,7 @@
20 #. module: quality
21 #: selection:quality.action,origin:0
22 msgid "Audit"
23-msgstr "Audit"
24+msgstr "Audit interno"
25
26 #. module: quality
27 #: code:addons/quality/quality.py:320 code:addons/quality/quality.py:337
28
29=== modified file 'quality/quality.py'
30--- quality/quality.py 2014-09-26 15:22:53 +0000
31+++ quality/quality.py 2014-09-29 14:45:40 +0000
32@@ -1485,7 +1485,7 @@
33 _description = 'Action intervent'
34
35 _columns = {
36- 'name': fields.text('Proposed activity', size=100),
37+ 'name': fields.text('Proposed activity'),
38 'manager_id': fields.many2one('res.users', 'Manager'),
39 'deadline': fields.date('Deadline'),
40 'action_id': fields.many2one('quality.action', 'Action',

Subscribers

People subscribed via source and target branches