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

[Merge] Merged addons-fixes branch 

bzr revid: jvo@tinyerp.com-20101027141154-5g36msxuol53mokg
This commit is contained in:
Jay (OpenERP) 2010-10-27 19:41:54 +05:30
parent e42eeba3e2 4147251af5
commit ca5fd4af7d
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/purchase/purchase.py
View File

@ -34,7 +34,7 @@ from osv.orm import browse_record, browse_null
# Model definition
#
class purchase_order(osv.osv):
def _calc_amount(self, cr, uid, ids, prop, unknow_none, unknow_dict):
res = {}
for order in self.browse(cr, uid, ids):
@ -42,7 +42,7 @@ class purchase_order(osv.osv):
for oline in order.order_line:
res[order.id] += oline.price_unit * oline.product_qty
return res
def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
res = {}
cur_obj=self.pool.get('res.currency')
@ -369,7 +369,7 @@ class purchase_order(osv.osv):
'journal_id': len(journal_ids) and journal_ids[0] or False,
'origin': o.name,
'invoice_line': il,
'fiscal_position': o.partner_id.property_account_position.id,
'fiscal_position': o.fiscal_position.id or o.partner_id.property_account_position.id,
'payment_term': o.partner_id.property_payment_term and o.partner_id.property_payment_term.id or False,
'company_id': o.company_id.id,
}

24
addons/purchase/purchase_demo.xml
View File

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
<!--Resource: purchase.order-->
<record id="order_purchase1" model="purchase.order">
<field model="stock.location" name="location_id" search="[]"/>
<field model="product.pricelist" name="pricelist_id" search="[]"/>
<field model="res.partner" name="partner_id" search="[]"/>
<field model="res.partner" name="partner_id" search="[('supplier','=','True')]" />
<field model="res.partner.address" name="partner_address_id" search="[]"/>
</record>
<record id="order_purchase2" model="purchase.order">
<field model="stock.location" name="location_id" search="[]"/>
<field model="product.pricelist" name="pricelist_id" search="[]"/>
<field model="res.partner" name="partner_id" search="[]"/>
<field model="res.partner" name="partner_id" search="[('supplier','=','True')]" />
<field model="res.partner.address" name="partner_address_id" search="[]"/>
</record>
<!--Resource: purchase.order.line-->
<record id="line1_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase1"/>
<field name="date_planned">2010/09/15</field>
@ -29,7 +29,7 @@
<field name="price_unit">150</field>
<field name="product_qty">5</field>
</record>
<record id="line2_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase1"/>
<field name="date_planned">2010/09/15</field>
@ -39,7 +39,7 @@
<field name="price_unit">450</field>
<field name="product_qty">2</field>
</record>
<record id="line3_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase2"/>
<field name="date_planned">2010/09/15</field>
@ -49,9 +49,9 @@
<field name="price_unit">900</field>
<field name="product_qty">1</field>
</record>
<workflow action="purchase_confirm" model="purchase.order" ref="order_purchase2"/>
</data>
</openerp>

6
addons/purchase/purchase_view.xml
View File

@ -41,7 +41,7 @@
parent="base.menu_purchase_root" sequence="4"/>
<menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
name="Incoming Shipments" sequence="9"
groups="base.group_extended"/>
groups="base.group_extended"/>
<menuitem action="stock.action_reception_picking_move" id="menu_action_picking_tree_in_move"
parent="menu_procurement_management_inventory" sequence="11"/>
@ -115,7 +115,7 @@
</group>
<notebook colspan="4">
<page string="Purchase Order">
<field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1}"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier','=',True)]" context="{'search_default_supplier':1}" />
<field name="partner_address_id"/>
<field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
<field name="origin" groups="base.group_extended"/>
@ -147,7 +147,7 @@
<button name="purchase_confirm" states="draft" string="Confirm Purchase Order" icon="gtk-go-forward"/>
<button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
<button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-go-forward"/>
<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
<button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
</group>
</page>

2
addons/sale/sale_view.xml
View File

@ -113,7 +113,7 @@
</group>
<notebook colspan="5">
<page string="Sales Order">
<field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
<field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
<field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended"/>
<field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended"/>