changeset 3ae505cf18d6 in modules/stock:default
details: https://hg.tryton.org/modules/stock?cmd=changeset;node=3ae505cf18d6
description:
Use simplified view for moves list on shipments
issue9459
review290501002
diffstat:
CHANGELOG | 1 +
move.xml | 7 +++++++
view/move_list_shipment.xml | 12 ++++++++++++
view/move_list_shipment_in.xml | 9 ++-------
view/shipment_in_form.xml | 2 +-
view/shipment_in_return_form.xml | 2 +-
view/shipment_internal_form.xml | 6 +++---
view/shipment_out_form.xml | 4 ++--
view/shipment_out_return_form.xml | 4 ++--
9 files changed, 31 insertions(+), 16 deletions(-)
diffs (138 lines):
diff -r 8a48ca85d1cd -r 3ae505cf18d6 CHANGELOG
--- a/CHANGELOG Wed Aug 12 22:02:26 2020 +0200
+++ b/CHANGELOG Fri Aug 14 14:20:42 2020 +0200
@@ -1,3 +1,4 @@
+* Use simplified view for moves list on shipments
* Add a relate from product to its moves
* Factorize the cost price of move for cost computation
* Fill grouping values when assigning move
diff -r 8a48ca85d1cd -r 3ae505cf18d6 move.xml
--- a/move.xml Wed Aug 12 22:02:26 2020 +0200
+++ b/move.xml Fri Aug 14 14:20:42 2020 +0200
@@ -29,6 +29,13 @@
<field name="name">move_list_shipment_in</field>
</record>
+ <record model="ir.ui.view" id="move_view_list_shipment">
+ <field name="model">stock.move</field>
+ <field name="type">tree</field>
+ <field name="priority" eval="20"/>
+ <field name="name">move_list_shipment</field>
+ </record>
+
<record model="ir.action.act_window" id="act_move_form">
<field name="name">Moves</field>
<field name="res_model">stock.move</field>
diff -r 8a48ca85d1cd -r 3ae505cf18d6 view/move_list_shipment.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/view/move_list_shipment.xml Fri Aug 14 14:20:42 2020 +0200
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<tree>
+ <field name="shipment" expand="2"/>
+ <field name="from_location" expand="1"/>
+ <field name="product" expand="2"/>
+ <field name="quantity"/>
+ <field name="uom"/>
+ <field name="to_location" expand="1"/>
+ <field name="state"/>
+</tree>
diff -r 8a48ca85d1cd -r 3ae505cf18d6 view/move_list_shipment_in.xml
--- a/view/move_list_shipment_in.xml Wed Aug 12 22:02:26 2020 +0200
+++ b/view/move_list_shipment_in.xml Fri Aug 14 14:20:42 2020 +0200
@@ -3,15 +3,10 @@
this repository contains the full copyright notices and license terms. -->
<tree>
<field name="shipment" expand="2"/>
+ <field name="from_location" expand="1"/>
<field name="product" expand="2"/>
- <field name="from_location" expand="1"/>
- <field name="to_location" expand="1"/>
<field name="quantity"/>
<field name="uom"/>
- <field name="planned_date"/>
- <field name="effective_date"/>
+ <field name="to_location" expand="1"/>
<field name="state"/>
- <button name="cancel" string="Cancel"/>
- <button name="draft" string="Reset to Draft"/>
- <button name="do" string="Do"/>
</tree>
diff -r 8a48ca85d1cd -r 3ae505cf18d6 view/shipment_in_form.xml
--- a/view/shipment_in_form.xml Wed Aug 12 22:02:26 2020 +0200
+++ b/view/shipment_in_form.xml Fri Aug 14 14:20:42 2020 +0200
@@ -24,7 +24,7 @@
view_ids="stock.move_view_list_shipment_in"/>
</page>
<page name="inventory_moves">
- <field name="inventory_moves" colspan="4"/>
+ <field name="inventory_moves" colspan="4"
view_ids="stock.move_view_list_shipment"/>
</page>
<page string="Other Info" id="other">
<label name="received_by"/>
diff -r 8a48ca85d1cd -r 3ae505cf18d6 view/shipment_in_return_form.xml
--- a/view/shipment_in_return_form.xml Wed Aug 12 22:02:26 2020 +0200
+++ b/view/shipment_in_return_form.xml Fri Aug 14 14:20:42 2020 +0200
@@ -20,7 +20,7 @@
<field name="effective_date"/>
<notebook colspan="4">
<page name="moves">
- <field name="moves" colspan="4"/>
+ <field name="moves" colspan="4"
view_ids="stock.move_view_list_shipment"/>
</page>
<page string="Other Info" id="other">
<label name="assigned_by"/>
diff -r 8a48ca85d1cd -r 3ae505cf18d6 view/shipment_internal_form.xml
--- a/view/shipment_internal_form.xml Wed Aug 12 22:02:26 2020 +0200
+++ b/view/shipment_internal_form.xml Fri Aug 14 14:20:42 2020 +0200
@@ -22,13 +22,13 @@
<field name="company"/>
<notebook colspan="4">
<page name="moves">
- <field name="moves" colspan="4"/>
+ <field name="moves" colspan="4"
view_ids="stock.move_view_list_shipment"/>
</page>
<page name="outgoing_moves">
- <field name="outgoing_moves" colspan="4"/>
+ <field name="outgoing_moves" colspan="4"
view_ids="stock.move_view_list_shipment"/>
</page>
<page name="incoming_moves">
- <field name="incoming_moves" colspan="4"/>
+ <field name="incoming_moves" colspan="4"
view_ids="stock.move_view_list_shipment"/>
</page>
<page string="Other Info" id="other">
<label name="assigned_by"/>
diff -r 8a48ca85d1cd -r 3ae505cf18d6 view/shipment_out_form.xml
--- a/view/shipment_out_form.xml Wed Aug 12 22:02:26 2020 +0200
+++ b/view/shipment_out_form.xml Fri Aug 14 14:20:42 2020 +0200
@@ -20,10 +20,10 @@
<field name="warehouse"/>
<notebook colspan="4">
<page name="inventory_moves">
- <field name="inventory_moves" colspan="4"/>
+ <field name="inventory_moves" colspan="4"
view_ids="stock.move_view_list_shipment"/>
</page>
<page string="Outgoing Moves" id="outgoing_moves">
- <field name="outgoing_moves" colspan="4"/>
+ <field name="outgoing_moves" colspan="4"
view_ids="stock.move_view_list_shipment"/>
</page>
<page string="Other Info" id="other">
<label name="assigned_by"/>
diff -r 8a48ca85d1cd -r 3ae505cf18d6 view/shipment_out_return_form.xml
--- a/view/shipment_out_return_form.xml Wed Aug 12 22:02:26 2020 +0200
+++ b/view/shipment_out_return_form.xml Fri Aug 14 14:20:42 2020 +0200
@@ -20,10 +20,10 @@
<field name="warehouse"/>
<notebook colspan="6">
<page name="incoming_moves">
- <field name="incoming_moves" colspan="4"/>
+ <field name="incoming_moves" colspan="4"
view_ids="stock.move_view_list_shipment"/>
</page>
<page name="inventory_moves">
- <field name="inventory_moves" colspan="4"/>
+ <field name="inventory_moves" colspan="4"
view_ids="stock.move_view_list_shipment"/>
</page>
<page string="Other Info" id="other">
<label name="received_by"/>
