Merge lp:~openerp-open-net/openobject-addons/ons_membership into lp:openobject-addons

[Open Net Sàrl]

This module has been developed and tested with OpenERP V6
That's why we propose this branch merging

[Open Net Sàrl (openerp-open-net)]

Hi

Sorry but I need help as I have never done any merging.
If I launch the command "bzr merge ..." in my directory, it responds "Nothing to do.".
What do I do now?

Thanks in advance

[Open Net Sàrl (openerp-open-net)]

Si tu as pas la réponse, demande à Thierry

Cordialement

Eberhard J-A
Directeur

Open Net Sàrl
www.open-net.ch
Ch. de la Lande 1 CH 1008 Prilly
021 / 625.35.75 - 078 / 898.40.77

----- Mail original -----
De: "Open Net Sàrl" <email address hidden>
À: "Open Net Sàrl" <email address hidden>
Envoyé: Vendredi 24 Septembre 2010 13:53:39
Objet: Re: [Merge] lp:~openerp-open-net/openobject-addons/ons_membership into lp:openobject-addons

Hi

Sorry but I need help as I have never done any merging.
If I launch the command "bzr merge ..." in my directory, it responds "Nothing to do.".
What do I do now?

Thanks in advance
--
https://code.launchpad.net/~openerp-open-net/openobject-addons/ons_membership/+merge/36453
You are the owner of lp:~openerp-open-net/openobject-addons/ons_membership.

[Open Net Sàrl (openerp-open-net)]

review: Approve

[Fabien (Open ERP) (fp-tinyerp)]

Seems to be a good improvement.
But I propose you to merge this in extra-addons or community-addons. So, I reject the proposal for addons.

Thanks,

review: Disapprove

Unmerged revisions

1. By <email address hidden> on 2010-09-23

First version

=== added file '__init__.py'
--- __init__.py	1970-01-01 00:00:00 +0000
+++ __init__.py	2010-09-23 14:59:01 +0000
@@ -0,0 +1,37 @@
+# -*- encoding: utf-8 -*-
+#
+#  File: __init__.py
+#  Module: ons_membership
+#
+#  Created by [e-mail]
+#
+#  Copyright (c) 2010 Open-Net Ltd. All rights reserved.
+##############################################################################
+#
+# Author Yvon Philiippe Crittin / Open Net Sarl
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+
+import membership

=== added file '__openerp__.py'
--- __openerp__.py	1970-01-01 00:00:00 +0000
+++ __openerp__.py	2010-09-23 14:59:01 +0000
@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+#
+#  File: __openerp__.py
+#  Module: ons_membership
+#
+#  Created by [e-mail]
+#
+#  Copyright (c) 2010 Open-Net Ltd. All rights reserved.
+##############################################################################
+#
+# Author Yvon Philiippe Crittin / Open Net Sarl
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+
+
+{
+	"name" : "More for the membership, by Open-Net",
+	"version" : "1.2.08",
+	"author" : "[e-mail]",
+	"website" : "http://open-net.ch",
+	"category" : "Generic Modules/Association",
+	"depends" : ["membership"],
+	"description": """
+This module lets you do more with the membership management:
+- you can add a fixed duration for a membership, starting at the date the partner is joined to
+- you can even have a variable membership, starting at the current date and ending at a pre-determined day  
+	""",
+	'init_xml': [],
+	'update_xml': [ "membership_view.xml" ],
+	'demo_xml': [],
+	'installable': True,
+	'active': False,
+}

