Browse Source

Merge 292c7d0d6a into 2cec0b9746

pull/301/merge
Roberto Camejo 9 months ago
committed by GitHub
parent
commit
a4ed7b83b8
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 7
      hide_menu_user/models/res_user.py
  2. 34
      hide_menu_user/views/res_users.xml
  3. 5
      pos_mrp_order/models/point_of_sale_make_mrp.py

7
hide_menu_user/models/res_user.py

@ -66,3 +66,10 @@ class RestrictMenu(models.Model):
_inherit = 'ir.ui.menu' _inherit = 'ir.ui.menu'
restrict_user_ids = fields.Many2many('res.users') restrict_user_ids = fields.Many2many('res.users')
module_name = fields.Char('Module Name', compute='_compute_module_name', store=True)
@api.depends('complete_name')
def _compute_module_name(self):
for menu in self:
module_name = menu.complete_name.split('/')[0] if menu.complete_name else ''
menu.module_name = module_name

34
hide_menu_user/views/res_users.xml

@ -6,9 +6,9 @@
<field name="inherit_id" ref="base.view_users_form"/> <field name="inherit_id" ref="base.view_users_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//notebook" position="inside"> <xpath expr="//notebook" position="inside">
<page string="Hide Specific Menu" attrs="{'invisible': [('is_admin','=', True)]}"> <page string="Hide Specific Menu" attrs="{'invisible': [('is_admin','=', True)]}">
<tree> <tree>
<field name="hide_menu_ids"/> <field name="hide_menu_ids" context="{'search_default_module':1, 'search_view_ref': 'hide_menu_user.edit_menu_access_search_custom', 'tree_view_ref': 'hide_menu_user.edit_menu_custom'}"/>
</tree> </tree>
</page> </page>
</xpath> </xpath>
@ -32,5 +32,35 @@
</xpath> </xpath>
</field> </field>
</record> </record>
<record id="edit_menu_access_search_custom" model="ir.ui.view">
<field name="name">ir.ui.menu.search</field>
<field name="model">ir.ui.menu</field>
<field name="arch" type="xml">
<search string="Menu">
<field name="name" string="Menu"/>
<field name="parent_id"/>
<separator/>
<filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
<group expand="0" string="Group By">
<filter string="Module" name="module" domain="[]" context="{'group_by':'module_name'}"/>
</group>
</search>
</field>
</record>
<record id="edit_menu_custom" model="ir.ui.view">
<field name="model">ir.ui.menu</field>
<field name="inherit_id" ref="base.edit_menu"/>
<field name="arch" type="xml">
<xpath expr="//tree" position="replace">
<tree string="Menu">
<field name="module_name" invisible="1"/>
<field name="sequence" widget='handle'/>
<field icon="icon" name="complete_name" string="Menu"/>
</tree>
</xpath>
</field>
</record>
</data> </data>
</odoo> </odoo>

5
pos_mrp_order/models/point_of_sale_make_mrp.py

@ -98,6 +98,11 @@ class MrpProduction(models.Model):
'move_finished_ids': [ 'move_finished_ids': [
(0, 0, finished_vals)] (0, 0, finished_vals)]
}) })
# This piece of code gets the order done immediately
immediate_production = self.env['mrp.immediate.production'].sudo().create(
{'mo_ids': [(6, 0, mrp_order.ids)], 'immediate_production_line_ids': [
(0, 0, {'production_id': mrp_order.id, 'to_immediate': True})]}).process()
mrp_order.button_mark_done()
return True return True

Loading…
Cancel
Save