[pos_order] +membership_stop

diff --git a/i18n/fr.po b/i18n/fr.po
index bb8c170..bed0a8a 100644 (file)
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -6,27 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-03 14:57+0000\n"
-"PO-Revision-Date: 2013-10-03 17:09+0100\n"
+"POT-Creation-Date: 2015-06-29 14:40+0000\n"
+"PO-Revision-Date: 2015-06-29 16:41+0100\n"
 "Last-Translator: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>\n"
 "Language-Team: \n"
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
-"Language: fr_FR\n"
+"X-Generator: Poedit 1.7.7\n"
 
 #. module: pos_membership
-#. openerp-web
-#: code:addons/pos_membership/static/src/xml/pos.xml:44
+#: model:ir.model,name:pos_membership.model_pos_session
+msgid "pos.session"
+msgstr "pos.session"
+
+#. module: pos_membership
+#: code:addons/pos_membership/pos_membership.py:850
 #, python-format
-msgid "Partner Create"
-msgstr "Créer le partenaire"
+msgid "Error!!!"
+msgstr "Erreur!!!"
 
 #. module: pos_membership
-#: model:ir.model,name:pos_membership.model_pos_session_opening
-msgid "pos.session.opening"
-msgstr "pos.session.opening"
+#: code:addons/pos_membership/pos_membership.py:665
+#, python-format
+msgid "Customer Invoice"
+msgstr "Facture Client"
+
+#. module: pos_membership
+#: model:ir.model,name:pos_membership.model_membership_membership_line
+msgid "Member line"
+msgstr "Ligne d'adhésion"
+
+#. module: pos_membership
+#: code:addons/pos_membership/pos_membership.py:850
+#, python-format
+msgid ""
+"You try to order grouped membership product to a partner who hasn't "
+"associated partners."
+msgstr ""
+"Vous essayez de vendre un produit d'adhésion groupé à un partenaire qui n'a "
+"pas de partenaire associé."
+
+#. module: pos_membership
+#: model:ir.model,name:pos_membership.model_pos_order_line
+msgid "Lines of Point of Sale"
+msgstr "Lignes de Point de Vente"
 
 #. module: pos_membership
 #. openerp-web
@@ -36,21 +61,20 @@ msgid "Address:"
 msgstr "Adresse:"
 
 #. module: pos_membership
-#: model:ir.model,name:pos_membership.model_pos_order
-msgid "Point of Sale"
-msgstr "Point de Vente"
+#: code:addons/pos_membership/pos_membership.py:611
+#, python-format
+msgid "Please provide a partner for the sale."
+msgstr "Merci d'indiquer un partenaire pour la vente."
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:123
-#, python-format
-msgid "return"
-msgstr "entrée"
+#: field:membership.membership_line,pos_order_line:0
+msgid "POS Order line"
+msgstr "Ligne de vente en PDV"
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:831
-#, python-format
-msgid "Error!!!"
-msgstr "Erreur!!!"
+#: field:pos.order,membership_stop:0
+msgid "Membership stop"
+msgstr "Date de fin d'adhésion"
 
 #. module: pos_membership
 #: view:pos.order:0
@@ -58,57 +82,59 @@ msgid "Print Receipt"
 msgstr "Imprimer le reçu"
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:667
+#: code:addons/pos_membership/pos_membership.py:117
 #, python-format
-msgid "Customer Invoice"
-msgstr "Facture Client"
+msgid ""
+"No cash statement found for this session. Unable to record returned cash."
+msgstr ""
+"Il n'y a pas de caisse pour cette session. Impossible de calculer le montant "
+"à rendre."
 
 #. module: pos_membership
-#. openerp-web
-#: code:addons/pos_membership/static/src/xml/pos.xml:8
-#, python-format
-msgid "Search Products"
-msgstr "Chercher des Produits"
+#: help:pos.order,membership_stop:0
+msgid "The end date of the last membership of this partner."
+msgstr "La date de fin d'adhésion de cette personne."
 
 #. module: pos_membership
-#: field:membership.membership_line,pos_order_line:0
-msgid "POS Order line"
-msgstr "Ligne de vente en PDV"
+#. openerp-web
+#: code:addons/pos_membership/static/src/xml/pos.xml:44
+#, python-format
+msgid "Partner Create"
+msgstr "Créer le partenaire"
 
 #. module: pos_membership
-#: model:ir.model,name:pos_membership.model_membership_membership_line
-msgid "Member line"
-msgstr "Ligne d'adhésion"
+#: code:addons/pos_membership/pos_membership.py:122
+#, python-format
+msgid "return"
+msgstr "entrée"
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:613
+#: code:addons/pos_membership/pos_membership.py:611
 #, python-format
 msgid "Error!"
 msgstr "Erreur!"
 
 #. module: pos_membership
