From 6e8ea0a820278ff79b97ed4ab276632e8de3c4c2 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
Date: Fri, 19 Jul 2013 00:15:04 -0400
Subject: [PATCH] [IMP] Documentation [ADD] Translation file + french [FIX]
 employee_id field does not exist [FIX] user_email field deprecated

---
 document_page_approval/__openerp__.py         |  29 +++--
 .../document_page_approval.py                 |   6 +-
 document_page_approval/document_page_wkfl.xml |  35 ++++--
 .../i18n/document_page_approval.pot           | 110 ++++++++++++++++
 document_page_approval/i18n/fr.po             | 119 ++++++++++++++++++
 5 files changed, 277 insertions(+), 22 deletions(-)
 create mode 100644 document_page_approval/i18n/document_page_approval.pot
 create mode 100644 document_page_approval/i18n/fr.po

diff --git a/document_page_approval/__openerp__.py b/document_page_approval/__openerp__.py
index 22a9559e..62b1aa01 100644
--- a/document_page_approval/__openerp__.py
+++ b/document_page_approval/__openerp__.py
@@ -27,16 +27,31 @@
     "license" : "AGPL-3",
     'category': 'Knowledge Management',
     'description': """
-Add a workflow to approve page modification and show the approved version by default
+This module adds a workflow to approve page modification and show the approved version by default.
+
+Scenario
+========
+
+* Set a valid email address on the company settings.
+* Create a new page category and set an approver group. Make sure users belonging to that group 
+  have valid email addresses.
+* Create a new page and choose the previously created category.
+* A notification is sent to the group with a link to the page history to review.
+* Depending on the review, the page history is approved or not.
+* Users reading the page see the last approved version.
     """,
-    'depends': ['document_page', 'email_template'],
-    'update_xml': ['document_page_wkfl.xml','document_page_view.xml'],
+    'depends': [
+        'document_page',
+        'email_template',
+        ],
+    'data': [
+        'document_page_wkfl.xml',
+        'document_page_view.xml',
+        'security/document_page_security.xml',
+        'security/ir.model.access.csv',
+        ],
     'installable': True,
     'auto_install': False,
     'images': [],
-    'data': [
-        'security/document_page_security.xml',
-        'security/ir.model.access.csv',
-        ]
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/document_page_approval/document_page_approval.py b/document_page_approval/document_page_approval.py
index 20d8af0a..12e0c951 100644
--- a/document_page_approval/document_page_approval.py
+++ b/document_page_approval/document_page_approval.py
@@ -86,8 +86,8 @@ class document_page_history_wkfl(orm.Model):
             users = self.pool.get('res.users').browse(cr, uid, uids)
 
             for user in users:
-                if user.user_email:
-                    emails += user.user_email
+                if user.email:
+                    emails += user.email
                     emails += ','
                 else:
                     empl_id = self.pool.get('hr.employee').search(cr, uid,[('login','=',user.login)])[0]
@@ -118,7 +118,7 @@ class document_page_history_wkfl(orm.Model):
         'is_parent_approval_required': fields.related('page_id', 'is_parent_approval_required', string="parent approval", type='boolean', store=False),
         'can_user_approve_page': fields.function(can_user_approve_page, string="can user approve this page", type='boolean', store=False),
         'get_approvers_email': fields.function(get_approvers_email, string="get all approvers email", type='text', store=False),
-        'get_page_url': fields.function(get_page_url, string="get page url", type='text', store=False),
+        'get_page_url': fields.function(get_page_url, string="URL", type='text', store=False),
         }
         
 class document_page_approval(orm.Model):
diff --git a/document_page_approval/document_page_wkfl.xml b/document_page_approval/document_page_wkfl.xml
index 4ee782c7..f92d8463 100644
--- a/document_page_approval/document_page_wkfl.xml
+++ b/document_page_approval/document_page_wkfl.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+
         <record model="workflow" id="wkf_document_page_history_aproval">
             <field name="name">document.page.history.aproval.wkf</field>
             <field name="osv">document.page.history</field>
@@ -34,6 +35,12 @@
             <field name="act_to" ref="act_draft" />
             <field name="signal">edit</field>
         </record>
