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

merge 

bzr revid: fp@tinyerp.com-20090406123810-tbj1z9n1rknezq3p
This commit is contained in:
Fabien Pinckaers 2009-04-06 14:38:10 +02:00
parent 7aadc28356 dc90ccab8b
commit 911e734e3f
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_view.xml
View File

@ -323,7 +323,7 @@
<field name="period_id" select="2"/>
<group colspan="2" col="3">
<button name="%(wizard_populate_statement_from_inv)d"
string="Import Invoice" type="action" />
string="Import Invoice" type="action" attrs="{'invisible':[('state','=','confirm')]}"/>
</group>
<newline/>
<field name="balance_start"/>

1
addons/product/product_view.xml
View File

@ -18,6 +18,7 @@
<field name="default_code"/>
<field name="name"/>
<field name="variants"/>
<field name="uom_id"/>
<field name="qty_available"/>
<field name="virtual_available"/>
<field invisible="'partner_id' not in context" name="price"/>

6
addons/sale/sale.py
View File

@ -850,7 +850,7 @@ class sale_order_line(osv.osv):
def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
uom=False, qty_uos=0, uos=False, name='', partner_id=False,
lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False):
lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False):
if not partner_id:
raise osv.except_osv(_('No Customer Defined !'), _('You have to select a customer in the sale form !\nPlease set one customer before choosing a product.'))
warning={}
@ -913,8 +913,8 @@ class sale_order_line(osv.osv):
result['delay'] = (product_obj.sale_delay or 0.0)
partner = partner_obj.browse(cr, uid, partner_id)
result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
result['name'] = product_obj.partner_ref
if not flag:
result['name'] = product_obj.partner_ref
domain = {}
if (not uom) and (not uos):
result['product_uom'] = product_obj.uom_id.id

2
addons/sale/sale_view.xml
View File

@ -123,7 +123,7 @@
<field
context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
name="product_uom_qty"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position)"
on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
select="1"/>
<field name="product_uom"
on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>

1
addons/stock/report_stock_view.xml
View File

@ -109,6 +109,7 @@
<field name="arch" type="xml">
<tree string="Stock Location" colors="blue:usage=='view';darkred:usage=='internal'">
<field name="complete_name"/>
<field name="usage"/>
<field name="stock_real_value" />
<field name="stock_virtual_value" />
</tree>

2
addons/stock/stock_sequence.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<data noupdate="1">
<!--
Sequences for packings
-->