diff options
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/addons/base/module/module_wizard.xml | 2 | ||||
| -rw-r--r-- | bin/addons/base/res/partner/partner.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/addons/base/module/module_wizard.xml b/bin/addons/base/module/module_wizard.xml index 737a3bb60e8..ff8f51bef6d 100644 --- a/bin/addons/base/module/module_wizard.xml +++ b/bin/addons/base/module/module_wizard.xml @@ -17,7 +17,7 @@ <menuitem action="wizard_upgrade" id="menu_wizard_upgrade" parent="menu_management" type="wizard"/> <record id="wizard_lang_install" model="ir.actions.wizard"> - <field name="name">Reload an Official Translation</field> + <field name="name">Load an Official Translation</field> <field name="wiz_name">module.lang.install</field> </record> <menuitem action="wizard_lang_install" id="menu_wizard_lang_install" parent="menu_translation" type="wizard"/> diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py index f5a7bf5a3bb..09cce57c49c 100644 --- a/bin/addons/base/res/partner/partner.py +++ b/bin/addons/base/res/partner/partner.py @@ -269,7 +269,7 @@ class res_partner_address(osv.osv): _name = 'res.partner.address' _order = 'id' _columns = { - 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=True, help="Keep empty for a private address, not related to partner."), + 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null', select=True, help="Keep empty for a private address, not related to partner."), 'type': fields.selection( [ ('default','Default'),('invoice','Invoice'), ('delivery','Delivery'), ('contact','Contact'), ('other','Other') ],'Address Type', help="Used to select automatically the right address according to the context in sales and purchases documents."), 'function': fields.many2one('res.partner.function', 'Function'), 'title': fields.selection(_contact_title_get, 'Title', size=32), |