odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20101012094030-7bodubs8w3il9fjh
This commit is contained in:
Fabien Pinckaers 2010-10-12 11:40:30 +02:00
parent 54a9fa160c 53ae3b4d10
commit 178d644b41
3 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
addons/delivery/delivery_view.xml
View File

@ -175,22 +175,6 @@
</field>
</record>
<record id="view_picking_withcarrier_delivery_form" model="ir.ui.view">
<field name="name">delivery.stock.picking_withcarrier.delivery.form.view</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_delivery_form"/>
<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 name="weight_net"/>
</field>
</field>
</record>
<record id="action_picking_tree4" model="ir.actions.act_window">
<field name="name">Picking to be invoiced</field>
<field name="res_model">stock.picking</field>
@ -242,19 +226,6 @@
</field>
</record>
<record id="view_picking_withcarrier_delivery_move_form" model="ir.ui.view">
<field name="name">delivery.stock.picking_withcarrier.delivery.move.form.view</field>
<field name="type">form</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_delivery_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
<field name="weight"/>
<field name="weight_net"/>
</xpath>
</field>
</record>
<record id="view_move_withweight_form" model="ir.ui.view">
<field name="name">stock.move.form.weight</field>
<field name="type">form</field>

1
addons/delivery/test/delivery_report.yml
View File

@ -12,7 +12,6 @@
invoice_state: none
move_lines:
- company_id: base.main_company
date_planned: '2010-05-11 15:18:57'
location_dest_id: stock.stock_location_customers
location_id: stock.stock_location_stock
name: HP CD writers

1
addons/procurement/schedulers.py
View File

@ -23,6 +23,7 @@ import time
from mx import DateTime
from osv import osv
from tools.translate import _
import netsvc
import pooler
from tools.translate import _