diff options
| author | Rémy Voet (ryv) <ryv@odoo.com> | 2020-01-21 09:55:58 +0000 |
|---|---|---|
| committer | Rémy Voet (ryv) <ryv@odoo.com> | 2020-03-06 09:16:16 +0000 |
| commit | 94b39d3ea3600e560d0f8aa0bac294908d6122c4 (patch) | |
| tree | bb7625b33c80b3867ba5fe0afe677f76995bd59e | |
| parent | 93ac430147f2b81a2c31c1a1ffc7b66b6a5c0943 (diff) | |
[REF] stock,purchase,repair,mrp: clean ACL/report
For stock, purchase, repair and mrp modules, do a small clean of ACL:
Remove duplication and useless line.
Also improve the readability of the stock traceability report.
task-2172399
closes odoo/odoo#45055
Signed-off-by: Simon Lejeune (sle) <sle@openerp.com>
| -rw-r--r-- | addons/mrp/security/ir.model.access.csv | 3 | ||||
| -rw-r--r-- | addons/purchase/security/ir.model.access.csv | 2 | ||||
| -rw-r--r-- | addons/purchase_stock/security/ir.model.access.csv | 1 | ||||
| -rw-r--r-- | addons/repair/security/ir.model.access.csv | 2 | ||||
| -rw-r--r-- | addons/sale_stock/security/ir.model.access.csv | 2 | ||||
| -rw-r--r-- | addons/stock/security/ir.model.access.csv | 10 | ||||
| -rw-r--r-- | addons/stock/static/src/xml/stock_traceability_report_line.xml | 15 | ||||
| -rw-r--r-- | addons/stock/views/report_stock_traceability.xml | 13 | ||||
| -rw-r--r-- | addons/website_sale/security/ir.model.access.csv | 2 | ||||
| -rw-r--r-- | addons/website_sale/security/website_sale.xml | 12 |
10 files changed, 17 insertions, 45 deletions
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index f3da2c3d932..3b3ebdf97d2 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -11,7 +11,6 @@ access_mrp_bom_line,mrp.bom.line,model_mrp_bom_line,group_mrp_user,1,0,0,0 access_mrp_bom_byproduct_user,mrp.bom.byproduct,model_mrp_bom_byproduct,mrp.group_mrp_user,1,0,0,0 access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,1 access_mrp_workcenter_manager,mrp.workcenter.manager,model_mrp_workcenter,mrp.group_mrp_manager,1,1,1,1 -access_mrp_resource_manager,access_mrp_resource manager,resource.model_resource_resource,mrp.group_mrp_manager,1,1,1,1 access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_manager,1,1,1,1 access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_manager,1,1,1,1 access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_manager,1,1,1,1 @@ -43,7 +42,7 @@ access_mrp_production_manager,mrp.production manager,model_mrp_production,mrp.gr access_stock_move_mrp_manager,stock.move mrp_manager,stock.model_stock_move,mrp.group_mrp_manager,1,0,0,0 access_stock_production_lot_user,stock.production.lot,stock.model_stock_production_lot,mrp.group_mrp_user,1,1,1,1 access_stock_warehouse_orderpoint_user,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,mrp.group_mrp_user,1,0,0,0 -access_stock_picking_mrp_manager,stock.picking mrp_manager,stock.model_stock_picking,mrp.group_mrp_manager,1,0,0,0 +access_stock_picking_mrp_manager,stock.picking mrp_manager,stock.model_stock_picking,mrp.group_mrp_manager,1,1,1,1 access_mrp_bom_stockuser,mrp.bom,model_mrp_bom,stock.group_stock_user,1,0,0,0 access_mrp_bom_line_stockuser,mrp.bom.line,model_mrp_bom_line,stock.group_stock_user,1,0,0,0 access_uom_category_mrp_manager,uom.category mrp_manager,uom.model_uom_category,mrp.group_mrp_manager,1,1,1,1 diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index 2435fd93bb5..2b5d68ae8ed 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -30,10 +30,8 @@ access_product_category_purchase_manager,product.category purchase_manager,produ access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,purchase.group_purchase_manager,1,1,1,1
access_product_packaging_purchase_manager,product.packaging purchase_manager,product.model_product_packaging,purchase.group_purchase_manager,1,1,1,1
access_product_supplierinfo_purchase_manager,product.supplierinfo purchase_manager,product.model_product_supplierinfo,purchase.group_purchase_manager,1,1,1,1
-access_product_group_res_partner_purchase_manager,res_partner group_purchase_manager,base.model_res_partner,purchase.group_purchase_manager,1,1,1,0
access_product_pricelist_item_purchase_manager,product.pricelist.item purchase_manager,product.model_product_pricelist_item,purchase.group_purchase_manager,1,1,1,1
access_account_account_purchase_manager,account.account purchase manager,account.model_account_account,purchase.group_purchase_manager,1,0,0,0
-access_account_journal_purchase_manager,account.journal purchase manager,account.model_account_journal,purchase.group_purchase_manager,1,0,0,0
access_purchase_bill_union,access_purchase_bill_union,model_purchase_bill_union,purchase.group_purchase_user,1,0,0,0
access_report_purchase_order,purchase.stock.report,model_purchase_report,purchase.group_purchase_manager,1,0,0,0
access_report_purchase_order_user,purchase.stock.report user,model_purchase_report,purchase.group_purchase_user,1,0,0,0
diff --git a/addons/purchase_stock/security/ir.model.access.csv b/addons/purchase_stock/security/ir.model.access.csv index 82b377f7318..12c826e863b 100644 --- a/addons/purchase_stock/security/ir.model.access.csv +++ b/addons/purchase_stock/security/ir.model.access.csv @@ -9,6 +9,5 @@ access_stock_location_purchase_user_manager,stock.location,stock.model_stock_loc access_stock_warehouse_purchase_user_manager,stock.warehouse,stock.model_stock_warehouse,purchase.group_purchase_manager,1,0,0,0 access_stock_picking_purchase_user_manager,stock.picking,stock.model_stock_picking,purchase.group_purchase_manager,1,1,1,1 access_stock_move_purchase_user_manager,stock.move,stock.model_stock_move,purchase.group_purchase_manager,1,1,1,1 -access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0 access_stock_warehouse_orderpoint_user,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,purchase.group_purchase_user,1,0,0,0 diff --git a/addons/repair/security/ir.model.access.csv b/addons/repair/security/ir.model.access.csv index d1c7ed737e5..9f16001a93b 100644 --- a/addons/repair/security/ir.model.access.csv +++ b/addons/repair/security/ir.model.access.csv @@ -4,6 +4,6 @@ access_repair_user,Repair user,model_repair_order,stock.group_stock_user,1,1,1,1 access_repair_tag_user,Repair Tags user,model_repair_tags,stock.group_stock_user,1,1,1,1 access_stock_production_lot_user,stock.production.lot user,stock.model_stock_production_lot,stock.group_stock_user,1,1,1,1 access_repair_line_user,repair.line user,model_repair_line,stock.group_stock_user,1,1,1,1 -access_account_tax_user,account.tax,account.model_account_tax,stock.group_stock_user,1,1,1,1 +access_account_tax_user,account.tax,account.model_account_tax,stock.group_stock_user,1,0,0,0 access_repair_order_make_invoice,access.repair.order.make_invoice,model_repair_order_make_invoice,stock.group_stock_user,1,1,1,0 access_stock_warn_insufficient_qty_repair,access.stock.warn.insufficient.qty.repair,model_stock_warn_insufficient_qty_repair,stock.group_stock_user,1,1,1,0 diff --git a/addons/sale_stock/security/ir.model.access.csv b/addons/sale_stock/security/ir.model.access.csv index 47abb8177e6..7f4be5c95a2 100644 --- a/addons/sale_stock/security/ir.model.access.csv +++ b/addons/sale_stock/security/ir.model.access.csv @@ -5,8 +5,8 @@ access_stock_move_manager,stock_move manager,stock.model_stock_move,sales_team.g access_sale_order_stock_worker,sale.order stock worker,model_sale_order,stock.group_stock_user,1,1,0,0 access_sale_order_line_stock_worker,sale.order.line stock worker,model_sale_order_line,stock.group_stock_user,1,1,0,0 access_stock_picking_sales,stock.picking.sales,stock.model_stock_picking,sales_team.group_sale_manager,1,1,1,1 +access_stock_picking_portal,stock.picking,stock.model_stock_picking,base.group_portal,1,0,0,0 access_product_packaging_user,product.packaging.user,product.model_product_packaging,sales_team.group_sale_salesman,1,1,1,0 -access_product_packaging_manager,product.packaging.manager,product.model_product_packaging,sales_team.group_sale_manager,1,0,0,0 access_stock_warehouse_user,stock.warehouse.user,stock.model_stock_warehouse,sales_team.group_sale_salesman,1,0,0,0 access_stock_location_user,stock.location.user,stock.model_stock_location,sales_team.group_sale_salesman,1,0,0,0 access_product_packaging_sale_manager,product.packaging salemanager,product.model_product_packaging,sales_team.group_sale_manager,1,1,1,1 diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv index 3b177eb51a0..2f4b90364b7 100644 --- a/addons/stock/security/ir.model.access.csv +++ b/addons/stock/security/ir.model.access.csv @@ -1,27 +1,22 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_procurement_group,procurement.group,model_procurement_group,base.group_user,1,1,1,0 -access_stock_rule,stock.rule,model_stock_rule,base.group_user,1,1,1,0 access_stock_warehouse_manager,stock.warehouse.manager,model_stock_warehouse,stock.group_stock_manager,1,1,1,1 access_stock_warehouse_user,stock.warehouse.user,model_stock_warehouse,base.group_user,1,0,0,0 -access_stock_location__partner_manager,stock.location.partner.manager,model_stock_location,base.group_partner_manager,1,0,0,0 +access_stock_location_partner_manager,stock.location.partner.manager,model_stock_location,base.group_partner_manager,1,0,0,0 access_stock_location_manager,stock.location.manager,model_stock_location,stock.group_stock_manager,1,1,1,1 access_stock_location_user,stock.location.user,model_stock_location,base.group_user,1,0,0,0 access_stock_picking_user,stock.picking user,model_stock_picking,stock.group_stock_user,1,1,1,1 access_stock_picking_manager,stock.picking manager,model_stock_picking,stock.group_stock_manager,1,1,1,1 -access_stock_picking_portal,stock.picking,stock.model_stock_picking,base.group_portal,1,0,0,0 access_stock_picking_type_all,stock.picking.type all users,model_stock_picking_type,base.group_user,1,0,0,0 access_stock_picking_type_user,stock.picking.type user,model_stock_picking_type,stock.group_stock_user,1,0,0,0 access_stock_picking_type_manager,stock.picking.type manager,model_stock_picking_type,stock.group_stock_manager,1,1,1,1 -access_stock_picking_type_portal,stock.picking.type portal,stock.model_stock_picking_type,base.group_portal,0,0,0,0 access_stock_production_lot_user,stock.production.lot user,model_stock_production_lot,stock.group_stock_user,1,1,1,1 access_stock_move_manager,stock.move manager,model_stock_move,stock.group_stock_manager,1,1,1,1 access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,1,1,0 -access_stock_move_portal,stock.move,stock.model_stock_move,base.group_portal,0,0,0,0 access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,0 access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1 access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,1,1,0 access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,1,1,1 -access_stock_location_stock_manager,stock.location stock manager,model_stock_location,stock.group_stock_manager,1,0,0,0 access_product_product_stock_user,product_product_stock_user,product.model_product_product,stock.group_stock_user,1,0,0,0 access_product_template_stock_user,product.template stock user,product.model_product_template,stock.group_stock_user,1,0,0,0 access_uom_category_stock_manager,uom.category stock_manager,uom.model_uom_category,stock.group_stock_manager,1,1,1,1 @@ -37,7 +32,6 @@ access_product_group_res_partner_stock_manager,res_partner group_stock_manager,b access_product_pricelist_item_stock_manager,product.pricelist.item stock_manager,product.model_product_pricelist_item,stock.group_stock_manager,1,1,1,1 access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,model_stock_warehouse_orderpoint,stock.group_stock_user,1,0,0,0 access_stock_warehouse_orderpoint_system,stock.warehouse.orderpoint system,model_stock_warehouse_orderpoint,stock.group_stock_manager,1,1,1,1 -access_stock_warehouse_orderpoint_portal,stock.warehouse.orderpoint,stock.model_stock_warehouse_orderpoint,base.group_portal,0,0,0,0 access_stock_quant_manager,stock.quant manager,model_stock_quant,stock.group_stock_manager,1,0,0,0 access_stock_quant_user,stock.quant user,model_stock_quant,stock.group_stock_user,1,0,0,0 access_stock_quant_all,stock.quant all users,model_stock_quant,base.group_user,1,0,0,0 @@ -48,7 +42,6 @@ access_stock_package_level_all,stock.package_level all users,model_stock_package access_stock_package_level_stock_manager,stock.package_level stock manager,model_stock_package_level,stock.group_stock_manager,1,1,1,1 access_stock_package_level_stock_user,stock.package_level stock user,model_stock_package_level,stock.group_stock_user,1,1,1,1 access_stock_rule_user,stock_rule user,model_stock_rule,stock.group_stock_user,1,0,0,0 -access_stock_rule_manager,stock_rule manager,model_stock_rule,stock.group_stock_manager,1,1,1,1 access_stock_rule_stock_manager,stock_rule stock manager,model_stock_rule,stock.group_stock_manager,1,1,1,1 access_stock_location_route_stock_manager,stock.location.route,model_stock_location_route,stock.group_stock_manager,1,1,1,1 access_stock_location_route,stock.location.route,model_stock_location_route,base.group_user,1,0,0,0 @@ -59,7 +52,6 @@ access_stock_move_line_all,stock.move.line all users,model_stock_move_line,base. access_stock_putaway_all,stock.putaway.rule all users,model_stock_putaway_rule,base.group_user,1,0,0,0 access_stock_putaway_manager,stock.putaway.rule all managers,model_stock_putaway_rule,stock.group_stock_manager,1,1,1,1 access_stock_removal_all,product.removal all users,model_product_removal,base.group_user,1,0,0,0 -access_stock_move_line_portal,stock.move.line portal,stock.model_stock_move_line,base.group_portal,0,0,0,0 access_barcode_nomenclature_stock_user,barcode.nomenclature.stock.user,barcodes.model_barcode_nomenclature,stock.group_stock_user,1,0,0,0 access_barcode_nomenclature_stock_manager,barcode.nomenclature.stock.manager,barcodes.model_barcode_nomenclature,stock.group_stock_manager,1,1,1,1 access_barcode_rule_stock_user,barcode.rule.stock.user,barcodes.model_barcode_rule,stock.group_stock_user,1,0,0,0 diff --git a/addons/stock/static/src/xml/stock_traceability_report_line.xml b/addons/stock/static/src/xml/stock_traceability_report_line.xml index fa39b9c3087..11504054a37 100644 --- a/addons/stock/static/src/xml/stock_traceability_report_line.xml +++ b/addons/stock/static/src/xml/stock_traceability_report_line.xml @@ -34,20 +34,19 @@ </t> <t t-if="l.reference == c"> <span t-if="c" t-att-class="spanclass"> - <a t-att-data-active-id="l.res_id" t-att-data-res-model="l.res_model" class="o_stock_reports_web_action" href="#"><t t-raw="c" /></a> + <a t-att-data-active-id="l.res_id" t-att-data-res-model="l.res_model" class="o_stock_reports_web_action" href="#"><t t-esc="c"/></a> + </span> + </t><t t-elif="l.lot_name == c and l.lot_name != false"> + <span> + <a class="o_stock_report_lot_action" href="#"><t t-esc="c"/></a> </span> </t> - <t t-elif="l.lot_name == c and l.lot_name != false"> - <span> - <a class="o_stock_report_lot_action" href="#"><t t-raw="c"/></a> - </span> - </t> <t t-if="l.reference != c and l.lot_name != c"> <t t-if="typeof c == 'string' || typeof c == 'number'"> - <t t-raw="c"/> + <t t-esc="c"/> </t> <t t-if="typeof c != 'string' & typeof c != 'number'"><span t-att-style="c[1]"> - <t t-raw="c[0]"/> + <t t-esc="c[0]"/> </span></t> </t> </td> diff --git a/addons/stock/views/report_stock_traceability.xml b/addons/stock/views/report_stock_traceability.xml index 20936403bf0..f6181bcf6e7 100644 --- a/addons/stock/views/report_stock_traceability.xml +++ b/addons/stock/views/report_stock_traceability.xml @@ -18,7 +18,7 @@ <t t-set="column" t-value="0" /> <t t-foreach="a['columns']" t-as="c"> <t t-set="column" t-value="column + 1" /> - <td t-att-data-id="a.get('id')" t-att-data-model="a['model']" t-att-data-model_id="a['model_id']" t-att-class="tdclass" t-att-data-level="a['level']"> + <td t-att-data-id="a.get('id')" t-att-data-model="a['model']" t-att-data-model_id="a['model_id']" t-att-class="tdclass" t-att-data-level="a['level']"> <t t-if="column == 1"> <t t-if="a.get('unfoldable') and not a.get('is_used')"> <span t-att-data-id="a['id']" class="o_stock_reports_unfoldable o_stock_reports_caret_icon"><i class="fa fa-fw fa-caret-right" role="img" aria-label="Unfold" title="Unfold"></i></span> @@ -29,16 +29,15 @@ </t> <t t-if="a['reference'] == c"> <span t-if="c" t-att-class="spanclass"> - <a t-att-data-active-id="a['res_id']" t-att-data-res-model="a['res_model']" class="o_stock_reports_web_action" href="#"><t t-raw="c" /></a> + <a t-att-data-active-id="a['res_id']" t-att-data-res-model="a['res_model']" class="o_stock_reports_web_action" href="#"><t t-esc="c" /></a> </span> </t> <t t-elif="a['lot_name'] == c"> <span> - <a class="o_stock_report_lot_action" href="#"><t t-raw="c"/></a> + <a class="o_stock_report_lot_action" href="#"><t t-esc="c"/></a> </span> - </t> - <t t-else=""> - <t t-raw="c"/> + </t><t t-else=""> + <t t-esc="c"/> </t> </td> </t> @@ -124,7 +123,7 @@ <span t-att-style="space_td"></span> </t> <span> - <t t-raw="c" /> + <t t-esc="c" /> </span> </td> </t> diff --git a/addons/website_sale/security/ir.model.access.csv b/addons/website_sale/security/ir.model.access.csv index 625480f9611..0e3f19844c8 100644 --- a/addons/website_sale/security/ir.model.access.csv +++ b/addons/website_sale/security/ir.model.access.csv @@ -7,7 +7,6 @@ access_product_public_category_public,product.category.public,model_product_publ access_product_pricelist_public,product.pricelist.public,product.model_product_pricelist,,1,0,0,0 access_product_pricelist_item_public,product.pricelist.item.public,product.model_product_pricelist_item,,1,0,0,0 access_product_style,product.style.public,website_sale.model_product_style,,1,0,0,0 -access_product_supplierinfo,product.supplierinfo.public,product.model_product_supplierinfo,,1,0,0,0 access_product_attribute_public,product.attribute public,product.model_product_attribute,,1,0,0,0 access_product_attribute_value_public,product.attribute value public,product.model_product_attribute_value,,1,0,0,0 access_product_product_attribute,product.template.attribute value public,product.model_product_template_attribute_value,,1,0,0,0 @@ -16,7 +15,6 @@ access_product_template_attribute_exclusion,product.template.attribute exclusion access_product_template_attribute_line_public,product.template.attribute line public,product.model_product_template_attribute_line,,1,0,0,0 access_fiscal_position_public,fiscal position public,account.model_account_fiscal_position,base.group_portal,1,0,0,0 access_payment_term,payment term public,account.model_account_payment_term,base.group_portal,1,0,0,0 -access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_public,1,0,0,0 access_account_tax_user,account.tax,account.model_account_tax,base.group_public,1,0,0,0 access_product_image_public,product.image public,model_product_image,,1,0,0,0 access_product_image_publisher,product.image wbesite publisher,model_product_image,website.group_website_publisher,1,1,1,1 diff --git a/addons/website_sale/security/website_sale.xml b/addons/website_sale/security/website_sale.xml index 120f67cccad..9c4702b0d9f 100644 --- a/addons/website_sale/security/website_sale.xml +++ b/addons/website_sale/security/website_sale.xml @@ -12,18 +12,6 @@ <field name="perm_unlink" eval="False"/> </record> - <record id="product_supplierinfo_public" model="ir.rule"> - <field name="name">Public product supplierinfo</field> - <field name="model_id" ref="product.model_product_supplierinfo"/> - <field name="domain_force">[('product_tmpl_id.website_published','=',True)]</field> - <field name="groups" eval="[(4, ref('base.group_public')), (4, ref('base.group_portal'))]"/> - <field name="perm_read" eval="True"/> - <field name="perm_write" eval="False"/> - <field name="perm_create" eval="False"/> - <field name="perm_unlink" eval="False"/> - </record> - - <!-- TODO: remove in master --> <!-- TODO: remove in master --> <record id="sales_team.group_sale_manager" model="res.groups"> <field name="implied_ids" eval="[(4, ref('website.group_website_publisher'))]"/> |