+
+    </data>
+
+    <!-- Allow user to make upgrade-proof customizations to email template -->
+
+    <data noupdate="1">
         
         <record id="email_template_new_draft_need_approval" model="email.template">
             <field name="name">Automated new draft need approval Notification Mail</field>
@@ -42,25 +49,29 @@
             <field name="email_to">${object.get_approvers_email}</field>
             <field name="model_id" ref="model_document_page_history"/>
             <field name="auto_delete" eval="True"/>
-            <field name="lang">${object.employee_id.partner_id.lang}</field>
-            <field name="body_html">
-                <![CDATA[
+            <field name="lang">${object.create_uid.partner_id.lang}</field>
+            <field name="body_html"><![CDATA[
 <p>Hello,</p>
 
-<p>The page "${object.page_id.name}" has been modified and need aprobation.</p>
+<p>The page "${object.page_id.name}" has been modified and need your approval.</p>
 
-<p>You can view the new version there: <a href="${object.get_page_url}"> ${object.get_page_url} </a></p>
-            
-                ]]>
+<p>You can review the new version here : <a href="${object.get_page_url}">${object.get_page_url}</a></p>
+ 
+<p>Have a great day.<br/>
+--<br/>
+OpenERP</p>]]>
             </field>
-            <field name="body_text">
-                <![CDATA[
+            <field name="body_text"><![CDATA[
 Hello,
 
-The page "${object.page_id.name}" has been modified and need aprobation.
+The page "${object.page_id.name}" has been modified and need your approval.
 
-You can view the new version there: ${object.get_page_url}
-            ]]></field>
+You can review the new version here: ${object.get_page_url}
+
+Have a great day.
+--
+OpenERP]]></field>
         </record>
+
     </data>
 </openerp>
