From f32285e438ad40cbcc78589c292effa892b7461e Mon Sep 17 00:00:00 2001
From: houssine
Date: Mon, 30 Mar 2020 11:49:04 +0200
Subject: [PATCH 01/49] [IMP] make code a bit simpler.
---
easy_my_coop/models/partner.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/easy_my_coop/models/partner.py b/easy_my_coop/models/partner.py
index 10fc653..ca2514b 100644
--- a/easy_my_coop/models/partner.py
+++ b/easy_my_coop/models/partner.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# Copyright 2019 Coop IT Easy SCRL fs
# Houssine Bakkali
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
@@ -75,7 +74,9 @@ class ResPartner(models.Model):
self.env['product.product']
.search([('is_share', '=', True)])
)
- share_types = [(share.default_code, share.short_name) for share in shares]
+ share_types = [
+ (share.default_code, share.short_name) for share in shares
+ ]
return [('', '')] + share_types
@api.multi
@@ -84,11 +85,11 @@ class ResPartner(models.Model):
'share_ids.share_number')
def _compute_cooperator_type(self):
for partner in self:
- share_type = ''
- for line in partner.share_ids:
- share_type = line.share_product_id.default_code
- if share_type:
- partner.cooperator_type = share_type
+ if partner.share_ids and partner.share_ids[0].share_number > 0:
+ share = partner.share_ids[0]
+ partner.cooperator_type = share.share_product_id.default_code
+ else:
+ partner.cooperator_type = ''
@api.multi
@api.depends('share_ids')
From 0e067d40e1fe1d7a12c2fe14dfeaa3409d5f61fe Mon Sep 17 00:00:00 2001
From: houssine
Date: Mon, 6 Apr 2020 19:05:02 +0200
Subject: [PATCH 02/49] [FIX] fix flagging cooperator on share transfer
---
easy_my_coop/models/operation_request.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/easy_my_coop/models/operation_request.py b/easy_my_coop/models/operation_request.py
index 56fb3fb..df86f00 100644
--- a/easy_my_coop/models/operation_request.py
+++ b/easy_my_coop/models/operation_request.py
@@ -285,7 +285,9 @@ class operation_request(models.Model):
partner = self.subscription_request.create_coop_partner()
# get cooperator number
sub_reg_num = int(sequence_id.next_by_id())
- partner_vals = sub_request.get_eater_vals(partner, self.share_product_id)
+ partner_vals.update(sub_request.get_eater_vals(
+ partner,
+ self.share_product_id))
partner_vals['cooperator_register_number'] = sub_reg_num
partner.write(partner_vals)
self.partner_id_to = partner
@@ -295,9 +297,9 @@ class operation_request(models.Model):
if self.partner_id_to.cooperator_register_number == 0:
sub_reg_num = int(sequence_id.next_by_id())
partner_vals['cooperator_register_number'] = sub_reg_num
- partner_vals = sub_request.get_eater_vals(
+ partner_vals.replace(sub_request.get_eater_vals(
self.partner_id_to,
- self.share_product_id)
+ self.share_product_id))
partner_vals['old_member'] = False
self.partner_id_to.write(partner_vals)
# remove the parts to the giver
From 9596730c89efa5859ccdea6f4c5b219cbae97120 Mon Sep 17 00:00:00 2001
From: enricostano
Date: Thu, 9 Apr 2020 19:19:23 +0200
Subject: [PATCH 03/49] [FIX] coop_it_easy: Pick right email template for
payment confirmation
---
easy_my_coop/models/account_invoice.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/easy_my_coop/models/account_invoice.py b/easy_my_coop/models/account_invoice.py
index 6c46ae8..8b2382e 100644
--- a/easy_my_coop/models/account_invoice.py
+++ b/easy_my_coop/models/account_invoice.py
@@ -100,18 +100,18 @@ class account_invoice(models.Model):
def send_certificate_email(self, certificate_email_template, sub_reg_line):
# we send the email with the certificate in attachment
certificate_email_template.sudo().send_mail(self.partner_id.id, False)
-
+
def set_cooperator_effective(self, effective_date):
sub_register_obj = self.env['subscription.register']
share_line_obj = self.env['share.line']
+ certificate_email_template = self.get_mail_template_certificate()
+
self.set_membership()
sequence_operation = self.get_sequence_operation()
sub_reg_operation = sequence_operation.next_by_id()
- certificate_email_template = self.get_mail_template_certificate()
-
for line in self.invoice_line_ids:
sub_reg_vals = self.get_subscription_register_vals(line,
effective_date)
From 70af8c60895430a29e9312ca5b4229918b9b33c3 Mon Sep 17 00:00:00 2001
From: houssine
Date: Mon, 20 Apr 2020 13:08:16 +0200
Subject: [PATCH 04/49] [FIX] fix wrong function call
---
easy_my_coop/models/operation_request.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/easy_my_coop/models/operation_request.py b/easy_my_coop/models/operation_request.py
index df86f00..b31dabe 100644
--- a/easy_my_coop/models/operation_request.py
+++ b/easy_my_coop/models/operation_request.py
@@ -297,7 +297,7 @@ class operation_request(models.Model):
if self.partner_id_to.cooperator_register_number == 0:
sub_reg_num = int(sequence_id.next_by_id())
partner_vals['cooperator_register_number'] = sub_reg_num
- partner_vals.replace(sub_request.get_eater_vals(
+ partner_vals.update(sub_request.get_eater_vals(
self.partner_id_to,
self.share_product_id))
partner_vals['old_member'] = False
From 64e35d95f0f7dd0427bc00c2a1efcac173e8c76b Mon Sep 17 00:00:00 2001
From: houssine
Date: Tue, 21 Apr 2020 12:51:06 +0200
Subject: [PATCH 05/49] [FIX] take manuel comment into account.
---
easy_my_coop/models/partner.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/easy_my_coop/models/partner.py b/easy_my_coop/models/partner.py
index ca2514b..f6d9afc 100644
--- a/easy_my_coop/models/partner.py
+++ b/easy_my_coop/models/partner.py
@@ -85,11 +85,12 @@ class ResPartner(models.Model):
'share_ids.share_number')
def _compute_cooperator_type(self):
for partner in self:
- if partner.share_ids and partner.share_ids[0].share_number > 0:
- share = partner.share_ids[0]
- partner.cooperator_type = share.share_product_id.default_code
- else:
- partner.cooperator_type = ''
+ share_type = ''
+ for line in partner.share_ids:
+ if line.share_number > 0:
+ share_type = line.share_product_id.default_code
+ break
+ partner.cooperator_type = share_type
@api.multi
@api.depends('share_ids')
From 13e96de68856d625a5017a814b2e38f270d01181 Mon Sep 17 00:00:00 2001
From: houssine
Date: Tue, 21 Apr 2020 13:52:26 +0200
Subject: [PATCH 06/49] [IMP] remove duplicate act window overriding
---
easy_my_coop/views/product_view.xml | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/easy_my_coop/views/product_view.xml b/easy_my_coop/views/product_view.xml
index 351f093..49e16e9 100644
--- a/easy_my_coop/views/product_view.xml
+++ b/easy_my_coop/views/product_view.xml
@@ -123,21 +123,6 @@
-
-
- Products
- ir.actions.act_window
- product.template
- tree,form,kanban
- form
- {"search_default_products": 1, 'default_type': 'product'}
- [('is_share','=',False)]
-
-
- Click to define a new product.
-
-
-
+
+This module allows to manage the cooperator subscription and all the cooperative business processes.
+Table of contents
+
+
+
+
Bugs are tracked on GitHub Issues.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+feedback.
+
Do not contact contributors directly about support or help with technical issues.
+
+
+
+