pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]base/res_partner: set indentation and merge with main branch

Browse Source 
bzr revid: kjo@tinyerp.com-20120313055125-fhdw31q7qheih9ob
This commit is contained in:
Kuldeep Joshi (OpenERP)
2012-03-13 11:21:25 +05:30
parent 41a5021110 7288a49499
commit 41fd7fca03
5 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/base_data.xml
+1
View File
@@ -1061,6 +1061,7 @@
<field name="address" eval="[]"/>
<field name="company_id" eval="None"/>
<field name="customer" eval="False"/>
<field name="is_company" eval="True"/>
</record>
<record id="main_address" model="res.partner.address">
<field name="partner_id" ref="main_partner"/>
openerp/addons/base/res/res_company.py
+3 -2
View File
@@ -124,7 +124,7 @@ class res_company(osv.osv):
'rml_header': fields.text('RML Header', required=True),
'rml_header2': fields.text('RML Internal Header', required=True),
'rml_header3': fields.text('RML Internal Header', required=True),
'logo': fields.binary('Logo'),
'logo': fields.related('partner_id', 'photo', string="Photo", type="binary"),
'currency_id': fields.many2one('res.currency', 'Currency', required=True),
'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),
'user_ids': fields.many2many('res.users', 'res_company_users_rel', 'cid', 'user_id', 'Accepted Users'),
@@ -224,11 +224,12 @@ class res_company(osv.osv):
self._get_company_children.clear_cache(self)
def create(self, cr, uid, vals, context=None):
if not vals.get('name', False) or vals.get('partner_id', False):
self.cache_restart(cr)
return super(res_company, self).create(cr, uid, vals, context=context)
obj_partner = self.pool.get('res.partner')
partner_id = obj_partner.create(cr, uid, {'name': vals['name'],'is_company':1}, context=context)
partner_id = obj_partner.create(cr, uid, {'name': vals['name'],'is_company':True}, context=context)
vals.update({'partner_id': partner_id})
self.cache_restart(cr)
company_id = super(res_company, self).create(cr, uid, vals, context=context)
openerp/addons/base/res/res_partner.py
+1 -1
View File
@@ -406,7 +406,7 @@ class res_partner(osv.osv):
# get the information that will be injected into the display format
# get the address format
address_format = address.country_id and address.country_id.address_format or \
'%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s'
'%(company_name)s\n%(street)s\n%(street2)s\n%(city)s,%(state_code)s %(zip)s'
args = {
'state_code': address.state_id and address.state_id.code or '',
'state_name': address.state_id and address.state_id.name or '',
openerp/addons/base/res/res_partner_demo.xml
+29 -32
View File
@@ -64,25 +64,22 @@
<!--
Resource: res.partner.category for training
-->
<record id="res_partner_category_consumers0" model="res.partner.category">
<field name="name">Consumers</field>
<field name="parent_id" ref="res_partner_category_0"/>
</record>
<record id="res_partner_category_retailers0" model="res.partner.category">
<field name="name">Retailers</field>
<field name="parent_id" ref="res_partner_category_0"/>
</record>
<record id="res_partner_category_miscellaneoussuppliers0" model="res.partner.category">
<field name="name">Miscellaneous Suppliers</field>
<field name="parent_id" ref="res_partner_category_8"/>
</record>
<record id="res_partner_category_woodsuppliers0" model="res.partner.category">
<field name="name">Wood Suppliers</field>
<field name="parent_id" ref="res_partner_category_8"/>
</record>
<record id="res_partner_category_consumers0" model="res.partner.category">
<field name="name">Consumers</field>
<field name="parent_id" ref="res_partner_category_0"/>
</record>
<record id="res_partner_category_retailers0" model="res.partner.category">
<field name="name">Retailers</field>
<field name="parent_id" ref="res_partner_category_0"/>
</record>
<record id="res_partner_category_miscellaneoussuppliers0" model="res.partner.category">
<field name="name">Miscellaneous Suppliers</field>
<field name="parent_id" ref="res_partner_category_8"/>
</record>
<record id="res_partner_category_woodsuppliers0" model="res.partner.category">
<field name="name">Wood Suppliers</field>
<field name="parent_id" ref="res_partner_category_8"/>
</record>
<!--
Resource: res.partner
@@ -565,8 +562,8 @@
<field model="res.country" name="country_id" search="[('name','=','Belgium')]"/>
<field name="street">71 rue de Chimay</field>
<field name="type">delivery</field>
<field name="email">p.l@agrolait.be</field>
<field name="phone">003281588557</field>
<field name="email">p.l@agrolait.be</field>
<field name="phone">003281588557</field>
<field name="use_parent_address" eval="0"/>
<field name="parent_id" ref="res_partner_agrolait"/>
<field name="title" ref="base.res_partner_title_sir"/>
@@ -578,8 +575,8 @@
<field model="res.country" name="country_id" search="[('name','=','Belgium')]"/>
<field name="street">69 rue de Chimay</field>
<field name="type">invoice</field>
<field name="email">serge.l@agrolait.be</field>
<field name="phone">003281588556</field>
<field name="email">serge.l@agrolait.be</field>
<field name="phone">003281588556</field>
<field name="use_parent_address" eval="0"/>
<field name="parent_id" ref="res_partner_agrolait"/>
<field name="title" ref="base.res_partner_title_sir"/>
@@ -635,14 +632,14 @@
</record>
<record id="res_partner_address_12" model="res.partner">
<field name="type">default</field>
<field name="city">Grenoble</field>
<field name="city">Grenoble</field>
<field name="name">Loïc Dupont</field>
<field name="zip">38100</field>
<field model="res.country" name="country_id" search="[('name','=','China')]"/>
<field name="street">Rue Lavoisier 145</field>
<field name="type">default</field>
<field name="email">l.dupont@tecsas.fr</field>
<field name="phone">+33-658-256545</field>
<field name="email">l.dupont@tecsas.fr</field>
<field name="phone">+33-658-256545</field>
<field name="use_parent_address" eval="0"/>
<field name="parent_id" ref="res_partner_10"/>
</record>
@@ -671,10 +668,10 @@
<field name="type">default</field>
<field name="name">Marine Leclerc</field>
<field name="street">rue Grande</field>
<field name="city">Brest</field>
<field name="city">Brest</field>
<field name="zip">29200</field>
<field name="email">marine@leclerc.fr</field>
<field name="phone">+33-298.334558</field>
<field name="email">marine@leclerc.fr</field>
<field name="phone">+33-298.334558</field>
<field name="use_parent_address" eval="0"/>
<field name="parent_id" ref="res_partner_11"/>
</record>
@@ -682,10 +679,10 @@
<field name="type">invoice</field>
<field name="name">Claude Leclerc</field>
<field name="street">rue Grande</field>
<field name="city">Brest</field>
<field name="city">Brest</field>
<field name="zip">29200</field>
<field name="email">claude@leclerc.fr</field>
<field name="phone">+33-298.334598</field>
<field name="email">claude@leclerc.fr</field>
<field name="phone">+33-298.334598</field>
<field name="use_parent_address" eval="0"/>
<field name="parent_id" ref="res_partner_11"/>
</record>
openerp/addons/base/res/res_partner_view.xml
+3 -2
View File
@@ -198,9 +198,9 @@
<field name="view_id" ref="view_partner_address_form1"/>
<field name="act_window_id" ref="action_partner_address_form"/>
</record>
<menuitem action="action_partner_address_form" id="menu_partner_address_form"
<!--menuitem action="action_partner_address_form" id="menu_partner_address_form"
groups="base.group_extended" name="Contacts"
parent="base.menu_address_book" sequence="30"/>
parent="base.menu_address_book" sequence="30"/-->
<!--
=========================================
@@ -316,6 +316,7 @@
<field name="email"/>
<field name="user_id" invisible="1"/>
<field name="is_company" invisible="1"/>
<field name="country" invisible="1"/>
<field name="country_id" invisible="1"/>
</tree>
</field>