[IMP] contacts_school_permission: filter signers (avanzosc#728)

marionumza · May 14, 2019 · 4eb708f · 4eb708f
1 parent d88c501
commit 4eb708f
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 10 deletions.
diff --git a/contacts_school_permission/i18n/contacts_school_permission.pot b/contacts_school_permission/i18n/contacts_school_permission.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-25 13:00+0000\n"
-"PO-Revision-Date: 2019-04-25 13:00+0000\n"
+"POT-Creation-Date: 2019-05-13 08:52+0000\n"
+"PO-Revision-Date: 2019-05-13 08:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,21 @@ msgstr ""
 msgid "Allowed Signers"
 msgstr ""
 
+#. module: contacts_school_permission
+#: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_permission_view_search
+msgid "Approved"
+msgstr ""
+
 #. module: contacts_school_permission
 #: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner_permission__attachment_doc
 msgid "Attached Document"
 msgstr ""
 
+#. module: contacts_school_permission
+#: model:ir.model,name:contacts_school_permission.model_res_partner
+msgid "Contact"
+msgstr ""
+
 #. module: contacts_school_permission
 #: model:ir.model,name:contacts_school_permission.model_res_partner_permission
 msgid "Contact Permission"
@@ -47,6 +57,11 @@ msgstr ""
 msgid "Default in Admission"
 msgstr ""
 
+#. module: contacts_school_permission
+#: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_permission_view_search
+msgid "Denied"
+msgstr ""
+
 #. module: contacts_school_permission
 #: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner_permission__description
 #: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner_permission_type__description
@@ -111,6 +126,7 @@ msgid "Not In Admission"
 msgstr ""
 
 #. module: contacts_school_permission
+#: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_permission_view_search
 #: selection:res.partner.permission,state:0
 msgid "Pending"
 msgstr ""
@@ -124,7 +140,10 @@ msgstr ""
 
 #. module: contacts_school_permission
 #: model:ir.actions.act_window,name:contacts_school_permission.action_res_partner_permission
+#: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner__permission_ids
+#: model:ir.model.fields,field_description:contacts_school_permission.field_res_users__permission_ids
 #: model:ir.ui.menu,name:contacts_school_permission.res_partner_permission_menuitem
+#: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_view_form
 msgid "Permissions"
 msgstr ""
 
@@ -140,11 +159,13 @@ msgstr ""
 
 #. module: contacts_school_permission
 #: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner_permission__state
+#: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_permission_view_search
 msgid "State"
 msgstr ""
 
 #. module: contacts_school_permission
 #: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner_permission__partner_id
+#: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_permission_view_search
 msgid "Student"
 msgstr ""
 

diff --git a/contacts_school_permission/i18n/es.po b/contacts_school_permission/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-25 13:00+0000\n"
-"PO-Revision-Date: 2019-04-25 13:00+0000\n"
+"POT-Creation-Date: 2019-05-13 08:52+0000\n"
+"PO-Revision-Date: 2019-05-13 08:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,21 @@ msgstr ""
 msgid "Allowed Signers"
 msgstr "Firmantes permitidos"
 
+#. module: contacts_school_permission
+#: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_permission_view_search
+msgid "Approved"
+msgstr "Aprobado"
+
 #. module: contacts_school_permission
 #: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner_permission__attachment_doc
 msgid "Attached Document"
 msgstr "Documento adjunto"
 
+#. module: contacts_school_permission
+#: model:ir.model,name:contacts_school_permission.model_res_partner
+msgid "Contact"
+msgstr "Contacto"
+
 #. module: contacts_school_permission
 #: model:ir.model,name:contacts_school_permission.model_res_partner_permission
 msgid "Contact Permission"
@@ -47,6 +57,11 @@ msgstr "Creado el"
 msgid "Default in Admission"
 msgstr "Por defecto en admisión"
 
+#. module: contacts_school_permission
+#: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_permission_view_search
+msgid "Denied"
+msgstr "Denegado"
+
 #. module: contacts_school_permission
 #: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner_permission__description
 #: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner_permission_type__description
@@ -69,7 +84,7 @@ msgstr "Fecha finalización"
 #: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner_permission__id
 #: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner_permission_type__id
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 #. module: contacts_school_permission
 #: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_permission_type_view_search
@@ -103,14 +118,15 @@ msgstr "Nombre"
 #. module: contacts_school_permission
 #: selection:res.partner.permission,state:0
 msgid "No"
-msgstr "No"
+msgstr ""
 
 #. module: contacts_school_permission
 #: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_permission_type_view_search
 msgid "Not In Admission"
 msgstr "No en admisión"
 
 #. module: contacts_school_permission
+#: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_permission_view_search
 #: selection:res.partner.permission,state:0
 msgid "Pending"
 msgstr "Pendiente"
@@ -124,7 +140,10 @@ msgstr "Tipo de permiso"
 
 #. module: contacts_school_permission
 #: model:ir.actions.act_window,name:contacts_school_permission.action_res_partner_permission
+#: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner__permission_ids
+#: model:ir.model.fields,field_description:contacts_school_permission.field_res_users__permission_ids
 #: model:ir.ui.menu,name:contacts_school_permission.res_partner_permission_menuitem
+#: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_view_form
 msgid "Permissions"
 msgstr "Permisos"
 
@@ -140,11 +159,13 @@ msgstr "Fecha de inicio"
 
 #. module: contacts_school_permission
 #: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner_permission__state
+#: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_permission_view_search
 msgid "State"
 msgstr "Estado"
 
 #. module: contacts_school_permission
 #: model:ir.model.fields,field_description:contacts_school_permission.field_res_partner_permission__partner_id
+#: model_terms:ir.ui.view,arch_db:contacts_school_permission.res_partner_permission_view_search
 msgid "Student"
 msgstr "Alumno"
 

diff --git a/contacts_school_permission/models/res_partner_permission.py b/contacts_school_permission/models/res_partner_permission.py
@@ -16,7 +16,8 @@ class ResPartnerPermission(models.Model):
         comodel_name='res.partner', string='Allowed Signers',
         compute='_compute_allowed_signer_ids', store=True)
     signer_id = fields.Many2one(
-        comodel_name='res.partner', string='Signed by')
+        comodel_name='res.partner', string='Signed by',
+        domain="[('id', 'in', allowed_signer_ids)]")
     type_id = fields.Many2one(
         comodel_name='res.partner.permission.type', string='Type',
         required=True)