=== added file 'membership.py'
--- membership.py	1970-01-01 00:00:00 +0000
+++ membership.py	2010-09-23 14:59:01 +0000
@@ -0,0 +1,295 @@
+# -*- encoding: utf-8 -*-
+#
+#  File: __init__.py
+#  Module: ons_membership
+#
+#  Created by [e-mail]
+#
+#  Copyright (c) 2010 Open-Net Ltd. All rights reserved.
+##############################################################################
+#
+# Author Yvon Philiippe Crittin / Open Net Sarl
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from osv import fields, osv
+from datetime import *
+from tools.translate import _
+import netsvc
+
+class membership_line(osv.osv):
+	_inherit = 'membership.membership_line'
+	
+	def _get_membership_summary(self, cr, uid, ids, field_name, arg, context={}):
+		res = {}
+		for id in ids:
+			res[id] = False
+			mbl = self.browse(cr, uid, id, context=context)
+			if mbl:
+				if mbl.kindof == 'period':
+					res[id] = 'From ' + datetime.strptime(mbl.date_from, '%Y-%m-%d').strftime('%d/%m/%y') + ' to ' + datetime.strptime(mbl.date_to, '%Y-%m-%d').strftime('%d/%m/%y')
+				elif mbl.kindof == 'duration':
+					res[id] = str(mbl.duration) + ' days'
+				elif mbl.kindof == 'until':
+					res[id] = datetime.strptime(mbl.date_until, '%Y-%m-%d').strftime('%d/%m/%y')
+		return res
+	
+	_columns = {
+		'kindof': fields.selection([('period', 'Period'), ('duration', 'Duration'), ('until', 'Until')], 'Kind Of', required=True),
+		'duration': fields.integer('Duration', help='Expressed in days, starts with the current date'),
+		'date_until': fields.date('Until', help='Starts with the current date'),
+		'summary': fields.function( _get_membership_summary, method=True, type='char', size=60, string='Summary', readonly=True, store=False ),
+	}
+	
+	_defaults = {
+		'kindof': lambda *a: 'period',
+	}
+	
+membership_line()
+
+class Product(osv.osv):
+	'''Product'''
+	_inherit = 'product.product'
+	
+	def _get_membership_summary(self, cr, uid, ids, field_name, arg, context={}):
+		res = {}
+		for id in ids:
+			res[id] = False
+			prod = self.browse(cr, uid, id, context=context)
+			if prod:
+				if prod.kindof == 'period':
+					res[id] = 'From ' + datetime.strptime(prod.membership_date_from, '%Y-%m-%d').strftime('%d/%m/%y') + ' to ' + datetime.strptime(prod.membership_date_to, '%Y-%m-%d').strftime('%d/%m/%y')
+				elif prod.kindof == 'duration':
+					res[id] = str(prod.duration) + ' days'
+				elif prod.kindof == 'until':
+					res[id] = datetime.strptime(prod.date_until, '%Y-%m-%d').strftime('%d/%m/%y')
+		return res
+	
+	_columns = {
+		'kindof': fields.selection([('period', 'Period'), ('duration', 'Duration'), ('until', 'Until')], 'Kind Of', required=True),
+		'duration': fields.integer('Duration', help='Expressed in days, starts with the current date'),
+		'date_until': fields.date('Until', help='Starts with the current date'),
+		'summary': fields.function( _get_membership_summary, method=True, type='char', size=60, string='Summary', readonly=True, store=False ),
+	}
+	
+	_defaults = {
+		'kindof': lambda *a: 'period',
+	}
+Product()
+
+class account_invoice_line(osv.osv):
+	_inherit='account.invoice.line'
+
+	def write(self, cr, uid, ids, vals, context=None):
+		"""Overrides membership write method
+		"""
+		
+		if not context:
+			context={}
+		res = super(account_invoice_line, self).write(cr, uid, ids, vals, context=context)
+		member_line_obj = self.pool.get('membership.membership_line')
+		for line in self.browse(cr, uid, ids):
+			if line.invoice_id.type == 'out_invoice':
+				ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
+				if line.product_id and line.product_id.membership and not ml_ids:
+					# Product line has changed to a membership product
+					date_from = line.product_id.membership_date_from
+					date_to = line.product_id.membership_date_to
+					membership_kindof = line.product_id.kindof
+					membership_duration = line.product_id.duration
+					membership_date_until = line.product_id.date_until
+
+					membership_ids = member_line_obj.search(cr, uid, [('membership_id','=',line.product_id.id)],context=context)
+					if membership_ids and len(membership_ids):
+						membership = member_line_obj.browse(cr, uid, membership_ids[0], context=context)
+						if membership:
+							if membership.kindof == 'duration':
+								date_from = date.today()
+								date_to = date.today() + timedelta(days=membership.duration)
+								membership_duration = membership.duration
+							elif membership.kindof == 'until':
+								date_from = date.today()
+								date_to = membership.date_until
+								membership_date_until = membership.date_until
+						membership_kindof = membership.kindof
+
+					if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
+						date_from = line.invoice_id.date_invoice
+					values = {
+						'partner': line.invoice_id.partner_id.id,
+						'membership_id': line.product_id.id,
+						'member_price': line.price_unit,
+						'date': time.strftime('%Y-%m-%d'),
+						'date_from': date_from,
+						'date_to': date_to,
+						'account_invoice_line': line.id,
+						'kindof': membership_kindof,
+						}
+					if membership_duration:
+						values['duration'] = membership_duration
+					if membership_date_until:
+						values['date_until'] = membership_date_until
+					line_id = member_line_obj.create(cr, uid, values)
+
+				if line.product_id and not line.product_id.membership and ml_ids:
+					# Product line has changed to a non membership product
+					member_line_obj.unlink(cr, uid, ml_ids, context=context)
+
+				if line.product_id and line.product_id.membership and ml_ids:
+					for ml_id in ml_ids:
+						member_line = member_line_obj.browse( cr, uid, ml_id, context=context )
+						if member_line:
+							values = {
+								'kindof': line.product_id.kindof,
+								'duration': line.product_id.duration,
+								'date_until': line.product_id.date_until
+							}
+							if line.product_id.kindof == 'duration':
+								date_from = date.today()
+								values['date_from'] = date_from
+								date_to = date_from + timedelta(days=line.product_id.duration)
+								values['date_to'] = date_to
+							elif line.product_id.kindof == 'until':
+								date_from = date.today()
+								values['date_from'] = date_from
+								date_to = line.product_id.date_until
+								values['date_to'] = date_to
+							member_line_obj.write( cr, uid, [ml_id], values, context=context )
+		return res
+
+	def create(self, cr, uid, vals, context={}):
+		"""Overrides membership create method
+		"""
+		
+		result = super(account_invoice_line, self).create(cr, uid, vals, context)
+		line = self.browse(cr, uid, result)
+		member_line_obj = self.pool.get('membership.membership_line')
+		if line.invoice_id.type == 'out_invoice':
+
+			ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line','=',line.id)])
+			if line.product_id and line.product_id.membership and not ml_ids:
+				# Product line is a membership product
+				date_from = line.product_id.membership_date_from
+				date_to = line.product_id.membership_date_to
+				membership_kindof = line.product_id.kindof
+				membership_duration = line.product_id.duration
+				membership_date_until = line.product_id.date_until
+
+				membership_ids = member_line_obj.search(cr, uid, [('membership_id','=',line.product_id.id)],context=context)
+				if membership_ids and len(membership_ids):
+					membership = member_line_obj.browse(cr, uid, membership_ids[0], context=context)
+					if membership:
+						if membership.kindof == 'duration':
+							date_from = date.today()
+							date_to = date.today() + timedelta(days=membership.duration)
+							membership_duration = membership.duration
+						elif membership.kindof == 'until':
+							date_from = date.today()
+							date_to = membership.date_until
+							membership_date_until = membership.date_until
+						membership_kindof = membership.kindof
+
+				if line.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to:
+					date_from = line.invoice_id.date_invoice
+				values = {
+							'partner': line.invoice_id.partner_id and line.invoice_id.partner_id.id or False,
+							'membership_id': line.product_id.id,
+							'member_price': line.price_unit,
+							'date': time.strftime('%Y-%m-%d'),
+							'date_from': date_from,
+							'date_to': date_to,
+							'account_invoice_line': line.id,
+							'kindof': membership_kindof,
+						}
+				if membership_duration:
+					values['duration'] = membership_duration
+				if membership_date_until:
+					values['date_until'] = membership_date_until
+				line_id = member_line_obj.create(cr, uid, values)
+
+		return result
+
+account_invoice_line()
+
+class Partner(osv.osv):
+	'''Partner'''
+	_inherit = 'res.partner'
+
+	def create_membership_invoice(self, cr, uid, ids, product_id=None, datas=None, context=None):
+		""" Create Customer Invoice of Membership for partners.
+		@param datas: datas has dictionary value which consist Id of Membership product and Cost Amount of Membership.
+					  datas = {'membership_product_id': None, 'amount':None}
+		"""
+
+		invoice_obj = self.pool.get('account.invoice')
+		product_obj = self.pool.get('product.product')
+		invoice_line_obj = self.pool.get('account.invoice.line')
+		invoice_tax_obj = self.pool.get('account.invoice.tax')
+		product_id = product_id or datas.get('membership_product_id',False)
+		amount = datas.get('amount', 0.0)
+		if not context:
+			context={}
+		invoice_list = []
+		if type(ids) in (int,long,):
+			ids = [ids]
+		for partner in self.browse(cr, uid, ids, context=context):
+			account_id = partner.property_account_receivable and partner.property_account_receivable.id or False
+			fpos_id = partner.property_account_position and partner.property_account_position.id or False
+			addr = self.address_get(cr, uid, [partner.id], ['invoice'])
+			if partner.free_member:
+				raise osv.except_osv(_('Error !'),
+						_("Partner is a free Member."))
+			if not addr.get('invoice', False):
+				raise osv.except_osv(_('Error !'),
+						_("Partner doesn't have an address to make the invoice."))
+			quantity = 1
+			line_value =  {
+				'product_id' : product_id,
+			}
+
+			line_dict = invoice_line_obj.product_id_change(cr, uid, {},
+							product_id, False, quantity, '', 'out_invoice', partner.id, fpos_id, price_unit=amount, context=context)
+			line_value.update(line_dict['value'])
+			if line_value.get('invoice_line_tax_id', False):
+				tax_tab = [(6, 0, line_value['invoice_line_tax_id'])]
+				line_value['invoice_line_tax_id'] = tax_tab
+
+			invoice_id = invoice_obj.create(cr, uid, {
+				'partner_id' : partner.id,
+				'address_invoice_id': addr.get('invoice', False),
+				'account_id': account_id,
+				'fiscal_position': fpos_id or False
+				}
+			)
+			line_value['invoice_id'] = invoice_id
+			invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context)
+			invoice_obj.write(cr, uid, invoice_id, {'invoice_line':[(6,0,[invoice_line_id])]}, context=context)
+			invoice_list.append(invoice_id)
+			if line_value['invoice_line_tax_id']:
+				tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
+				for tax in tax_value:
+					   invoice_tax_obj.create(cr, uid, tax, context=context)
+		return invoice_list
+
+Partner()

