Merge pull request #57 from ClearCorp-dev/8.0-document_page-gs

Module document_page: Improved widget and email template.
2025-07-22 20:12:04 -06:00 · 2015-07-30 23:05:03 +02:00 · 2015-07-30 23:05:03 +02:00 · 8225be0b61
commit 8225be0b61
parent 28320b7755 b27a50e1ef
8 changed files with 137 additions and 178 deletions
--- a/document_page/openerp.py
+++ b/document_page/openerp.py
@ -33,6 +33,7 @@ Web pages
    'license': 'AGPL-3',
    'depends': [
        'knowledge',
+        'mail',
    ],
    'data': [
        'wizard/document_page_create_menu_view.xml',
--- a/document_page/document_page_view.xml
+++ b/document_page/document_page_view.xml
@ -277,7 +277,8 @@
                    <label for="create_date" class="oe_edit_only"/>
                    <field name="create_date" readonly="1"/>
                    <label for="content" class="oe_edit_only"/>
-                    <field name="content" colspan="4"/>
+                    <field name="content" colspan="4"
+                        widget="html" options='{"safe": True}'/>
                </form>
            </field>
        </record>
--- a/document_page_approval/data/email_template.xml
+++ b/document_page_approval/data/email_template.xml
@ -23,7 +23,7 @@

 <p>Have a great day.<br/>
 --<br/>
-OpenERP</p>]]>
+Odoo</p>]]>
            </field>
        </record>

--- a/document_page_approval/i18n/document_page_approval.pot
+++ b/document_page_approval/i18n/document_page_approval.pot
@ -26,7 +26,7 @@ msgid "\n"
 "\n"
 "<p>Have a great day.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</p>\n"
 "            "
 msgstr ""

--- a/document_page_approval/i18n/es.po
+++ b/document_page_approval/i18n/es.po
@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-27 20:53+0000\n"
-"PO-Revision-Date: 2015-07-27 20:53+0000\n"
+"POT-Creation-Date: 2015-07-30 15:19+0000\n"
+"PO-Revision-Date: 2015-07-30 15:19+0000\n"
 "Last-Translator: Glen Sojo <glen.sojo@clearcorp.co.cr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@ -26,7 +26,7 @@ msgid "\n"
 "\n"
 "<p>Have a great day.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</p>\n"
 "            "
 msgstr "\n"
 "<p>Hola,</p>\n"
@ -37,7 +37,7 @@ msgstr "\n"
 "\n"
 "<p>Que tenga un buen día.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</p>\n"
 "            "

 #. module: document_page_approval
--- a/document_page_approval/i18n/es_CR.po
+++ b/document_page_approval/i18n/es_CR.po
@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-27 20:53+0000\n"
-"PO-Revision-Date: 2015-07-27 20:53+0000\n"
+"POT-Creation-Date: 2015-07-30 15:19+0000\n"
+"PO-Revision-Date: 2015-07-30 15:19+0000\n"
 "Last-Translator: Glen Sojo <glen.sojo@clearcorp.co.cr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@ -26,7 +26,7 @@ msgid "\n"
 "\n"
 "<p>Have a great day.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</p>\n"
 "            "
 msgstr "\n"
 "<p>Hola,</p>\n"
@ -37,7 +37,7 @@ msgstr "\n"
 "\n"
 "<p>Que tenga un buen día.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</p>\n"
 "            "

 #. module: document_page_approval
--- a/document_page_approval/i18n/fr.po
+++ b/document_page_approval/i18n/fr.po
@ -1,36 +1,21 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
 #	* document_page_approval
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: Odoo Server 8.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"
+"POT-Creation-Date: 2015-07-30 14:19-0600\n"
+"PO-Revision-Date: 2015-07-30 14:19-0600\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
+"Content-Transfer-Encoding: 8bit\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"
@ -39,10 +24,10 @@ msgid "\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"
+"\n"
 "<p>Have a great day.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</p>\n"
 "            "
 msgstr "\n"
 "<p>Bonjour,</p>\n"
@ -50,61 +35,14 @@ msgstr "\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"
+"\n"
 "<p>Bonne journée.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</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
+#: view:document.page.history:document_page_approval.wiki_history_form_inherit
 msgid "Approve"
 msgstr "Approuver"

@ -114,6 +52,52 @@ 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"
+#: field:document.page.history,approved_uid:0
+msgid "Approved By"
+msgstr "Approuvée par"
+
+#. module: document_page_approval
+#: field:document.page.history,approved_date:0
+msgid "Approved Date"
+msgstr "Date d'approbation"
+
+#. 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
+msgid "Document Page"
+msgstr "Page"
+
+#. 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
+#: selection:document.page.history,state:0
+msgid "Draft"
+msgstr "Brouillon"
+
+#. 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
+#: code:addons/document_page_approval/document_page_approval.py:66
+#, python-format
+msgid "New version of the document %s approved."
+msgstr ""
+
+#. 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.history,state:0
+msgid "Status"
+msgstr "Statut"
--- a/document_page_approval/i18n/sl.po
+++ b/document_page_approval/i18n/sl.po
@ -1,119 +1,48 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
 #	* document_page_approval
 #
-# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-19 03:58+0000\n"
-"PO-Revision-Date: 2015-04-13 07:38+0200\n"
+"POT-Creation-Date: 2015-07-30 14:20-0600\n"
+"PO-Revision-Date: 2015-07-30 14:20-0600\n"
 "Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
 "Language-Team: Slovenian <translate@matmoz.si>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: \n"
-"Language: sl\n"
-"X-Generator: Lokalize 1.5\n"
-
-#. module: document_page_approval
-#: field:document.page.history,state:0
-msgid "Status"
-msgstr "Status"
-
-#. module: document_page_approval
-#: field:document.page,approval_required:0
-msgid "Require approval"
-msgstr "Zahtevana odobritev"
-
-#. 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 "Nadrejena odobritev"

 #. module: document_page_approval
 #: model:email.template,body_html:document_page_approval.email_template_new_draft_need_approval
-msgid ""
-"\n"
+msgid "\n"
 "<p>Hello,</p>\n"
 "\n"
-"<p>The page \"${object.page_id.name}\" has been modified and need your "
-"approval.</p>\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>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"
+"Odoo</p>\n"
 "            "
-msgstr ""
-"\n"
+msgstr "\n"
 "<p>Pozdravljeni,</p>\n"
 "\n"
-"<p>Stran \"${object.page_id.name}\" vsebuje spremembe, ki potrebujejo vašo "
-"odobritev.</p>\n"
+"<p>Stran \"${object.page_id.name}\" vsebuje spremembe, ki potrebujejo vašo odobritev.</p>\n"
+"\n"
+"<p>Novo različico lahko pregledate tukaj: <a href=\"${object.get_page_url}\">${object.get_page_url}</a></p>\n"
 "\n"
-"<p>Novo različico lahko pregledate tukaj: <a href=\"${object.get_page_url}\">"
-"${object.get_page_url}</a></p>\n"
-" \n"
 "<p>Lep dan.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</p>\n"
 "            "

 #. module: document_page_approval
-#: model:ir.model,name:document_page_approval.model_document_page
-msgid "Document Page"
-msgstr "Stran dokumenta"
-
-#. module: document_page_approval
-#: field:document.page,approved_uid:0
-#: field:document.page.history,approved_uid:0
-msgid "Approved By"
-msgstr "Odobril"
-
-#. 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 "Nova različica \"${object.page_id.name}\" za odobritev"
-
-#. module: document_page_approval
-#: selection:document.page.history,state:0
-msgid "Draft"
-msgstr "Osnutek"
-
-#. module: document_page_approval
-#: field:document.page.history,get_page_url:0
-msgid "URL"
-msgstr "URL povezava"
-
-#. module: document_page_approval
-#: field:document.page,approved_date:0
-#: field:document.page.history,approved_date:0
-msgid "Approved Date"
-msgstr "Datum odobritve"
-
-#. module: document_page_approval
-#: field:document.page.history,can_user_approve_page:0
-msgid "can user approve this page"
-msgstr "uporabnik lahko odobri to stran"
-
-#. module: document_page_approval
-#: field:document.page,approver_gid:0
-msgid "Approver group"
-msgstr "Skupina pooblaščenih za odobritev"
-
-#. module: document_page_approval
-#: model:ir.model,name:document_page_approval.model_document_page_history
-msgid "Document Page History"
-msgstr "Zgodovina strani dokumentov"
-
-#. module: document_page_approval
-#: view:document.page.history:0
+#: view:document.page.history:document_page_approval.wiki_history_form_inherit
 msgid "Approve"
 msgstr "Odobri"

@ -123,8 +52,52 @@ msgid "Approved"
 msgstr "Odobreno"

 #. module: document_page_approval
-#: field:document.page.history,get_approvers_email:0
-msgid "get all approvers email"
-msgstr "pridobi vse e-poštne naslove pooblaščenih za odobritve "
+#: field:document.page.history,approved_uid:0
+msgid "Approved By"
+msgstr "Odobril"

+#. module: document_page_approval
+#: field:document.page.history,approved_date:0
+msgid "Approved Date"
+msgstr "Datum odobritve"

+#. module: document_page_approval
+#: field:document.page,approver_gid:0
+msgid "Approver group"
+msgstr "Skupina pooblaščenih za odobritev"
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page
+msgid "Document Page"
+msgstr "Stran dokumenta"
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page_history
+msgid "Document Page History"
+msgstr "Zgodovina strani dokumentov"
+
+#. module: document_page_approval
+#: selection:document.page.history,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
+#. 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 "Nova različica \"${object.page_id.name}\" za odobritev"
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/document_page_approval.py:66
+#, python-format
+msgid "New version of the document %s approved."
+msgstr ""
+
+#. module: document_page_approval
+#: field:document.page,approval_required:0
+msgid "Require approval"
+msgstr "Zahtevana odobritev"
+
+#. module: document_page_approval
+#: field:document.page.history,state:0
+msgid "Status"
+msgstr "Status"