Max (OpenERP) has proposed merging
lp:~openerp-dev/openerp-int/mck_change_zip_to_postal_code into
lp:~openerp-dev/openerp-int/mck_addons.
Requested reviews:
tfr (Openerp) (tfr)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-int/mck_change_zip_to_postal_code/+merge/132885
579869 - Change Zip to Postal Code in Model and remove old string="Postal Code"
fixes in views
--
https://code.launchpad.net/~openerp-dev/openerp-int/mck_change_zip_to_postal_code/+merge/132885
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-int/mck_addons.
=== modified file 'mck_contact/role.py'
--- mck_contact/role.py 2012-10-23 21:35:19 +0000
+++ mck_contact/role.py 2012-11-05 13:44:19 +0000
@@ -276,7 +276,7 @@
return {'value':{
'street': False,
'street2': False,
- 'zip': False,
+ 'postal_code': False,
'city': False,
'country_id': False,
'state': False,
@@ -286,7 +286,7 @@
return {'value':{
'street': location.street,
'street2': location.street2,
- 'zip': location.zip,
+ 'postal_code': location.zip,
'city': location.city,
'country_id': location.country_id and location.country_id.id or False,
#'region' : location.country_id and location.country_id.region or False,
=== modified file 'mck_contact/view/company.xml'
--- mck_contact/view/company.xml 2012-10-09 18:23:22 +0000
+++ mck_contact/view/company.xml 2012-11-05 13:44:19 +0000
@@ -102,7 +102,7 @@
<field name="street" />
<field name="street2" />
<field name="city" />
- <field name="zip" string="Postal Code"/>
+ <field name="zip" />
<field name="country_id" />
<!--
<field name="region" string="Regional Focus" />
@@ -251,7 +251,7 @@
<field name="street" />
<field name="street2" />
<field name="city" />
- <field name="zip" string="Postal Code"/>
+ <field name="zip" />
<field name="country_id" />
<!--
<field name="region" string="Regional Focus" />
=== modified file 'mck_contact/view/location.xml'
--- mck_contact/view/location.xml 2012-10-09 18:23:22 +0000
+++ mck_contact/view/location.xml 2012-11-05 13:44:19 +0000
@@ -16,7 +16,7 @@
<field name="partner_id" />
<field name="country_id" />
<field name="city" />
- <field name="zip" string="Postal Code"/>
+ <field name="zip" />
<field name="state" />
<!--
<field name="region" string="Regional Focus"/>
@@ -36,7 +36,7 @@
<field name="street" />
<field name="street2" />
<field name="city" />
- <field name="zip" string="Postal Code"/>
+ <field name="zip" />
<field name="country_id" />
<!--
<field name="region" string="Regional Focus" />
@@ -62,7 +62,7 @@
<field name="street2" colspan="4" />
<label string="" colspan="8"/>
<field name="city" colspan="2" />
- <field name="zip" string="Postal Code" colspan="2"/>
+ <field name="zip" colspan="2"/>
<field name="country_id" colspan="2" on_change="onchange_country(country_id)" />
<field name="state" colspan="2" />
<!--
=== modified file 'mck_demo/__openerp__.py'
--- mck_demo/__openerp__.py 2012-08-30 12:20:28 +0000
+++ mck_demo/__openerp__.py 2012-11-05 13:44:19 +0000
@@ -39,7 +39,7 @@
'data/mck_contact/mck.role.function.csv',
'data/mck_contact/mck.company.industry.csv',
'data/mck_internal/mck.practice.region.csv',
- 'data/mck_internal/mck.practice.csv',
+ #'data/mck_internal/mck.practice.csv',
#'data/mck_contact/res.partner.location.csv',
],
'installable': True,
=== modified file 'mck_event/event.py'
--- mck_event/event.py 2012-10-09 20:40:19 +0000
+++ mck_event/event.py 2012-11-05 13:44:19 +0000
@@ -68,7 +68,7 @@
'street1':fields.char('Street 1',size=64),
'street2':fields.char('Street 2',size=64),
'city':fields.char('City',size=64),
- 'zip':fields.char('Postal Code',size=64),
+ 'postal_code':fields.char('Postal Code',size=64),
'country_state':fields.char('State',64),
'country':fields.many2one('res.country','Country',ondelete="restrict"),
'date' : fields.related('end_date', string='Date', type="date", store=True),
=== modified file 'mck_event/view/event.xml'
--- mck_event/view/event.xml 2012-10-04 12:14:05 +0000
+++ mck_event/view/event.xml 2012-11-05 13:44:19 +0000
@@ -176,7 +176,7 @@
<field name="city" attrs="{'readonly':[('state','=', 'draft')]}"
colspan="4" />
<label string="" colspan="12" />
- <field name="zip" attrs="{'readonly':[('state','=', 'draft')]}"
+ <field name="postal_code" attrs="{'readonly':[('state','=', 'draft')]}"
colspan="4" />
<field name="country" attrs="{'readonly':[('state','=', 'draft')]}"
colspan="4" />
=== modified file 'mck_publication/wizard/export_recipient.py'
--- mck_publication/wizard/export_recipient.py 2012-10-09 20:16:25 +0000
+++ mck_publication/wizard/export_recipient.py 2012-11-05 13:44:19 +0000
@@ -103,7 +103,7 @@
feuil1.write(0,4,'Street 1')
feuil1.write(0,5,'Street 2')
feuil1.write(0,6,'City')
- feuil1.write(0,7,'Zip code')
+ feuil1.write(0,7,'Postal code')
feuil1.write(0,8,'Country')
feuil1.write(0,9,'State')
feuil1.write(0,10,'Number of copy(ies)')
_______________________________________________
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
