Dharti Ratani(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-i18-address-format-dhr into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-i18-address-format-dhr/+merge/118697
Hello,
Adding fields_view_get in crm_lead form to change the address format based
on user's company's country's address format.
Thanks
dhr
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-i18-address-format-dhr/+merge/118697
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-i18-address-format-dhr.
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2012-08-08 09:08:46 +0000
+++ crm/crm_lead.py 2012-08-08 09:26:37 +0000
@@ -293,6 +293,7 @@
result = {}
if partner_id:
partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+<<<<<<< TREE
values = {
'partner_name' : partner.name,
'street' : partner.street,
@@ -302,6 +303,43 @@
'country_id' : partner.country_id and partner.country_id.id or False,
}
return {'value' : values}
+=======
+ result = {'partner_name' : partner.name}
+ return {'value' : result}
+
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+ res = super(crm_lead,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+
+ if view_type == 'form':
+ country_id = self.pool.get('res.users').browse(cr, uid, uid,context).company_id.country_id
+ if country_id and country_id.address_format:
+ address_format = country_id.address_format
+ else:
+ address_format = '%(company_name)s%(street)s%(street2)s%(city)s,%(state_code)s %(zip)s%(country_name)s'
+ address_format = address_format.replace(',','')
+ fields = {
+ 'zip': {'change_default': True, 'string': 'Zip', 'views': {}, 'selectable': True, 'type': 'char', 'size': 24},
+ 'city': {'selectable': True, 'views': {}, 'type': 'char', 'string': 'City', 'size': 128},
+ 'street': {'selectable': True, 'views': {}, 'type': 'char', 'string': 'Street', 'size': 128},
+ 'street2': {'selectable': True, 'views': {}, 'type': 'char', 'string': 'Street2', 'size': 128},
+ 'country_id': {'domain': [], 'string': 'Country', 'views': {}, 'relation': 'res.country', 'context': {}, 'selectable': True, 'type': 'many2one'},
+ 'state_id': {'domain': [], 'string': 'State', 'views': {}, 'relation': 'res.country.state', 'context': {}, 'selectable': True, 'type': 'many2one'}
+ }
+ args = {
+ 'street': '<field name="street"/>',
+ 'street2': '<field name="street2"/>',
+ 'city': '<field name="city"/>',
+ 'state_code': '<field name="state_id"/>',
+ 'zip': '<field name="zip"/>',
+ 'country_name': '<field name="country_id"/>',
+ 'company_name': '',
+ }
+ old = '<div class="address_format"/>'
+ new = '<div class="address_format">' + address_format % args + '</div>'
+ res['arch'] = res['arch'].replace(old,new)
+ res['fields'].update(fields)
+ return res
+>>>>>>> MERGE-SOURCE
def _check(self, cr, uid, ids=False, context=None):
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2012-08-08 07:24:53 +0000
+++ crm/crm_lead_view.xml 2012-08-08 09:26:37 +0000
@@ -159,6 +159,7 @@
<field name="partner_id" string="Customer"
on_change="on_change_partner(partner_id)" />
<label for="street" string="Address"/>
+<<<<<<< TREE
<div>
<field name="street" placeholder="Street..."/>
<field name="street2"/>
@@ -169,6 +170,9 @@
</div>
<field name="country_id" placeholder="Country" options='{"no_open": true}'/>
</div>
+=======
+ <div class="address_format"/>
+>>>>>>> MERGE-SOURCE
</group>
<group>
<label for="contact_name" />
@@ -517,6 +521,7 @@
<field name="partner_name"/>
<label for="street" string="Address"/>
<div>
+<<<<<<< TREE
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div class="address_format">
@@ -526,6 +531,17 @@
</div>
<field name="country_id" placeholder="Country" options='{"no_open": true}'/>
</div>
+=======
+ <field name="street" placeholder="Street..."/>
+ <field name="street2"/>
+ <div class="address_format">
+ <field name="city" placeholder="City" style="width: 40%%"/>
+ <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
+ <field name="zip" placeholder="ZIP" style="width: 34%%"/>
+ </div>
+ <field name="country_id" placeholder="Country"/>
+ </div>
+>>>>>>> MERGE-SOURCE
</group>
<group>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
