savoirfairelinux-openerp team mailing list archive
-
savoirfairelinux-openerp team
-
Mailing list archive
-
Message #00762
lp:~savoirfairelinux-openerp/partner-contact-management/amelioration1 into lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions
elhadji.dem@xxxxxxxxxxxxxxxxxxxx has proposed merging lp:~savoirfairelinux-openerp/partner-contact-management/amelioration1 into lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions.
Requested reviews:
Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)
For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/partner-contact-management/amelioration1/+merge/200739
- show maiden name after lastname, show fisrtname before lastname, regenerate po and pot files.
- replace partner_maiden_name by partner_maiden_name_title: it display maiden name after name and show title before name.
- add fr.po file for partner_maiden_name_title module.
- translate tags in French
--
https://code.launchpad.net/~savoirfairelinux-openerp/partner-contact-management/amelioration1/+merge/200739
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/partner-contact-management/base_contact_by_functions.
=== modified file 'base_contact_by_functions/__openerp__.py'
--- base_contact_by_functions/__openerp__.py 2014-01-03 15:07:50 +0000
+++ base_contact_by_functions/__openerp__.py 2014-01-07 21:57:31 +0000
@@ -35,7 +35,7 @@
Contributors
------------
-* EL HADJI DEM (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
+* El Hadji Dem (elhadji.dem@xxxxxxxxxxxxxxxxxxxx)
""",
'depends': [
'base_contact',
=== modified file 'base_contact_by_functions/i18n/base_contact_by_functions.pot'
--- base_contact_by_functions/i18n/base_contact_by_functions.pot 2014-01-03 16:57:29 +0000
+++ base_contact_by_functions/i18n/base_contact_by_functions.pot 2014-01-07 21:57:31 +0000
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-03 16:48+0000\n"
-"PO-Revision-Date: 2014-01-03 11:48-0500\n"
+"POT-Creation-Date: 2014-01-07 16:35+0000\n"
+"PO-Revision-Date: 2014-01-07 11:36-0500\n"
"Last-Translator: EL Hadji DEM <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@
#. module: base_contact_by_functions
#: view:res.partner:0
-msgid "Street..."
+msgid "City ???"
msgstr ""
#. module: base_contact_by_functions
@@ -175,6 +175,11 @@
msgstr ""
#. module: base_contact_by_functions
+#: field:functions,institution_id:0
+msgid "institution"
+msgstr ""
+
+#. module: base_contact_by_functions
#: view:res.partner:0
msgid "Address"
msgstr ""
@@ -225,8 +230,8 @@
msgstr ""
#. module: base_contact_by_functions
-#: field:functions,institution_id:0
-msgid "institution"
+#: view:res.partner:0
+msgid "Street..."
msgstr ""
#. module: base_contact_by_functions
=== modified file 'base_contact_by_functions/res_partner.py'
--- base_contact_by_functions/res_partner.py 2014-01-03 20:42:34 +0000
+++ base_contact_by_functions/res_partner.py 2014-01-07 21:57:31 +0000
@@ -97,11 +97,12 @@
relation="res.partner",
method=True,
type="one2many"),
- # Replace company by Organism
+ # Redefine this fields for translation
'use_parent_address': fields.boolean(
'Use Organism Address',
help="Select this if you want to set organism's address information for this contact"),
-
+ 'is_company': fields.boolean('Is an Organism',
+ help="Check if the contact is an organism, otherwise it is a person."),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'base_contact_by_functions/res_partner_view.xml'
--- base_contact_by_functions/res_partner_view.xml 2014-01-03 16:57:29 +0000
+++ base_contact_by_functions/res_partner_view.xml 2014-01-07 21:57:31 +0000
@@ -113,75 +113,77 @@
</t>
</templates>
</kanban>
- <form string="Contact" version="7.0">
- <sheet>
- <field name="image" widget='image' class="oe_avatar oe_left"
- options='{"preview_image": "image_medium"}'/>
- <div class="oe_title">
- <label for="name" class="oe_edit_only"/>
- <h1>
- <field name="name" style="width: 70%%"/>
- </h1>
- </div>
- <group>
- <!-- inherited part -->
- <field name="category_id" widget="many2many_tags"
- placeholder="Tags..." style="width: 70%%"/>
- <field name="parent_id"
- placeholder="Organism"
- domain="[('is_company','=',True)]"
- string="Parent Organism"/>
- <!-- inherited part end -->
- <field name="function_id" placeholder="e.g. Sales Director"/>
- <group colspan="4">
- <field name="start_date" />
- <field name="end_date"/>
- <field name="naming"/>
- </group>
- <field name="email"/>
- <field name="phone"/>
- <field name="mobile"/>
- </group>
- <div>
- <field name="use_parent_address"/>
- <label for="use_parent_address" string="Use organism address"/>
- </div>
- <group>
- <label for="type"/>
- <div name="div_type">
- <field class="oe_inline" name="type"/>
- </div>
- <label for="street" string="Address"
- attrs="{'invisible': [('use_parent_address','=', True)]}"/>
- <div attrs="{'invisible': [('use_parent_address','=', True)]}"
- name="div_address">
- <field name="street" placeholder="Street..."/>
- <field name="street2"/>
- <div class="address_format">
- <field name="city" placeholder="City" style="width: 40%%"/>
- <field name="state_id" class="oe_no_button"
- placeholder="State" style="width: 37%%"
- options='{"no_open": True}' on_change="onchange_state(state_id)"/>
- <field name="zip" placeholder="ZIP" style="width: 20%%"/>
- </div>
- <field name="country_id" placeholder="Country"
- class="oe_no_button" options='{"no_open": True}'/>
- </div>
- </group>
- <field name="supplier" invisible="True"/>
- <group string="Bank Accounts">
- <field name="bank_ids" nolabel="1">
- <tree string="Bank Details">
- <field name="state" invisible="1"/>
- <field name="sequence" invisible="1"/>
- <field name="acc_number"/>
- <field name="bank_name"/>
- <field name="owner_name"/>
- </tree>
- </field>
- </group>
- </sheet>
- </form>
+ <form string="Contact" version="7.0">
+ <sheet>
+ <field name="image" widget='image' class="oe_avatar oe_left"
+ options='{"preview_image": "image_medium"}'/>
+ <div class="oe_title">
+ <label for="name" class="oe_edit_only"/>
+ <h1>
+ <field name="name" style="width: 70%%"/>
+ </h1>
+ </div>
+ <group>
+ <!-- inherited part -->
+ <field name="category_id"
+ widget="many2many_tags"
+ placeholder="Tags..."
+ style="width: 70%%"/>
+ <field name="parent_id"
+ placeholder="Organism"
+ domain="[('is_company','=',True)]"
+ string="Parent Organism"/>
+ <!-- inherited part end -->
+ <field name="function_id" placeholder="e.g. Sales Director"/>
+ <group colspan="4">
+ <field name="start_date" />
+ <field name="end_date"/>
+ <field name="naming"/>
+ </group>
+ <field name="email"/>
+ <field name="phone"/>
+ <field name="mobile"/>
+ </group>
+ <div>
+ <field name="use_parent_address"/>
+ <label for="use_parent_address" string="Use organism address"/>
+ </div>
+ <group>
+ <label for="type"/>
+ <div name="div_type">
+ <field class="oe_inline" name="type"/>
+ </div>
+ <label for="street" string="Address"
+ attrs="{'invisible': [('use_parent_address','=', True)]}"/>
+ <div attrs="{'invisible': [('use_parent_address','=', True)]}"
+ name="div_address">
+ <field name="street" placeholder="Street..."/>
+ <field name="street2"/>
+ <div class="address_format">
+ <field name="city" placeholder="City" style="width: 40%%"/>
+ <field name="state_id" class="oe_no_button"
+ placeholder="State" style="width: 37%%"
+ options='{"no_open": True}' on_change="onchange_state(state_id)"/>
+ <field name="zip" placeholder="ZIP" style="width: 20%%"/>
+ </div>
+ <field name="country_id" placeholder="Country"
+ class="oe_no_button" options='{"no_open": True}'/>
+ </div>
+ </group>
+ <field name="supplier" invisible="True"/>
+ <group string="Bank Accounts">
+ <field name="bank_ids" nolabel="1">
+ <tree string="Bank Details">
+ <field name="state" invisible="1"/>
+ <field name="sequence" invisible="1"/>
+ <field name="acc_number"/>
+ <field name="bank_name"/>
+ <field name="owner_name"/>
+ </tree>
+ </field>
+ </group>
+ </sheet>
+ </form>
</field>
</page>
</notebook>
@@ -192,8 +194,8 @@
string="Function"/>
</field>
</field>
+ </record>
- </record>
<!--Add passportnumber, deleverycoubtry, expiredDate in partner view-->
<record id="view_passport_info_form" model="ir.ui.view">
<field name="name">passport.info.form.inherit</field>
@@ -229,6 +231,14 @@
<field name="bank_ids" nolabel="1"/>
</group>
</xpath>
+ <xpath expr="//field[@name='other_contact_ids']/form//field[@name='category_id']"
+ position="replace">
+ <field name="category_id"
+ widget="many2many_tags"
+ placeholder="Tags..."
+ style="width: 70%%"
+ string="Tag"/>
+ </xpath>
<xpath expr="//field[@name='other_contact_ids']/form//field[@name='parent_id']"
position="replace">
<group colspan="4">
@@ -510,24 +520,5 @@
</xpath>
</field>
</record>
-
- <!--Replace company by organism-->
- <record id="view_partner_simple_form" model="ir.ui.view">
- <field name="name">res.partner.simplified.form</field>
- <field name="model">res.partner</field>
- <field name="arch" type="xml">
- <label for="is_company" position="replace">
- <label for="is_company" string="Is an Organism?"/>
- </label>
- <field name="parent_id" position="replace">
- <field name="parent_id"
- placeholder="Organism"
- domain="[('is_company', '=', True)]"
- context="{'default_is_company': True, 'default_supplier': supplier}"
- attrs="{'invisible': [('is_company','=', True),('parent_id', '=', False)]}"
- on_change="onchange_address(use_parent_address, parent_id)"/>
- </field>
- </field>
- </record>
</data>
</openerp>
=== removed file 'partner_maiden_name/i18n/fr.po'
--- partner_maiden_name/i18n/fr.po 2014-01-03 15:07:50 +0000
+++ partner_maiden_name/i18n/fr.po 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * partner_maiden_name
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-03 07:40+0000\n"
-"PO-Revision-Date: 2014-01-03 02:40-0500\n"
-"Last-Translator: EL Hadji DEM <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-"X-Generator: Poedit 1.5.4\n"
-
-#. module: partner_maiden_name
-#: help:res.partner,maiden_name:0
-msgid "Maiden name."
-msgstr "Nom de jeune fille."
-
-#. module: partner_maiden_name
-#: view:res.partner:0 field:res.partner,maiden_name:0
-msgid "Maiden name"
-msgstr "Nom de jeune fille"
-
-#. module: partner_maiden_name
-#: model:ir.model,name:partner_maiden_name.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
=== removed file 'partner_maiden_name/i18n/partner_maiden_name.pot'
--- partner_maiden_name/i18n/partner_maiden_name.pot 2014-01-03 15:07:50 +0000
+++ partner_maiden_name/i18n/partner_maiden_name.pot 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * partner_maiden_name
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-03 07:39+0000\n"
-"PO-Revision-Date: 2014-01-03 02:39-0500\n"
-"Last-Translator: EL Hadji DEM <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-"X-Generator: Poedit 1.5.4\n"
-
-#. module: partner_maiden_name
-#: help:res.partner,maiden_name:0
-msgid "Maiden name."
-msgstr ""
-
-#. module: partner_maiden_name
-#: view:res.partner:0 field:res.partner,maiden_name:0
-msgid "Maiden name"
-msgstr ""
-
-#. module: partner_maiden_name
-#: model:ir.model,name:partner_maiden_name.model_res_partner
-msgid "Partner"
-msgstr ""
=== renamed directory 'partner_maiden_name' => 'partner_maiden_name_title'
=== modified file 'partner_maiden_name_title/__openerp__.py'
--- partner_maiden_name/__openerp__.py 2014-01-03 15:07:50 +0000
+++ partner_maiden_name_title/__openerp__.py 2014-01-07 21:57:31 +0000
@@ -21,17 +21,17 @@
##############################################################################
{
- 'name': 'Partner Maiden Name',
+ 'name': 'Partner Maiden Name - Title',
'version': '0.1',
'author': 'Savoir-faire Linux',
'maintainer': 'Savoir-faire Linux',
'website': 'http://www.savoirfairelinux.com',
'category': 'MISC',
'description': """
-Partner Maiden Name
-===================
+Partner Maiden Name - Title
+===========================
-This module allows you to add maiden name
+This module allows you to add maiden name and display title before name
Contributors
------------
=== added file 'partner_maiden_name_title/fr.po'
--- partner_maiden_name_title/fr.po 1970-01-01 00:00:00 +0000
+++ partner_maiden_name_title/fr.po 2014-01-07 21:57:31 +0000
@@ -0,0 +1,37 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * partner_maiden_name_title
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-07 20:02+0000\n"
+"PO-Revision-Date: 2014-01-07 15:03-0500\n"
+"Last-Translator: EL Hadji DEM <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: partner_maiden_name_title
+#: help:res.partner,maiden_name:0
+msgid "Maiden name."
+msgstr "Nom de jeune fille."
+
+#. module: partner_maiden_name_title
+#: view:res.partner:0 field:res.partner,maiden_name:0
+msgid "Maiden name"
+msgstr "Nom de jeune fille"
+
+#. module: partner_maiden_name_title
+#: view:res.partner:0
+msgid "Title"
+msgstr "Civilité"
+
+#. module: partner_maiden_name_title
+#: model:ir.model,name:partner_maiden_name_title.model_res_partner
+msgid "Partner"
+msgstr "Organisme"
=== added file 'partner_maiden_name_title/i18n/fr.po'
--- partner_maiden_name_title/i18n/fr.po 1970-01-01 00:00:00 +0000
+++ partner_maiden_name_title/i18n/fr.po 2014-01-07 21:57:31 +0000
@@ -0,0 +1,37 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * partner_maiden_name_title
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-07 20:14+0000\n"
+"PO-Revision-Date: 2014-01-07 15:14-0500\n"
+"Last-Translator: EL Hadji DEM <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: partner_maiden_name_title
+#: help:res.partner,maiden_name:0
+msgid "Maiden name."
+msgstr "Nom de jeune fille."
+
+#. module: partner_maiden_name_title
+#: view:res.partner:0 field:res.partner,maiden_name:0
+msgid "Maiden name"
+msgstr "Nom de jeune fille"
+
+#. module: partner_maiden_name_title
+#: view:res.partner:0
+msgid "Title"
+msgstr "Civilité"
+
+#. module: partner_maiden_name_title
+#: model:ir.model,name:partner_maiden_name_title.model_res_partner
+msgid "Partner"
+msgstr "Organisme"
=== added file 'partner_maiden_name_title/i18n/partner_maiden_name_title.pot'
--- partner_maiden_name_title/i18n/partner_maiden_name_title.pot 1970-01-01 00:00:00 +0000
+++ partner_maiden_name_title/i18n/partner_maiden_name_title.pot 2014-01-07 21:57:31 +0000
@@ -0,0 +1,37 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * partner_maiden_name_title
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-07 20:01+0000\n"
+"PO-Revision-Date: 2014-01-07 15:02-0500\n"
+"Last-Translator: EL Hadji DEM <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: partner_maiden_name_title
+#: help:res.partner,maiden_name:0
+msgid "Maiden name."
+msgstr ""
+
+#. module: partner_maiden_name_title
+#: view:res.partner:0 field:res.partner,maiden_name:0
+msgid "Maiden name"
+msgstr ""
+
+#. module: partner_maiden_name_title
+#: view:res.partner:0
+msgid "Title"
+msgstr ""
+
+#. module: partner_maiden_name_title
+#: model:ir.model,name:partner_maiden_name_title.model_res_partner
+msgid "Partner"
+msgstr ""
=== modified file 'partner_maiden_name_title/res_partner_view.xml'
--- partner_maiden_name/res_partner_view.xml 2014-01-03 15:07:50 +0000
+++ partner_maiden_name_title/res_partner_view.xml 2014-01-07 21:57:31 +0000
@@ -7,8 +7,18 @@
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
+ <field name="title" position="replace"/>
<field name="category_id" position="before">
- <field name="maiden_name" attrs="{'invisible': [('is_company','=', True)]}" placeholder="Maiden name"/>
+ <field name="maiden_name"
+ attrs="{'invisible': [('is_company','=', True)]}"
+ placeholder="Maiden name"/>
+ </field>
+ <field name="parent_id" position="after">
+ <field name="title"
+ domain="[('domain', '=', 'contact')]"
+ options='{"no_open": True}'
+ attrs="{'invisible': [('is_company','=', True)]}"
+ placeholder="Title"/>
</field>
</field>
</record>
=== modified file 'partner_member_observer/i18n/fr.po'
--- partner_member_observer/i18n/fr.po 2014-01-03 16:57:29 +0000
+++ partner_member_observer/i18n/fr.po 2014-01-07 21:57:31 +0000
@@ -34,7 +34,7 @@
#. module: partner_member_observer
#: field:res.partner,member_states:0
msgid "Member state"
-msgstr "État membre"
+msgstr "Etat membre"
#. module: partner_member_observer
#: field:res.partner,observer_state:0
Follow ups