diff --git a/document_page_approval/i18n/document_page_approval.pot b/document_page_approval/i18n/document_page_approval.pot
new file mode 100644
index 00000000..4ddc9733
--- /dev/null
+++ b/document_page_approval/i18n/document_page_approval.pot
@@ -0,0 +1,110 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* document_page_approval
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-19 03:58+0000\n"
+"PO-Revision-Date: 2013-07-19 03:58+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: document_page_approval
+#: field:document.page.history,state:0
+msgid "Status"
+msgstr ""
+
+#. module: document_page_approval
+#: field:document.page,approval_required:0
+msgid "Require approval"
+msgstr ""
+
+#. module: document_page_approval
+#: field:document.page,is_parent_approval_required:0
+#: field:document.page.history,is_parent_approval_required:0
+msgid "parent approval"
+msgstr ""
+
+#. module: document_page_approval
+#: model:email.template,body_html:document_page_approval.email_template_new_draft_need_approval
+msgid "\n"
+"<p>Hello,</p>\n"
+"\n"
+"<p>The page \"${object.page_id.name}\" has been modified and need your approval.</p>\n"
+"\n"
+"<p>You can review the new version here : <a href=\"${object.get_page_url}\">${object.get_page_url}</a></p>\n"
+" \n"
+"<p>Have a great day.<br/>\n"
+"--<br/>\n"
+"OpenERP</p>\n"
+"            "
+msgstr ""
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page
+msgid "Document Page"
+msgstr ""
+
+#. module: document_page_approval
+#: field:document.page,approved_uid:0
+#: field:document.page.history,approved_uid:0
+msgid "Approved By"
+msgstr ""
+
+#. module: document_page_approval
+#: model:email.template,subject:document_page_approval.email_template_new_draft_need_approval
+msgid "New version of \"${object.page_id.name}\" to approve"
+msgstr ""
+
+#. module: document_page_approval
+#: selection:document.page.history,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: document_page_approval
+#: field:document.page.history,get_page_url:0
+msgid "URL"
+msgstr ""
+
+#. module: document_page_approval
+#: field:document.page,approved_date:0
+#: field:document.page.history,approved_date:0
+msgid "Approved Date"
+msgstr ""
+
+#. module: document_page_approval
+#: field:document.page.history,can_user_approve_page:0
+msgid "can user approve this page"
+msgstr ""
+
+#. module: document_page_approval
+#: field:document.page,approver_gid:0
+msgid "Approver group"
+msgstr ""
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page_history
+msgid "Document Page History"
+msgstr ""
+
+#. module: document_page_approval
+#: view:document.page.history:0
+msgid "Approve"
+msgstr ""
+
+#. module: document_page_approval
+#: selection:document.page.history,state:0
+msgid "Approved"
+msgstr ""
+
+#. module: document_page_approval
+#: field:document.page.history,get_approvers_email:0
+msgid "get all approvers email"
+msgstr ""
+
diff --git a/document_page_approval/i18n/fr.po b/document_page_approval/i18n/fr.po
new file mode 100644
index 00000000..26573fa4
--- /dev/null
+++ b/document_page_approval/i18n/fr.po
@@ -0,0 +1,119 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* document_page_approval
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-19 03:58+0000\n"
+"PO-Revision-Date: 2013-07-19 03:58+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: document_page_approval
+#: field:document.page.history,state:0
+msgid "Status"
+msgstr "Statut"
+
+#. module: document_page_approval
+#: field:document.page,approval_required:0
+msgid "Require approval"
+msgstr "Nécessite une approbation"
+
+#. module: document_page_approval
+#: field:document.page,is_parent_approval_required:0
+#: field:document.page.history,is_parent_approval_required:0
+msgid "parent approval"
+msgstr "Approbation parente"
+
+#. module: document_page_approval
+#: model:email.template,body_html:document_page_approval.email_template_new_draft_need_approval
+msgid "\n"
+"<p>Hello,</p>\n"
+"\n"
+"<p>The page \"${object.page_id.name}\" has been modified and need your approval.</p>\n"
+"\n"
+"<p>You can review the new version here : <a href=\"${object.get_page_url}\">${object.get_page_url}</a></p>\n"
+" \n"
+"<p>Have a great day.<br/>\n"
+"--<br/>\n"
+"OpenERP</p>\n"
+"            "
+msgstr "\n"
+"<p>Bonjour,</p>\n"
+"\n"
+"<p>La page \"${object.page_id.name}\" a été modifié et demande votre approbation.</p>\n"
+"\n"
+"<p>Vous pouvez réviser la nouvelle version ici : <a href=\"${object.get_page_url}\">${object.get_page_url}</a></p>\n"
+" \n"
+"<p>Bonne journée.<br/>\n"
+"--<br/>\n"
+"OpenERP</p>\n"
+"            "
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page
+msgid "Document Page"
+msgstr "Page"
+
+#. module: document_page_approval
+#: field:document.page,approved_uid:0
+#: field:document.page.history,approved_uid:0
+msgid "Approved By"
+msgstr "Approuvée par"
+
+#. module: document_page_approval
+#: model:email.template,subject:document_page_approval.email_template_new_draft_need_approval
+msgid "New version of \"${object.page_id.name}\" to approve"
+msgstr "Nouvelle version de \"${object.page_id.name}\" à approuver"
+
+#. module: document_page_approval
+#: selection:document.page.history,state:0
+msgid "Draft"
+msgstr "Brouillon"
+
+#. module: document_page_approval
+#: field:document.page.history,get_page_url:0
+msgid "URL"
+msgstr "URL"
+
+#. module: document_page_approval
+#: field:document.page,approved_date:0
+#: field:document.page.history,approved_date:0
+msgid "Approved Date"
+msgstr "Date d'approbation"
+
+#. module: document_page_approval
+#: field:document.page.history,can_user_approve_page:0
+msgid "can user approve this page"
+msgstr "Est-ce que l'usager peut approuver cette page ?"
+
+#. module: document_page_approval
+#: field:document.page,approver_gid:0
+msgid "Approver group"
+msgstr "Groupe approbateur"
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page_history
+msgid "Document Page History"
+msgstr "Historique de la page"
+
+#. module: document_page_approval
+#: view:document.page.history:0
+msgid "Approve"
+msgstr "Approuver"
+
+#. module: document_page_approval
+#: selection:document.page.history,state:0
+msgid "Approved"
+msgstr "Approuvée"
+
+#. module: document_page_approval
+#: field:document.page.history,get_approvers_email:0
+msgid "get all approvers email"
+msgstr "Récupérer toutes les adresses courriels des approbateurs"