diff --git a/__manifest__.py b/__manifest__.py index 7554be0..9dc3c93 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -12,17 +12,19 @@ 'views/machine_area_views.xml', 'views/machine_views.xml', 'views/res_partner_view.xml', - 'views/partner_machine_access_html.xml', 'views/assets.xml', + 'views/machine_product_training_views.xml', 'data/data.xml', 'data/data_product_and_categories.xml', + 'data/machine_product_links.xml', + ], 'qweb': [ 'static/src/xml/ows_briefing_details.xml', 'static/src/xml/ows_briefing_details_edit.xml', 'static/src/xml/ows_pos_order_selector.xml', - 'static/src/xml/partner_access_popup.xml', + 'static/src/xml/ows_pos_machine_access_view.xml', ], 'installable': True, 'assets': { diff --git a/data/machine_product_links.xml b/data/machine_product_links.xml new file mode 100644 index 0000000..be99f67 --- /dev/null +++ b/data/machine_product_links.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/models/ows_models.py b/models/ows_models.py index e9a7f2b..0f846ab 100644 --- a/models/ows_models.py +++ b/models/ows_models.py @@ -14,10 +14,34 @@ class ResPartner(models.Model): ows_user_id = fields.One2many('ows.user', 'partner_id', string="OWS Benutzerdaten") # ✳️ Zugriff auf Felder aus ows.user per compute + inverse (statt related) - birthday = fields.Date(compute='_compute_ows_user_fields', inverse='_inverse_ows_user_fields', store=False) - rfid_card = fields.Text(compute='_compute_ows_user_fields', inverse='_inverse_ows_user_fields', store=False) - security_briefing = fields.Boolean(compute='_compute_ows_user_fields', inverse='_inverse_ows_user_fields', store=False) - security_id = fields.Text(compute='_compute_ows_user_fields', inverse='_inverse_ows_user_fields', store=False) + birthday = fields.Date( + string="Geburtstag", + compute='_compute_ows_user_fields', + inverse='_inverse_ows_user_fields', + store=False + ) + + rfid_card = fields.Text( + string="RFID Card ID", + compute='_compute_ows_user_fields', + inverse='_inverse_ows_user_fields', + store=False + ) + + security_briefing = fields.Boolean( + string="Haftungsausschluss", + compute='_compute_ows_user_fields', + inverse='_inverse_ows_user_fields', + store=False + ) + + security_id = fields.Text( + string="Haftungsausschluss ID", + compute='_compute_ows_user_fields', + inverse='_inverse_ows_user_fields', + store=False + ) + @api.depends('ows_user_id') def _compute_ows_user_fields(self): diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index 227b5fb..022703c 100644 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -2,6 +2,7 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_ows_machine_access_user,ows.machine.access,model_ows_machine_access,base.group_user,1,1,1,1 access_ows_machine_user,ows.machine,model_ows_machine,base.group_user,1,1,1,1 access_ows_machine_product_user,ows.machine.product,model_ows_machine_product,base.group_user,1,1,1,1 +access_ows_machine_training_user,access_ows_machine_training_user,model_ows_machine_training,base.group_user,1,1,1,1 access_ows_machine_area,ows.machine.area,model_ows_machine_area,base.group_user,1,1,1,1 access_ows_user,ows.user,model_ows_user,base.group_user,1,1,1,1 access_ows_machine_training,ows.machine.training,model_ows_machine_training,base.group_user,1,1,1,1 diff --git a/static/src/xml/partner_access_popup.xml b/static/src/xml/ows_pos_machine_access_view.xml similarity index 100% rename from static/src/xml/partner_access_popup.xml rename to static/src/xml/ows_pos_machine_access_view.xml diff --git a/views/assets.xml b/views/assets.xml index 8f59d57..7f4624b 100644 --- a/views/assets.xml +++ b/views/assets.xml @@ -3,7 +3,7 @@ + src="/open_workshop/static/src/xml/ows_pos_machine_access_view.xml"/> diff --git a/views/machine_product_training_views.xml b/views/machine_product_training_views.xml new file mode 100644 index 0000000..53a9d60 --- /dev/null +++ b/views/machine_product_training_views.xml @@ -0,0 +1,49 @@ + + + + ows.machine.product.tree + ows.machine.product + + + + + + + + + + + ows.machine.training.tree + ows.machine.training + + + + + + + + + + + Maschinen-Nutzungsprodukte + ows.machine.product + tree + + + Verwalte die Zuordnung von Maschinen zu Nutzungsprodukten. + + + + + + Maschinen-Einweisungsprodukte + ows.machine.training + tree + + + Verwalte die Zuordnung von Maschinen zu Einweisungsprodukten. + + + + + diff --git a/views/menu_views.xml b/views/menu_views.xml index 106a933..b70287b 100644 --- a/views/menu_views.xml +++ b/views/menu_views.xml @@ -15,11 +15,45 @@ - - - - + + + + + + + + + + + + + + + + + + ows.machine.product.tree diff --git a/views/partner_machine_access_html.xml b/views/partner_machine_access_html.xml deleted file mode 100644 index 8ea8aa9..0000000 --- a/views/partner_machine_access_html.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - res.partner.form.ows.machine.access.html - res.partner - - - - - - - - - - diff --git a/views/res_partner_view.xml b/views/res_partner_view.xml index 96dd7e2..b9bad8e 100644 --- a/views/res_partner_view.xml +++ b/views/res_partner_view.xml @@ -1,5 +1,25 @@ + + + res.partner.form.ows.machine.access.html + res.partner + + + + + + + + + + res.partner.form.ows.machine.access
Verwalte die Zuordnung von Maschinen zu Nutzungsprodukten.
Verwalte die Zuordnung von Maschinen zu Einweisungsprodukten.