Merge branch 'master' into membership_grouped

diff --git a/i18n/fr.po b/i18n/fr.po
index 18dd83c..7e7d90d 100644 (file)
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.2dev-20121129-000101\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-19 11:24+0000\n"
-"PO-Revision-Date: 2012-12-19 12:29+0100\n"
+"POT-Creation-Date: 2012-12-20 15:21+0000\n"
+"PO-Revision-Date: 2012-12-20 16:23+0100\n"
 "Last-Translator: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -17,29 +17,39 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: remembership
-#: model:ir.model,name:remembership.model_res_partner
-msgid "Partner"
-msgstr "Partenaire"
+#: model:ir.model,name:remembership.model_pos_make_payment
+msgid "Point of Sale Payment"
+msgstr "Payé en point de vente"
 
 #. module: remembership
 #: sql_constraint:res.partner:0
 msgid "The member identifier must be unique !"
-msgstr "L'identifiant de l'adhérent doit être unique !"
+msgstr "L'identifiant de l'adhérent-e doit être unique !"
 
 #. module: remembership
 #: model:ir.model,name:remembership.model_account_invoice_line
 msgid "Invoice Line"
 msgstr "Ligne de facture"
 
+#. module: remembership
+#: help:res.partner,associate_members:0
+msgid "Members who are associated to this partner."
+msgstr "Membres qui sont associé-e-s à ce-tte partenaire."
+
 #. module: remembership
 #: field:res.partner,member_ident:0
 msgid "Member identifier"
-msgstr "Identifiant de l'adhérent"
+msgstr "Identifiant de l'adhérent-e"
 
 #. module: remembership
-#: model:ir.model,name:remembership.model_pos_make_payment
-msgid "Point of Sale Payment"
-msgstr "Payé en point de vente"
+#: model:ir.model,name:remembership.model_res_partner
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: remembership
+#: field:res.partner,associate_members:0
+msgid "Associate members"
+msgstr "Membres associé-e-s"
 
 #~ msgid "Product"
 #~ msgstr "Produit"

diff --git a/i18n/remembership.pot b/i18n/remembership.pot
index 30780de..14db989 100644 (file)
--- a/i18n/remembership.pot
+++ b/i18n/remembership.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0alpha-20121206-000102\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-19 11:24+0000\n"
-"PO-Revision-Date: 2012-12-19 11:24+0000\n"
+"POT-Creation-Date: 2012-12-20 15:21+0000\n"
+"PO-Revision-Date: 2012-12-20 15:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: remembership
-#: model:ir.model,name:remembership.model_res_partner
-msgid "Partner"
+#: model:ir.model,name:remembership.model_pos_make_payment
+msgid "Point of Sale Payment"
 msgstr ""
 
 #. module: remembership
@@ -30,13 +30,23 @@ msgstr ""
 msgid "Invoice Line"
 msgstr ""
 
+#. module: remembership
+#: help:res.partner,associate_members:0
+msgid "Members who are associated to this partner."
+msgstr ""
+
 #. module: remembership
 #: field:res.partner,member_ident:0
 msgid "Member identifier"
 msgstr ""
 
 #. module: remembership
-#: model:ir.model,name:remembership.model_pos_make_payment
-msgid "Point of Sale Payment"
+#: model:ir.model,name:remembership.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: remembership
+#: field:res.partner,associate_members:0
+msgid "Associate members"
 msgstr ""
 

diff --git a/remembership.py b/remembership.py
index b799cc7..c2e6c85 100644 (file)
--- a/remembership.py
+++ b/remembership.py
@@ -31,6 +31,7 @@ class Partner(osv.osv):
 
     _columns = {
         'member_ident': fields.char('Member identifier', size=64),
+        'associate_members': fields.one2many('res.partner', 'associate_member', 'Associate members', help='Members who are associated to this partner.'),
     }
 
     _sql_constraints = [