Merge lp:~therp-nl/therp-addons/7.0-partner_name_dutch_salutation into lp:~therp-nl/therp-addons/7.0

[Holger Brunn (Therp)]

[lp:~therp-nl/therp-addons/7.0-partner_name_dutch_salutation]

103. By Holger Brunn (Therp) on 2014-01-29

[ADD] mention latest changes in manifest

104. By Holger Brunn (Therp) on 2014-01-29

[FIX] copy&paste mistake

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks, sorry I've missed this.

Salutations in English are capitalized (as in "Dear Madam" / "My dear Professor"). Can you change this in the data lines and update the translations?

review: Needs Fixing

[lp:~therp-nl/therp-addons/7.0-partner_name_dutch_salutation]

105. By Holger Brunn (Therp) on 2014-03-17

[FIX] English salutations are capitalized

[Holger Brunn (Therp) (hbrunn)]

Thanks!

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks for the updates

review: Approve

=== modified file 'partner_name_dutch/__openerp__.py'
--- partner_name_dutch/__openerp__.py	2013-10-01 12:00:28 +0000
+++ partner_name_dutch/__openerp__.py	2014-03-17 07:52:16 +0000
@@ -27,12 +27,16 @@
     - have infixes
     - have initials
     - split first and last name (provided by partner_firstname)
+    - use a different title for address and salutation ('aan de heer'/'geachte
+      heer')
     """,
     "category" : "Generic Modules",
     "depends" : [
         'partner_firstname',
     ],
     "data" : [
+        "data/res_partner_title.xml",
+        "view/res_partner_title.xml",
         'view/res_partner.xml',
     ],
     "js": [

=== added directory 'partner_name_dutch/data'
=== added file 'partner_name_dutch/data/res_partner_title.xml'
--- partner_name_dutch/data/res_partner_title.xml	1970-01-01 00:00:00 +0000
+++ partner_name_dutch/data/res_partner_title.xml	2014-03-17 07:52:16 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="base.res_partner_title_prof" model="res.partner.title">
+            <field name="salutation">Prof.</field>
+        </record>
+        <record id="base.res_partner_title_doctor" model="res.partner.title">
+            <field name="salutation">Dr.</field>
+        </record>
+        <record id="base.res_partner_title_mister" model="res.partner.title">
+            <field name="salutation">Mister</field>
+        </record>
+        <record id="base.res_partner_title_miss" model="res.partner.title">
+            <field name="salutation">Miss</field>
+        </record>
+        <record id="base.res_partner_title_madam" model="res.partner.title">
+            <field name="salutation">Madam</field>
+        </record>
+        <record id="base.res_partner_title_sir" model="res.partner.title">
+            <field name="salutation">Sir</field>
+        </record>
+    </data>
+</openerp>

=== modified file 'partner_name_dutch/i18n/nl.po'
--- partner_name_dutch/i18n/nl.po	2013-10-02 14:43:20 +0000
+++ partner_name_dutch/i18n/nl.po	2014-03-17 07:52:16 +0000
@@ -26,7 +26,41 @@
 msgstr "Tussenvoegsel"
 
 #. module: partner_name_dutch
+#: field:res.partner.title,salutation:0
+msgid "Salutation"
+msgstr "Aanhef"
+
+#. module: partner_name_dutch
 #: field:res.partner,initials:0
 msgid "Initials"
 msgstr "Voorletters"
 
+#. module: partner_name_dutch
+#: model:res.partner.title,salutation:base.res_partner_title_prof
+msgid "Prof."
+msgstr "prof."
+
+#. module: partner_name_dutch
+#: model:res.partner.title,salutation:base.res_partner_title_doctor
+msgid "Dr."
+msgstr "dr."
+
+#. module: partner_name_dutch
+#: model:res.partner.title,salutation:base.res_partner_title_mister
+msgid "Mister"
+msgstr "heer"
+
+#. module: partner_name_dutch
+#: model:res.partner.title,salutation:base.res_partner_title_miss
+msgid "Miss"
+msgstr "mejuffrouw"
+
+#. module: partner_name_dutch
+#: model:res.partner.title,salutation:base.res_partner_title_madam
+msgid "Madam"
+msgstr "mevrouw"
+
+#. module: partner_name_dutch
+#: model:res.partner.title,salutation:base.res_partner_title_sir
+msgid "Sir"
+msgstr "heer"

=== modified file 'partner_name_dutch/model/__init__.py'
--- partner_name_dutch/model/__init__.py	2013-10-01 12:00:28 +0000
+++ partner_name_dutch/model/__init__.py	2014-03-17 07:52:16 +0000
@@ -19,3 +19,4 @@
 #
 ##############################################################################
 import res_partner
+import res_partner_title

=== added file 'partner_name_dutch/model/res_partner_title.py'
--- partner_name_dutch/model/res_partner_title.py	1970-01-01 00:00:00 +0000
+++ partner_name_dutch/model/res_partner_title.py	2014-03-17 07:52:16 +0000
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Therp BV (<http://therp.nl>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from openerp.osv.orm import Model
+from openerp.osv import fields
+
+class ResPartnerTitle(Model):
+    _inherit = 'res.partner.title'
+
+    _columns = {
+        'salutation': fields.char('Salutation', size=64, translate=True),
+    }

=== added file 'partner_name_dutch/view/res_partner_title.xml'
--- partner_name_dutch/view/res_partner_title.xml	1970-01-01 00:00:00 +0000
+++ partner_name_dutch/view/res_partner_title.xml	2014-03-17 07:52:16 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="view_partner_title_tree" model="ir.ui.view">
+            <field name="model">res.partner.title</field>
+            <field name="inherit_id" ref="base.view_partner_title_tree" />
+            <field name="arch" type="xml">
+                <data>
+                    <field name="name" position="after">
+                        <field name="salutation" />
+                    </field>
+                </data>
+            </field>
+        </record>
+        <record id="view_partner_title_form" model="ir.ui.view">
+            <field name="model">res.partner.title</field>
+            <field name="inherit_id" ref="base.view_partner_title_form" />
+            <field name="arch" type="xml">
+                <data>
+                    <field name="name" position="after">
+                        <field name="salutation" />
+                    </field>
+                </data>
+            </field>
+        </record>
+    </data>
+</openerp>