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

[Merge] Merge with main server. 

bzr revid: mdi@tinyerp.com-20120703090025-2i96d8gzhr7z9sfh
This commit is contained in:
Divyesh Makwana (Open ERP) 2012-07-03 14:30:25 +05:30
parent f3e1bd6048 b6f55d7a23
commit 54993f0348
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openerp/addons/base/res/res_bank_view.xml
View File

@ -102,12 +102,17 @@
<group>
<group name="owner" string="Bank Account Owner">
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="owner_name"/>
<field name="street"/>
<field name="city"/>
<field name="zip"/>
<field name="country_id"/>
<field name="state_id"/>
<label for="street" string="Address"/>
<div>
<field name="owner_name" placeholder="Name"/>
<field name="street" placeholder="Street"/>
<div>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
</div>
</group>
<group name="bank" string="Information About the Bank">
<field name="bank" on_change="onchange_bank_id(bank)"/>

2
openerp/addons/base/res/res_partner.py
View File

@ -151,7 +151,7 @@ class res_partner(osv.osv):
'customer': fields.boolean('Customer', help="Check this box if the partner is a customer."),
'supplier': fields.boolean('Supplier', help="Check this box if the partner is a supplier. If it's not checked, purchase people will not see it when encoding a purchase order."),
'employee': fields.boolean('Employee', help="Check this box if the partner is an Employee."),
'function': fields.char('Function', size=128),
'function': fields.char('Job Position', size=128),
'type': fields.selection( [('default','Default'),('invoice','Invoice'),
('delivery','Delivery'), ('contact','Contact'),
('other','Other')],

6
openerp/addons/base/res/res_partner_view.xml
View File

@ -121,12 +121,6 @@
domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
class="oe_inline"
on_change="onchange_address(use_parent_address, parent_id)"/>,
</h2>
<div attrs="{'invisible' : [('is_company', '=', True)]}">
<label for="function" class="oe_edit_only" />
</div>
<h2 attrs="{'invisible' : [('is_company', '=', True)]}">
<field name="function" class="oe_inline" placeholder="Job Position"/>
</h2>
<field name="category_id" widget="many2many_tags" placeholder="Tags..."/>