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

fixed typo and invoice rate calculation in PO 

bzr revid: hda@hda-laptop-20110420063428-gw5za9vc8mc40lyt
This commit is contained in:
Husen Daudi 2011-04-20 12:04:28 +05:30
parent 2062bd4e8c 71049f8bb6
commit 1163498c5b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mrp/mrp_view.xml
View File

@ -638,7 +638,7 @@
<field name="date_planned"/>
<field name="origin"/>
<newline/>
<field name="product_id" on_change="product_id_change(product_id)"/>
<field name="product_id" on_change="product_id_change(product_id)" domain="[('type','=','product')]"/>
<field name="product_qty"/>
<field name="product_uom"/>
<button type="action"

8
addons/procurement/procurement.py
View File

@ -512,13 +512,13 @@ class stock_warehouse_orderpoint(osv.osv):
'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
'product_min_qty': fields.float('Min Quantity', required=True,
help="When the virtual stock goes belong the Min Quantity, OpenERP generates "\
help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\
"a procurement to bring the virtual stock to the Max Quantity."),
'product_max_qty': fields.float('Max Quantity', required=True,
help="When the virtual stock goes belong the Max Quantity, OpenERP generates "\
"a procurement to bring the virtual stock to the Max Quantity."),
help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
"a procurement to bring the virtual stock to the Quantity specified as Max Quantity."),
'qty_multiple': fields.integer('Qty Multiple', required=True,
help="The procurement quantity will by rounded up to this multiple."),
help="The procurement quantity will be rounded up to this multiple."),
'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),
'company_id': fields.many2one('res.company','Company',required=True),
'procurement_draft_ids': fields.function(_get_draft_procurements, method=True, type='many2many', relation="procurement.order", \

2
addons/purchase/purchase.py
View File

@ -98,7 +98,7 @@ class purchase_order(osv.osv):
tot = 0.0
for invoice in purchase.invoice_ids:
if invoice.state not in ('draft','cancel'):
tot += invoice.amount_untaxed
tot += (invoice.amount_untaxed - invoice.residual)
if purchase.amount_untaxed:
res[purchase.id] = tot * 100.0 / purchase.amount_untaxed
else:

2
addons/resource/resource_view.xml
View File

@ -225,7 +225,7 @@
</group>
<group colspan="2" col="2">
<field name="date_from"/>
<field name="calendar_id" string="Working Period" readonly='1'/>
<field name="calendar_id" string="Working Period"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<group colspan="2" col="2">