[13.0][FIX] document_page: fix multicompany rules

2025-07-29 03:46:29 -06:00 · 2020-11-04 15:17:00 +01:00 · 2020-11-04 15:17:00 +01:00 · 17618ab87e
commit 17618ab87e
parent c9719b42cf
28 changed files with 9 additions and 46 deletions
--- a/document_page/manifest.py
+++ b/document_page/manifest.py
@ -4,7 +4,7 @@

 {
    "name": "Document Page",
-    "version": "13.0.1.0.3",
+    "version": "13.0.1.0.4",
    "category": "Knowledge Management",
    "author": "OpenERP SA, Odoo Community Association (OCA)",
    "images": [
--- a/document_page/i18n/de.po
+++ b/document_page/i18n/de.po
@ -199,7 +199,6 @@ msgstr "Dokumenten Seite Historie"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Dokumentenseite"

@ -362,7 +361,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__message_ids
 #, fuzzy
-#| msgid "Pages"
 msgid "Messages"
 msgstr "Seiten"

@ -551,7 +549,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__website_message_ids
 #, fuzzy
-#| msgid "Pages"
 msgid "Website Messages"
 msgstr "Seiten"

--- a/document_page/i18n/en.po
+++ b/document_page/i18n/en.po
@ -197,7 +197,6 @@ msgstr "Document Page History"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Document Page"

@ -272,7 +271,6 @@ msgstr "If checked, new messages require your attention."
 #: model:ir.model.fields,help:document_page.field_document_page__message_has_error
 #: model:ir.model.fields,help:document_page.field_document_page__message_has_sms_error
 #, fuzzy
-#| msgid "If checked, new messages require your attention."
 msgid "If checked, some messages have a delivery error."
 msgstr "If checked, new messages require your attention."

@ -402,7 +400,6 @@ msgstr "Number of Actions"
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__message_has_error_counter
 #, fuzzy
-#| msgid "Number of Actions"
 msgid "Number of errors"
 msgstr "Number of Actions"

@ -414,7 +411,6 @@ msgstr "Number of messages which requires an action"
 #. module: document_page
 #: model:ir.model.fields,help:document_page.field_document_page__message_has_error_counter
 #, fuzzy
-#| msgid "Number of messages which requires an action"
 msgid "Number of messages with delivery error"
 msgstr "Number of messages which requires an action"

@ -556,7 +552,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__website_message_ids
 #, fuzzy
-#| msgid "Messages"
 msgid "Website Messages"
 msgstr "Messages"

--- a/document_page/i18n/es.po
+++ b/document_page/i18n/es.po
@ -198,7 +198,6 @@ msgstr "Historial de página del documento"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Página del documento"

@ -361,7 +360,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__message_ids
 #, fuzzy
-#| msgid "Pages"
 msgid "Messages"
 msgstr "Páginas"

@ -550,7 +548,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__website_message_ids
 #, fuzzy
-#| msgid "Pages"
 msgid "Website Messages"
 msgstr "Páginas"

--- a/document_page/i18n/es_AR.po
+++ b/document_page/i18n/es_AR.po
@ -198,7 +198,6 @@ msgstr "Historia de página de documento"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Página de documento"

--- a/document_page/i18n/es_CR.po
+++ b/document_page/i18n/es_CR.po
@ -198,7 +198,6 @@ msgstr "Historia de página de documento"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Página de documento"

--- a/document_page/i18n/es_MX.po
+++ b/document_page/i18n/es_MX.po
@ -198,7 +198,6 @@ msgstr "Historia de página de documento"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Página de documento"

--- a/document_page/i18n/es_VE.po
+++ b/document_page/i18n/es_VE.po
@ -198,7 +198,6 @@ msgstr "Historia de página de documento"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Página de documento"

--- a/document_page/i18n/fi.po
+++ b/document_page/i18n/fi.po
@ -197,7 +197,6 @@ msgstr "Dokumentin sivuhistoria"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Dokumentin sivu"

--- a/document_page/i18n/fr.po
+++ b/document_page/i18n/fr.po
@ -397,7 +397,6 @@ msgstr "Nombre d'actions"
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__message_has_error_counter
 #, fuzzy
-#| msgid "Number of error"
 msgid "Number of errors"
 msgstr "Nombre d'erreurs"

@ -472,7 +471,6 @@ msgstr "Révision"
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__message_has_sms_error
 #, fuzzy
-#| msgid "Message Delivery error"
 msgid "SMS Delivery error"
 msgstr "Erreur d'envoi du message"

@ -555,7 +553,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__website_message_ids
 #, fuzzy
-#| msgid "Messages"
 msgid "Website Messages"
 msgstr "Messages"

--- a/document_page/i18n/hr.po
+++ b/document_page/i18n/hr.po
@ -199,7 +199,6 @@ msgstr "Povijest stranica Dokumenata"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Stranica dokumenata"

@ -362,7 +361,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__message_ids
 #, fuzzy
-#| msgid "Pages"
 msgid "Messages"
 msgstr "Stranice"

@ -553,7 +551,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__website_message_ids
 #, fuzzy
-#| msgid "Pages"
 msgid "Website Messages"
 msgstr "Stranice"

--- a/document_page/i18n/hu.po
+++ b/document_page/i18n/hu.po
@ -197,7 +197,6 @@ msgstr "Dokumantum oldal előzmény"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Documentum oldal"

--- a/document_page/i18n/it.po
+++ b/document_page/i18n/it.po
@ -198,7 +198,6 @@ msgstr "Cronologia Pagina Documento"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Pagina documento"

@ -361,7 +360,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__message_ids
 #, fuzzy
-#| msgid "Pages"
 msgid "Messages"
 msgstr "Pagine"

@ -554,7 +552,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__website_message_ids
 #, fuzzy
-#| msgid "Pages"
 msgid "Website Messages"
 msgstr "Pagine"

--- a/document_page/i18n/mk.po
+++ b/document_page/i18n/mk.po
@ -197,7 +197,6 @@ msgstr "Историја на страница на документ"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Страница на документ"

--- a/document_page/i18n/mn.po
+++ b/document_page/i18n/mn.po
@ -197,7 +197,6 @@ msgstr "Баримтын Хуудасны Түүх"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Баримтын Хуудас"

--- a/document_page/i18n/nl.po
+++ b/document_page/i18n/nl.po
@ -198,7 +198,6 @@ msgstr "Document pagina historie"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Document pagina"

--- a/document_page/i18n/nl_NL.po
+++ b/document_page/i18n/nl_NL.po
@ -198,7 +198,6 @@ msgstr "Documentpagina-historie"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Documentpagina"

@ -361,7 +360,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__message_ids
 #, fuzzy
-#| msgid "Pages"
 msgid "Messages"
 msgstr "Pagina's"

@ -550,7 +548,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__website_message_ids
 #, fuzzy
-#| msgid "Pages"
 msgid "Website Messages"
 msgstr "Pagina's"

--- a/document_page/i18n/pl.po
+++ b/document_page/i18n/pl.po
@ -199,7 +199,6 @@ msgstr "Historia strony dokumentu"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Strona dokumentu"

--- a/document_page/i18n/pt.po
+++ b/document_page/i18n/pt.po
@ -198,7 +198,6 @@ msgstr "Histórico da Página do Documento"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Página do Documento"

@ -361,7 +360,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__message_ids
 #, fuzzy
-#| msgid "Pages"
 msgid "Messages"
 msgstr "Páginas"

@ -552,7 +550,6 @@ msgstr ""
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page__website_message_ids
 #, fuzzy
-#| msgid "Pages"
 msgid "Website Messages"
 msgstr "Páginas"

--- a/document_page/i18n/pt_BR.po
+++ b/document_page/i18n/pt_BR.po
@ -198,7 +198,6 @@ msgstr "Histórico da Página de Documento"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Página do Documento"

--- a/document_page/i18n/pt_PT.po
+++ b/document_page/i18n/pt_PT.po
@ -198,7 +198,6 @@ msgstr "Histórico da Página do Documento"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page History"
 msgid "Document Page Show Diff"
 msgstr "Histórico da Página do Documento"

--- a/document_page/i18n/ro.po
+++ b/document_page/i18n/ro.po
@ -198,7 +198,6 @@ msgstr "Istoric Pagini Documente"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Pagina Documentului"

--- a/document_page/i18n/ru.po
+++ b/document_page/i18n/ru.po
@ -199,7 +199,6 @@ msgstr "История страницы документа"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Страница документа"

--- a/document_page/i18n/sl.po
+++ b/document_page/i18n/sl.po
@ -198,7 +198,6 @@ msgstr "Zgodovina strani dokumentov"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Stran dokumenta"

--- a/document_page/i18n/sv.po
+++ b/document_page/i18n/sv.po
@ -197,7 +197,6 @@ msgstr "Dokumentets sidhistorik"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Dokumentsida"

--- a/document_page/i18n/tr.po
+++ b/document_page/i18n/tr.po
@ -197,7 +197,6 @@ msgstr "Belge Sayfa Geçmişi"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 #, fuzzy
-#| msgid "Document Page"
 msgid "Document Page Show Diff"
 msgstr "Belge Sayfası"

--- a/document_page/security/document_page_security.xml
+++ b/document_page/security/document_page_security.xml
@ -17,7 +17,7 @@
        <field name="global" eval="True" />
        <field
            name="domain_force"
-        >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        >['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
    </record>
    <record model="ir.rule" id="document_page_history_rule">
        <field name="name">document_page_history multi-company</field>
@ -25,6 +25,6 @@
        <field name="global" eval="True" />
        <field
            name="domain_force"
-        >['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        >['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
    </record>
 </odoo>
--- a/document_page/views/document_page_category.xml
+++ b/document_page/views/document_page_category.xml
@ -18,6 +18,10 @@
                                string="Category"
                                context="{'default_type':'category'}"
                            />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
                        </group>
                        <group>
                            <field name="write_uid" groups="base.group_no_one" />
@ -60,6 +64,7 @@
                <field name="create_uid" invisible="1" />
                <field name="write_uid" />
                <field name="write_date" />
+                <field name="company_id" groups="base.group_multi_company" />
            </tree>
        </field>
    </record>
@ -76,6 +81,7 @@
                <field name="parent_id" />
                <field name="create_uid" />
                <field name="content_uid" />
+                <field name="company_id" groups="base.group_multi_company" />
                <group expand="0" string="Group By...">
                    <filter
                        name="group_by_category"