~jgrandguillaume-c2c/openobject-addons/multi-company-cost-price

« back to all changes in this revision

Viewing changes to delivery/delivery_view.xml

  • Committer: Joël Grand-Guillaume
  • Date: 2010-04-08 09:00:10 UTC
  • mfrom: (2533.3.664)
  • Revision ID: joel.grandguillaume@camptocamp.com-20100408090010-c0pqjan341s18bxs
[MRG] Merge from last trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
143
143
                </field>
144
144
            </field>
145
145
        </record>
 
146
        
 
147
        <record id="view_picking_withweight_in_form" model="ir.ui.view">
 
148
            <field name="name">stock.picking_withweight.in.form.view</field>
 
149
            <field name="type">form</field>
 
150
            <field name="model">stock.picking</field>
 
151
            <field name="inherit_id" ref="stock.view_picking_in_form"/>
 
152
            <field name="arch" type="xml">
 
153
                <field name="type" position="after">
 
154
                    <field name="weight"/>
 
155
                </field>
 
156
            </field>
 
157
        </record>
 
158
 
 
159
        <record id="view_picking_withweight_internal_form" model="ir.ui.view">
 
160
            <field name="name">stock.picking_withweight.internal.form.view</field>
 
161
            <field name="type">form</field>
 
162
            <field name="model">stock.picking</field>
 
163
            <field name="inherit_id" ref="stock.view_picking_form"/>
 
164
            <field name="arch" type="xml">
 
165
                <field name="type" position="after">
 
166
                    <field name="weight"/>
 
167
                </field>
 
168
            </field>
 
169
        </record>        
146
170
 
147
171
        <record id="view_picking_withcarrier_delivery_form" model="ir.ui.view">
148
172
            <field name="name">delivery.stock.picking_withcarrier.delivery.form.view</field>
168
192
            <field name="context">{'contact_display': 'partner'}</field>
169
193
            <field name="search_view_id" ref="stock.view_picking_out_search"/>
170
194
        </record>
171
 
 
 
195
        
 
196
        <record id="view_picking_withcarrier_out_move_form" model="ir.ui.view">
 
197
            <field name="name">delivery.stock.picking_withcarrier.out.move.form.view</field>
 
198
            <field name="type">form</field>
 
199
            <field name="model">stock.picking</field>
 
200
            <field name="inherit_id" ref="stock.view_picking_out_form"/>
 
201
            <field name="arch" type="xml">
 
202
                <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
 
203
                    <field name="weight"/>
 
204
                </xpath>
 
205
            </field>
 
206
        </record>
 
207
        
 
208
        <record id="view_picking_withweight_in_move_form" model="ir.ui.view">
 
209
            <field name="name">stock.picking_withweight.in.move.form.view</field>
 
210
            <field name="type">form</field>
 
211
            <field name="model">stock.picking</field>
 
212
            <field name="inherit_id" ref="stock.view_picking_in_form"/>
 
213
            <field name="arch" type="xml">
 
214
                <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
 
215
                    <field name="weight"/>
 
216
                </xpath>
 
217
            </field>
 
218
        </record>
 
219
 
 
220
        <record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
 
221
            <field name="name">stock.picking_withweight.internal.move.form.view</field>
 
222
            <field name="type">form</field>
 
223
            <field name="model">stock.picking</field>
 
224
            <field name="inherit_id" ref="stock.view_picking_form"/>
 
225
            <field name="arch" type="xml">
 
226
                <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
 
227
                    <field name="weight"/>
 
228
                </xpath>
 
229
            </field>
 
230
        </record>        
 
231
 
 
232
        <record id="view_picking_withcarrier_delivery_move_form" model="ir.ui.view">
 
233
            <field name="name">delivery.stock.picking_withcarrier.delivery.move.form.view</field>
 
234
            <field name="type">form</field>
 
235
            <field name="model">stock.picking</field>
 
236
            <field name="inherit_id" ref="stock.view_picking_delivery_form"/>
 
237
            <field name="arch" type="xml">
 
238
                <xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
 
239
                    <field name="weight"/>
 
240
                </xpath>
 
241
            </field>
 
242
        </record>
 
243
        
 
244
        <record id="view_move_withweight_tree" model="ir.ui.view">
 
245
            <field name="name">stock.move.tree.weight</field>
 
246
            <field name="type">tree</field>
 
247
            <field name="model">stock.move</field>
 
248
            <field name="inherit_id" ref="stock.view_move_tree"/>
 
249
            <field name="arch" type="xml">
 
250
                <field name="product_uom" position="after">
 
251
                    <field name="weight"/>
 
252
                </field>
 
253
            </field>
 
254
        </record>
 
255
        
 
256
        <record id="view_move_withweight_form" model="ir.ui.view">
 
257
            <field name="name">stock.move.form.weight</field>
 
258
            <field name="type">form</field>
 
259
            <field name="model">stock.move</field>
 
260
            <field name="inherit_id" ref="stock.view_move_form"/>
 
261
            <field name="arch" type="xml">
 
262
                <field name="product_uom" position="after">
 
263
                    <field name="weight"/>
 
264
                </field>
 
265
            </field>
 
266
        </record>
 
267
        
 
268
        <record id="view_move_reception_picking_withweight_tree" model="ir.ui.view">
 
269
            <field name="name">stock.move.reception.packing.tree.weight</field>
 
270
            <field name="type">tree</field>
 
271
            <field name="model">stock.move</field>
 
272
            <field name="inherit_id" ref="stock.view_move_tree_reception_picking"/>
 
273
            <field name="arch" type="xml">
 
274
                <field name="product_uom" position="after">
 
275
                    <field name="weight"/>
 
276
                </field>
 
277
            </field>
 
278
        </record>
 
279
        
 
280
        <record id="view_move_reception_picking_withweight_form" model="ir.ui.view">
 
281
            <field name="name">stock.move.reception.packing.form.weight</field>
 
282
            <field name="type">form</field>
 
283
            <field name="model">stock.move</field>
 
284
            <field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
 
285
            <field name="arch" type="xml">
 
286
                <field name="product_uom" position="after">
 
287
                    <field name="weight"/>
 
288
                </field>
 
289
            </field>
 
290
        </record>
 
291
        
172
292
    </data>
173
293
</openerp>