diff --git a/contacts_school_permission/views/res_partner_permission_view.xml b/contacts_school_permission/views/res_partner_permission_view.xml
@@ -27,7 +27,6 @@
                                    options="{'no_create': True}" />
                             <field name="allowed_signer_ids" invisible="True" />
                             <field name="signer_id"
-                                   domain="[('id', 'in', allowed_signer_ids)]"
                                    options="{'no_create': True, 'no_open': True}"/>
                             <field name="state" />
                         </group>
@@ -62,9 +61,17 @@
                 <field name="signer_id" />
                 <field name="type_id" />
                 <field name="description" />
+                <filter name="approved" string="Approved"
+                        domain="[('state', '=', 'yes')]" />
+                <filter name="denied" string="Denied"
+                        domain="[('state', '=', 'no')]" />
+                <filter name="pending" string="Pending"
+                        domain="[('state', '=', 'pending')]" />
                 <group name="groupby">
                     <filter name="partner" string="Student" domain="[]"
                             context="{'group_by': 'partner_id'}" />
+                    <filter name="state" string="State" domain="[]"
+                            context="{'group_by': 'state'}" />
                 </group>
             </search>
         </field>

diff --git a/contacts_school_permission/views/res_partner_view.xml b/contacts_school_permission/views/res_partner_view.xml
@@ -13,9 +13,13 @@
                               decoration-success="state=='yes'"
                               decoration-danger="state=='no'">
                             <field name="partner_id" invisible="True" />
+                            <field name="allowed_signer_ids" invisible="True" />
                             <field name="description" />
-                            <field name="type_id" />
-                            <field name="signer_id" />
+                            <field name="type_id"
+                                   options="{'no_create': True}"/>
+                            <field name="type_description" />
+                            <field name="signer_id"
+                                   options="{'no_create': True, 'no_open': True}" />
                             <field name="start_date" />
                             <field name="end_date" />
                             <field name="state" />