-#: model:ir.model,name:pos_membership.model_pos_session
-msgid "pos.session"
-msgstr "pos.session"
+#: field:membership.membership_line,pos_order_id:0
+msgid "Order"
+msgstr "Reçu"
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:831
+#. openerp-web
+#: code:addons/pos_membership/static/src/xml/pos.xml:8
 #, python-format
-msgid ""
-"You try to order grouped membership product to a partner who hasn't "
-"associated partners."
-msgstr ""
-"Vous essayez de vendre un produit d'adhésion groupé à un partenaire qui n'a "
-"pas de partenaire associé."
+msgid "Search Products"
+msgstr "Chercher des Produits"
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:613
+#. openerp-web
+#: code:addons/pos_membership/static/src/xml/pos.xml:49
 #, python-format
-msgid "Please provide a partner for the sale."
-msgstr "Merci d'indiquer un partenaire pour la vente."
+msgid "Name:"
+msgstr "Nom:"
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:117
+#: code:addons/pos_membership/pos_membership.py:116
 #, python-format
 msgid "error!"
 msgstr "erreur!"
@@ -119,25 +145,9 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: pos_membership
-#. openerp-web
-#: code:addons/pos_membership/static/src/xml/pos.xml:49
-#, python-format
-msgid "Name:"
-msgstr "Nom:"
-
-#. module: pos_membership
-#: model:ir.model,name:pos_membership.model_pos_order_line
-msgid "Lines of Point of Sale"
-msgstr "Lignes de Point de Vente"
-
-#. module: pos_membership
-#: field:membership.membership_line,pos_order_id:0
-msgid "Order"
-msgstr "Reçu"
+#: model:ir.model,name:pos_membership.model_pos_order
+msgid "Point of Sale"
+msgstr "Point de Vente"
 
-#. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:118
-#, python-format
-msgid ""
-"No cash statement found for this session. Unable to record returned cash."
-msgstr ""
+#~ msgid "pos.session.opening"
+#~ msgstr "pos.session.opening"

diff --git a/i18n/pos_membership.pot b/i18n/pos_membership.pot
index eaaf174..42e1b41 100644 (file)
--- a/i18n/pos_membership.pot
+++ b/i18n/pos_membership.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-03 14:57+0000\n"
-"PO-Revision-Date: 2013-10-03 14:57+0000\n"
+"POT-Creation-Date: 2015-06-29 14:40+0000\n"
+"PO-Revision-Date: 2015-06-29 14:40+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,57 +16,49 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: pos_membership
-#. openerp-web
-#: code:addons/pos_membership/static/src/xml/pos.xml:44
-#, python-format
-msgid "Partner Create"
-msgstr ""
-
-#. module: pos_membership
-#: model:ir.model,name:pos_membership.model_pos_session_opening
-msgid "pos.session.opening"
+#: model:ir.model,name:pos_membership.model_pos_session
+msgid "pos.session"
 msgstr ""
 
 #. module: pos_membership
-#. openerp-web
-#: code:addons/pos_membership/static/src/xml/pos.xml:66
+#: code:addons/pos_membership/pos_membership.py:850
 #, python-format
-msgid "Address:"
+msgid "Error!!!"
 msgstr ""
 
 #. module: pos_membership
-#: model:ir.model,name:pos_membership.model_pos_order
-msgid "Point of Sale"
+#: code:addons/pos_membership/pos_membership.py:665
+#, python-format
+msgid "Customer Invoice"
 msgstr ""
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:123
-#, python-format
-msgid "return"
+#: model:ir.model,name:pos_membership.model_membership_membership_line
+msgid "Member line"
 msgstr ""
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:831
+#: code:addons/pos_membership/pos_membership.py:850
 #, python-format
-msgid "Error!!!"
+msgid "You try to order grouped membership product to a partner who hasn't associated partners."
 msgstr ""
 
 #. module: pos_membership
-#: view:pos.order:0
-msgid "Print Receipt"
+#: model:ir.model,name:pos_membership.model_pos_order_line
+msgid "Lines of Point of Sale"
 msgstr ""
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:667
+#. openerp-web
+#: code:addons/pos_membership/static/src/xml/pos.xml:66
 #, python-format
-msgid "Customer Invoice"
+msgid "Address:"
 msgstr ""
 
 #. module: pos_membership
-#. openerp-web
-#: code:addons/pos_membership/static/src/xml/pos.xml:8
+#: code:addons/pos_membership/pos_membership.py:611
 #, python-format
-msgid "Search Products"
+msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: pos_membership
@@ -75,42 +67,55 @@ msgid "POS Order line"
 msgstr ""
 
 #. module: pos_membership
