pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source 
bzr revid: fp@tinyerp.com-20100716155034-gmgif2ezs8qjb02a
This commit is contained in:
Fabien Pinckaers
2010-07-16 17:50:34 +02:00
parent 3e4f28ff6e a7af9d5fe2
commit 4cf309611b
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/delivery/delivery_view.xml
+4
View File
@@ -141,6 +141,8 @@
<field name="arch" type="xml">
<field name="address_id" position="after">
<field name="carrier_id"/>
<field name="carrier_tracking_ref" groups="base.group_extended"/>
<field name="number_of_packages" groups="base.group_extended"/>
<field name="weight"/>
</field>
</field>
@@ -178,6 +180,8 @@
<field name="arch" type="xml">
<field name="address_id" position="after">
<field name="carrier_id"/>
<field name="carrier_tracking_ref" groups="base.group_extended"/>
<field name="number_of_packages" groups="base.group_extended"/>
<field name="weight"/>
</field>
</field>
addons/delivery/stock.py
+2
View File
@@ -55,6 +55,8 @@ class stock_picking(osv.osv):
'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20),
'stock.move': (_get_picking_line, ['product_id','product_qty','product_uom','product_uos_qty'], 20),
}),
'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
'number_of_packages': fields.integer('Number of Packages'),
}
def action_invoice_create(self, cursor, user, ids, journal_id=False,