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

[MERGE] merge sbh branch for stock 

bzr revid: mra@mra-laptop-20100622034928-tp90pvrw3fi6myzx
This commit is contained in:
Mustufa Rangwala 2010-06-22 09:19:28 +05:30
parent fc076c95f1 de589d0d73
commit 0b88078d26
3 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/stock/stock_view.xml
View File

@ -213,7 +213,8 @@
<newline/>
<field name="author_id" readonly="1"/>
<newline/>
<field name="description"/>
<separator string="Description" colspan="4"/>
<field colspan="4" name="description" nolabel="1"/>
</form>
</field>
</record>
@ -550,13 +551,15 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Entry Lines">
<group height="200" width="500">
<field name="address_id" invisible="True" context="{'contact_display':'partner'}"/>
<field name="picking_id" invisible="True"/>
<field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1"/><newline/>
<field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1" height="100" width="500"/><newline/>
<group colspan="4">
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
<button name="action_move" string="Add" type="object" icon="gtk-add"/>
</group>
</group>
</form>
</field>
</record>

48
addons/stock/wizard/stock_move_view.xml
View File

@ -99,11 +99,12 @@
</record>
<record id="view_split_in_lots" model="ir.ui.view">
<field name="name">Split in lots</field>
<field name="model">stock.move.split</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Split in lots">
<field name="name">Split in lots</field>
<field name="model">stock.move.split</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Split in lots">
<group width="660" height="275">
<field name="product_id" colspan="4" readonly="1"/>
<newline/>
<group colspan="4" col="4">
@ -142,24 +143,25 @@
</form>
</field>
</group>
<separator string="" colspan="4" />
<label string="" colspan="2" />
<button icon='gtk-cancel' special="cancel"
string="Cancel" />
<button name="split_lot" string="Ok"
type="object" icon="gtk-ok" />
</form>
</field>
</record>
<separator string="" colspan="4" />
<label string="" colspan="2" />
<button icon='gtk-cancel' special="cancel"
string="Cancel" />
<button name="split_lot" string="Ok"
type="object" icon="gtk-ok" />
</group>
</form>
</field>
</record>
<record id="track_line" model="ir.actions.act_window">
<field name="name">Split in lots</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">stock.move.split</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
<record id="track_line" model="ir.actions.act_window">
<field name="name">Split in lots</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">stock.move.split</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">new</field>
</record>
</data>
</data>
</openerp>

1
addons/stock_planning/stock_planning_view.xml
View File

@ -161,7 +161,6 @@
<label string = "Per User :"/>
<label string = "Per Department :"/>
<label string = "Per Warehouse :"/>
<label string = "Per Company :"/>
<label string = "Periods :"/>
<field name="analyzed_user_id" nolabel = "1" domain = "[('company_id','=',company_id)] "/>
<field name="analyzed_dept_id" nolabel = "1" domain = "[('company_id','=',company_id)] " />