Fix: Stop tracking __pycache__ files
This commit is contained in:
parent
7a0cf23df9
commit
c347e6f4d1
@ -1,6 +1,6 @@
|
||||
{
|
||||
'name': 'Access Restriction By User',
|
||||
'version': '19.0.1.0.0',
|
||||
'version': '19.0.1.0.1',
|
||||
'summary': 'Restrict access to Warehouses, Picking Types, Locations, Work Centers, and Approvals by User',
|
||||
'description': """
|
||||
Restricts visibility of:
|
||||
@ -22,7 +22,8 @@
|
||||
'security/ir_rule.xml',
|
||||
'security/ir_actions_act_window.xml',
|
||||
'views/res_users_views.xml',
|
||||
'views/mrp_production_views.xml',
|
||||
'views/mrp_production_v19.xml',
|
||||
'views/stock_picking_v19.xml',
|
||||
],
|
||||
'installable': True,
|
||||
'application': False,
|
||||
|
||||
Binary file not shown.
@ -1,10 +1,5 @@
|
||||
from . import res_users
|
||||
from . import restricted_models
|
||||
from . import sale_order
|
||||
<<<<<<< HEAD
|
||||
from . import stock_picking
|
||||
=======
|
||||
>>>>>>> 3a96e90 (feat: Hide quality check buttons on manufacturing orders for specific user groups with exceptions for quality roles.)
|
||||
from . import mrp_production
|
||||
from . import stock_picking
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -3,91 +3,9 @@ from odoo import models, fields, api
|
||||
class MrpProduction(models.Model):
|
||||
_inherit = 'mrp.production'
|
||||
|
||||
<<<<<<< HEAD
|
||||
restrict_quality_check_button = fields.Boolean(compute='_compute_restrict_quality_check_button')
|
||||
|
||||
@api.depends_context('uid')
|
||||
def _compute_restrict_quality_check_button(self):
|
||||
user = self.env.user
|
||||
for production in self:
|
||||
is_inventory_user = user.has_group('stock.group_stock_user')
|
||||
is_mrp_user = user.has_group('mrp.group_mrp_user')
|
||||
is_mrp_manager = user.has_group('mrp.group_mrp_manager')
|
||||
|
||||
is_restricted_role = is_inventory_user or is_mrp_user or is_mrp_manager
|
||||
|
||||
is_quality_manager = user.has_group('quality.group_quality_manager')
|
||||
is_system = user.has_group('base.group_system')
|
||||
|
||||
if is_restricted_role and not (is_quality_manager or is_system):
|
||||
production.restrict_quality_check_button = True
|
||||
else:
|
||||
production.restrict_quality_check_button = False
|
||||
=======
|
||||
hide_quality_check_button = fields.Boolean(compute='_compute_hide_quality_check_button')
|
||||
|
||||
@api.depends('product_id')
|
||||
@api.depends_context('uid')
|
||||
def _compute_hide_quality_check_button(self):
|
||||
for record in self:
|
||||
<<<<<<< HEAD
|
||||
user = self.env.user
|
||||
|
||||
# Define the restricted groups
|
||||
# 1. Inventory User (stock.group_stock_user)
|
||||
# 2. Manufacturing User (mrp.group_mrp_user)
|
||||
# 3. MPS User (mrp_mps.group_mrp_mps) - handled safely
|
||||
|
||||
is_restricted = False
|
||||
|
||||
if user.has_group('stock.group_stock_user') or user.has_group('mrp.group_mrp_user'):
|
||||
is_restricted = True
|
||||
|
||||
# Check MPS User group safely as it might not be installed or ID might differ
|
||||
if not is_restricted:
|
||||
if user.has_group('mrp_mps.group_mrp_mps'):
|
||||
is_restricted = True
|
||||
else:
|
||||
# Fallback search by name if XML ID not found or module not standard in this env
|
||||
if self.env['res.groups'].search_count([('name', '=', 'MPS User'), ('id', 'in', user.groups_id.ids)]):
|
||||
is_restricted = True
|
||||
|
||||
# Logic: If user is in ANY of the restricted groups, we hide the button.
|
||||
# However, usually "Manager" groups inherit "User" groups.
|
||||
# So a Manager would also be a User.
|
||||
# We must Ensure that we DO NOT hide it if the user is a Quality Manager or Quality User?
|
||||
# The request says: "only hide ... from user in inventory user group, manufacturing user group and MPS user group"
|
||||
# It implies if I am ONLY one of those, I shouldn't see it.
|
||||
# But if I am ALSO a Quality User, should I see it?
|
||||
# Usually, Quality User > Inventory User regarding Quality checks.
|
||||
# If I hide it for Inventory User, and I am both Inventory User AND Quality User, I will simply NOT see it if I check "if has_group(Inventory)".
|
||||
# So I should probably check if the user is NOT a Quality User/Manager.
|
||||
|
||||
# But the user request is specific: "change the logic... to only hide ... from user in [groups]"
|
||||
# If I am an Inventory User, I shouldn't see it.
|
||||
# If I am also a Quality User, do I see it? Standard Odoo: Quality Users see it.
|
||||
# If the user wants to restriction, likely they want these specific functional users NOT to do quality checks
|
||||
# UNLESS they are explicitly Quality Users?
|
||||
# Or maybe they want to hide it EVEN IF they are Quality Users?
|
||||
# "Only hide ... from user in ..." suggests targeting these specific roles.
|
||||
|
||||
# Let's refine the logic:
|
||||
# Hide IF (User is Inventory OR Mfg OR MPS) AND (User is NOT Quality Manager/User?)
|
||||
# Or is it a hard hide? "Only hide ... from [list]"
|
||||
# If I assume the user implies "People who are just Inventory/Mfg/MPS users shouldn't see this",
|
||||
# then if someone is ALSO a Quality Manager, they should probably see it.
|
||||
# So I will add an exception: If user is Quality User+, they see it.
|
||||
|
||||
is_quality_user = user.has_group('quality.group_quality_user') or user.has_group('quality.group_quality_manager')
|
||||
|
||||
if is_restricted and not is_quality_user:
|
||||
record.hide_quality_check_button = True
|
||||
else:
|
||||
record.hide_quality_check_button = False
|
||||
>>>>>>> 3a96e90 (feat: Hide quality check buttons on manufacturing orders for specific user groups with exceptions for quality roles.)
|
||||
=======
|
||||
# Logic: Hide logic is inverse of "is allowed"
|
||||
# If allowed_quality_checks is True, hide = False
|
||||
# If allowed_quality_checks is False, hide = True
|
||||
record.hide_quality_check_button = not self.env.user.allowed_quality_checks
|
||||
>>>>>>> 4a049d1 (feat: Implement user-specific control for quality check button visibility on manufacturing orders and inventory transfers via a new `allowed_quality_checks` field on users.)
|
||||
|
||||
@ -3,42 +3,9 @@ from odoo import models, fields, api
|
||||
class StockPicking(models.Model):
|
||||
_inherit = 'stock.picking'
|
||||
|
||||
<<<<<<< HEAD
|
||||
restrict_quality_check_button = fields.Boolean(compute='_compute_restrict_quality_check_button')
|
||||
|
||||
@api.depends_context('uid')
|
||||
def _compute_restrict_quality_check_button(self):
|
||||
user = self.env.user
|
||||
for picking in self:
|
||||
# Check if user is in restricted groups (Inventory User or MPS User/Manager)
|
||||
# MPS user usually relates to Manufacturing Manager or User, but user specifically asked for "MPS User".
|
||||
# Since there is no widespread "MPS User" group in standard, we assume it falls under Manufacturing.
|
||||
# However, we will check strictly for the groups mentioned in the request:
|
||||
# Inventory User: stock.group_stock_user
|
||||
# Manufacturing User: mrp.group_mrp_user
|
||||
# MPS User: mrp.group_mrp_manager (often implies MPS access)
|
||||
|
||||
is_inventory_user = user.has_group('stock.group_stock_user')
|
||||
is_mrp_user = user.has_group('mrp.group_mrp_user')
|
||||
is_mrp_manager = user.has_group('mrp.group_mrp_manager')
|
||||
|
||||
# User is possibly restricted if they have one of these basic roles
|
||||
is_restricted_role = is_inventory_user or is_mrp_user or is_mrp_manager
|
||||
|
||||
# But we must NOT hide if they are Quality Manager or System Admin
|
||||
is_quality_manager = user.has_group('quality.group_quality_manager')
|
||||
is_system = user.has_group('base.group_system')
|
||||
|
||||
if is_restricted_role and not (is_quality_manager or is_system):
|
||||
picking.restrict_quality_check_button = True
|
||||
else:
|
||||
picking.restrict_quality_check_button = False
|
||||
=======
|
||||
hide_quality_check_button = fields.Boolean(compute='_compute_hide_quality_check_button')
|
||||
|
||||
@api.depends('picking_type_id')
|
||||
@api.depends_context('uid')
|
||||
def _compute_hide_quality_check_button(self):
|
||||
for record in self:
|
||||
record.hide_quality_check_button = not self.env.user.allowed_quality_checks
|
||||
>>>>>>> 4a049d1 (feat: Implement user-specific control for quality check button visibility on manufacturing orders and inventory transfers via a new `allowed_quality_checks` field on users.)
|
||||
|
||||
@ -1,51 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
<<<<<<< HEAD:views/mrp_production_views.xml
|
||||
<<<<<<< HEAD
|
||||
<!-- Inherit from quality_mrp view -->
|
||||
<record id="view_mrp_production_form_inherit_access_restriction" model="ir.ui.view">
|
||||
=======
|
||||
<record id="mrp_production_view_form_inherit_access_restriction" model="ir.ui.view">
|
||||
>>>>>>> 3a96e90 (feat: Hide quality check buttons on manufacturing orders for specific user groups with exceptions for quality roles.)
|
||||
=======
|
||||
<record id="mrp_production_view_form_inherit_access_restriction_v19" model="ir.ui.view">
|
||||
>>>>>>> 5091c7f (feat: Update module to Odoo 19 by bumping version, adapting MRP and Stock Picking views, and removing stock valuation layer access rules.):views/mrp_production_v19.xml
|
||||
<field name="name">mrp.production.view.form.inherit.access.restriction</field>
|
||||
<field name="model">mrp.production</field>
|
||||
<field name="priority">99999</field>
|
||||
<field name="inherit_id" ref="mrp.mrp_production_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<<<<<<< HEAD:views/mrp_production_views.xml
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<field name="state" position="before">
|
||||
<field name="restrict_quality_check_button" invisible="1"/>
|
||||
</field>
|
||||
|
||||
<!-- Header Button -->
|
||||
<xpath expr="//button[@name='check_quality']" position="attributes">
|
||||
<attribute name="invisible">not quality_check_todo or restrict_quality_check_button</attribute>
|
||||
</xpath>
|
||||
|
||||
<!-- Smart Buttons -->
|
||||
<xpath expr="//button[@name='%(quality_mrp.quality_check_action_mo)d'][1]" position="attributes">
|
||||
<attribute name="invisible">not check_ids or quality_check_fail or not quality_check_todo or restrict_quality_check_button</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//button[@name='%(quality_mrp.quality_check_action_mo)d'][2]" position="attributes">
|
||||
<attribute name="invisible">not check_ids or quality_check_fail or quality_check_todo or restrict_quality_check_button</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//button[@name='%(quality_mrp.quality_check_action_mo)d'][3]" position="attributes">
|
||||
<attribute name="invisible">not check_ids or not quality_check_fail or restrict_quality_check_button</attribute>
|
||||
</xpath>
|
||||
|
||||
=======
|
||||
<xpath expr="//header" position="inside">
|
||||
=======
|
||||
<xpath expr="//sheet" position="inside">
|
||||
>>>>>>> 4a049d1 (feat: Implement user-specific control for quality check button visibility on manufacturing orders and inventory transfers via a new `allowed_quality_checks` field on users.)
|
||||
=======
|
||||
<sheet position="inside">
|
||||
>>>>>>> 5091c7f (feat: Update module to Odoo 19 by bumping version, adapting MRP and Stock Picking views, and removing stock valuation layer access rules.):views/mrp_production_v19.xml
|
||||
<field name="hide_quality_check_button" invisible="1"/>
|
||||
</sheet>
|
||||
<xpath expr="//button[@name='check_quality']" position="attributes">
|
||||
@ -54,7 +15,6 @@
|
||||
<xpath expr="//button[@name='button_quality_alert']" position="attributes">
|
||||
<attribute name="invisible">hide_quality_check_button</attribute>
|
||||
</xpath>
|
||||
>>>>>>> 3a96e90 (feat: Hide quality check buttons on manufacturing orders for specific user groups with exceptions for quality roles.)
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
|
||||
@ -1,44 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
<<<<<<< HEAD:views/stock_picking_views.xml
|
||||
<<<<<<< HEAD
|
||||
<!-- Inherit from the quality control view that adds the button -->
|
||||
<!-- We need to ensure we target the right buttons. The Quality Checks button is added by quality_control/views/stock_picking_views.xml -->
|
||||
<!-- The button names are 'check_quality', 'open_quality_alert_picking', 'action_open_quality_check_picking' -->
|
||||
|
||||
<record id="view_picking_form_inherit_access_restriction" model="ir.ui.view">
|
||||
<field name="name">stock.picking.view.form.inherit.access.restriction</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="inherit_id" ref="quality_control.stock_picking_view_form_inherit_quality"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="state" position="before">
|
||||
<field name="restrict_quality_check_button" invisible="1"/>
|
||||
</field>
|
||||
|
||||
<!-- Hide the 'Quality Checks' button (header) -->
|
||||
<xpath expr="//button[@name='check_quality']" position="attributes">
|
||||
<attribute name="invisible">not quality_check_todo or state in ('done', 'cancel') or restrict_quality_check_button</attribute>
|
||||
</xpath>
|
||||
|
||||
<!-- Hide the 'Quality Checks' smart buttons -->
|
||||
<!-- There are multiple buttons with same name/icon but different states/colors -->
|
||||
<!-- We target all of them if possible, or specifically by their index/attributes -->
|
||||
|
||||
<xpath expr="//button[@name='action_open_quality_check_picking'][1]" position="attributes">
|
||||
<attribute name="invisible">not check_ids or quality_check_fail or not quality_check_todo or restrict_quality_check_button</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//button[@name='action_open_quality_check_picking'][2]" position="attributes">
|
||||
<attribute name="invisible">not check_ids or quality_check_fail or quality_check_todo or restrict_quality_check_button</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//button[@name='action_open_quality_check_picking'][3]" position="attributes">
|
||||
<attribute name="invisible">not check_ids or not quality_check_fail or restrict_quality_check_button</attribute>
|
||||
</xpath>
|
||||
|
||||
=======
|
||||
<record id="stock_picking_view_form_inherit_access_restriction" model="ir.ui.view">
|
||||
=======
|
||||
<record id="stock_picking_view_form_inherit_access_restriction_v19" model="ir.ui.view">
|
||||
>>>>>>> 5091c7f (feat: Update module to Odoo 19 by bumping version, adapting MRP and Stock Picking views, and removing stock valuation layer access rules.):views/stock_picking_v19.xml
|
||||
<field name="name">stock.picking.view.form.inherit.access.restriction</field>
|
||||
<field name="model">stock.picking</field>
|
||||
<field name="priority">1000</field>
|
||||
@ -53,7 +15,6 @@
|
||||
<xpath expr="//button[@name='button_quality_alert']" position="attributes">
|
||||
<attribute name="invisible">hide_quality_check_button</attribute>
|
||||
</xpath>
|
||||
>>>>>>> 4a049d1 (feat: Implement user-specific control for quality check button visibility on manufacturing orders and inventory transfers via a new `allowed_quality_checks` field on users.)
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user