1
=== modified file 'l10n_it_sale/stock/picking.py'
2
--- l10n_it_sale/stock/picking.py	2013-03-14 11:11:29 +0000
3
+++ l10n_it_sale/stock/picking.py	2013-05-02 06:38:28 +0000
4
@@ -34,7 +34,6 @@
5
34
	'name':fields.char('Carriage Condition', size=64, required=True, readonly=False),
34
	'name':fields.char('Carriage Condition', size=64, required=True, readonly=False),
6
35
	'note': fields.text('Note'),
35
	'note': fields.text('Note'),
7
36
    }
36
    }
8
37
stock_picking_carriage_condition()
9
38
37
10
39
class stock_picking_goods_description(orm.Model):
38
class stock_picking_goods_description(orm.Model):
11
40
    """
39
    """
12
@@ -47,8 +46,6 @@
13
47
	'name':fields.char('Description of Goods', size=64, required=True, readonly=False),
46
	'name':fields.char('Description of Goods', size=64, required=True, readonly=False),
14
48
	'note': fields.text('Note'),
47
	'note': fields.text('Note'),
15
49
    }
48
    }
16
50
stock_picking_goods_description()
17
51
18
52
49
19
53
class stock_picking_reason(orm.Model):
50
class stock_picking_reason(orm.Model):
20
54
    """
51
    """
21
@@ -61,7 +58,6 @@
22
61
	'name':fields.char('Reason For Transportation', size=64, required=True, readonly=False),
58
	'name':fields.char('Reason For Transportation', size=64, required=True, readonly=False),
23
62
	'note': fields.text('Note'),
59
	'note': fields.text('Note'),
24
63
    }
60
    }
25
64
stock_picking_reason()
26
65
61
27
66
class stock_picking(orm.Model):
62
class stock_picking(orm.Model):
28
67
    _inherit = "stock.picking.out"
63
    _inherit = "stock.picking.out"
29
@@ -103,4 +99,16 @@
30
103
        default.update({'ddt_number': ''})
99
        default.update({'ddt_number': ''})
31
104
        return super(stock_picking, self).copy(cr, uid, id, default, context)
100
        return super(stock_picking, self).copy(cr, uid, id, default, context)
32
105
101
34
106
stock_picking()
102
# Redefinition of the new fields in order to update the model stock.picking in the orm
35
103
# FIXME: this is a temporary workaround because of a framework bug (ref: lp996816).
36
104
# It should be removed as soon as
37
105
# the bug is fixed
38
106
class stock_picking(orm.Model):
39
107
    _inherit = 'stock.picking'
40
108
    _columns =  {
41
109
        'carriage_condition_id': fields.many2one('stock.picking.carriage_condition', 'Carriage condition'),
42
110
        'goods_description_id': fields.many2one('stock.picking.goods_description', 'Description of goods'),
43
111
        'transportation_reason_id': fields.many2one('stock.picking.transportation_reason', 'Reason for transportation'),
44
112
        'ddt_number':  fields.char('DDT', size=64),
45
113
        'ddt_date':  fields.date('DDT date'),
46
114
    }
47
107
115
48
=== modified file 'l10n_it_sale/stock/picking_view.xml'
49
--- l10n_it_sale/stock/picking_view.xml	2013-03-13 08:21:42 +0000
50
+++ l10n_it_sale/stock/picking_view.xml	2013-05-02 06:38:28 +0000
51
@@ -4,7 +4,7 @@
52
4
		<record id="stock_picking_form_ddt_inherit" model="ir.ui.view">
4
		<record id="stock_picking_form_ddt_inherit" model="ir.ui.view">
53
5
			<field name="name">stock.picking.form.ddt.inherit</field>
5
			<field name="name">stock.picking.form.ddt.inherit</field>
54
6
			<field name="model">stock.picking.out</field>
6
			<field name="model">stock.picking.out</field>
56
7
			<field name="inherit_id" ref="stock.view_picking_form"/>
7
			<field name="inherit_id" ref="stock.view_picking_out_form"/>
57
8
			<field name="arch" type="xml">
8
			<field name="arch" type="xml">
58
9
				<field name="move_type" position="after">
9
				<field name="move_type" position="after">
59
10
					<field name="goods_description_id"/>
10
					<field name="goods_description_id"/>
60
@@ -18,7 +18,7 @@
61
18
	<record id="stock_picking_tree_ddt_inherit" model="ir.ui.view">
18
	<record id="stock_picking_tree_ddt_inherit" model="ir.ui.view">
62
19
			<field name="name">stock.picking.tree.ddt.inherit</field>
19
			<field name="name">stock.picking.tree.ddt.inherit</field>
63
20
			<field name="model">stock.picking.out</field>
20
			<field name="model">stock.picking.out</field>
65
21
			<field name="inherit_id" ref="stock.vpicktree"/>
21
			<field name="inherit_id" ref="stock.view_picking_out_tree"/>
66
22
			<field name="arch" type="xml">
22
			<field name="arch" type="xml">
67
23
				<field name="name" position="before">
23
				<field name="name" position="before">
68
24
					<field name="ddt_number"/>
24
					<field name="ddt_number"/>
69
@@ -30,7 +30,7 @@
70
30
		<record id="stock_view_picking_form_ddt" model="ir.ui.view">
30
		<record id="stock_view_picking_form_ddt" model="ir.ui.view">
71
31
			<field name="name">stock.view.picking.form.ddt</field>
31
			<field name="name">stock.view.picking.form.ddt</field>
72
32
			<field name="model">stock.picking.out</field>
32
			<field name="model">stock.picking.out</field>
74
33
			<field name="inherit_id" ref="stock.view_picking_form"/>
33
			<field name="inherit_id" ref="stock.view_picking_out_form"/>
75
34
			<field name="arch" type="xml">
34
			<field name="arch" type="xml">
76
35
				<field name="backorder_id" position="after">
35
				<field name="backorder_id" position="after">
77
36
					<field name="ddt_number" readonly="1"/>
36
					<field name="ddt_number" readonly="1"/>
Reviewer	Review Type	Date Requested	Status
Andrea Cometa (community)		2013-05-02	Approve on 2013-05-13
Review via email: mp+162031@code.launchpad.net