diff --git a/golem_family_membership/__manifest__.py b/golem_family_membership/__manifest__.py
index da8a91d..00bc1ff 100644
--- a/golem_family_membership/__manifest__.py
+++ b/golem_family_membership/__manifest__.py
@@ -17,16 +17,16 @@
# along with this program. If not, see .
{
- 'name': 'GOLEM families membership',
- 'summary': 'GOLEM Families membership ',
- 'description': 'GOLEM Families Membership',
- 'version': '10.0.0.0.0',
+ 'name': 'GOLEM Family Memberships',
+ 'summary': 'GOLEM Family Membership Management',
+ 'description': 'GOLEM Family Membership Management',
+ 'version': '10.0.0.1.0',
'category': 'GOLEM',
'author': 'Fabien Bourgeois, Youssef ELOUAHBY',
'license': 'AGPL-3',
'application': False,
'installable': True,
- 'depends': ['golem_family'],
+ 'depends': ['golem_family', 'membership'],
'data': ['views/golem_family_views.xml',
'wizard/golem_membership_invoice_views.xml']
}
diff --git a/golem_family_membership/models/golem_family.py b/golem_family_membership/models/golem_family.py
index 74a63d3..7ea0b30 100644
--- a/golem_family_membership/models/golem_family.py
+++ b/golem_family_membership/models/golem_family.py
@@ -18,7 +18,8 @@
""" GOLEM Families Adaptations"""
-from odoo import models, fields, api, _
+from odoo import models, api, _
+
class GolemFamily(models.Model):
""" GOLEM Family Adaptations """
@@ -28,12 +29,12 @@ class GolemFamily(models.Model):
def family_membership(self):
""" Wizard call for family membership """
self.ensure_one()
- family_id = self[0]
+ family = self[0]
return {
'name' : _('Please fill the family membership form'),
'type' : 'ir.actions.act_window',
'res_model' : 'golem.membership.invoice',
- 'context': {'default_family_id': family_id.id},
+ 'context': {'default_family_id': family.id},
'view_mode': 'form',
'target': 'new'
}
diff --git a/golem_family_membership/wizard/golem_membership_invoice.py b/golem_family_membership/wizard/golem_membership_invoice.py
index 5952ff1..9ae904c 100644
--- a/golem_family_membership/wizard/golem_membership_invoice.py
+++ b/golem_family_membership/wizard/golem_membership_invoice.py
@@ -24,27 +24,26 @@ class GolemMembershipInvoice(models.TransientModel):
""" GOLEM Membership Invoice adaptations """
_inherit = 'golem.membership.invoice'
- family_id = fields.Many2one('golem.family')
+ family_id = fields.Many2one('golem.family', required=True)
members_ids = fields.Many2many('res.partner')
on_the_name_of = fields.Many2one('res.partner', domain="[('id', '=', members_ids[0][2])]")
@api.onchange('family_id')
- def onchange_family_id(self):
- """ fill members_ids """
+ def onchange_family(self):
+ """ Fill members_ids """
for record in self:
- for member in record.family_id.member_ids:
- record.members_ids += member
+ record.members_ids = [(6, False, record.family_id.members_ids.ids)]
@api.multi
def membership_family_invoice(self):
""" Create family membership """
self.ensure_one()
record = self[0]
- datas = {'membership_product_id': self.product_id.id,
- 'amount': self.member_price}
+ datas = {'membership_product_id': record.product_id.id,
+ 'amount': record.member_price}
invoice_list = record.on_the_name_of.create_membership_invoice(datas=datas)
- datas = {'membership_product_id': self.product_id.id,
- 'amount': 0}
+ datas = {'membership_product_id': record.product_id.id,
+ 'amount': 0.0}
gen = (member for member in record.members_ids if member != record.on_the_name_of)
for member in gen:
id_membership = member.create_membership_invoice(datas=datas)
diff --git a/golem_family_membership/wizard/golem_membership_invoice_views.xml b/golem_family_membership/wizard/golem_membership_invoice_views.xml
index e3d495c..e10d9b2 100644
--- a/golem_family_membership/wizard/golem_membership_invoice_views.xml
+++ b/golem_family_membership/wizard/golem_membership_invoice_views.xml
@@ -16,17 +16,19 @@ 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 .
-->
+
-
+
+
- membership.family.invoice.view.form
+ GOLEM Membership Family Invoice Form
golem.membership.invoice
+