-#: model:ir.model,name:pos_membership.model_membership_membership_line
-msgid "Member line"
+#: field:pos.order,membership_stop:0
+msgid "Membership stop"
 msgstr ""
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:613
+#: view:pos.order:0
+msgid "Print Receipt"
+msgstr ""
+
+#. module: pos_membership
+#: code:addons/pos_membership/pos_membership.py:117
 #, python-format
-msgid "Error!"
+msgid "No cash statement found for this session. Unable to record returned cash."
 msgstr ""
 
 #. module: pos_membership
-#: model:ir.model,name:pos_membership.model_pos_session
-msgid "pos.session"
+#: help:pos.order,membership_stop:0
+msgid "The end date of the last membership of this partner."
 msgstr ""
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:831
+#. openerp-web
+#: code:addons/pos_membership/static/src/xml/pos.xml:44
 #, python-format
-msgid "You try to order grouped membership product to a partner who hasn't associated partners."
+msgid "Partner Create"
 msgstr ""
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:613
+#: code:addons/pos_membership/pos_membership.py:122
 #, python-format
-msgid "Please provide a partner for the sale."
+msgid "return"
 msgstr ""
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:117
+#: code:addons/pos_membership/pos_membership.py:611
 #, python-format
-msgid "error!"
+msgid "Error!"
 msgstr ""
 
 #. module: pos_membership
-#: model:ir.model,name:pos_membership.model_res_partner
-msgid "Partner"
+#: field:membership.membership_line,pos_order_id:0
+msgid "Order"
+msgstr ""
+
+#. module: pos_membership
+#. openerp-web
+#: code:addons/pos_membership/static/src/xml/pos.xml:8
+#, python-format
+msgid "Search Products"
 msgstr ""
 
 #. module: pos_membership
@@ -121,18 +126,18 @@ msgid "Name:"
 msgstr ""
 
 #. module: pos_membership
-#: model:ir.model,name:pos_membership.model_pos_order_line
-msgid "Lines of Point of Sale"
+#: code:addons/pos_membership/pos_membership.py:116
+#, python-format
+msgid "error!"
 msgstr ""
 
 #. module: pos_membership
-#: field:membership.membership_line,pos_order_id:0
-msgid "Order"
+#: model:ir.model,name:pos_membership.model_res_partner
+msgid "Partner"
 msgstr ""
 
 #. module: pos_membership
-#: code:addons/pos_membership/pos_membership.py:118
-#, python-format
-msgid "No cash statement found for this session. Unable to record returned cash."
+#: model:ir.model,name:pos_membership.model_pos_order
+msgid "Point of Sale"
 msgstr ""
 

diff --git a/pos_membership.py b/pos_membership.py
index b53eac3..213a06f 100644 (file)
--- a/pos_membership.py
+++ b/pos_membership.py
@@ -27,7 +27,6 @@ import time
 from datetime import datetime, date
 from dateutil.relativedelta import relativedelta
 
-
 STATE = [
     ('none', 'Non Member'),
     ('canceled', 'Cancelled Member'),
@@ -689,6 +688,29 @@ class pos_order(osv.osv):
         print("DEV: [pos_membership] [pos_order] [create]: res=%s" % (str(res)))
         return res
 
+    def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
+        if not part:
+            return {'value': {}}
+        res = super(pos_order, self).onchange_partner_id(cr, uid, ids, part=part, context=context)
+        membership_stop = self.pool.get('res.partner').browse(cr, uid, part, context=context).membership_stop
+        res['value']['membership_stop'] = membership_stop
+        return res
+
+    def _get_membership_stop(self, cr, uid, ids, name, args, context=None):
+        """This function return the end date of the partner in pos order."""
+        res = {}
+        for order in self.browse(cr, uid, ids):
+            res[order.id] = order.partner_id.membership_stop
+        return res
+
+    _columns = {
+        'membership_stop': fields.function(
+            _get_membership_stop,
+            string='Membership stop',
+            type='date',
+            help='The end date of the last membership of this partner.',
+        ),
+    }
 pos_order()
 
 class pos_order_line(osv.osv):

diff --git a/view/pos_membership.xml b/view/pos_membership.xml
index 9374981..deb3065 100644 (file)
--- a/view/pos_membership.xml
+++ b/view/pos_membership.xml
@@ -22,6 +22,9 @@
                 <xpath expr="//button[@string='Reprint']" position="attributes">
                     <attribute name="string">Print Receipt</attribute>
                 </xpath>
+                <xpath expr="//field[@name='partner_id']" position="after">
+                    <field name="membership_stop" attrs="{'invisible': [('state','in', ('done', 'cancel'))]}"/>
+                </xpath>
                 <!-- Problem to overload this field with another module. Be careful to make this field required when using this module
                 <xpath expr="//field[@name='partner_id']" position="replace">
                     <field name="partner_id" on_change="onchange_partner_id(partner_id, context)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','in', ('paid', 'done', 'invoiced'))]}" required="1" />