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

View Improvement 

bzr revid: fp@tinyerp.com-20080903160226-frpeezajtbgvx113
This commit is contained in:
Fabien Pinckaers 2008-09-03 18:02:26 +02:00
parent 74ffd7364c
commit 0b6832f9b1
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/purchase/purchase.py
View File

@ -166,7 +166,7 @@ class purchase_order(osv.osv):
'invoiced':fields.boolean('Invoiced & Paid', readonly=True, select=True),
'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
'invoice_method': fields.selection([('manual','Manual'),('order','From order'),('picking','From picking')], 'Invoicing Control', required=True),
'minimum_planned_date':fields.function(_minimum_planned_date, method=True,store=True, string='Planned Date', type='date', help="Minimum schedule date of all products."),
'minimum_planned_date':fields.function(_minimum_planned_date, method=True,store=True, string='Planned Date', type='date', help="This is computed as the minimum scheduled date of all purchase order lines' products."),
'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount'),
'amount_tax': fields.function(_amount_tax, method=True, string='Taxes'),
'amount_total': fields.function(_amount_total, method=True, string='Total'),

20
addons/purchase/purchase_view.xml
View File

@ -25,12 +25,12 @@
<form string="Purchase Order">
<group col="6" colspan="4">
<field name="name" select="1"/>
<field name="shipped" select="2"/>
<field name="date_order" select="2"/>
<field name="invoiced" select="2"/>
<newline/>
<field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)"/>
<field name="origin" select="2"/>
<field name="date_order" select="2"/>
<field name="shipped" select="2"/>
</group>
<notebook colspan="4">
<page string="Purchase Order">
@ -60,12 +60,16 @@
</group>
</page>
<page string="Delivery &amp; Invoices">
<separator string="Delivery" colspan="2"/>
<separator string="Invoice Control" colspan="2"/>
<field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
<field name="invoice_method"/>
<field name="minimum_planned_date"/>
<field name="location_id"/>
<group colspan="2" col="2">
<separator string="Delivery" colspan="2"/>
<field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
<field name="minimum_planned_date"/>
<field name="location_id"/>
</group>
<group colspan="2" col="2">
<separator string="Invoice Control" colspan="2"/>
<field name="invoice_method"/>
</group>
<newline/>
<separator string="Purchase Control" colspan="4"/>
<field name="validator"/>