Merge lp:~openobject-italia-core-devs/openobject-italia/fix_ddt_number_in_tree into lp:~openobject-italia-core-devs/openobject-italia/italian-addons

Proposed by Lorenzo Battistini
Status: Merged
Merged at revision: 125
Proposed branch: lp:~openobject-italia-core-devs/openobject-italia/fix_ddt_number_in_tree
Merge into: lp:~openobject-italia-core-devs/openobject-italia/italian-addons
Diff against target: 27 lines (+16/-1)
1 file modified
l10n_it_sale/stock/picking_view.xml (+16/-1)
To merge this branch: bzr merge lp:~openobject-italia-core-devs/openobject-italia/fix_ddt_number_in_tree
Reviewer Review Type Date Requested Status
Lorenzo Battistini Approve
Review via email: mp+74790@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lorenzo Battistini (elbati) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_it_sale/stock/picking_view.xml'
--- l10n_it_sale/stock/picking_view.xml 2011-08-08 19:17:15 +0000
+++ l10n_it_sale/stock/picking_view.xml 2011-09-09 13:46:08 +0000
@@ -14,7 +14,22 @@
14 <field name="ddt_date"/>14 <field name="ddt_date"/>
15 </field>15 </field>
16 </field>16 </field>
17 </record>17 </record>
18
19 <record id="stock_picking_tree_ddt_inherit" model="ir.ui.view">
20 <field name="name">stock.picking.tree.ddt.inherit</field>
21 <field name="model">stock.picking</field>
22 <field name="inherit_id" ref="stock.view_picking_out_tree"/>
23 <field name="arch" type="xml">
24 <field name="name" position="before">
25 <field name="ddt_number"/>
26 <field name="ddt_date"/>
27 </field>
28 </field>
29 </record>
30
31
32
18<!-- serve?33<!-- serve?
19 <record id="stock_view_picking_form_ddt_inherit" model="ir.ui.view">34 <record id="stock_view_picking_form_ddt_inherit" model="ir.ui.view">
20 <field name="name">stock.view.picking.form.ddt.inherit</field>35 <field name="name">stock.view.picking.form.ddt.inherit</field>