odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] stock.picking: improve picking form view to have unified layout 

bzr revid: odo@openerp.com-20100907132008-j3mmsn9ifp08z7ti
This commit is contained in:
Olivier Dony 2010-09-07 15:20:08 +02:00
parent d8aff85095
commit 9f6d2ba445
2 changed files with 82 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/stock/stock.py
View File

@ -658,7 +658,7 @@ class stock_picking(osv.osv):
'invoice_state': fields.selection([ 'invoice_state': fields.selection([
("invoiced", "Invoiced"), ("invoiced", "Invoiced"),
("2binvoiced", "To Be Invoiced"), ("2binvoiced", "To Be Invoiced"),
("none", "Not from Picking")], "Invoice Status", ("none", "Not from Picking")], "Invoice Control",
select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}), select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
'company_id': fields.many2one('res.company', 'Company', required=True, select=True), 'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
} }

144
addons/stock/stock_view.xml
View File

@ -607,19 +607,22 @@
<field name="model">stock.picking</field> <field name="model">stock.picking</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Picking list"> <form string="Internal Picking list">
<group colspan="4" col="6"> <group colspan="4" col="6">
<field name="name" readonly="1"/> <group colspan="4" col="4">
<field name="origin"/> <field name="name" readonly="1"/>
<field name="backorder_id" groups="base.group_extended" readonly="1"/> <field name="origin"/>
<field name="date"/> <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" required="1" colspan="4"/>
<field name="min_date"/> <field name="backorder_id" readonly="1" groups="base.group_extended"/>
<field name="type"/> </group>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/> <group colspan="2" col="2">
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="date"/>
<field name="min_date" readonly="1"/>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
</group>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="General Information"> <page string="Products">
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines}"> <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines}">
<tree colors="grey:scrapped == True" string="Stock Moves"> <tree colors="grey:scrapped == True" string="Stock Moves">
<field name="name" string="Move Name"/> <field name="name" string="Move Name"/>
@ -723,16 +726,17 @@
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/> <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
</group> </group>
</page> </page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
<field name="auto_picking" groups="base.group_extended"/>
<field name="invoice_state" groups="base.group_extended"/>
<field name="date_done" groups="base.group_extended"/>
<field name="move_type" groups="base.group_extended"/>
<field name="type" groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</page>
<page string="Notes"> <page string="Notes">
<field colspan="4" name="note" nolabel="1"/> <field colspan="4" name="note" nolabel="1"/>
</page> </page>
<page string="Other info" groups="base.group_extended">
<field name="auto_picking"/>
<field name="invoice_state"/>
<field name="date_done"/>
<newline/>
<field name="move_type"/>
</page>
</notebook> </notebook>
</form> </form>
</field> </field>
@ -788,21 +792,23 @@
<field name="model">stock.picking</field> <field name="model">stock.picking</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Picking list"> <form string="Delivery Picking list">
<group col="6" colspan="4" attrs="{'readonly': [('state','not in',['draft','auto'])]}"> <group col="6" colspan="4" attrs="{'readonly': [('state','not in',['draft','auto'])]}">
<field name="name" readonly="1"/> <group colspan="4" col="4">
<field name="address_id" required="1"/> <field name="name" readonly="1"/>
<field name="origin"/> <field name="origin" readonly="1"/>
<field name="backorder_id" groups="base.group_extended" readonly="1"/> <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" required="1" colspan="4"/>
<field name="date" /> <field name="invoice_state"/>
<field name="min_date"/> <field name="backorder_id" readonly="1" groups="base.group_extended"/>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/> </group>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <group colspan="2" col="2">
<field name="type" invisible="1"/> <field name="date"/>
<field name="invoice_state" invisible="1"/> <field name="min_date" readonly="1"/>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
</group>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="General Information"> <page string="Products">
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" > <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
<tree colors="grey:scrapped == True" string="Stock Moves"> <tree colors="grey:scrapped == True" string="Stock Moves">
<field name="name" string="Move Name"/> <field name="name" string="Move Name"/>
@ -905,15 +911,17 @@
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/> <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
</group> </group>
</page> </page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
<field name="auto_picking" groups="base.group_extended"/>
<field name="invoice_state" groups="base.group_extended"/>
<field name="date_done" groups="base.group_extended"/>
<field name="move_type" groups="base.group_extended"/>
<field name="type" groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</page>
<page string="Notes"> <page string="Notes">
<field colspan="4" name="note" nolabel="1"/> <field colspan="4" name="note" nolabel="1"/>
</page> </page>
<page string="Other info" groups="base.group_extended">
<field name="auto_picking"/>
<newline/>
<field name="date_done"/>
<field name="move_type"/>
</page>
</notebook> </notebook>
</form> </form>
</field> </field>
@ -1004,20 +1012,23 @@
<field name="model">stock.picking</field> <field name="model">stock.picking</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Picking list"> <form string="Outgoing Picking list">
<group col="6" colspan="4"> <group col="6" colspan="4">
<field name="address_id" required="1" /> <group colspan="4" col="4">
<field name="min_date"/> <field name="name" readonly="1"/>
<field name="name" readonly="1"/> <field name="origin" readonly="1"/>
<field name="invoice_state"/> <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" required="1" colspan="4"/>
<field name="backorder_id" readonly="1"/> <field name="invoice_state"/>
<field name="origin" readonly="1"/> <field name="backorder_id" readonly="1" groups="base.group_extended"/>
<field name="type" invisible="1"/> </group>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/> <group colspan="2" col="2">
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="date"/>
<field name="min_date" readonly="1"/>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
</group>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="General Information"> <page string="Products">
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" > <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}" >
<tree colors="grey:scrapped==True" string="Stock Moves"> <tree colors="grey:scrapped==True" string="Stock Moves">
<field name="product_id"/> <field name="product_id"/>
@ -1116,15 +1127,16 @@
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/> <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
</group> </group>
</page> </page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
<field name="auto_picking" groups="base.group_extended"/>
<field name="date_done" groups="base.group_extended"/>
<field name="move_type" groups="base.group_extended"/>
<field name="type" groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</page>
<page string="Notes"> <page string="Notes">
<field colspan="4" name="note" nolabel="1"/> <field colspan="4" name="note" nolabel="1"/>
</page> </page>
<page string="Other info" groups="base.group_extended">
<field name="auto_picking"/>
<newline/>
<field name="date_done"/>
<field name="move_type"/>
</page>
</notebook> </notebook>
</form> </form>
</field> </field>
@ -1215,16 +1227,18 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Input Picking List"> <form string="Input Picking List">
<group colspan="4" col="6"> <group colspan="4" col="6">
<field name="name" readonly="1"/> <group colspan="4" col="4">
<field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" required="1" /> <field name="name" readonly="1"/>
<field name="origin"/> <field name="origin"/>
<field name="backorder_id" readonly="1" groups="base.group_extended"/> <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" required="1" colspan="4"/>
<field name="date"/> <field name="invoice_state" string="Invoice Control"/>
<field name="type"/> <field name="backorder_id" readonly="1" groups="base.group_extended"/>
<field name="min_date" readonly="1"/> </group>
<field name="invoice_state" string="Invoice Control"/> <group colspan="2" col="2">
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/> <field name="date"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="min_date" readonly="1"/>
<field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
</group>
</group> </group>
<notebook colspan="4"> <notebook colspan="4">
<page string="General Information"> <page string="General Information">
@ -1324,6 +1338,10 @@
<button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/> <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
</group> </group>
</page> </page>
<page string="Additional Info" groups="base.group_extended,base.group_multi_company">
<field name="type" groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</page>
<page string="Notes"> <page string="Notes">
<field colspan="4" name="note" nolabel="1"/> <field colspan="4" name="note" nolabel="1"/>
</page> </page>