Merge lp:~fabien-morin/unifield-server/fm-us-2047 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4125
Proposed branch: lp:~fabien-morin/unifield-server/fm-us-2047
Merge into: lp:unifield-server
Diff against target: 96 lines (+51/-6)
2 files modified
bin/addons/base/ir/ir_attachment.py (+4/-4)
bin/addons/msf_profile/i18n/fr_MF.po (+47/-2)
To merge this branch: bzr merge lp:~fabien-morin/unifield-server/fm-us-2047
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+313166@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=== modified file 'bin/addons/base/ir/ir_attachment.py'
2--- bin/addons/base/ir/ir_attachment.py 2016-11-24 14:41:24 +0000
3+++ bin/addons/base/ir/ir_attachment.py 2016-12-13 17:57:13 +0000
4@@ -442,12 +442,12 @@
5
6 _columns = {
7 'name': fields.char('Path to save the attachments to', size=256,
8- help="The complet path to the local folder where Unifield will save attachment files.",
9+ help="The complete path to the local folder where Unifield will save attachment files.",
10 required=True),
11 'next_migration' : fields.datetime('Next migration date',
12- help="Next planned execution of thei migration to move the old attachment to the path you defined"),
13+ help="Next planned execution of the migration to move the old attachment to the path defined"),
14 'migration_date': fields.datetime('Last migration execution date', readonly=True),
15- 'migration_error': fields.text('Migration error', readonly=True),
16+ 'migration_error': fields.text('Migration errors', readonly=True),
17 'is_migration_running': fields.function(_is_migration_running,
18 type='boolean', string='Moving files...', method=True,
19 readonly=True),
20@@ -614,7 +614,7 @@
21 'numbercall': 1,
22 'active': True,
23 }
24- cron_obj.write(cr, uid, default_migrate_attachment.id, values, context=context)
25+ cron_obj.write(cr, uid, default_migrate_attachment.id, values, context=context)
26 return super(attachment_config, self).write(cr, uid, ids, vals, context=context)
27
28 attachment_config()
29
30=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
31--- bin/addons/msf_profile/i18n/fr_MF.po 2016-12-07 06:47:50 +0000
32+++ bin/addons/msf_profile/i18n/fr_MF.po 2016-12-13 17:57:13 +0000
33@@ -75286,16 +75286,61 @@
34 msgstr "Dossier d'enregistrement des pièces jointes"
35
36 #. module: base
37-#: help:attachment.config,name:0
38-msgid "The complet path to the local folder where Unifield will save attachment files."
39+#: field:attachment.config,next_migration:444
40+msgid "Next migration date"
41+msgstr "Date de la prochaine migration"
42+
43+#. module: base
44+#: help:attachment.config,name:445
45+msgid "The complete path to the local folder where Unifield will save attachment files."
46 msgstr "Dossier dans lequel les pièces jointes seront stockées."
47
48 #. module: base
49+#: help:attachment.config,next_migration:448
50+msgid "Next planned execution of the migration to move the old attachment to the path defined"
51+msgstr "Prochaine execution planifiée de migration pour déplacer les anciènes pièces jointes vers le nouveau chemin défini."
52+
53+#. module: base
54+#: field:attachment.config,migration_date:449
55+msgid "Last migration execution date"
56+msgstr "Date de la dernière migration"
57+
58+#. module: base
59+#: field:attachment.config,migration_error:450
60+msgid "Migration errors"
61+msgstr "Erreurs de migration"
62+
63+#. module: base
64+#: field:attachment.config,is_migration_running:452
65+msgid "Moving files..."
66+msgstr "Déplacement des fichiers..."
67+
68+#. module: base
69+#: field:attachment.config,moving_rate:454
70+msgid "Moving process"
71+msgstr "Avancement du déplacement"
72+
73+#. module: base
74+#: constraint:attachment.config:469
75+msgid "You cannot have more than one Attachment configuration"
76+msgstr "Vous ne pouvez pas avoir plus d'une configuration de pièces jointes"
77+
78+#. module: base
79 #: view:attachment.config:0
80 #: model:ir.model,name:base.model_attachment_config
81 msgid "Attachment configuration"
82 msgstr "Configuration des pièces jointes"
83
84+#. module: base
85+#: view:attachment.config:0
86+msgid "Old attachments migration"
87+msgstr "Migration des anciennes pièces jointes"
88+
89+#. module: base
90+#: view:attachment.config:0
91+msgid "Migrate old attachement to store them in local file system"
92+msgstr "Migrer les anciennes pièces jointes pour les stocker sur le système de fichier local"
93+
94 #. module: board
95 #: code:addons/board/queries_finance.py:11
96 #: code:addons/board/queries_finance.py:30

Subscribers

People subscribed via source and target branches