diff options
| author | Simon Lejeune <sle@openerp.com> | 2019-08-02 13:20:14 +0000 |
|---|---|---|
| committer | Simon Lejeune <sle@openerp.com> | 2019-08-07 14:11:21 +0000 |
| commit | b8f963a5e901b59d3eb085e52d217e7294170a71 (patch) | |
| tree | 81fa8c4212bd15ca760188b2ad57104b55359c57 | |
| parent | aee0da7d5395d05a74a0d1b6e3f12bb3b56c3600 (diff) | |
[REF] stock_landed_costs: cost and adjusment lines in a notebook
We do this in a separate commit so that the diff of the next ones will
still be readable.
task-59011
| -rw-r--r-- | addons/stock_landed_costs/views/stock_landed_cost_views.xml | 111 |
1 files changed, 56 insertions, 55 deletions
diff --git a/addons/stock_landed_costs/views/stock_landed_cost_views.xml b/addons/stock_landed_costs/views/stock_landed_cost_views.xml index b733097e384..809ce0691c2 100644 --- a/addons/stock_landed_costs/views/stock_landed_cost_views.xml +++ b/addons/stock_landed_costs/views/stock_landed_cost_views.xml @@ -35,69 +35,70 @@ <field name="account_move_id"/> </group> </group> - - <separator string="Cost Lines"/> <p class="oe_grey"> Landed cost are computed based on the purchase unit of measure. </p> - <field name="cost_lines"> - <form string="Cost Lines"> - <group> - <group> + <notebook> + <page string="Cost Lines"> + <field name="cost_lines"> + <form string="Cost Lines"> + <group> + <group> + <field name="product_id" + domain="[('landed_cost_ok', '=', True)]" + context="{'default_landed_cost_ok': True, 'form_view_ref':'stock_landed_costs.view_stock_landed_cost_type_form'}"/> + <field name="price_unit"/> + </group> + <group> + <field name="split_method"/> + <field name="account_id" options="{'no_create': True}"/> + </group> + </group> + <label for="name"/> + <field name="name"/> + </form> + <tree string="Cost Lines" editable="bottom"> <field name="product_id" domain="[('landed_cost_ok', '=', True)]" - context="{'default_landed_cost_ok': True, 'form_view_ref':'stock_landed_costs.view_stock_landed_cost_type_form'}"/> - <field name="price_unit"/> - </group> - <group> - <field name="split_method"/> + context="{'default_landed_cost_ok': True, 'default_type': 'service', 'form_view_ref':'stock_landed_costs.view_stock_landed_cost_type_form'}"/> + <field name="name"/> <field name="account_id" options="{'no_create': True}"/> - </group> + <field name="split_method"/> + <field name="price_unit"/> + </tree> + </field> + <group class="oe_subtotal_footer oe_right"> + <field name="amount_total" widget="monetary"/> + <button colspan="2" name="compute_landed_cost" string="Compute" type="object" class="oe_right btn-secondary" states='draft'/> </group> - <label for="name"/> - <field name="name"/> - </form> - <tree string="Cost Lines" editable="bottom"> - <field name="product_id" - domain="[('landed_cost_ok', '=', True)]" - context="{'default_landed_cost_ok': True, 'default_type': 'service', 'form_view_ref':'stock_landed_costs.view_stock_landed_cost_type_form'}"/> - <field name="name"/> - <field name="account_id" options="{'no_create': True}"/> - <field name="split_method"/> - <field name="price_unit"/> - </tree> - </field> - <group class="oe_subtotal_footer oe_right"> - <field name="amount_total" widget="monetary"/> - <button colspan="2" name="compute_landed_cost" string="Compute" type="object" class="oe_right btn-secondary" states='draft'/> - </group> - - <div class="oe_clear"/> - <separator string="Valuation Adjustments"/> - <field name="valuation_adjustment_lines"> - <form string="Valuation Adjustments"> - <group> - <group> - <field name="product_id"/> - <field name="quantity"/> - </group> - <group> - <field name="former_cost"/> + </page> + <page string="Valuation Adjustments"> + <field name="valuation_adjustment_lines"> + <form string="Valuation Adjustments"> + <group> + <group> + <field name="product_id"/> + <field name="quantity"/> + </group> + <group> + <field name="former_cost"/> + <field name="additional_landed_cost"/> + </group> + </group> + </form> + <tree string="Valuation Adjustments" editable="bottom" create="0"> + <field name="cost_line_id" readonly="1"/> + <field name="product_id" readonly="1"/> + <field name="weight" readonly="1"/> + <field name="volume" readonly="1"/> + <field name="quantity" readonly="1"/> + <field name="former_cost_per_unit" readonly="1" widget="monetary"/> + <field name="former_cost" readonly="1"/> <field name="additional_landed_cost"/> - </group> - </group> - </form> - <tree string="Valuation Adjustments" editable="bottom" create="0"> - <field name="cost_line_id" readonly="1"/> - <field name="product_id" readonly="1"/> - <field name="weight" readonly="1"/> - <field name="volume" readonly="1"/> - <field name="quantity" readonly="1"/> - <field name="former_cost_per_unit" readonly="1" widget="monetary"/> - <field name="former_cost" readonly="1"/> - <field name="additional_landed_cost"/> - </tree> - </field> + </tree> + </field> + </page> + </notebook> </sheet> <div class="oe_chatter"> <field name="message_follower_ids" widget="mail_followers"/> |