summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorTiffany Chang (tic) <tic@odoo.com>2020-02-17 15:03:54 +0000
committerTiffany Chang (tic) <tic@odoo.com>2020-03-05 13:04:10 +0000
commit99252f3d93ca68077e0169c580eaecb6fc8ce8fd (patch)
treecab40e8d6743773755f575d33e8d717228cb24ec /addons
parent70146bed17e013a3ecb6b89677060c707df6c546 (diff)
[IMP] stock/mrp: Update UX
This commit updates product, stock and manufacturing views for improved usability. Handles view only changes of overall usability improvement task. Specifically spec numbers: 1. Add "Run Scheduler" (from stock) to the manufacturing app under operations 5. Make "detailed operations" wizard modal have more intitutive footer buttons (i.e. don't say "Confirm"/"Cancel" when changes aren't possible. 8. Rearranging of vendor pricelist view 9. Updating of tooltip content for "property_stock_account_input_categ_id" Task: 2041853
Diffstat (limited to 'addons')
-rw-r--r--addons/mrp/views/stock_move_views.xml5
-rw-r--r--addons/product/views/product_views.xml58
-rw-r--r--addons/stock/views/stock_move_views.xml5
-rw-r--r--addons/stock_account/models/product.py5
4 files changed, 40 insertions, 33 deletions
diff --git a/addons/mrp/views/stock_move_views.xml b/addons/mrp/views/stock_move_views.xml
index 187b844a6ac..e2e1cdec630 100644
--- a/addons/mrp/views/stock_move_views.xml
+++ b/addons/mrp/views/stock_move_views.xml
@@ -147,4 +147,9 @@
action="stock.action_stock_scrap"
sequence="25"/>
+ <menuitem id="menu_procurement_compute_mrp"
+ action="stock.action_procurement_compute"
+ parent="menu_mrp_manufacturing"
+ sequence="135"/>
+
</odoo>
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index df24d2def41..a23c62ce3cc 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -566,36 +566,36 @@
<field name="model">product.supplierinfo</field>
<field name="arch" type="xml">
<form string="Vendor Information">
- <group>
- <group name="vendor" string="Vendor">
- <field name="product_variant_count" invisible="1"/>
- <field name="name" context="{'res_partner_search_mode': 'supplier'}"/>
- <field name="product_name"/>
- <field name="product_code"/>
- <field name="product_id" groups="product.group_product_variant" domain="[('product_tmpl_id', '=', product_tmpl_id)]" options="{'no_create_edit': True}"/>
- <label for="delay"/>
- <div>
- <field name="delay" class="oe_inline"/> days
- </div>
- </group>
- <group string="Price List">
- <field name="product_tmpl_id" string="Product" invisible="context.get('visible_product_tmpl_id', True)"/>
- <label for="min_qty"/>
- <div class="o_row">
- <field name="min_qty"/>
- <field name="product_uom" groups="uom.group_uom"/>
- </div>
- <label for="price"/>
- <div class="o_row">
- <field name="price"/><field name="currency_id" groups="base.group_multi_currency"/>
- </div>
- <label for="date_start" string="Validity"/>
- <div class="o_row"><field name="date_start"/> to <field name="date_end"/></div>
- </group>
- <group string="Other Information" groups="base.group_multi_company">
- <field name="company_id" options="{'no_create': True}"/>
+ <sheet>
+ <group>
+ <group name="vendor" string="Vendor">
+ <field name="product_variant_count" invisible="1"/>
+ <field name="name" context="{'res_partner_search_mode': 'supplier'}"/>
+ <field name="product_name"/>
+ <field name="product_code"/>
+ <label for="delay"/>
+ <div>
+ <field name="delay" class="oe_inline"/> days
+ </div>
+ </group>
+ <group string="Pricelist">
+ <field name="product_tmpl_id" string="Product" invisible="context.get('visible_product_tmpl_id', True)"/>
+ <field name="product_id" groups="product.group_product_variant" domain="[('product_tmpl_id', '=', product_tmpl_id)]" options="{'no_create_edit': True}"/>
+ <label for="min_qty"/>
+ <div class="o_row">
+ <field name="min_qty"/>
+ <field name="product_uom" groups="uom.group_uom"/>
+ </div>
+ <label for="price" string="Unit Price"/>
+ <div class="o_row">
+ <field name="price"/><field name="currency_id" groups="base.group_multi_currency"/>
+ </div>
+ <label for="date_start" string="Validity"/>
+ <div class="o_row"><field name="date_start"/> to <field name="date_end"/></div>
+ <field name="company_id" options="{'no_create': True}"/>
+ </group>
</group>
- </group>
+ </sheet>
</form>
</field>
</record>
diff --git a/addons/stock/views/stock_move_views.xml b/addons/stock/views/stock_move_views.xml
index 3ad6c21c2a9..71a972c3727 100644
--- a/addons/stock/views/stock_move_views.xml
+++ b/addons/stock/views/stock_move_views.xml
@@ -212,10 +212,13 @@
</group>
</group>
<field name="move_line_ids" attrs="{'readonly': ['|', ('state', '=', 'cancel'), '&amp;', ('state', '=', 'done'), ('is_locked', '=', True)]}" context="{'tree_view_ref': 'stock.view_stock_move_line_operation_tree', 'default_product_uom_id': product_uom, 'default_picking_id': picking_id, 'default_move_id': id, 'default_product_id': product_id, 'default_location_id': location_id, 'default_location_dest_id': location_dest_id, 'default_company_id': company_id}"/>
- <footer class="oe_edit_only">
+ <footer class="oe_edit_only" attrs="{'invisible': ['|', ('state', '=', 'cancel'), '&amp;', ('state', '=', 'done'), ('is_locked', '=', True)]}">
<button string="Confirm" special="save" class="oe_highlight"/>
<button string="Discard" special="cancel"/>
</footer>
+ <footer class="oe_edit_only" attrs="{'invisible': ['|', '&amp;', ('state', '!=', 'cancel'), ('state', '!=', 'done'), '&amp;', ('state', '=', 'done'), ('is_locked', '!=', True)]}">
+ <button string="Close" special="cancel"/>
+ </footer>
</form>
</field>
</record>
diff --git a/addons/stock_account/models/product.py b/addons/stock_account/models/product.py
index bea0dfacd87..4d80dc285c7 100644
--- a/addons/stock_account/models/product.py
+++ b/addons/stock_account/models/product.py
@@ -627,9 +627,8 @@ class ProductCategory(models.Model):
property_stock_account_input_categ_id = fields.Many2one(
'account.account', 'Stock Input Account', company_dependent=True,
domain="[('company_id', '=', allowed_company_ids[0]), ('deprecated', '=', False)]", check_company=True,
- help="""When doing automated inventory valuation, counterpart journal items for all incoming stock moves will be posted in this account,
- unless there is a specific valuation account set on the source location. This is the default value for all products in this category.
- It can also directly be set on each product.""")
+ help="""Counterpart journal items for all incoming stock moves will be posted in this account, unless there is a specific valuation account
+ set on the source location. This is the default value for all products in this category. It can also directly be set on each product.""")
property_stock_account_output_categ_id = fields.Many2one(
'account.account', 'Stock Output Account', company_dependent=True,
domain="[('company_id', '=', allowed_company_ids[0]), ('deprecated', '=', False)]", check_company=True,