=== added file 'membership_view.xml'
--- membership_view.xml	1970-01-01 00:00:00 +0000
+++ membership_view.xml	2010-09-23 14:59:01 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+
+		<record model="ir.ui.view" id="ons_mbship_view_partner_form">
+			<field name="name">res.partner.form.inherit</field>
+			<field name="model">res.partner</field>
+			<field name="inherit_id" ref="membership.view_partner_form"/>
+			<field name="arch" type="xml">
+				<field name="member_lines" position="replace">
+					<field name="member_lines" nolabel="1" colspan="4" readonly="1">
+						<tree string="Memberships">
+							<field name="date"/>
+							<field name="membership_id"/>
+							<field name="kindof"/>
+							<field name="summary"/>
+							<field name="member_price"/>
+							<field name="account_invoice_id"/>
+							<field name="state"/>
+						</tree>
+						<form string="Memberships">
+							<field name="date"/>
+							<field name="member_price"/>
+							<field name="membership_id"/>
+							<field name="account_invoice_id"/>
+							<field name="kindof"/>
+							<field name="summary"/>
+							<field name="state" colspan="4"/>
+						</form>
+					</field>
+				</field>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="ons_mbship_view_product_form_inherit1">
+			<field name="name">ons_mbship.product.normal.form.1</field>
+			<field name="type">form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="membership.membership_products_form"/>
+			<field name="arch" type="xml">
+				<field name="membership_date_from" position="before">
+					<field name="kindof"/>
+					<group colspan="2">
+						<field colspan="2" name="duration" attrs="{'invisible':[('kindof','&lt;&gt;','duration')], 'required':[('kindof','=','duration')]}"/>
+						<field colspan="2" name="date_until" attrs="{'invisible':[('kindof','&lt;&gt;','until')], 'required':[('kindof','=','until')]}"/>
+						<newline/>
+					</group>
+				</field>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="ons_mbship_view_product_form_inherit2">
+			<field name="name">ons_mbship.product.normal.form.2</field>
+			<field name="type">form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="membership.membership_products_form"/>
+			<field name="arch" type="xml">
+				<field name="membership_date_from" position="replace">
+					<field name="membership_date_from" attrs="{'invisible':[('kindof','&lt;&gt;','period')], 'required':[('kindof','=','period')]}"/>
+				</field>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="ons_mbship_view_product_form_inherit3">
+			<field name="name">ons_mbship.product.normal.form.3</field>
+			<field name="type">form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="membership.membership_products_form"/>
+			<field name="arch" type="xml">
+				<field name="membership_date_to" position="replace">
+					<field name="membership_date_to" attrs="{'invisible':[('kindof','&lt;&gt;','period')], 'required':[('kindof','=','period')]}"/>
+				</field>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="ons_mbship_view_product_tree_inherit1">
+			<field name="name">ons_mbship.product.normal.tree.1</field>
+			<field name="type">form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="membership.membership_products_tree"/>
+			<field name="arch" type="xml">
+				<field name="membership_date_from" position="replace"/>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="ons_mbship_view_product_tree_inherit2">
+			<field name="name">ons_mbship.product.normal.tree.2</field>
+			<field name="type">form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="membership.membership_products_tree"/>
+			<field name="arch" type="xml">
+				<field name="membership_date_to" position="replace"/>
+			</field>
+		</record>
+		<record model="ir.ui.view" id="ons_mbship_view_product_tree_inherit3">
+			<field name="name">ons_mbship.product.normal.tree.3</field>
+			<field name="type">form</field>
+			<field name="model">product.product</field>
+			<field name="inherit_id" ref="membership.membership_products_tree"/>
+			<field name="arch" type="xml">
+				<field name="list_price" position="after">
+					<field name="summary"/>
+					<field name="kindof"/>
+				</field>
+			</field>
+		</record>
+
+	</data>
+</openerp>