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

[jftempo]

=== modified file 'bin/addons/base/ir/ir_attachment.py'
--- bin/addons/base/ir/ir_attachment.py	2016-11-24 14:41:24 +0000
+++ bin/addons/base/ir/ir_attachment.py	2016-12-13 17:57:13 +0000
@@ -442,12 +442,12 @@
 
     _columns = {
         'name': fields.char('Path to save the attachments to', size=256,
-                            help="The complet path to the local folder where Unifield will save attachment files.",
+                            help="The complete path to the local folder where Unifield will save attachment files.",
                             required=True),
         'next_migration' : fields.datetime('Next migration date',
-                                           help="Next planned execution of thei migration to move the old attachment to the path you defined"),
+                                           help="Next planned execution of the migration to move the old attachment to the path defined"),
         'migration_date': fields.datetime('Last migration execution date', readonly=True),
-        'migration_error': fields.text('Migration error', readonly=True),
+        'migration_error': fields.text('Migration errors', readonly=True),
         'is_migration_running': fields.function(_is_migration_running,
                                                 type='boolean', string='Moving files...', method=True,
                                                 readonly=True),
@@ -614,7 +614,7 @@
                 'numbercall': 1,
                 'active': True,
             }
-            cron_obj.write(cr, uid, default_migrate_attachment.id, values, context=context) 
+            cron_obj.write(cr, uid, default_migrate_attachment.id, values, context=context)
         return super(attachment_config, self).write(cr, uid, ids, vals, context=context)
 
 attachment_config()
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2016-12-07 06:47:50 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2016-12-13 17:57:13 +0000
@@ -75286,16 +75286,61 @@
 msgstr "Dossier d'enregistrement des pièces jointes"
 
 #. module: base
-#: help:attachment.config,name:0
-msgid "The complet path to the local folder where Unifield will save attachment files."
+#: field:attachment.config,next_migration:444
+msgid "Next migration date"
+msgstr "Date de la prochaine migration"
+
+#. module: base
+#: help:attachment.config,name:445
+msgid "The complete path to the local folder where Unifield will save attachment files."
 msgstr "Dossier dans lequel les pièces jointes seront stockées."
 
 #. module: base
+#: help:attachment.config,next_migration:448
+msgid "Next planned execution of the migration to move the old attachment to the path defined"
+msgstr "Prochaine execution planifiée de migration pour déplacer les anciènes pièces jointes vers le nouveau chemin défini."
+
+#. module: base
+#: field:attachment.config,migration_date:449
+msgid "Last migration execution date"
+msgstr "Date de la dernière migration"
+
+#. module: base
+#: field:attachment.config,migration_error:450
+msgid "Migration errors"
+msgstr "Erreurs de migration"
+
+#. module: base
+#: field:attachment.config,is_migration_running:452
+msgid "Moving files..."
+msgstr "Déplacement des fichiers..."
+
+#. module: base
+#: field:attachment.config,moving_rate:454
+msgid "Moving process"
+msgstr "Avancement du déplacement"
+
+#. module: base
+#: constraint:attachment.config:469
+msgid "You cannot have more than one Attachment configuration"
+msgstr "Vous ne pouvez pas avoir plus d'une configuration de pièces jointes"
+
+#. module: base
 #: view:attachment.config:0
 #: model:ir.model,name:base.model_attachment_config
 msgid "Attachment configuration"
 msgstr "Configuration des pièces jointes"
 
+#. module: base
+#: view:attachment.config:0
+msgid "Old attachments migration"
+msgstr "Migration des anciennes pièces jointes"
+
+#. module: base
+#: view:attachment.config:0
+msgid "Migrate old attachement to store them in local file system"
+msgstr "Migrer les anciennes pièces jointes pour les stocker sur le système de fichier local"
+
 #. module: board
 #: code:addons/board/queries_finance.py:11
 #: code:addons/board/queries_finance.py:30