openerp-openbig

Merge lp:~openbig/bigconsulting/pack_changedview into lp:bigconsulting

  1. pack_changedview
  2. Merge into addons
Proposed by gpa(OpenERP)
Status: Merged
Merged at revision: 84
Proposed branch: lp:~openbig/bigconsulting/pack_changedview
Merge into: lp:bigconsulting
Diff against target: 163 lines (+128/-19)
1 file modified
packing_barcode_check/packing_barcode_check_view.xml (+128/-19)
To merge this branch: bzr merge lp:~openbig/bigconsulting/pack_changedview
Reviewer Review Type Date Requested Status
openbig Pending
Review via email: mp+34534@code.launchpad.net

Description of the change

Changes in the view of packing_barcode_check module

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'packing_barcode_check/packing_barcode_check_view.xml'
2--- packing_barcode_check/packing_barcode_check_view.xml 2010-09-01 09:51:38 +0000
3+++ packing_barcode_check/packing_barcode_check_view.xml 2010-09-03 12:51:39 +0000
4@@ -2,31 +2,140 @@
5 <openerp>
6 <data>
7
8- <record model="ir.ui.view" id="view_packing_barcode_check_out_button_inherit_form">
9- <field name="name">stock.picking.inherit</field>
10- <field name="model">stock.picking</field>
11- <field name="inherit_id" ref="stock.view_picking_out_form" />
12- <field name="type">form</field>
13- <field name="arch" type="xml">
14- <data>
15- <xpath expr="//button[@string='Packing Done']" position="replace">
16- <button name="%(stock.partial_picking)d" states="scanned" string="Packing Done" type="action"/>
17- </xpath>
18- <xpath expr="//button[@name='button_cancel']" position="replace">
19- <button name="button_cancel" states="scanned,assigned,confirmed,draft" string="Cancel"/>
20- </xpath>
21- </data>
22- </field>
23- </record>
24-
25 <record model="ir.ui.view" id="view_packing_barcode_check_out_inherit_form">
26 <field name="name">stock.picking.inherit</field>
27 <field name="model">stock.picking</field>
28 <field name="inherit_id" ref="stock.view_picking_out_form" />
29 <field name="type">form</field>
30 <field name="arch" type="xml">
31- <xpath expr="/form/notebook/page[@string='General Information']" position="after">
32- <page string="Scanning Info">
33+ <xpath expr="/form/notebook/page[@string='General Information']" position="replace">
34+ <page string="General Information" attrs="{'invisible':[('state','=', 'assigned')]}">
35+ <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
36+ <form string="Stock Moves">
37+ <separator colspan="4" string="Move Information"/>
38+ <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
39+ <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
40+ <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)" select="1"/>
41+ <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
42+ <field name="product_uom" select="1"/>
43+ <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
44+ <field groups="product.group_uos" name="product_uos_qty"/>
45+ <field colspan="4" invisible="1" name="name" select="1"/>
46+ <field invisible="1" name="date"/>
47+ <field name="date_planned"/>
48+ <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
49+ <field name="prodlot_id" select="1"
50+ context="{'location_id':location_id, 'product_id':product_id}"
51+ domain="[('product_id','=',product_id)]"
52+ on_change="onchange_lot_id(prodlot_id,product_qty, location_id)"/>
53+ <field groups="base.group_extended" name="tracking_id" select="1"/>
54+ <label/>
55+ <button name="%(stock.track_line)d" string="Split in production lots" type="action"/>
56+ <separator colspan="4" string="Move State"/>
57+ <field name="state" select="1"/>
58+ <group colspan="2">
59+ <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
60+ <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
61+ <button name="action_cancel" states="assigned" string="Cancel" type="object"/>
62+ </group>
63+ </form>
64+ </field>
65+ <group col="7" colspan="4">
66+ <label colspan="6"/>
67+ <button name="%(stock.move_split)d" string="Split in Two" type="action"/>
68+ </group>
69+ <group col="10" colspan="4">
70+ <field name="state" readonly="1"/>
71+ <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
72+ <button name="draft_validate" states="draft" string="Process Now" type="object"/>
73+ <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended"/>
74+ <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
75+ <button name="%(stock.partial_picking)d" states="scanned" string="Packing Done" type="action"/>
76+ <button name="button_cancel" states="scanned,assigned,confirmed,draft" string="Cancel"/>
77+ </group>
78+ </page>
79+ <page string="Scanning Info" attrs="{'invisible':[('state','!=', 'assigned')]}">
80+ <group col="8" colspan="4" expand="1">
81+ <field name="tobe_scan_ids" nolabel="1">
82+ <tree string="Unscanned Quantity">
83+ <field name="product_name"/>
84+ <field name="lot_number"/>
85+ <field name="quantity"/>
86+ <field name="unscan_quantity"/>
87+ </tree>
88+ </field>
89+ <field name="scaned_ids" nolabel="1">
90+ <tree string="Scanned Quantity">
91+ <field name="product_name"/>
92+ <field name="lot_number"/>
93+ <field name="quantity"/>
94+ <field name="scan_quantity"/>
95+ </tree>
96+ </field>
97+ </group>
98+ <group col="10" colspan="4">
99+ <button name="%(id_scan_product)d" states="assigned,scanned" string="Scan Packing" type="action"/>
100+ <button name="action_reset" states="assigned,scanned" string="Reset" type="object"/>
101+ </group>
102+ </page>
103+ </xpath>
104+ </field>
105+ </record>
106+
107+
108+ <record model="ir.ui.view" id="view_packing_barcode_check_inherit_form">
109+ <field name="name">stock.picking.inherit</field>
110+ <field name="model">stock.picking</field>
111+ <field name="inherit_id" ref="stock.view_picking_form" />
112+ <field name="type">form</field>
113+ <field name="arch" type="xml">
114+ <xpath expr="/form/notebook/page[@string='General Information']" position="replace">
115+ <page string="General Information" attrs="{'invisible':[('state','=', 'assigned')]}">
116+ <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
117+ <form string="Stock Moves">
118+ <separator colspan="4" string="Move Information"/>
119+ <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
120+ <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
121+ <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)" select="1"/>
122+ <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
123+ <field name="product_uom" select="1"/>
124+ <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
125+ <field groups="product.group_uos" name="product_uos_qty"/>
126+ <field colspan="4" invisible="1" name="name" select="1"/>
127+ <field invisible="1" name="date"/>
128+ <field name="date_planned"/>
129+ <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
130+ <field name="prodlot_id" select="1"
131+ context="{'location_id':location_id, 'product_id':product_id}"
132+ domain="[('product_id','=',product_id)]"
133+ on_change="onchange_lot_id(prodlot_id,product_qty, location_id)"/>
134+ <field groups="base.group_extended" name="tracking_id" select="1"/>
135+ <label/>
136+ <button name="%(stock.track_line)d" string="Split in production lots" type="action"/>
137+ <separator colspan="4" string="Move State"/>
138+ <field name="state" select="1"/>
139+ <group colspan="2">
140+ <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
141+ <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
142+ <button name="action_cancel" states="assigned" string="Cancel" type="object"/>
143+ </group>
144+ </form>
145+ </field>
146+ <group col="7" colspan="4">
147+ <label colspan="6"/>
148+ <button name="%(stock.move_split)d" string="Split in Two" type="action"/>
149+ </group>
150+ <group col="10" colspan="4">
151+ <field name="state" readonly="1"/>
152+ <button name="draft_force_assign" states="draft" string="Confirm (Do Not Process Now)" type="object"/>
153+ <button name="draft_validate" states="draft" string="Process Now" type="object"/>
154+ <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
155+ <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
156+ <button name="%(stock.partial_picking)d" states="scanned" string="Validate" type="action"/>
157+ <button name="button_cancel" states="scanned,assigned,confirmed,draft" string="Cancel"/>
158+ </group>
159+ </page>
160+ <page string="Scanning Info" attrs="{'invisible':[('state','!=', 'assigned')]}">
161 <group col="8" colspan="4" expand="1">
162 <field name="tobe_scan_ids" nolabel="1">
163 <tree string="Unscanned Quantity">

Subscribers

People subscribed via source and target branches