diff options
| author | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-07-18 10:18:20 +0530 |
|---|---|---|
| committer | Divyesh Makwana (Open ERP) <mdi@tinyerp.com> | 2012-07-18 10:18:20 +0530 |
| commit | 4e975bdd14698f6954fee0c60bbb27bfa72e6ea8 (patch) | |
| tree | ef7922279e4a3e407edd175cc43fa294dcaeee5b /addons/procurement | |
| parent | 6c0781ef8634f918b97aa53aec5219f9ca9985a8 (diff) | |
| parent | 2a89c6079c9f7f5d9135bcda777fda3f3ed8d859 (diff) | |
[Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120718044820-s4r6iiuxh8zk8db2
Diffstat (limited to 'addons/procurement')
| -rw-r--r-- | addons/procurement/procurement_view.xml | 46 | ||||
| -rw-r--r-- | addons/procurement/wizard/schedulers_all_view.xml | 2 |
2 files changed, 30 insertions, 18 deletions
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 6edf4868e8a..fe2b1d0ca69 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -55,34 +55,46 @@ <field name="state" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed" /> </header> <sheet> + <label for="name" class="oe_edit_only"/> + <h1> + <field name="name" class="oe_inline"/> + <label string="-" attrs="{'invisible':[('origin','=',False)]}"/> + <field name="origin" class="oe_inline"/> + </h1> <group> - <group string="References"> - <field name="name"/> - <field name="origin"/> - <field name="company_id" groups="base.group_multi_company" widget="selection"/> - </group> - <group string="Planification"> + <group> <field name="date_planned"/> <field name="procure_method"/> <field name="priority"/> </group> + <group> + <field name="message"/> + <field name="company_id" groups="base.group_multi_company" widget="selection"/> + </group> </group> <notebook> <page string="Procurement Details"> - <group string="Product & Location" col="4"> - <field name="product_id" on_change="onchange_product_id(product_id)"/> - <field name="location_id" domain="[('usage','=','internal')]"/> - <field name="product_qty"/> - <field name="product_uom"/> - - <field name="product_uos_qty" groups="product.group_uos"/> - <field name="product_uos" groups="product.group_uos"/> + <group> + <group> + <field name="product_id" on_change="onchange_product_id(product_id)"/> + <label for="product_qty"/> + <div> + <field name="product_qty" class="oe_inline"/> + <field name="product_uom" class="oe_inline"/> + </div> + <label for="product_uos_qty" groups="product.group_uos"/> + <div groups="product.group_uos"> + <field name="product_uos_qty" class="oe_inline"/> + <field name="product_uos" class="oe_inline"/> + </div> + </group> + <group> + <field name="location_id" domain="[('usage','=','internal')]"/> + </group> </group> - <separator string="Status"/> - <field name="message"/> </page> <page string="Extra Information"> - <group string="Details" col="4"> + <group> <field name="move_id"/> <field name="date_close"/> <field name="close_move"/> diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml index 01712a0cedd..ee2a5d33e25 100644 --- a/addons/procurement/wizard/schedulers_all_view.xml +++ b/addons/procurement/wizard/schedulers_all_view.xml @@ -10,7 +10,7 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Scheduler Parameters" version="7.0"> - <group string="This wizard allows you to run all procurement, production and/or purchase orders that should be processed based on their configuration. By default, the scheduler is launched automatically every night by OpenERP. You can use this menu to force it to be launched now. Note that it runs in the background, you may have to wait for a few minutes until it has finished computing."> + <group> <field name="automatic"/> </group> <footer> |