Merge lp:~savoirfairelinux-openerp/openerp-isp/invoice_refactoring into lp:openerp-isp

[Joao Alfredo Gama Batista]

 * Split the big invoice routine into 3 separate methods.
 * Minor adjustments and code clean-up.

[lp:~savoirfairelinux-openerp/openerp-isp/invoice_refactoring]

32. By Joao Alfredo Gama Batista on 2014-08-22

[FIX] Fix error in voucher creation

33. By Joao Alfredo Gama Batista on 2014-08-22

[FIX] Fix typo in action context

34. By Vincent Vinet on 2014-09-05

pep8 + add deactivation date on contracts

35. By Vincent Vinet on 2014-09-08

flake cleanup

36. By Vincent Vinet on 2014-09-08

make sure we assign account invoice lines

37. By Vincent Vinet on 2014-09-10

add prorata invoicing tests

38. By Vincent Vinet on 2014-09-11

refac tests to allow deactivate tests, complete activate tests and pass them

39. By Vincent Vinet on 2014-09-11

fix refunds

40. By Vincent Vinet on 2014-09-11

create prorata invoices on deactivation

41. By Vincent Vinet on 2014-09-12

remove debug print

42. By Vincent Vinet on 2014-09-12

remove seemingly unused field

43. By Vincent Vinet on 2014-09-12

also remove from view ¬¬

44. By Vincent Vinet on 2014-09-12

remove serial assignment from packager configurator, move into 3 simple wizards

45. By Vincent Vinet on 2014-09-12

merge Marc Cassuto 2014-09-12 contract_isp

46. By Vincent Vinet on 2014-09-15

add groups and states handling to show add/reserve/return buttons

47. By Vincent Vinet on 2014-09-15

test that reseller prorata invoice is assigned correctly

48. By Vincent Vinet on 2014-09-15

fix tests to run in oe test env

49. By Marc Cassuto (SFL) on 2014-09-16

contract_isp_package_configurator : Add fr translation

50. By Marc Cassuto (SFL) on 2014-09-16

contract_isp_package_configurator : Add fr translation

51. By Marc Cassuto (SFL) on 2014-09-16

product_dependencies - Add fr translation

52. By Marc Cassuto (SFL) on 2014-09-16

contract_isp - Add fr translation

53. By Vincent Vinet on 2014-09-16

refac to allow integrating class of service better, pep8 cleanup

54. By Marc Cassuto (SFL) on 2014-09-16

contract_isp_invoice - Add fr translation

55. By Marc Cassuto (SFL) on 2014-09-16

Merge diverted branches

56. By Vincent Vinet on 2014-09-16

do not show reserve/return buttons for non-stockable products

57. By Vincent Vinet on 2014-09-16

restrict production lots to available ones in add/replace wizards

58. By Vincent Vinet on 2014-09-17

fix serial number checking

59. By Vincent Vinet on 2014-09-19

disallow activation dates in the future

60. By Vincent Vinet on 2014-09-19

log reserve/exchange/return to contract

61. By Marc Cassuto (SFL) on 2014-09-21

Update .pot files and fr translations for all modules

62. By Marc Cassuto (SFL) on 2014-09-21

contract_isp_package_configurator - Tried to get the translation from the wizard

63. By Vincent Vinet on 2014-09-23

use the right account and journal to create vouchers

64. By Vincent Vinet on 2014-09-24

prevent rounding a None currency

65. By Vincent Vinet on 2014-09-25

prevent double billing exception lines and one time lines

66. By Vincent Vinet on 2014-09-25

allow searching non-prorata invoice dates

67. By Vincent Vinet on 2014-09-25

in package configurator, call contract.service onchange product id to get duration before create

68. By Vincent Vinet on 2014-09-25

specify source process when creating invoices

69. By Vincent Vinet on 2014-09-25

actually use the source_process

70. By Vincent Vinet on 2014-09-26

prevent error when getting invoice dates for empty ids

71. By Vincent Vinet on 2014-09-26

wrong period id when confirming voucher

72. By Vincent Vinet on 2014-09-29

do not bill activation multiple times

73. By Vincent Vinet on 2014-09-29

revert checking activation line status on subscription

74. By Vincent Vinet on 2014-09-29

clean date_interval/format_interval usage

75. By Vincent Vinet on 2014-09-29

default date format for format_interval

76. By Vincent Vinet on 2014-09-30

use price, not list price, for analytic lines

77. By Vincent Vinet on 2014-09-30

only create prorata lines on activation, allow passing in date strings for operation date, do not filter already created

78. By Vincent Vinet on 2014-09-30

do not show line_cr/dr_ids in the payment voucher launched from contract

79. By Marc Cassuto (SFL) on 2014-09-30

contract_isp_invoice - change 'Create voucher' button name to 'Create Initial Invoice'

80. By Marc Cassuto (SFL) on 2014-09-30

contract_isp_invoice - change 'Create voucher' button name to 'Create Initial Invoice'

81. By Vincent Vinet on 2014-10-01

allow passing operation_date in str form

82. By Vincent Vinet on 2014-10-01

do not multiply total price by quantity when creating analytic lines

83. By Vincent Vinet on 2014-10-01

revert r78 as it hides payments at too many places

84. By Vincent Vinet on 2014-10-03

show smarter error on account blank pricelist voucher creation

85. By Vincent Vinet on 2014-10-03

create recurrent invoices at invoice day

86. By Vincent Vinet on 2014-10-03

do not allow deactivate in the future

87. By Vincent Vinet on 2014-10-06

use partner fiscal position to calculate taxes on default voucher amount

88. By Vincent Vinet on 2014-10-17

do not create invoices grouped by journal type for contracts

89. By Vincent Vinet on 2014-11-07

copy context to avoid side effects in batch invoice creation

90. By Vincent Vinet on 2014-11-24

bill onetime services in recurrent billing

Unmerged revisions

90. By Vincent Vinet on 2014-11-24

bill onetime services in recurrent billing

89. By Vincent Vinet on 2014-11-07

copy context to avoid side effects in batch invoice creation

88. By Vincent Vinet on 2014-10-17

do not create invoices grouped by journal type for contracts

87. By Vincent Vinet on 2014-10-06

use partner fiscal position to calculate taxes on default voucher amount

86. By Vincent Vinet on 2014-10-03

do not allow deactivate in the future

85. By Vincent Vinet on 2014-10-03

create recurrent invoices at invoice day

84. By Vincent Vinet on 2014-10-03

show smarter error on account blank pricelist voucher creation

83. By Vincent Vinet on 2014-10-01

revert r78 as it hides payments at too many places

82. By Vincent Vinet on 2014-10-01

do not multiply total price by quantity when creating analytic lines

81. By Vincent Vinet on 2014-10-01

allow passing operation_date in str form

=== modified file 'contract_isp/contract.py'
--- contract_isp/contract.py	2013-11-07 15:10:04 +0000
+++ contract_isp/contract.py	2014-11-24 15:05:14 +0000
@@ -21,14 +21,19 @@
 ##############################################################################
 
 import logging
+_logger = logging.getLogger(__name__)
 import calendar
 import datetime
+
 import openerp.addons.decimal_precision as dp
 from openerp.osv import orm, fields
-from openerp.report import report_sxw
-from openerp.tools import convert
+from openerp.tools import SUPERUSER_ID, DEFAULT_SERVER_DATE_FORMAT
 from openerp.tools.translate import _
 
+LINE_TYPE_EXCEPTION = 'x'
+LINE_TYPE_RECURRENT = 'r'
+LINE_TYPE_ONETIME = 'o'
+
 
 def add_months(sourcedate, months):
     month = sourcedate.month - 1 + months
@@ -38,7 +43,7 @@
     return datetime.date(year, month, day)
 
 
-def date_interval(start_date, month_end=True, date_format='%m/%d/%Y'):
+def date_interval(start_date, month_end=True):
     if month_end:
         end_date = datetime.date(start_date.year,
                                  start_date.month,
@@ -47,10 +52,12 @@
     else:
         end_date = add_months(start_date, 1) - datetime.timedelta(days=1)
 
-    interval = '(%s - %s)' % (start_date.strftime(date_format),
-                              end_date.strftime(date_format))
-
-    return interval
+    return start_date, end_date
+
+
+def format_interval(start, end, date_format=DEFAULT_SERVER_DATE_FORMAT):
+    return '(%s - %s)' % (start.strftime(date_format),
+                          end.strftime(date_format))
 
 
 class res_company(orm.Model):
@@ -105,10 +112,11 @@
     _inherit = 'product.product'
 
     _columns = {
-        'analytic_line_type': fields.selection((('r', 'Recurrent'),
-                                                ('x', 'Exception'),
-                                                ('o', 'One time')),
-                                               'Type in contract'),
+        'analytic_line_type': fields.selection(((LINE_TYPE_RECURRENT, 'Recurrent'),
+                                                (LINE_TYPE_EXCEPTION, 'Exception'),
+                                                (LINE_TYPE_ONETIME, 'One time')),
+                                               'Type in contract',
+                                               required=True),
         'require_activation': fields.boolean('Require activation')
     }
 
@@ -117,7 +125,6 @@
     _name = 'contract.service'
 
     def _get_product_price(self, cr, uid, ids, field_name, arg, context=None):
-        product_obj = self.pool.get('product.product')
         product_pricelist_obj = self.pool.get('product.pricelist')
         partner_id = self.browse(
             cr, uid, ids[0],
@@ -150,6 +157,8 @@
 
     _columns = {
         'activation_date': fields.datetime('Activation date'),
+        'billed_to_date': fields.date('Billed until date'),
+        'deactivation_date': fields.datetime('Deactivation date'),
         'duration': fields.integer('Duration'),
         'product_id': fields.many2one('product.product',
                                       'Product',
@@ -159,10 +168,12 @@
             digits_compute=dp.get_precision('Product Unit of Measure')),
         'category_id': fields.many2one('product.category', 'Product Category'),
         'name': fields.char('Description', size=64),
-        'analytic_line_type': fields.selection((('r', 'Recurrent'),
-                                                ('x', 'Exception'),
-                                                ('o', 'One time')),
-                                               'Type'),
+        'analytic_line_type': fields.selection(
+            ((LINE_TYPE_RECURRENT, 'Recurrent'),
+             (LINE_TYPE_EXCEPTION, 'Exception'),
+             (LINE_TYPE_ONETIME, 'One time')),
+            'Type'),
+        # XXX Should this be a function based on product.product?
         'require_activation': fields.boolean('Require activation'),
         'account_id': fields.many2one('account.analytic.account', 'Contract'),
         'unit_price': fields.function(
@@ -201,7 +212,7 @@
             ret['value']['require_activation'] = product.require_activation
             ret['value']['category_id'] = product.categ_id.id
             ret['value']['unit_price'] = product.list_price
-            if product.analytic_line_type in ('r', 'o'):
+            if product.analytic_line_type == LINE_TYPE_RECURRENT:
                 ret['value']['duration'] = 0
             else:
                 ret['value']['duration'] = 1
@@ -215,13 +226,63 @@
 
         return ret
 
+    def _prorata_rate(self, days_used, days_in_month):
+        """ Returns a rate to compute prorata invoices.
+        Current method is days_used / days_in_month, rounded DOWN
+        to 2 digits
+        """
+        return (100 * days_used / days_in_month) / 100.0
+
+    def _get_prorata_interval_rate(self, cr, uid, change_date, context=None):
+        """ Get the prorata interval and price rate.
+
+        Returns a tuple (start_date, end_date, price percent)
+        """
+        month_days = calendar.monthrange(change_date.year,
+                                         change_date.month)[1]
+        start_date = add_months(change_date, 1)
+        end_date = start_date.replace(day=month_days)
+        used_days = month_days - change_date.day
+        ptx = self._prorata_rate(used_days, month_days)
+
+        return start_date, end_date, ptx
+
+    def _get_prorata_interval_rate_deactivate(self, cr, uid, change_date,
+                                              context=None):
+        start_date, end_date, ptx = self._get_prorata_interval_rate(
+            cr, uid, change_date, context=context)
+        ptx = ptx * -1
+        return start_date, end_date, ptx
+
+    def _get_date_format(self, cr, uid, obj, context):
+        partner_lang = obj.account_id.partner_id.lang
+        res_lang_obj = self.pool['res.lang']
+        query = [
+            ('code', '=', partner_lang),
+            ('active', '=', True)
+        ]
+        lang_id = res_lang_obj.search(cr, uid, query, context=context)
+        if lang_id:
+            date_format = res_lang_obj.browse(cr, uid,
+                                              lang_id[0],
+                                              context=context).date_format
+
+        else:
+            date_format = '%Y/%m/%d'
+        return date_format
+
     def create_analytic_line(self, cr, uid, ids,
                              mode='manual',
                              date=None,
                              context=None):
-
-        if not date:
-            date = datetime.date.today()
+        context = context or {}
+        if date is None:
+            date = context.get("operation_date", datetime.date.today())
+            if not isinstance(date, datetime.date):
+                date = datetime.datetime.strptime(
+                    date,
+                    DEFAULT_SERVER_DATE_FORMAT,
+                ).date()
 
         if type(ids) is int:
             ids = [ids]
@@ -229,72 +290,130 @@
         ret = []
         record = {}
         next_month = None
-        company_obj = self.pool.get('res.company')
-        company_id = company_obj._company_default_get(cr, uid, context)
-        company = company_obj.browse(cr, uid, company_id, context)
-
         account_analytic_line_obj = self.pool.get('account.analytic.line')
         for line in self.browse(cr, uid, ids, context):
-            account_id = line.account_id.id
-            partner_lang = line.account_id.partner_id.lang
-            res_lang_obj = self.pool.get('res.lang')
-            query = [
-                ('code', '=', partner_lang),
-                ('active', '=', True)
-            ]
-            lang_id = res_lang_obj.search(cr, uid, query, context=context)
-            if lang_id:
-                date_format = res_lang_obj.browse(cr, uid,
-                                                  lang_id[0],
-                                                  context=context).date_format
-
-            else:
-                date_format = '%Y/%m/%d'
-
-            if line.analytic_line_type == 'r':
+            date_format = self._get_date_format(cr, uid, line, context=context)
+            start, end = None, None
+
+            amount = line.price
+
+            if line.analytic_line_type == LINE_TYPE_RECURRENT:
                 if mode == 'prorata':
                     activation_date = date
-
-                    month_days = calendar.monthrange(activation_date.year,
-                                                     activation_date.month)[1]
-
-                    used_days = month_days - activation_date.day
-                    ptx = (100 * used_days / month_days) / 100.0
-
-                    amount = line.product_id.list_price * ptx
-                    interval = date_interval(add_months(date, 1),
-                                             True,
-                                             date_format)
+                    start, end, ptx = self._get_prorata_interval_rate(
+                        cr, uid,
+                        activation_date,
+                        context=context,
+                    )
+
+                    amount = amount * ptx
 
                 elif mode == 'cron':
-                    amount = line.product_id.list_price
                     next_month = add_months(date, 1)
                     next_month = datetime.date(
                         next_month.year,
                         next_month.month,
                         1)
-                    interval = date_interval(next_month,
-                                             False,
-                                             date_format)
+                    start, end = date_interval(next_month, False)
 
                 elif mode == 'manual':
-                    amount = line.product_id.list_price
-                    interval = date_interval(date, False, date_format)
+                    start, end = date_interval(date, False)
 
                 elif mode == 'subscription':
-                    amount = line.product_id.list_price
-                    interval = ''
+                    line.write({'activation_line_generated': True})
 
+            if start and end:
+                interval = format_interval(start, end, date_format)
             else:
                 interval = ''
-                amount = line.product_id.list_price
 
             general_account_id = line.product_id.property_account_expense.id \
                 or line.product_id.categ_id.property_account_expense_categ.id
 
             record = {
                 'name': ' '.join([line.product_id.name,
-                                  True and line.name or '',
+                                  line.name or '',
+                                  interval]),
+                'amount': (amount * -1),
+                'account_id': line.account_id.id,
+                'user_id': uid,
+                'general_account_id': general_account_id,
+                'product_id': line.product_id.id,
+                'contract_service_id': line.id,
+                'to_invoice': 1,
+                'unit_amount': line.qty,
+                'is_prorata': mode == 'prorata',
+                'date': (next_month or date).strftime('%Y-%m-%d'),
+                'journal_id': 1
+            }
+
+            if line.analytic_line_type == LINE_TYPE_EXCEPTION:
+                new_duration = line.duration - 1
+                line.write({'duration': new_duration})
+                if new_duration <= 0:
+                    self.unlink(cr, SUPERUSER_ID, line.id)
+                    record['contract_service_id'] = False
+            elif line.analytic_line_type == LINE_TYPE_ONETIME:
+                if line.duration > 0:
+                    line.write({'duration': line.duration - 1})
+                else:
+                    # Do not create an already billed line
+                    continue
+
+            if 'default_type' in context:
+                context.pop('default_type')
+
+            ret.append(account_analytic_line_obj.create(cr, uid, record,
+                                                        context))
+        return ret
+
+    def create_refund_line(self, cr, uid, ids,
+                           mode='manual',
+                           date=None,
+                           context=None):
+        context = context or {}
+        if date is None:
+            date = context.get("operation_date", datetime.date.today())
+            if not isinstance(date, datetime.date):
+                date = datetime.datetime.strptime(
+                    date,
+                    DEFAULT_SERVER_DATE_FORMAT,
+                ).date()
+
+        if type(ids) is int:
+            ids = [ids]
+
+        ret = []
+        record = {}
+        account_analytic_line_obj = self.pool.get('account.analytic.line')
+        for line in self.browse(cr, uid, ids, context):
+            if any((line.analytic_line_type != LINE_TYPE_RECURRENT,
+                    mode != "prorata")):
+                # Not handled for now, only pro-rata deactivate
+                continue
+
+            date_format = self._get_date_format(cr, uid, line, context=context)
+
+            deactivation_date = date
+            start, end, ptx = self._get_prorata_interval_rate_deactivate(
+                cr, uid,
+                deactivation_date,
+                context=context,
+            )
+
+            amount = line.product_id.list_price * ptx
+
+            interval = format_interval(start, end,
+                                       date_format=date_format)
+
+            general_account_id = (
+                line.product_id.property_account_expense.id or
+                line.product_id.categ_id.property_account_expense_categ.id
+            )
+
+            record = {
+                'name': ' '.join([line.product_id.name,
+                                  line.name or '',
                                   interval]),
                 'amount': (amount * -1) * line.qty,
                 'account_id': line.account_id.id,
@@ -305,16 +424,10 @@
                 'to_invoice': 1,
                 'unit_amount': line.qty,
                 'is_prorata': mode == 'prorata',
-                'date': next_month and next_month.strftime('%Y-%m-%d') or date.strftime('%Y-%m-%d'),
+                'date': date.strftime('%Y-%m-%d'),
                 'journal_id': 1
             }
 
-            if line.analytic_line_type == 'x':
-                line.write({'duration': line.duration - 1})
-                if line.duration <= 0:
-                    line.unlink()
-                    record['contract_service_id'] = False
-
             if 'default_type' in context:
                 context.pop('default_type')
 
@@ -330,10 +443,16 @@
 
         return ret
 
-    def action_desactivate(self, cr, uid, ids, context):
-        return self.write(cr, uid, ids,
-                          {'state': 'inactive', 'activation_date': None},
-                          context)
+    def action_deactivate(self, cr, uid, ids, context):
+        values = {'state': 'inactive'}
+        if "deactivation_date" in context:
+            values["deactivation_date"] = context["deactivation_date"]
+        else:
+            values["deactivation_date"] = fields.datetime.now()
+
+        self.write(cr, uid, ids, values, context)
+
+        return True
 
 
 class account_analytic_account(orm.Model):
@@ -364,12 +483,13 @@
         if context and context.get('create_analytic_line_mode', False):
             mode = context.get('create_analytic_line_mode')
 
-        account_analytic_line_obj = self.pool.get('account.analytic.line')
         contract_service_obj = self.pool.get('contract.service')
         query = [
             ('account_id', 'in', ids),
             ('state', '=', 'active'),
-            ('analytic_line_type', 'in', ('r', 'x'))
+            ('analytic_line_type', 'in', (LINE_TYPE_RECURRENT,
+                                          LINE_TYPE_ONETIME,
+                                          LINE_TYPE_EXCEPTION))
         ]
         contract_service_ids = contract_service_obj.search(cr, uid,
                                                            query,
@@ -384,6 +504,30 @@
 
         return {}
 
+    def create_refund_lines(self, cr, uid, ids, context=None):
+        context = context or {}
+        mode = context.get('create_analytic_line_mode', 'manual')
+
+        contract_service_obj = self.pool["contract.service"]
+        query = [
+            ('account_id', 'in', ids),
+            ('state', '=', 'inactive'),
+            # only recurrent is handled in refund right now
+            ('analytic_line_type', 'in', (LINE_TYPE_RECURRENT,)),
+        ]
+        contract_service_ids = contract_service_obj.search(cr, uid,
+                                                           query,
+                                                           order='account_id',
+                                                           context=context)
+
+        if contract_service_ids:
+            contract_service_obj.create_refund_line(cr, uid,
+                                                    contract_service_ids,
+                                                    mode=mode,
+                                                    context=context)
+
+        return {}
+
     def create(self, cr, uid, values, context=None):
         if values['type'] == 'contract' and values['use_contract_services']:
             values['name'] = values['code']

=== modified file 'contract_isp/contract_isp_view.xml'
--- contract_isp/contract_isp_view.xml	2013-11-07 15:10:04 +0000
+++ contract_isp/contract_isp_view.xml	2014-11-24 15:05:14 +0000
@@ -22,68 +22,68 @@
 	    </field>
 	</record>
 
-	<record id="view_contract_isp_form" model="ir.ui.view">
-            <field name="name">contract.isp.form</field>
-            <field name="model">account.analytic.account</field>
-	    <field name="inherit_id" ref="account_analytic_analysis.account_analytic_account_form_form"/>
-            <field name="arch" type="xml">
-                <xpath expr='//div[@name="project"]' position='inside'>
-                    <field name="use_contract_services" />
-                    <label for="use_contract_services" />
-                </xpath>
+  <record id="view_contract_isp_form" model="ir.ui.view">
+    <field name="name">contract.isp.form</field>
+    <field name="model">account.analytic.account</field>
+    <field name="inherit_id" ref="account_analytic_analysis.account_analytic_account_form_form"/>
+    <field name="arch" type="xml">
+      <xpath expr='//div[@name="project"]' position='inside'>
+        <field name="use_contract_services" />
+        <label for="use_contract_services" />
+      </xpath>
 
-		<xpath expr="//separator[@string='Invoicing']" position="before">
-		    <separator 
-			name="services"
-			string="Services"
-			attrs="{'invisible': [('use_contract_services', '=', False)]}"/>
-		    <field 
-			name="contract_service_ids"
-			mode="tree"
-			select="1"
-			options="{'always_reload': True, 'reload_on_button': True}"
-			attrs="{'invisible': [('use_contract_services', '=', False)]}">
-			<tree editable="botton" colors="green:state=='active'" >
-			    <field name="account_id" invisible="1"/>
-			    <field name="state" readonly="True" />
-			    <field name="activation_date"
-				   attrs="{'readonly': [('state', 'in', ('draft', 'active'))]}" />
-			    <field name="category_id" invisible="1" />
-			    <field name="product_id"
-				   on_change="on_change_product_id(product_id)"
-				   attrs="{'readonly': [('state', '=', 'active')]}"
-				   domain="['&amp;', ('analytic_line_type', 'in', ('r', 'x', 'o')), ('categ_id', '=', category_id)]" />
-			    <field name="name" />
-			    <field name="qty" on_change="on_change_qty(qty, unit_price)" />
-			    <field name="unit_price" invisible="1" />
-			    <field name="price" readonly="1" sum="Total Price" />
-			    <field name="analytic_line_type" />
-			    <field name="require_activation" invisible="True" />
-			    <field 
-				name="duration"
-				attrs="{'readonly': [('state', 'in', ('draft', 'active')),
-				                     ('analytic_line_type', 'in', ('r', 'o'))],
-                                        'required': [('analytic_line_type', '=', 'x')]}" />
-			    <field name="account_id" invisible="True" />
-			    <button
-				name="%(action_view_contract_service_activate)d"
-				string="Activate"
-				type="action"
-				states="draft,inactive"
-				icon="gtk-yes"
-				groups="contract_isp.group_isp_agent"/>
-			    <button
-				name="action_desactivate"
-				string="Desactivate"
-				type="object"
-				states="active"
-				icon="gtk-no"
-				groups="contract_isp.group_isp_agent"/>
-			</tree>
-		    </field>
-		</xpath>
-	    </field>
-	</record>
+      <xpath expr="//separator[@string='Invoicing']" position="before">
+        <separator 
+          name="services"
+          string="Services"
+          attrs="{'invisible': [('use_contract_services', '=', False)]}"/>
+        <field 
+          name="contract_service_ids"
+          mode="tree"
+          select="1"
+          options="{'always_reload': True, 'reload_on_button': True}"
+          attrs="{'invisible': [('use_contract_services', '=', False)]}">
+          <tree editable="botton" colors="black:require_activation==False; green:state=='active'" >
+            <field name="account_id" invisible="1"/>
+            <field name="state" readonly="True" />
+            <field name="activation_date"
+              attrs="{'readonly': [('state', 'in', ('draft', 'active'))]}" />
+            <field name="category_id" invisible="1" />
+            <field name="product_id"
+              on_change="on_change_product_id(product_id)"
+              attrs="{'readonly': [('state', '=', 'active')]}"
+              domain="['&amp;', ('analytic_line_type', 'in', ('r', 'x', 'o')), ('categ_id', '=', category_id)]" />
+            <field name="name" />
+            <field name="qty" on_change="on_change_qty(qty, unit_price)" />
+            <field name="unit_price" invisible="1" />
+            <field name="price" readonly="1" sum="Total Price" />
+            <field name="analytic_line_type" />
+            <field name="require_activation" invisible="True" />
+            <field 
+              name="duration"
+              attrs="{'readonly': [('state', 'in', ('draft', 'active')),
+              ('analytic_line_type', 'in', ('r', 'o'))],
+              'required': [('analytic_line_type', '=', 'x')]}" />
+            <field name="account_id" invisible="True" />
+            <button
+              name="%(action_view_contract_service_activate)d"
+              string="Activate"
+              type="action"
+              icon="gtk-yes"
+              attrs="{'invisible': ['|', ('state', 'not in', ('draft', 'inactive')), ('require_activation', '=', False)]}"
+              groups="contract_isp.group_isp_agent"/>
+            <button
+              name="%(action_view_contract_service_deactivate)d"
+              string="Desactivate"
+              type="action"
+              icon="gtk-no"
+              attrs="{'invisible': ['|', ('state', '!=', 'active'), ('require_activation', '=', False)]}"
+              groups="contract_isp.group_isp_agent"/>
+          </tree>
+        </field>
+      </xpath>
+    </field>
+  </record>
 
 	<record id="view_contract_service_form" model="ir.ui.view">
             <field name="name">contract.service.form</field>
@@ -126,11 +126,11 @@
 			states="draft"
 			groups="contract_isp.group_isp_agent" />
 		    <button
-			name="action_desactivate"
+			name="%(action_view_contract_service_deactivate)d"
 			string="Desactivate"
 			icon="gtk-no"
 			states="active"
-			type="object"
+			type="action"
 			groups="contract_isp.group_isp_agent" />
 		</tree>
 	    </field>
@@ -148,17 +148,23 @@
 	    </field>
 	</record>
 
-        <record id="contract_isp_form_suspend" model="ir.ui.view">
-            <field name="name">contract.isp.form.suspend</field>
-            <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//header/button[@name='set_pending']" position='attributes'>
-		    <attribute name="string">Suspend</attribute>
-		</xpath>
-	    </field>
-	</record>
-
+  <record id="contract_isp_form_buttons_adjust" model="ir.ui.view">
+    <field name="name">contract.isp.form.suspend</field>
+    <field name="model">account.analytic.account</field>
+    <field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
+    <field name="arch" type="xml">
+      <xpath expr="//header/button[@name='set_close']" position='attributes'>
+        <attribute name="groups">contract_isp.group_isp_agent2</attribute>
+      </xpath>
+      <xpath expr="//header/button[@name='set_cancel']" position='attributes'>
+        <attribute name="groups">contract_isp.group_isp_agent2</attribute>
+      </xpath>
+      <xpath expr="//header/button[@name='set_pending']" position='attributes'>
+        <attribute name="string">Suspend</attribute>
+        <attribute name="groups">contract_isp.group_isp_agent2</attribute>
+      </xpath>
+    </field>
+  </record>
 
         <act_window
             id="action_contract_service_manage"

=== modified file 'contract_isp/i18n/contract_isp.pot'
--- contract_isp/i18n/contract_isp.pot	2013-09-16 17:59:01 +0000
+++ contract_isp/i18n/contract_isp.pot	2014-11-24 15:05:14 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-13 12:37+0000\n"
-"PO-Revision-Date: 2013-08-13 12:37+0000\n"
+"POT-Creation-Date: 2014-09-21 02:02+0000\n"
+"PO-Revision-Date: 2014-09-21 02:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,26 +16,32 @@
 "Plural-Forms: \n"
 
 #. module: contract_isp
-#: field:account.analytic.line,contract_service_id:0
-#: field:contract.service.activate,service_id:0
-msgid "Service"
-msgstr ""
-
-#. module: contract_isp
-#: selection:contract.service,analytic_line_type:0
-#: selection:product.product,analytic_line_type:0
-msgid "Recurrent"
-msgstr ""
-
-#. module: contract_isp
-#: selection:contract.service,analytic_line_type:0
-#: selection:product.product,analytic_line_type:0
-msgid "Exception"
-msgstr ""
-
-#. module: contract_isp
-#: field:contract.service,state:0
-msgid "State"
+#: field:contract.service.activate,account_id:0
+#: field:contract.service.deactivate,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: contract_isp
+#: view:account.analytic.account:0
+#: view:contract.service:0
+#: view:contract.service.activate:0
+msgid "Activate"
+msgstr ""
+
+#. module: contract_isp
+#: view:contract.service.activate:0
+#: model:ir.actions.act_window,name:contract_isp.action_view_contract_service_activate
+msgid "Activate Service"
+msgstr ""
+
+#. module: contract_isp
+#: field:contract.service.activate,activation_date:0
+msgid "Activation Date"
+msgstr ""
+
+#. module: contract_isp
+#: field:contract.service,activation_line_generated:0
+msgid "Activation Line Generated?"
 msgstr ""
 
 #. module: contract_isp
@@ -44,23 +50,56 @@
 msgstr ""
 
 #. module: contract_isp
-#: field:res.partner,account_analytic_account_ids:0
-msgid "Analytic Accounts/Contracts"
-msgstr ""
-
-#. module: contract_isp
-#: field:contract.service,analytic_line_type:0
-msgid "Type"
-msgstr ""
-
-#. module: contract_isp
-#: model:res.groups,comment:contract_isp.group_isp_agent
-msgid "The user will be able to manage customers and contracts"
-msgstr ""
-
-#. module: contract_isp
-#: view:account.analytic.account:0
-msgid "Total Price"
+#: selection:contract.service,state:0
+msgid "Active"
+msgstr ""
+
+#. module: contract_isp
+#: model:res.groups,name:contract_isp.group_isp_agent
+msgid "Agent Level 1"
+msgstr ""
+
+#. module: contract_isp
+#: model:res.groups,name:contract_isp.group_isp_agent2
+msgid "Agent Level 2"
+msgstr ""
+
+#. module: contract_isp
+#: code:_description:0
+#: view:contract.service:0
+#: model:ir.model,name:contract_isp.model_account_analytic_account
+#, python-format
+msgid "Analytic Account"
+msgstr ""
+
+#. module: contract_isp
+#: code:_description:0
+#: model:ir.model,name:contract_isp.model_account_analytic_line
+#, python-format
+msgid "Analytic Line"
+msgstr ""
+
+#. module: contract_isp
+#: view:contract.service.activate:0
+#: view:contract.service.deactivate:0
+msgid "Cancel"
+msgstr ""
+
+#. module: contract_isp
+#: code:_description:0
+#: model:ir.model,name:contract_isp.model_res_company
+#, python-format
+msgid "Companies"
+msgstr ""
+
+#. module: contract_isp
+#: field:contract.service,account_id:0
+msgid "Contract"
+msgstr ""
+
+#. module: contract_isp
+#: view:contract.service:0
+msgid "Contract Services"
 msgstr ""
 
 #. module: contract_isp
@@ -69,19 +108,137 @@
 msgstr ""
 
 #. module: contract_isp
+#: field:res.company,cutoff_day:0
+msgid "Cutoff day"
+msgstr ""
+
+#. module: contract_isp
+#: model:account.analytic.journal,name:contract_isp.analytic_journal_data
+msgid "Data Use"
+msgstr ""
+
+#. module: contract_isp
+#: view:contract.service.deactivate:0
+msgid "Deactivate"
+msgstr ""
+
+#. module: contract_isp
+#: model:ir.actions.act_window,name:contract_isp.action_view_contract_service_deactivate
+msgid "Deactivate Service"
+msgstr ""
+
+#. module: contract_isp
+#: field:contract.service.deactivate,deactivation_date:0
+msgid "Deactivation Date"
+msgstr ""
+
+#. module: contract_isp
+#: field:contract.service,deactivation_date:0
+msgid "Deactivation date"
+msgstr ""
+
+#. module: contract_isp
+#: view:contract.service.deactivate:0
+msgid "Dectivate Service"
+msgstr ""
+
+#. module: contract_isp
+#: field:res.company,default_journal_id:0
+msgid "Default Journal"
+msgstr ""
+
+#. module: contract_isp
+#: view:account.analytic.account:0
+#: view:contract.service:0
+msgid "Desactivate"
+msgstr ""
+
+#. module: contract_isp
+#: field:contract.service,name:0
+msgid "Description"
+msgstr ""
+
+#. module: contract_isp
+#: field:contract.service,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: contract_isp
+#: selection:contract.service,analytic_line_type:0
+#: selection:product.product,analytic_line_type:0
+msgid "Exception"
+msgstr ""
+
+#. module: contract_isp
+#: view:res.company:0
+msgid "ISP Contract Management"
+msgstr ""
+
+#. module: contract_isp
+#: selection:contract.service,state:0
+msgid "Inactive"
+msgstr ""
+
+#. module: contract_isp
+#: selection:contract.service,analytic_line_type:0
+#: selection:product.product,analytic_line_type:0
+msgid "One time"
+msgstr ""
+
+#. module: contract_isp
+#: field:res.company,parent_account_id:0
+msgid "Parent Analytic Account"
+msgstr ""
+
+#. module: contract_isp
+#: code:_description:0
+#: model:ir.model,name:contract_isp.model_res_partner
+#, python-format
+msgid "Partner"
+msgstr ""
+
+#. module: contract_isp
+#: field:res.partner,partner_analytic_account_id:0
+msgid "Partner Analytic Account"
+msgstr ""
+
+#. module: contract_isp
+#: field:contract.service,price:0
+msgid "Price"
+msgstr ""
+
+#. module: contract_isp
+#: code:_description:0
 #: field:contract.service,product_id:0
 #: model:ir.model,name:contract_isp.model_product_product
+#, python-format
 msgid "Product"
 msgstr ""
 
 #. module: contract_isp
-#: model:ir.model,name:contract_isp.model_account_analytic_line
-msgid "Analytic Line"
-msgstr ""
-
-#. module: contract_isp
-#: field:contract.service,price:0
-msgid "Price"
+#: field:contract.service,category_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: contract_isp
+#: field:account.analytic.line,is_prorata:0
+msgid "Prorata"
+msgstr ""
+
+#. module: contract_isp
+#: field:contract.service,qty:0
+msgid "Qty"
+msgstr ""
+
+#. module: contract_isp
+#: selection:contract.service,analytic_line_type:0
+#: selection:product.product,analytic_line_type:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: contract_isp
+#: model:account.analytic.journal,name:contract_isp.analytic_journal_recurrent
+msgid "Recurrent Service"
 msgstr ""
 
 #. module: contract_isp
@@ -91,87 +248,58 @@
 msgstr ""
 
 #. module: contract_isp
+#: field:account.analytic.line,contract_service_id:0
+#: field:contract.service.activate,service_id:0
+#: field:contract.service.deactivate,service_id:0
+msgid "Service"
+msgstr ""
+
+#. module: contract_isp
+#: view:account.analytic.account:0
+#: field:account.analytic.account,contract_service_ids:0
+#: model:ir.actions.act_window,name:contract_isp.action_contract_service_manage
+msgid "Services"
+msgstr ""
+
+#. module: contract_isp
+#: field:contract.service,state:0
+msgid "State"
+msgstr ""
+
+#. module: contract_isp
+#: view:account.analytic.account:0
+msgid "Suspend"
+msgstr ""
+
+#. module: contract_isp
+#: model:res.groups,comment:contract_isp.group_isp_agent
+#: model:res.groups,comment:contract_isp.group_isp_agent2
+msgid "The users in this group will be able to manage customers and contracts"
+msgstr ""
+
+#. module: contract_isp
+#: view:account.analytic.account:0
+msgid "Total Price"
+msgstr ""
+
+#. module: contract_isp
+#: field:contract.service,analytic_line_type:0
+msgid "Type"
+msgstr ""
+
+#. module: contract_isp
 #: field:product.product,analytic_line_type:0
 msgid "Type in contract"
 msgstr ""
 
 #. module: contract_isp
-#: selection:contract.service,state:0
-msgid "Inactive"
-msgstr ""
-
-#. module: contract_isp
-#: field:res.company,parent_account_id:0
-msgid "Parent Analytic Account"
-msgstr ""
-
-#. module: contract_isp
-#: selection:contract.service,state:0
-msgid "Active"
-msgstr ""
-
-#. module: contract_isp
-#: view:res.company:0
-msgid "ISP Contract Management"
-msgstr ""
-
-#. module: contract_isp
-#: field:res.partner,analytic_data_lines_ids:0
-#: field:res.partner,analytic_tel_lines_ids:0
-msgid "Account Lines"
-msgstr ""
-
-#. module: contract_isp
-#: field:contract.service.activate,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: contract_isp
-#: selection:contract.service,analytic_line_type:0
-#: selection:product.product,analytic_line_type:0
-msgid "One time"
-msgstr ""
-
-#. module: contract_isp
-#: view:account.analytic.account:0
-#: view:contract.service:0
-msgid "Desactivate"
-msgstr ""
-
-#. module: contract_isp
-#: model:ir.model,name:contract_isp.model_contract_service_activate
-msgid "contract.service.activate"
-msgstr ""
-
-#. module: contract_isp
-#: model:ir.model,name:contract_isp.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: contract_isp
-#: field:contract.service,account_id:0
-msgid "Contract"
-msgstr ""
-
-#. module: contract_isp
-#: view:contract.service.activate:0
-msgid "Cancel"
-msgstr ""
-
-#. module: contract_isp
-#: view:contract.service.activate:0
-#: model:ir.actions.act_window,name:contract_isp.action_view_contract_service_activate
-msgid "Activate Service"
-msgstr ""
-
-#. module: contract_isp
-#: field:res.company,cutoff_day:0
-msgid "Cutoff day"
-msgstr ""
-
-#. module: contract_isp
-#: field:res.partner,payments_ids:0
-msgid "Payments"
+#: field:contract.service,unit_price:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: contract_isp
+#: model:account.analytic.journal,name:contract_isp.analytic_journal_tel
+msgid "Voice Use"
 msgstr ""
 
 #. module: contract_isp
@@ -180,72 +308,38 @@
 msgstr ""
 
 #. module: contract_isp
-#: field:res.partner,partner_analytic_account_id:0
-msgid "Partner Analytic Account"
-msgstr ""
-
-#. module: contract_isp
-#: view:account.analytic.account:0
-#: view:contract.service:0
-#: view:contract.service.activate:0
-msgid "Activate"
-msgstr ""
-
-#. module: contract_isp
-#: field:contract.service,account_line_id:0
-msgid "Account Entry"
-msgstr ""
-
-#. module: contract_isp
+#: constraint:contract.service.activate:0
+msgid "You cannot activate a service in the future."
+msgstr ""
+
+#. module: contract_isp
+#: constraint:contract.service.deactivate:0
+msgid "You cannot deactivate a service in the future."
+msgstr ""
+
+#. module: contract_isp
+#: code:_description:0
 #: model:ir.model,name:contract_isp.model_contract_service
+#, python-format
 msgid "contract.service"
 msgstr ""
 
 #. module: contract_isp
-#: model:res.groups,name:contract_isp.group_isp_agent
-msgid "Agent"
-msgstr ""
-
-#. module: contract_isp
-#: view:account.analytic.account:0
-msgid "Suspend"
-msgstr ""
-
-#. module: contract_isp
-#: view:contract.service:0
-#: model:ir.model,name:contract_isp.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: contract_isp
-#: field:contract.service.activate,activation_date:0
-msgid "Activation Date"
-msgstr ""
-
-#. module: contract_isp
-#: view:account.analytic.account:0
-#: field:account.analytic.account,contract_service_ids:0
-#: model:ir.actions.act_window,name:contract_isp.action_contract_service_manage
-msgid "Services"
-msgstr ""
-
-#. module: contract_isp
-#: field:contract.service,duration:0
-msgid "Duration"
-msgstr ""
-
-#. module: contract_isp
-#: model:ir.model,name:contract_isp.model_res_partner
-msgid "Partner"
-msgstr ""
-
-#. module: contract_isp
-#: field:contract.service,activation_line_generated:0
-msgid "Activation Line Generated?"
-msgstr ""
-
-#. module: contract_isp
-#: view:contract.service:0
-msgid "Contract Services"
+#: code:_description:0
+#: model:ir.model,name:contract_isp.model_contract_service_activate
+#, python-format
+msgid "contract.service.activate"
+msgstr ""
+
+#. module: contract_isp
+#: code:_description:0
+#: model:ir.model,name:contract_isp.model_contract_service_deactivate
+#, python-format
+msgid "contract.service.deactivate"
+msgstr ""
+
+#. module: contract_isp
+#: view:account.analytic.account:0
+msgid "contract_isp.group_isp_agent2"
 msgstr ""
 

=== added file 'contract_isp/i18n/fr.po'
--- contract_isp/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ contract_isp/i18n/fr.po	2014-11-24 15:05:14 +0000
@@ -0,0 +1,338 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* contract_isp
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-21 02:02+0000\n"
+"PO-Revision-Date: 2014-09-20 22:45-0500\n"
+"Last-Translator: Marc Cassuto <[e-mail]>\n"
+"Language-Team: \n"
+"Language: 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"
+
+#. module: contract_isp
+#: field:contract.service.activate,account_id:0
+#: field:contract.service.deactivate,account_id:0
+msgid "Account"
+msgstr "Compte"
+
+#. module: contract_isp
+#: view:account.analytic.account:0 view:contract.service:0
+#: view:contract.service.activate:0
+msgid "Activate"
+msgstr "Activer"
+
+#. module: contract_isp
+#: view:contract.service.activate:0
+#: model:ir.actions.act_window,name:contract_isp.action_view_contract_service_activate
+msgid "Activate Service"
+msgstr "Activer un Service"
+
+#. module: contract_isp
+#: field:contract.service.activate,activation_date:0
+msgid "Activation Date"
+msgstr "Date d'Activation"
+
+#. module: contract_isp
+#: field:contract.service,activation_line_generated:0
+msgid "Activation Line Generated?"
+msgstr "Ligne d'Activation Générée ?"
+
+#. module: contract_isp
+#: field:contract.service,activation_date:0
+msgid "Activation date"
+msgstr "Date d'Activation"
+
+#. module: contract_isp
+#: selection:contract.service,state:0
+msgid "Active"
+msgstr "Actif"
+
+#. module: contract_isp
+#: model:res.groups,name:contract_isp.group_isp_agent
+msgid "Agent Level 1"
+msgstr "Agent Niveau 1"
+
+#. module: contract_isp
+#: model:res.groups,name:contract_isp.group_isp_agent2
+msgid "Agent Level 2"
+msgstr "Agent niveau 2"
+
+#. module: contract_isp
+#: code:_description:0 view:contract.service:0
+#: model:ir.model,name:contract_isp.model_account_analytic_account
+#, python-format
+msgid "Analytic Account"
+msgstr "Contrat"
+
+#. module: contract_isp
+#: code:_description:0
+#: model:ir.model,name:contract_isp.model_account_analytic_line
+#, python-format
+msgid "Analytic Line"
+msgstr "Lignes facturables"
+
+#. module: contract_isp
+#: view:contract.service.activate:0 view:contract.service.deactivate:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: contract_isp
+#: code:_description:0 model:ir.model,name:contract_isp.model_res_company
+#, python-format
+msgid "Companies"
+msgstr "Companies"
+
+#. module: contract_isp
+#: field:contract.service,account_id:0
+msgid "Contract"
+msgstr "Contrat"
+
+#. module: contract_isp
+#: view:contract.service:0
+msgid "Contract Services"
+msgstr "Services du Contrat"
+
+#. module: contract_isp
+#: field:account.analytic.account,use_contract_services:0
+msgid "Contract services"
+msgstr "Services du Contrat"
+
+#. module: contract_isp
+#: field:res.company,cutoff_day:0
+msgid "Cutoff day"
+msgstr "Date de Cut-off"
+
+#. module: contract_isp
+#: model:account.analytic.journal,name:contract_isp.analytic_journal_data
+msgid "Data Use"
+msgstr "Consommations de données"
+
+#. module: contract_isp
+#: view:contract.service.deactivate:0
+msgid "Deactivate"
+msgstr "Désactiver"
+
+#. module: contract_isp
+#: model:ir.actions.act_window,name:contract_isp.action_view_contract_service_deactivate
+msgid "Deactivate Service"
+msgstr "Désactiver un Service"
+
+#. module: contract_isp
+#: field:contract.service.deactivate,deactivation_date:0
+msgid "Deactivation Date"
+msgstr "Date de Désactivation"
+
+#. module: contract_isp
+#: field:contract.service,deactivation_date:0
+msgid "Deactivation date"
+msgstr "Date de Désactivation"
+
+#. module: contract_isp
+#: view:contract.service.deactivate:0
+msgid "Dectivate Service"
+msgstr "Désactiver un Service"
+
+#. module: contract_isp
+#: field:res.company,default_journal_id:0
+msgid "Default Journal"
+msgstr "Journal Comptable par défaut"
+
+#. module: contract_isp
+#: view:account.analytic.account:0 view:contract.service:0
+msgid "Desactivate"
+msgstr "Désactiver"
+
+#. module: contract_isp
+#: field:contract.service,name:0
+msgid "Description"
+msgstr "Description"
+
+#. module: contract_isp
+#: field:contract.service,duration:0
+msgid "Duration"
+msgstr "Durée"
+
+#. module: contract_isp
+#: selection:contract.service,analytic_line_type:0
+#: selection:product.product,analytic_line_type:0
+msgid "Exception"
+msgstr "Exception"
+
+#. module: contract_isp
+#: view:res.company:0
+msgid "ISP Contract Management"
+msgstr "Gestion de contrats pour les FSI"
+
+#. module: contract_isp
+#: selection:contract.service,state:0
+msgid "Inactive"
+msgstr "Inactif"
+
+#. module: contract_isp
+#: selection:contract.service,analytic_line_type:0
+#: selection:product.product,analytic_line_type:0
+msgid "One time"
+msgstr "Facturé une fois"
+
+#. module: contract_isp
+#: field:res.company,parent_account_id:0
+msgid "Parent Analytic Account"
+msgstr "Contrat parent"
+
+#. module: contract_isp
+#: code:_description:0 model:ir.model,name:contract_isp.model_res_partner
+#, python-format
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: contract_isp
+#: field:res.partner,partner_analytic_account_id:0
+msgid "Partner Analytic Account"
+msgstr "Contrat du partenaire"
+
+#. module: contract_isp
+#: field:contract.service,price:0
+msgid "Price"
+msgstr "Prix"
+
+#. module: contract_isp
+#: code:_description:0 field:contract.service,product_id:0
+#: model:ir.model,name:contract_isp.model_product_product
+#, python-format
+msgid "Product"
+msgstr "Produit"
+
+#. module: contract_isp
+#: field:contract.service,category_id:0
+msgid "Product Category"
+msgstr "Catégorie de Produit"
+
+#. module: contract_isp
+#: field:account.analytic.line,is_prorata:0
+msgid "Prorata"
+msgstr "Pro-rata"
+
+#. module: contract_isp
+#: field:contract.service,qty:0
+msgid "Qty"
+msgstr "Qté"
+
+#. module: contract_isp
+#: selection:contract.service,analytic_line_type:0
+#: selection:product.product,analytic_line_type:0
+msgid "Recurrent"
+msgstr "Récurrent"
+
+#. module: contract_isp
+#: model:account.analytic.journal,name:contract_isp.analytic_journal_recurrent
+msgid "Recurrent Service"
+msgstr "Service Récurrent"
+
+#. module: contract_isp
+#: field:contract.service,require_activation:0
+#: field:product.product,require_activation:0
+msgid "Require activation"
+msgstr "Nécessite une acitvation"
+
+#. module: contract_isp
+#: field:account.analytic.line,contract_service_id:0
+#: field:contract.service.activate,service_id:0
+#: field:contract.service.deactivate,service_id:0
+msgid "Service"
+msgstr "Service"
+
+#. module: contract_isp
+#: view:account.analytic.account:0
+#: field:account.analytic.account,contract_service_ids:0
+#: model:ir.actions.act_window,name:contract_isp.action_contract_service_manage
+msgid "Services"
+msgstr "Services"
+
+#. module: contract_isp
+#: field:contract.service,state:0
+msgid "State"
+msgstr "Statut"
+
+#. module: contract_isp
+#: view:account.analytic.account:0
+msgid "Suspend"
+msgstr "Suspendre"
+
+#. module: contract_isp
+#: model:res.groups,comment:contract_isp.group_isp_agent
+#: model:res.groups,comment:contract_isp.group_isp_agent2
+msgid "The users in this group will be able to manage customers and contracts"
+msgstr ""
+"Les utilisateurs de ce groupe pourront gérer les clients et les contrats"
+
+#. module: contract_isp
+#: view:account.analytic.account:0
+msgid "Total Price"
+msgstr "Prix Total"
+
+#. module: contract_isp
+#: field:contract.service,analytic_line_type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: contract_isp
+#: field:product.product,analytic_line_type:0
+msgid "Type in contract"
+msgstr "Type dans le contrat"
+
+#. module: contract_isp
+#: field:contract.service,unit_price:0
+msgid "Unit Price"
+msgstr "Prix Unitaire"
+
+#. module: contract_isp
+#: model:account.analytic.journal,name:contract_isp.analytic_journal_tel
+msgid "Voice Use"
+msgstr "Consommation Téléphonique"
+
+#. module: contract_isp
+#: selection:contract.service,state:0
+msgid "Waiting for activating"
+msgstr "En attente d'activation"
+
+#. module: contract_isp
+#: constraint:contract.service.activate:0
+msgid "You cannot activate a service in the future."
+msgstr "Vous ne pouvez pas activer un service dans le futur."
+
+#. module: contract_isp
+#: constraint:contract.service.deactivate:0
+msgid "You cannot deactivate a service in the future."
+msgstr "Vous ne pouvez pas désactiver un service dans le futur."
+
+#. module: contract_isp
+#: code:_description:0 model:ir.model,name:contract_isp.model_contract_service
+#, python-format
+msgid "contract.service"
+msgstr "contract.service"
+
+#. module: contract_isp
+#: code:_description:0
+#: model:ir.model,name:contract_isp.model_contract_service_activate
+#, python-format
+msgid "contract.service.activate"
+msgstr "contract.service.activate"
+
+#. module: contract_isp
+#: code:_description:0
+#: model:ir.model,name:contract_isp.model_contract_service_deactivate
+#, python-format
+msgid "contract.service.deactivate"
+msgstr "contract.service.deactivate"
+
+#. module: contract_isp
+#: view:account.analytic.account:0
+msgid "contract_isp.group_isp_agent2"
+msgstr "contract_isp.group_isp_agent2"

=== modified file 'contract_isp/wizard/activate_contract_service.py'
--- contract_isp/wizard/activate_contract_service.py	2013-09-16 17:59:01 +0000
+++ contract_isp/wizard/activate_contract_service.py	2014-11-24 15:05:14 +0000
@@ -21,30 +21,38 @@
 ##############################################################################
 
 import datetime
+
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.translate import _
 from openerp.osv import orm, fields
-from openerp.addons.contract_isp.contract import add_months
+
+from ..contract import LINE_TYPE_RECURRENT
+
+
+def _get_account_id(self, cr, uid, context=None):
+    if context.get('active_model', '') == 'contract.service':
+        contract_id = context.get('active_id')
+        contract_service = self.pool.get('contract.service').browse(
+            cr, uid, contract_id, context)
+
+        return contract_service.account_id.id
+    return None
+
+
+def _get_service_id(self, cr, uid, context=None):
+    if context.get('active_model', '') == 'contract.service':
+        service_id = context.get('active_id')
+        contract_service = self.pool.get('contract.service').browse(
+            cr, uid, service_id, context)
+
+        return contract_service.id
+    return None
 
 
 class contract_service_activate(orm.TransientModel):
     _name = 'contract.service.activate'
-
-    def _get_account_id(self, cr, uid, context=None):
-        if context.get('active_model', '') == 'contract.service':
-            contract_id = context.get('active_id')
-            contract_service = self.pool.get('contract.service').browse(
-                cr, uid, contract_id, context)
-
-            return contract_service.account_id.id
-        return None
-
-    def _get_service_id(self, cr, uid, context=None):
-        if context.get('active_model', '') == 'contract.service':
-            service_id = context.get('active_id')
-            contract_service = self.pool.get('contract.service').browse(
-                cr, uid, service_id, context)
-
-            return contract_service.id
-        return None
+    _get_account_id = _get_account_id
+    _get_service_id = _get_service_id
 
     _columns = {
         'activation_date': fields.datetime('Activation Date'),
@@ -54,15 +62,27 @@
 
     _defaults = {
         'activation_date': fields.datetime.now,
-        'account_id': lambda s, cr, uid, ctx: s._get_account_id(cr, uid, ctx),
-        'service_id': lambda s, cr, uid, ctx: s._get_service_id(cr, uid, ctx)
+        'account_id': _get_account_id,
+        'service_id': _get_service_id,
     }
 
     def activate(self, cr, uid, ids, context=None):
         wizard = self.browse(cr, uid, ids[0], context)
-        company_obj = self.pool.get('res.company')
-        company_id = company_obj._company_default_get(cr, uid, context)
-        cutoff = company_obj.read(cr, uid, company_id, 'cutoff_day', context)
+        contract_service_obj = self.pool.get('contract.service')
+        contract_service = contract_service_obj.browse(
+            cr, uid, wizard.service_id.id, context)
+
+        contract_service.write({
+            'activation_date': wizard.activation_date,
+            'state': 'active'
+        })
+
+        self._create_analytic_lines(cr, uid, ids[0], context)
+
+        return True
+
+    def _create_analytic_lines(self, cr, uid, wiz_id, context=None):
+        wizard = self.browse(cr, uid, wiz_id, context)
         contract_service_obj = self.pool.get('contract.service')
         contract_service = contract_service_obj.browse(
             cr, uid, wizard.service_id.id, context)
@@ -72,48 +92,102 @@
             int(wizard.activation_date[5:7]),
             int(wizard.activation_date[8:10]))
 
-        cuttoff_day = company_obj.read(
-            cr, uid,
-            company_id,
-            fields=['cutoff_day'],
-            context=context)['cutoff_day']
-
-        invoice_day = company_obj.read(
-            cr, uid,
-            company_id,
-            fields=['invoice_day'],
-            context=context)['invoice_day']
-
-        cutoff_date = datetime.date(
-            datetime.date.today().year,
-            datetime.date.today().month,
-            int(cuttoff_day))
-
-        invoice_date = datetime.date(
-            datetime.date.today().year,
-            datetime.date.today().month,
-            int(invoice_day))
-
-        contract_service.write({
-            'activation_date': wizard.activation_date,
-            'state': 'active'
+        # When registering an initial payment, we generate activation lines
+        # we do not wish to generate another month entry if not needed
+        # vvinet: This is not currently part of our scenarios, remove it
+        #         it can be put back if we want to handle it
+        # if contract_service.activation_line_generated is False:
+        #     contract_service.create_analytic_line(mode='manual',
+        #                                           date=activation_date,
+        #                                           context=context)
+        #     contract_service.write({'activation_line_generated': True})
+
+        # Upon activating, always create activation lines
+        if contract_service.analytic_line_type == LINE_TYPE_RECURRENT:
+            contract_service.create_analytic_line(mode='prorata',
+                                                  date=activation_date,
+                                                  context=context)
+
+    def _check_future_date(self, cr, uid, ids, context=None):
+        today = datetime.datetime.utcnow().date()
+        for wiz in self.browse(cr, uid, ids, context=None):
+            act_date = datetime.datetime.strptime(
+                wiz.activation_date, DEFAULT_SERVER_DATETIME_FORMAT,
+            ).date()
+
+            if act_date > today:
+                return False
+        return True
+
+    _constraints = [
+        (_check_future_date,
+         _('You cannot activate a service in the future.'),
+         ['activation_date']),
+    ]
+
+
+class contract_service_deactivate(orm.TransientModel):
+    _name = 'contract.service.deactivate'
+
+    _columns = {
+        'deactivation_date': fields.datetime('Deactivation Date'),
+        'account_id': fields.many2one('account.analytic.account', 'Account'),
+        'service_id': fields.many2one('contract.service', 'Service')
+    }
+
+    _defaults = {
+        'deactivation_date': fields.datetime.now,
+        'account_id': _get_account_id,
+        'service_id': _get_service_id,
+    }
+
+    def deactivate(self, cr, uid, ids, context=None):
+        context = context or {}
+        wizard = self.browse(cr, uid, ids[0], context)
+        contract_service_obj = self.pool.get('contract.service')
+        context["deactivation_date"] = wizard.deactivation_date
+        contract_service_obj.action_deactivate(cr, uid,
+                                               [wizard.service_id.id],
+                                               context=context)
+        # If we activate again, we will need a new activation line, as
+        # we will have refunded any extra, and will need to bill in
+        # advance again.
+        contract_service_obj.write(cr, uid, [wizard.service_id.id], {
+            'activation_line_generated': False,
         })
 
-        query = [
-            ('account_id', '=', wizard.account_id.id),
-            ('state', '=', 'draft')
-        ]
-        draft_line_ids = contract_service_obj.search(cr, uid, query,
-                                                     context=context)
-
-        if not draft_line_ids:
-            for line in wizard.account_id.contract_service_ids:
-                if line.activation_line_generated is False:
-                    line.create_analytic_line(mode='manual',
-                                              date=activation_date)
-
-                    if line.analytic_line_type == 'r':
-                        line.create_analytic_line(mode='prorata',
-                                                  date=activation_date)
-
-        return True
+        self._create_refund_lines(cr, uid, ids[0], context)
+        return True
+
+    def _create_refund_lines(self, cr, uid, wiz_id, context=None):
+        wizard = self.browse(cr, uid, wiz_id, context)
+        contract_service_obj = self.pool.get('contract.service')
+
+        deactivate_date = datetime.datetime.strptime(
+            wizard.deactivation_date,
+            DEFAULT_SERVER_DATETIME_FORMAT,
+        ).date()
+
+        contract_service_obj.create_refund_line(
+            cr, uid,
+            [wizard.service_id.id],
+            mode='prorata',
+            date=deactivate_date,
+            context=context)
+
+    def _check_future_date(self, cr, uid, ids, context=None):
+        today = datetime.datetime.utcnow().date()
+        for wiz in self.browse(cr, uid, ids, context=None):
+            act_date = datetime.datetime.strptime(
+                wiz.deactivation_date, DEFAULT_SERVER_DATETIME_FORMAT,
+            ).date()
+
+            if act_date > today:
+                return False
+        return True
+
+    _constraints = [
+        (_check_future_date,
+         _('You cannot deactivate a service in the future.'),
+         ['deactivation_date']),
+    ]

=== modified file 'contract_isp/wizard/activate_contract_service.xml'
--- contract_isp/wizard/activate_contract_service.xml	2013-09-16 17:59:01 +0000
+++ contract_isp/wizard/activate_contract_service.xml	2014-11-24 15:05:14 +0000
@@ -1,40 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        <record id="view_contract_service_activate" model="ir.ui.view">
-            <field name="name">Activate Service</field>
-            <field name="model">contract.service.activate</field>
-            <field name="arch" type="xml">
-                <form string="Activate Service" version="7.0">
-		    <group>
-			<field name="activation_date" />
-			<field name="account_id" invisible="1" />
-			<field name="service_id" invisible="1" />
-		    </group>
-		    <footer>
-			<button 
-			    name="activate"
-			    string="Activate"
-			    type="object"
-			    class="oe_highlight" />
-			<button
-			    string="Cancel"
-			    class="oe_link"
-			    special="cancel" />
-		    </footer>
-		</form>
-	    </field>
-	</record>
-        <record id="action_view_contract_service_activate" model="ir.actions.act_window">
-            <field name="name">Activate Service</field>
-            <field name="type">ir.actions.act_window</field>
-	    <field name="src_model">contract.service</field>
-            <field name="res_model">contract.service.activate</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-	    <field name="context">{'default_service_id': active_id}</field>
-            <field name="target">new</field>
-        </record>
+  <data>
+    <record id="view_contract_service_activate" model="ir.ui.view">
+      <field name="name">Activate Service</field>
+      <field name="model">contract.service.activate</field>
+      <field name="arch" type="xml">
+        <form string="Activate Service" version="7.0">
+          <group>
+            <field name="activation_date" />
+            <field name="account_id" invisible="1" />
+            <field name="service_id" invisible="1" />
+          </group>
+          <footer>
+            <button 
+              name="activate"
+              string="Activate"
+              type="object"
+              class="oe_highlight" />
+            <button
+              string="Cancel"
+              class="oe_link"
+              special="cancel" />
+          </footer>
+        </form>
+      </field>
+    </record>
+
+    <record id="view_contract_service_deactivate" model="ir.ui.view">
+      <field name="name">Deactivate Service</field>
+      <field name="model">contract.service.deactivate</field>
+      <field name="arch" type="xml">
+        <form string="Dectivate Service" version="7.0">
+          <group>
+            <field name="deactivation_date" />
+            <field name="account_id" invisible="1" />
+            <field name="service_id" invisible="1" />
+          </group>
+          <footer>
+            <button 
+              name="deactivate"
+              string="Deactivate"
+              type="object"
+              class="oe_highlight" />
+            <button
+              string="Cancel"
+              class="oe_link"
+              special="cancel" />
+          </footer>
+        </form>
+      </field>
+    </record>
+    <record id="action_view_contract_service_activate" model="ir.actions.act_window">
+      <field name="name">Activate Service</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="src_model">contract.service</field>
+      <field name="res_model">contract.service.activate</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="context">{'default_service_id': active_id}</field>
+      <field name="target">new</field>
+    </record>
+    <record id="action_view_contract_service_deactivate" model="ir.actions.act_window">
+      <field name="name">Deactivate Service</field>
+      <field name="type">ir.actions.act_window</field>
+      <field name="src_model">contract.service</field>
+      <field name="res_model">contract.service.deactivate</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="context">{'default_service_id': active_id}</field>
+      <field name="target">new</field>
+    </record>
 
     </data>
 </openerp>

=== modified file 'contract_isp_automatic_invoicing/contract.py'
--- contract_isp_automatic_invoicing/contract.py	2013-11-01 16:15:27 +0000
+++ contract_isp_automatic_invoicing/contract.py	2014-11-24 15:05:14 +0000
@@ -19,7 +19,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import orm, fields
+from openerp.osv import orm
+
+from openerp.addons.contract_isp_invoice.invoice import (
+    PROCESS_CRON,
+)
 
 
 class account_analytic_account(orm.Model):
@@ -42,5 +46,5 @@
 
         for contract_id in ids_to_invoice:
             self.create_analytic_lines(cr, uid, [contract_id], context=context)
-            self.create_invoice(cr, uid, contract_id, context=context)
+            self.create_invoice(cr, uid, contract_id, PROCESS_CRON, context=context)
             cr.commit()

=== modified file 'contract_isp_automatic_invoicing/i18n/contract_isp_automatic_invoicing.pot'
--- contract_isp_automatic_invoicing/i18n/contract_isp_automatic_invoicing.pot	2013-09-16 17:59:01 +0000
+++ contract_isp_automatic_invoicing/i18n/contract_isp_automatic_invoicing.pot	2014-11-24 15:05:14 +0000
@@ -0,0 +1,24 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* contract_isp_automatic_invoicing
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-21 02:50+0000\n"
+"PO-Revision-Date: 2014-09-21 02:50+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: contract_isp_automatic_invoicing
+#: code:_description:0
+#: model:ir.model,name:contract_isp_automatic_invoicing.model_account_analytic_account
+#, python-format
+msgid "Analytic Account"
+msgstr ""
+

=== added file 'contract_isp_automatic_invoicing/i18n/fr.po'
--- contract_isp_automatic_invoicing/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ contract_isp_automatic_invoicing/i18n/fr.po	2014-11-24 15:05:14 +0000
@@ -0,0 +1,24 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* contract_isp_automatic_invoicing
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-21 02:50+0000\n"
+"PO-Revision-Date: 2014-09-20 22:52-0500\n"
+"Last-Translator: Marc Cassuto <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: contract_isp_automatic_invoicing
+#: code:_description:0
+#: model:ir.model,name:contract_isp_automatic_invoicing.model_account_analytic_account
+#, python-format
+msgid "Analytic Account"
+msgstr "Contrat"

=== modified file 'contract_isp_invoice/__init__.py'
--- contract_isp_invoice/__init__.py	2013-09-16 17:59:01 +0000
+++ contract_isp_invoice/__init__.py	2014-11-24 15:05:14 +0000
@@ -20,5 +20,8 @@
 #
 ##############################################################################
 
-import contract
-import wizard
+from . import (
+    contract,
+    invoice,
+    wizard,
+)

=== modified file 'contract_isp_invoice/contract.py'
--- contract_isp_invoice/contract.py	2014-01-20 04:25:39 +0000
+++ contract_isp_invoice/contract.py	2014-11-24 15:05:14 +0000
@@ -20,20 +20,38 @@
 #
 ##############################################################################
 
+import calendar
+import datetime
+import logging
 import sys
-import logging
 import time
-import datetime
+
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
-import openerp.addons.decimal_precision as dp
-from openerp.addons.contract_isp.contract import add_months, date_interval
+from openerp.addons.contract_isp.contract import add_months
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
 from openerp import netsvc
 import openerp.exceptions
 
+from .invoice import PROCESS_PRORATA, PROCESS_RECURRENT
+
 _logger = logging.getLogger(__name__)
 
 
+def count_months_stupid(from_date, to_date):
+    from_date = from_date.replace(day=1)
+    to_date = to_date.replace(day=1)
+    # Don't even bother making this smart for now
+    count = 0
+    while from_date < to_date:
+        count += 1
+        from_date = (
+            from_date + datetime.timedelta(days=32)
+        ).replace(day=1)
+
+    return count
+
+
 class res_company(orm.Model):
     _inherit = "res.company"
 
@@ -68,10 +86,6 @@
 
     _columns = {
         'later_validation': fields.boolean('Later Validation'),
-        'original_amount': fields.float(
-            'Original Amount', digits_compute=dp.get_precision('Account'),
-            required=True, readonly=True,
-            states={'draft':[('readonly',False)]}),
     }
 
     _defaults = {
@@ -98,11 +112,6 @@
     def create(self, cr, uid, data, context=None):
         if context is None:
             context = {}
-        if context.get('original_amount', False) and data.get('amount', False):
-            if data['amount'] < data['original_amount']:
-                raise orm.except_orm(
-                    _('Error'),
-                    _('Amount cannot be less than the invoice amount'))
 
         return super(account_voucher, self).create(
             cr, uid, data, context=context)
@@ -114,7 +123,6 @@
         ret = True
         account_analytic_account_obj = self.pool.get(
             'account.analytic.account')
-        account_invoice_obj = self.pool.get('account.invoice')
 
         voucher = self.browse(cr, uid, ids[0], context=context)
 
@@ -132,10 +140,14 @@
                 inv = account_analytic_account_obj.create_invoice(
                     cr, uid, context.get('active_id'), context=context)
 
-                a = account_invoice_obj._workflow_signal(
-                    cr, uid, [inv],
-                    'invoice_open', context=context)
-
+                wf_service = netsvc.LocalService("workflow")
+                if isinstance(inv, list):
+                    for i in inv:
+                        wf_service.trg_validate(
+                            uid, 'account.invoice', i, 'invoice_open', cr)
+                else:
+                    wf_service.trg_validate(
+                        uid, 'account.invoice', inv, 'invoice_open', cr)
             else:
                 raise openerp.exceptions.Warning(_('Contract not found'))
 
@@ -143,12 +155,12 @@
                 ret = super(account_voucher, self).proforma_voucher(
                     cr, uid, ids, context=context)
 
-
             if voucher.journal_id.later_validation is False:
                 account_move_line_obj = self.pool.get('account.move.line')
+                account_id = voucher.partner_id.property_account_receivable.id
                 query = [
                     ('partner_id', '=', voucher.partner_id.id),
-                    ('account_id', '=', voucher.partner_id.property_account_receivable.id),
+                    ('account_id', '=', account_id),
                     ('reconcile_id', '=', False)
                 ]
 
@@ -160,14 +172,13 @@
                     period_obj = self.pool.get('account.period')
                     date = False
                     period_id = False
-                    journal_id = False
-                    account_id = False
+                    journal_id = voucher.journal_id.id
 
                     date = time.strftime('%Y-%m-%d')
                     ctx = dict(context or {}, account_period_prefer_normal=True)
                     period_ids = period_obj.find(cr, uid, dt=date, context=ctx)
                     if period_ids:
-                        period_id = ids[0]
+                        period_id = period_ids[0]
                         account_move_line_obj.reconcile(cr, uid, ids_to_reconcile,
                                                         'manual', account_id,
                                                         period_id, journal_id,
@@ -204,140 +215,399 @@
     }
 
 
+class contract_service(orm.Model):
+    _inherit = 'contract.service'
+
+    def _get_invoice_day(self, cr, uid, context):
+        res_company_obj = self.pool["res.company"]
+        res_company_data = res_company_obj.read(
+            cr, uid,
+            res_company_obj._company_default_get(cr, uid, context),
+            context=context)
+
+        invoice_day = int(res_company_data['invoice_day'])
+        return invoice_day
+
+    def _get_prorata_interval_rate(self, cr, uid, change_date, context=None):
+        """ Get the prorata interval and price rate.
+
+        Returns a tuple (start_date, end_date, price percent)
+        """
+        today = (context or {}).get("operation_date", datetime.date.today())
+        invoice_day = self._get_invoice_day(cr, uid, context)
+
+        curmonth_days = calendar.monthrange(today.year,
+                                            today.month)[1]
+        month_days = calendar.monthrange(change_date.year,
+                                         change_date.month)[1]
+
+        if invoice_day < today.day:
+            start_date = add_months(change_date, 1)
+            end_date = add_months(today, 1)
+            end_date = end_date.replace(
+                day=calendar.monthrange(end_date.year,
+                                        end_date.month)[1],
+            )
+            month_days = calendar.monthrange(start_date.year,
+                                             start_date.month)[1]
+            ptx = self._prorata_rate(
+                month_days - start_date.day,
+                month_days,
+            )
+            ptx += count_months_stupid(start_date, end_date)
+
+        else:  # if today_date <= invoice_day:
+            if change_date < today.replace(day=1):
+                # Activation in previous month
+                start_date = add_months(change_date, 1)
+                end_date = today.replace(day=curmonth_days)
+                month_days = calendar.monthrange(start_date.year,
+                                                 start_date.month)[1]
+                ptx = self._prorata_rate(
+                    month_days - start_date.day,
+                    month_days,
+                )
+                ptx += count_months_stupid(start_date, end_date)
+            else:
+                # Activation is in current month (or future - same)
+                end_date = add_months(change_date, 1)
+                start_date = end_date.replace(day=1)
+                ptx = -1 * self._prorata_rate(
+                    end_date.day,
+                    calendar.monthrange(end_date.year,
+                                        end_date.month)[1],
+                )
+
+        return start_date, end_date, ptx
+
+    def _get_prorata_interval_rate_deactivate(self, cr, uid, change_date,
+                                              context=None):
+        today = (context or {}).get("operation_date", datetime.date.today())
+        invoice_day = self._get_invoice_day(cr, uid, context)
+
+        if invoice_day < today.day:
+            start_date = change_date
+            end_date = add_months(today, 1)
+            end_date = end_date.replace(
+                day=calendar.monthrange(end_date.year,
+                                        end_date.month)[1],
+            )
+
+            month_days = calendar.monthrange(start_date.year,
+                                             start_date.month)[1]
+            ptx = -1 * self._prorata_rate(
+                month_days - start_date.day,
+                month_days,
+            )
+            ptx -= count_months_stupid(start_date, end_date)
+        else:  # if today <= invoice_day
+            if change_date < today:
+                # Deactivation in the past, refund period from
+                # deactivation to end of current month
+                start_date = change_date
+                end_date = today.replace(
+                    day=calendar.monthrange(today.year,
+                                            today.month)[1],
+                )
+
+                month_days = calendar.monthrange(start_date.year,
+                                                 start_date.month)[1]
+                ptx = -1 * self._prorata_rate(
+                    month_days - start_date.day,
+                    month_days,
+                )
+                ptx -= count_months_stupid(start_date, end_date)
+            else:
+                # Deactivation in future, bill period from now to deactivation
+                start_date = today
+                end_date = change_date
+                start_month_days = calendar.monthrange(start_date.year,
+                                                       start_date.month)[1]
+                end_month_days = calendar.monthrange(end_date.year,
+                                                     end_date.month)[1]
+                if add_months(start_date, 1).replace(day=1) > end_date:
+                    # Both dates in same month
+                    ptx = self._prorata_rate(
+                        end_date.day - start_date.day,
+                        start_month_days,
+                    )
+                else:
+                    ptx = sum((
+                        # Rate for first month
+                        self._prorata_rate(start_month_days - start_date.day,
+                                           start_month_days),
+                        # Each full month excluding end month
+                        count_months_stupid(start_date, end_date) - 1,
+                        # Rate for end month
+                        self._prorata_rate(end_date.day,
+                                           end_month_days),
+                    ))
+
+        return start_date, end_date, ptx
+
+
 class account_analytic_account(orm.Model):
     _inherit = "account.analytic.account"
 
     _columns = {
         'close_date': fields.datetime('Close date'),
-        'close_reason': fields.text('Reasons')
+        'close_reason': fields.text('Reasons'),
     }
 
     _defaults = {
         'close_date': fields.datetime.now
     }
 
-    def create_invoice(self, cr, uid, ids, prorata=False, context=None):
-        return_int = False
-        if isinstance(ids, int):
-            return_int = True
+    def get_last_invoice_date(self, cr, uid, ids, source_process, inv=False,
+                              context=None):
+        res = {}
+        source_process = tuple((source_process or '').split(","))
+        account_ids = tuple(ids)
+        if not ids:
+            return res
+
+        cr.execute(
+            """
+            SELECT account_analytic_line.account_id
+                 , DATE(MAX(account_invoice.date_invoice))
+            FROM account_analytic_line
+            JOIN account_invoice
+              ON account_analytic_line.invoice_id = account_invoice.id
+            WHERE account_analytic_line.account_id IN %s
+              AND account_analytic_line.invoice_id IS NOT NULL
+              AND {neg} COALESCE(account_invoice.source_process, '') IN %s
+            GROUP BY account_analytic_line.account_id
+            """.format(neg=('NOT' if inv else '')),
+            (account_ids, source_process),
+        )
+
+        for account_id, lid in cr.fetchall():
+            res[account_id] = lid
+        return res
+
+    def get_last_invoice_date_non_prorata(self, cr, uid, ids, context=None):
+        return self.get_last_invoice_date(cr, uid, ids,
+                                          PROCESS_PRORATA, inv=True,
+                                          context=context)
+
+    def send_email_contract_invoice(self, cr, uid, ids, context=None):
+        context = context or {}
+
+        if not isinstance(ids, list):
             ids = [ids]
 
-        account_analytic_account_obj = self.pool.get('account.analytic.account')
-        account_analytic_line = self.pool.get('account.analytic.line')
-        contract_service_obj = self.pool.get('contract.service')
-        res_company_obj = self.pool.get('res.company')
         account_invoice_obj = self.pool.get('account.invoice')
-        res_company_data = res_company_obj.read(
-            cr, uid,
-            res_company_obj._company_default_get(cr, uid, context),
-            context=context)
+        mail_template_obj = self.pool.get('email.template')
+        ir_model_data_obj = self.pool.get('ir.model.data')
+        mail_template_id = ir_model_data_obj.get_object_reference(
+            cr, uid, 'account',
+            'email_template_edi_invoice')[1]
+        mail_mail_obj = self.pool.get('mail.mail')
+
+        for inv in ids:
+            _logger.info(
+                "Mailing invoice %s" % account_invoice_obj.browse(
+                    cr, uid, inv, context=context).name)
+
+            try:
+                mail_id = mail_template_obj.send_mail(
+                    cr, uid, mail_template_id, inv, context=context)
+                mail_message = mail_mail_obj.browse(
+                    cr, uid, mail_id,
+                    context=context).mail_message_id
+                mail_message.write({'type': 'email'})
+            except:
+                _logger.error(
+                    'Error generating mail for invoice %s:'
+                    '\n\n%s' % (
+                        account_invoice_obj.browse(
+                            cr, uid, inv, context=context).name,
+                        sys.exc_info()[0]))
+
+        return True
+
+    def _create_invoice(self, cr, uid, ids, context=None):
+        context = context or {}
+
+        data = {
+            'name': True,
+        }
+
+        if context.get('create_invoice_mode', 'contract') == 'reseller':
+            data.update({'partner': True})
+
+        res = []
+
+        account_analytic_line_obj = self.pool['account.analytic.line']
+        account_invoice_obj = self.pool['account.invoice']
+        account_invoice_line_obj = self.pool['account.invoice.line']
+        move_obj = self.pool["account.move"]
         wf_service = netsvc.LocalService("workflow")
 
-        if res_company_data['send_email_contract_invoice']:
-            mail_template_obj = self.pool.get('email.template')
-            ir_model_data_obj = self.pool.get('ir.model.data')
-            mail_template_id = ir_model_data_obj.get_object_reference(
-                cr, uid, 'account',
-                'email_template_edi_invoice')[1]
-            mail_mail_obj = self.pool.get('mail.mail')
-
-        cuttoff_day = res_company_data['cutoff_day']
-
-        cutoff_date = datetime.date(
-            datetime.date.today().year,
-            datetime.date.today().month,
-            int(cuttoff_day)
+        if sum(-line.amount
+               for line in account_analytic_line_obj.browse(
+                   cr, uid, ids, context=context)
+               ) < 0:
+            for line in account_analytic_line_obj.browse(cr, uid, ids, context=context):
+                line.write({"amount": -line.amount})
+            context["type"] = "out_refund"
+
+        inv = account_analytic_line_obj.invoice_cost_create(
+            cr, uid, ids, data=data, context=context)
+
+        if isinstance(inv, list):
+            # vvinet - this could mess up refunds/invoices, does it get called?
+            if len(inv) > 1:
+                # Merge invoices
+                query = [('invoice_id', 'in', inv)]
+                line_ids = account_invoice_line_obj.search(
+                    cr, uid, query, context=context)
+                account_invoice_line_obj.write(
+                    cr, uid, line_ids, {'invoice_id': inv[0]},
+                    context=context)
+                account_invoice_obj.button_compute(
+                    cr, uid, [inv[0]], context=context)
+                account_invoice_obj.unlink(cr, uid, inv[1:], context=context)
+
+            inv = inv[0]
+
+        # vvinet - any of the passed ids that did not get assigned to an
+        #          invoice gets assigned to the first one
+        unassigned_ids = account_invoice_line_obj.search(
+            cr, uid, [('id', 'in', ids), ('invoice_id', '=', False)],
         )
-
+        if unassigned_ids:
+            account_invoice_line_obj.write(cr, uid, {'invoice_id': inv})
+
+        res.append(inv)
+
+        # jgama - If its a prorata invoice, change the invoice date
+        #         according to the invoice_day variable
+        to_write = {}
+        if context.get('source_process'):
+            to_write['source_process'] = context['source_process']
+        if context.get('date_invoice') and (
+                context.get('prorata', False) or
+                context.get('source_process') == PROCESS_RECURRENT):
+            to_write['date_invoice'] = context.get('date_invoice')
+
+        if to_write:
+            account_invoice_obj.write(cr, uid, inv, to_write, context=context)
+
+        if context.get('not_subscription_voucher', True):
+            _logger.debug(
+                "Opening invoice %s" % account_invoice_obj.browse(
+                    cr, uid, inv, context=context).name)
+
+            wf_service.trg_validate(
+                uid, 'account.invoice', inv, 'invoice_open', cr)
+
+        return res
+
+    def create_invoice(self, cr, uid, ids, source_process=None, context=None):
+        context = context or {}
+        prorata = (source_process == PROCESS_PRORATA)
+        context["source_process"] = source_process
+        _logger.debug("create_invoice %r %s", ids, prorata)
+
+        if not isinstance(ids, list):
+            ids = [ids]
+
+        date = context.get("operation_date", datetime.date.today())
+        if not isinstance(date, datetime.date):
+            date = datetime.datetime.strptime(
+                date,
+                DEFAULT_SERVER_DATE_FORMAT,
+            ).date()
+
+        account_analytic_account_obj = self.pool['account.analytic.account']
+        account_analytic_line_obj = self.pool['account.analytic.line']
+        res_company_obj = self.pool['res.company']
+        res_company_data = res_company_obj.read(
+            cr, uid,
+            res_company_obj._company_default_get(cr, uid, context),
+            context=context)
+
+        cutoff_day = res_company_data['cutoff_day']
+
+        cutoff_date = datetime.date(date.year, date.month, int(cutoff_day))
         invoice_day = res_company_data['invoice_day']
 
-        invoice_date = datetime.date(
-            datetime.date.today().year,
-            datetime.date.today().month,
-            int(invoice_day)
-        )
+        invoice_date = date.replace(day=int(invoice_day))
 
-        if prorata:
-            if datetime.date.today() <= cutoff_date:
-                date_invoice = invoice_date.strftime('%Y-%m-%d')
+        ctx = dict(context.copy(), prorata=prorata)
+        if prorata or source_process == PROCESS_RECURRENT:
+            if date <= cutoff_date:
+                ctx.update(date_invoice=invoice_date.strftime('%Y-%m-%d'))
             else:
-                date_invoice = add_months(invoice_date, 1).strftime(
-                    '%Y-%m-%d')
-
-        ret = []
-        for contract_id in ids:
-            query = [('account_id', '=', contract_id),
+                ctx.update(
+                    date_invoice=add_months(invoice_date, 1).strftime(
+                        '%Y-%m-%d')
+                )
+
+        res = []
+
+        if context.get('create_invoice_mode', 'contract') != 'reseller':
+            for contract_id in ids:
+                query = [('account_id', '=', contract_id),
+                         ('to_invoice', '!=', False),
+                         ('invoice_id', '=', False),
+                         ('product_id', '!=', False),
+                         ('is_prorata', '=', prorata)]
+
+                ids_to_invoice = account_analytic_line_obj.search(
+                    cr, uid, query, context=context)
+
+                if ids_to_invoice:
+                    _logger.info(
+                        "Invoicing contract %s lines %r",
+                        account_analytic_account_obj.browse(
+                            cr, uid, contract_id, context=context).name,
+                        ids_to_invoice,
+                    )
+
+                    inv = self._create_invoice(
+                        cr, uid, ids_to_invoice, context=ctx.copy())
+
+                    if isinstance(inv, list):
+                        for i in inv:
+                            res.append(i)
+                    else:
+                        res.append(inv)
+
+                    if res_company_data['send_email_contract_invoice']:
+                        self.send_email_contract_invoice(
+                            cr, uid, inv, context=context)
+
+        else:
+            query = [('account_id', 'in', ids),
                      ('to_invoice', '!=', False),
                      ('invoice_id', '=', False),
                      ('product_id', '!=', False),
                      ('is_prorata', '=', prorata)]
 
-            ids_to_invoice = account_analytic_line.search(cr, uid, query,
-                                                          context=context)
+            ids_to_invoice = account_analytic_line_obj.search(
+                cr, uid, query, context=context)
             if ids_to_invoice:
                 _logger.info(
-                    "Invoicing contract %s" %
+                    "Invoicing partner %s" %
                     account_analytic_account_obj.browse(
-                        cr, uid, contract_id, context=context).name)
-
-                data = {
-                    'name': True,
-                }
-                inv = account_analytic_line.invoice_cost_create(
-                    cr, uid, ids_to_invoice, data=data, context=context)
+                        cr, uid, ids[0], context=context).partner_id.parent_id.name)
+
+                inv = self._create_invoice(
+                    cr, uid, ids_to_invoice, context=ctx)
+
                 if isinstance(inv, list):
                     for i in inv:
-                        ret.append(i)
-
+                        res.append(i)
                 else:
-                    ret.append(inv)
-
-                # jgama - If its a prorata invoice, change the invoice date
-                #         according to the invoice_day variable
-                if prorata:
-                    account_invoice_obj.write(
-                        cr, uid, inv, {'date_invoice': date_invoice},
-                        context=context)
-
-                if context.get('not_subscription_voucher', True):
-                    _logger.debug(
-                        "Opening invoice %s" % account_invoice_obj.browse(
-                            cr, uid, inv[0], context=context).name)
-
-                    wf_service.trg_validate(
-                        uid, 'account.invoice', inv[0], 'invoice_open', cr)
-                    #a = account_invoice_obj._workflow_signal(
-                    #    cr, uid, inv, 'invoice_open', context)
-
-                    if res_company_data['send_email_contract_invoice']:
-                        _logger.info(
-                            "Mailing invoice %s" % account_invoice_obj.browse(
-                                cr, uid, inv[0], context=context).name)
-
-                        ctx = dict(context, default_type='email')
-
-                        try:
-                            mail_id = mail_template_obj.send_mail(
-                                cr, uid, mail_template_id, inv[0], context=ctx)
-                            mail_message = mail_mail_obj.browse(
-                                cr, uid, mail_id,
-                                context=context).mail_message_id
-                            mail_message.write({'type': 'email'})
-                        except:
-                            _logger.error(
-                                'Error generating mail for invoice %s:'
-                                '\n\n%s' % (
-                                    account_invoice_obj.browse(
-                                        cr, uid, inv[0], context=context).name,
-                                    sys.exc_info()[0]))
-
-        if return_int:
-            if len(ret) == 0:
-                return None
-            else:
-                return ret[0]
-        else:
-            return ret
+                    res.append(inv)
+
+                if res_company_data['send_email_contract_invoice']:
+                    self.send_email_contract_invoice(
+                        cr, uid, inv, context=context)
+
+        return res
 
     def set_close(self, cr, uid, ids, context=None):
 
@@ -354,24 +624,36 @@
         if context is None:
             context = {}
 
-        res_currency_obj = self.pool.get('res.currency')
-        account_analytic_account_obj = self.pool.get(
-            'account.analytic.account')
-        account_invoice_obj = self.pool.get('account.invoice')
-
-        cur = self.browse(
-            cr, uid, ids[0], context=context).pricelist_id.currency_id
-
+        res_currency_obj = self.pool['res.currency']
+        fposition_obj = self.pool["account.fiscal.position"]
+        tax_obj = self.pool["account.tax"]
+
+        voucher = self.browse(cr, uid, ids[0], context=context)
+        cur = voucher.pricelist_id.currency_id
         amount_tax = amount_untaxed = 0
-        for line in self.browse(
-                cr, uid, ids[0], context=context).contract_service_ids:
-            for c in self.pool.get('account.tax').compute_all(
-                    cr, uid, line.product_id.taxes_id, line.unit_price,
+        for line in self.browse(cr, uid, ids[0],
+                                context=context).contract_service_ids:
+            line_tax_ids = fposition_obj.map_tax(
+                cr, uid,
+                voucher.partner_id.property_account_position,
+                line.product_id.taxes_id,
+                context=context)
+            line_tax_ids = tax_obj.browse(cr, uid, line_tax_ids,
+                                          context=context)
+
+            for c in tax_obj.compute_all(
+                    cr, uid, line_tax_ids, line.unit_price,
                     line.qty, line.product_id,
                     line.account_id.partner_id)['taxes']:
                 amount_tax += c.get('amount', 0.0)
 
             amount_untaxed += line.unit_price * line.qty
+        if cur is None:
+            raise orm.except_orm(
+                _('No pricelist specified'),
+                _('You must set a pricelist on the analytic account before'
+                  ' creating vouchers.'))
+
         amount = res_currency_obj.round(cr, uid, cur, amount_tax) + \
             res_currency_obj.round(cr, uid, cur, amount_untaxed)
 
@@ -391,7 +673,7 @@
             partner.parent_id.id or partner.id
 
         return {
-            'name': _('Create Voucher'),
+            'name': _('Create Initial Invoice'),
             'type': 'ir.actions.act_window',
             'res_model': 'account.voucher',
             'view_type': 'form',
@@ -401,7 +683,7 @@
             'context': {'not_subscription_voucher': False,
                         'default_type': 'receipt',
                         'default_amount': amount,
-                        'original_amount': amount,
+                        'default_original_amount': amount,
                         'default_partner_id': voucher_partner_id}
         }
 
@@ -412,6 +694,7 @@
     def invoice_cost_create(self, cr, uid, ids, data=None, context=None):
         # jgama - Sligtly modified version. Original from
         #         hr_timesheet_invoice.py
+        # vvinet - removed grouping by journal type
 
         analytic_account_obj = self.pool.get('account.analytic.account')
         account_payment_term_obj = self.pool.get('account.payment.term')
@@ -427,162 +710,175 @@
         if data is None:
             data = {}
 
-        journal_types = {}
-
-        # prepare for iteration on journal and accounts
-        for line in self.pool.get('account.analytic.line').browse(
-                cr, uid, ids, context=context):
-            if line.journal_id.type not in journal_types:
-                journal_types[line.journal_id.type] = set()
-            journal_types[line.journal_id.type].add(line.account_id.id)
-        for journal_type, account_ids in journal_types.items():
-            for account in analytic_account_obj.browse(
-                    cr, uid, list(account_ids), context=context):
-                # jgama - If there's a parent, invoice the parent
-                partner = account.partner_id.parent_id or account.partner_id
-
-                if (not partner) or not (account.pricelist_id):
-                    raise orm.except_orm(
-                        _('Analytic Account Incomplete!'),
-                        _('Contract incomplete. Please fill in the Customer and Pricelist fields.'))
-
-                date_due = False
-                if partner.property_payment_term:
-                    pterm_list = account_payment_term_obj.compute(
-                        cr, uid, partner.property_payment_term.id, value=1,
-                        date_ref=time.strftime('%Y-%m-%d'))
-                    if pterm_list:
-                        pterm_list = [line[0] for line in pterm_list]
-                        pterm_list.sort()
-                        date_due = pterm_list[-1]
-
-                curr_invoice = {
-                    'name': time.strftime('%d/%m/%Y') + ' - ' + account.name,
-                    'origin': account.name,
-                    'partner_id': partner.id,
-                    'company_id': account.company_id.id,
-                    'payment_term': partner.property_payment_term.id or False,
-                    'account_id': partner.property_account_receivable.id,
-                    'currency_id': account.pricelist_id.currency_id.id,
-                    'date_due': date_due,
-                    'fiscal_position': partner.property_account_position.id
+        account_ids = list(set(
+            line.account_id.id
+            for line in self.pool.get('account.analytic.line').browse(
+                cr, uid, ids, context=context)
+        ))
+
+        for account in analytic_account_obj.browse(
+                cr, uid, list(account_ids), context=context):
+            # jgama - If there's a parent, invoice the parent
+            if account.partner_id.parent_id:
+                partner = account.partner_id.parent_id
+                line_prefix = u" - ".join(filter(None, (
+                    account.partner_id.code,
+                    account.partner_id.name,
+                )))
+            else:
+                partner = account.partner_id
+                line_prefix = None
+
+            if (not partner) or not (account.pricelist_id):
+                raise orm.except_orm(
+                    _('Analytic Account Incomplete!'),
+                    _('Contract incomplete. Please fill in the Customer '
+                      'and Pricelist fields.'))
+
+            date_due = False
+            if partner.property_payment_term:
+                pterm_list = account_payment_term_obj.compute(
+                    cr, uid, partner.property_payment_term.id, value=1,
+                    date_ref=time.strftime('%Y-%m-%d'))
+                if pterm_list:
+                    pterm_list = [line[0] for line in pterm_list]
+                    pterm_list.sort()
+                    date_due = pterm_list[-1]
+
+            curr_invoice = {
+                'name': time.strftime('%d/%m/%Y') + ' - ' + account.name,
+                'origin': account.name,
+                'partner_id': partner.id,
+                'company_id': account.company_id.id,
+                'payment_term': partner.property_payment_term.id or False,
+                'account_id': partner.property_account_receivable.id,
+                'currency_id': account.pricelist_id.currency_id.id,
+                'date_due': date_due,
+                'fiscal_position': partner.property_account_position.id
+            }
+            context2 = context.copy()
+            context2['lang'] = partner.lang
+            # set company_id in context, so the correct default journal
+            # will be selected
+            context2['force_company'] = curr_invoice['company_id']
+            # set force_company in context so the correct product
+            # properties are selected (eg. income account)
+            context2['company_id'] = curr_invoice['company_id']
+
+            last_invoice = invoice_obj.create(
+                cr, uid, curr_invoice, context=context2)
+            invoices.append(last_invoice)
+
+            cr.execute("""
+                       SELECT product_id, user_id, to_invoice, sum(amount), sum(unit_amount), product_uom_id
+                       FROM account_analytic_line as line
+                       WHERE account_id = %s
+                         AND line.id IN %s
+                         AND to_invoice IS NOT NULL
+                       GROUP BY product_id, user_id, to_invoice, product_uom_id
+                       """, (account.id, tuple(ids)))
+
+            for product_id, user_id, factor_id, total_price, qty, uom in cr.fetchall():
+                context2.update({'uom': uom})
+
+                if data.get('product'):
+                    # force product, use its public price
+                    product_id = data['product'][0]
+                    unit_price = self._get_invoice_price(
+                        cr, uid, account, product_id, user_id, qty, context2)
+                else:
+                    # expenses, using price from amount field
+                    unit_price = qty and total_price * -1.0 / qty or 0.0
+
+                factor = invoice_factor_obj.browse(
+                    cr, uid, factor_id, context=context2)
+                # factor_name = factor.customer_name and line_name + ' - ' + factor.customer_name or line_name
+                factor_name = ''
+                if data.get('factor_name', False):
+                    factor_name = factor.customer_name
+
+                curr_line = {
+                    'price_unit': unit_price,
+                    'quantity': qty,
+                    'product_id': product_id or False,
+                    'discount': factor.factor,
+                    'invoice_id': last_invoice,
+                    'name': factor_name,
+                    'uos_id': uom,
+                    'account_analytic_id': account.id,
                 }
-                context2 = context.copy()
-                context2['lang'] = partner.lang
-                # set company_id in context, so the correct default journal
-                # will be selected
-                context2['force_company'] = curr_invoice['company_id']
-                # set force_company in context so the correct product
-                # properties are selected (eg. income account)
-                context2['company_id'] = curr_invoice['company_id']
-
-                last_invoice = invoice_obj.create(
-                    cr, uid, curr_invoice, context=context2)
-                invoices.append(last_invoice)
-
-                cr.execute("""SELECT product_id, user_id, to_invoice, sum(amount), sum(unit_amount), product_uom_id
-                        FROM account_analytic_line as line LEFT JOIN account_analytic_journal journal ON (line.journal_id = journal.id)
-                        WHERE account_id = %s
-                            AND line.id IN %s AND journal.type = %s AND to_invoice IS NOT NULL
-                        GROUP BY product_id, user_id, to_invoice, product_uom_id""", (account.id, tuple(ids), journal_type))
-
-                for product_id, user_id, factor_id, total_price, qty, uom in cr.fetchall():
-                    context2.update({'uom': uom})
-
-                    if data.get('product'):
-                        # force product, use its public price
-                        product_id = data['product'][0]
-                        unit_price = self._get_invoice_price(
-                            cr, uid, account, product_id, user_id, qty, context2)
-                    #elif journal_type == 'general' and product_id:
-                    #    # timesheets, use sale price
-                    #    unit_price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, context2)
-                    else:
-                        # expenses, using price from amount field
-                        unit_price = qty and total_price * -1.0 / qty or 0.0
-
-                    factor = invoice_factor_obj.browse(
-                        cr, uid, factor_id, context=context2)
-                    # factor_name = factor.customer_name and line_name + ' - ' + factor.customer_name or line_name
-                    factor_name = ''
-                    if data.get('factor_name', False):
-                        factor_name = factor.customer_name
-
-                    curr_line = {
-                        'price_unit': unit_price,
-                        'quantity': qty,
-                        'product_id': product_id or False,
-                        'discount': factor.factor,
-                        'invoice_id': last_invoice,
+                product = product_obj.browse(
+                    cr, uid, product_id, context=context2)
+                if product:
+                    factor_name = data.get('product_name', '') and \
+                        product_obj.name_get(
+                            cr, uid, [product_id], context=context2)[0][1]
+                    if factor.customer_name and data.get('factor_name',
+                                                         False):
+                        factor_name += ' - ' + factor.customer_name
+
+                    general_account = product.property_account_income or \
+                        product.categ_id.property_account_income_categ
+                    if not general_account:
+                        raise orm.except_orm(
+                            _("Configuration Error!"),
+                            _("Please define income account for product '%s'.") % product.name)
+                    taxes = product.taxes_id or general_account.tax_ids
+                    tax = fiscal_pos_obj.map_tax(
+                        cr, uid,
+                        account.partner_id.property_account_position,
+                        taxes)
+                    curr_line.update({
+                        'invoice_line_tax_id': [(6, 0, tax)],
                         'name': factor_name,
-                        'uos_id': uom,
-                        'account_analytic_id': account.id,
-                    }
-                    product = product_obj.browse(
-                        cr, uid, product_id, context=context2)
-                    if product:
-                        factor_name = data.get('product_name', '') and \
-                            product_obj.name_get(
-                                cr, uid, [product_id], context=context2)[0][1]
-                        if factor.customer_name and data.get('factor_name',
-                                                             False):
-                            factor_name += ' - ' + factor.customer_name
-
-                        general_account = product.property_account_income or \
-                            product.categ_id.property_account_income_categ
-                        if not general_account:
-                            raise orm.except_orm(
-                                _("Configuration Error!"),
-                                _("Please define income account for product '%s'.") % product.name)
-                        taxes = product.taxes_id or general_account.tax_ids
-                        tax = fiscal_pos_obj.map_tax(
-                            cr, uid,
-                            account.partner_id.property_account_position,
-                            taxes)
-                        curr_line.update({
-                            'invoice_line_tax_id': [(6, 0, tax)],
-                            'name': factor_name,
-                            'invoice_line_tax_id': [(6, 0, tax)],
-                            'account_id': general_account.id,
-                        })
-                    #
-                    # Compute for lines
-                    #
-                    cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(ids), product_id, factor_id))
-
-                    line_ids = cr.dictfetchall()
-                    note = []
-                    for line in line_ids:
-                        # set invoice_line_note
-                        details = []
-                        if data.get('date', False):
-                            details.append(line['date'])
-                        if data.get('time', False):
-                            if line['product_uom_id']:
-                                details.append("%s %s" % (
-                                    line['unit_amount'],
-                                    product_uom_obj.browse(
-                                        cr, uid, [line['product_uom_id']],
-                                        context2)[0].name))
-
-                            else:
-                                details.append("%s" % (line['unit_amount'], ))
-                        if data.get('name', False):
-                            details.append(line['name'])
-                        note.append(u' - '.join(
-                            map(lambda x: unicode(x) or '', details)))
-                    if note:
-                        if curr_line['name']:
-                            curr_line['name'] += "\n" + ("\n".join(
-                                map(lambda x: unicode(x) or '', note)))
+                        'invoice_line_tax_id': [(6, 0, tax)],
+                        'account_id': general_account.id,
+                    })
+
+                if line_prefix:
+                    curr_line["name"] = u'{0}\n{1}'.format(
+                        line_prefix, curr_line["name"])
+
+                #
+                # Compute for lines
+                #
+                cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(ids), product_id, factor_id))
+
+                line_ids = cr.dictfetchall()
+                note = []
+                for line in line_ids:
+                    # set invoice_line_note
+                    details = []
+                    if data.get('date', False):
+                        details.append(line['date'])
+                    if data.get('time', False):
+                        if line['product_uom_id']:
+                            details.append("%s %s" % (
+                                line['unit_amount'],
+                                product_uom_obj.browse(
+                                    cr, uid, [line['product_uom_id']],
+                                    context2)[0].name))
+
                         else:
-                            curr_line['name'] = "\n".join(
-                                map(lambda x: unicode(x) or '', note))
-                    invoice_line_obj.create(
-                        cr, uid, curr_line, context=context)
-                    cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s", (last_invoice, account.id, tuple(ids)))
-
-                invoice_obj.button_reset_taxes(
-                    cr, uid, [last_invoice], context)
+                            details.append("%s" % (line['unit_amount'], ))
+                    if data.get('name', False):
+                        details.append(line['name'])
+                    if data.get('partner', False):
+                        details.append(account.partner_id.name)
+                    note.append(u' - '.join(
+                        map(lambda x: unicode(x) or '', details)))
+                if note:
+                    if curr_line['name']:
+                        curr_line['name'] += "\n" + ("\n".join(
+                            map(lambda x: unicode(x) or '', note)))
+                    else:
+                        curr_line['name'] = "\n".join(
+                            map(lambda x: unicode(x) or '', note))
+                invoice_line_obj.create(
+                    cr, uid, curr_line, context=context)
+                cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s", (last_invoice, account.id, tuple(ids)))
+
+            invoice_obj.button_reset_taxes(
+                cr, uid, [last_invoice], context)
+
         return invoices
-

=== modified file 'contract_isp_invoice/contract_isp_invoice_view.xml'
--- contract_isp_invoice/contract_isp_invoice_view.xml	2014-01-20 04:25:39 +0000
+++ contract_isp_invoice/contract_isp_invoice_view.xml	2014-11-24 15:05:14 +0000
@@ -19,7 +19,7 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position='inside'>
-                    <button string="Create Voucher"
+                    <button string="Create Initial Invoice"
                             name="prepare_voucher"
                             context="{'default_partner_id': partner_id}"
                             type="object" />
@@ -34,7 +34,6 @@
             <field name="arch" type="xml">
                 <field name="name" position="after">
                     <field name="later_validation" invisible="1" />
-		    <field name="original_amount" invisible="1" />
                 </field>
                 <button name="proforma_voucher" position="attributes">
                     <attribute name="attrs">{'invisible': [('later_validation', '=', True)]}</attribute>

=== modified file 'contract_isp_invoice/i18n/contract_isp_invoice.pot'
--- contract_isp_invoice/i18n/contract_isp_invoice.pot	2013-09-16 17:59:01 +0000
+++ contract_isp_invoice/i18n/contract_isp_invoice.pot	2014-11-24 15:05:14 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-13 12:38+0000\n"
-"PO-Revision-Date: 2013-08-13 12:38+0000\n"
+"POT-Creation-Date: 2014-09-16 16:39+0000\n"
+"PO-Revision-Date: 2014-09-16 16:39+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,43 +16,235 @@
 "Plural-Forms: \n"
 
 #. module: contract_isp_invoice
-#: view:account.analytic.account:0
-#: model:ir.actions.act_window,name:contract_isp_invoice.action_view_create_voucher
-msgid "Create Voucher"
-msgstr ""
-
-#. module: contract_isp_invoice
-#: model:ir.model,name:contract_isp_invoice.model_contract_service_activate
-msgid "contract.service.activate"
-msgstr ""
-
-#. module: contract_isp_invoice
+#: model:email.template,body_html:contract_isp_invoice.email_template_contract_isp_invoice_close
+msgid "\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
+"\n"
+"    <p>Dear Accountant,</p>\n"
+"    <p>\n"
+"    Please take notice that the following contract is being terminated.\n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"    <table>\n"
+"    <tr>\n"
+"    <td>Contract:</td><td>${object.name}</td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"    <td>Partner:</td><td>${object.partner_id.name}</td>\n"
+"    </tr> \n"
+"    <tr>\n"
+"    <td>Close date:</td><td>${object.close_date}</td>\n"
+"    </tr>\n"
+"    </table>\n"
+"    <h3>Reasons/Comments</h3>\n"
+"    <p>${object.close_reason}</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_account_voucher
+#, python-format
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_account_analytic_account
+#, python-format
+msgid "Analytic Account"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: code:_description:0
 #: model:ir.model,name:contract_isp_invoice.model_account_analytic_line
+#, python-format
 msgid "Analytic Line"
 msgstr ""
 
 #. module: contract_isp_invoice
+#: view:contract.isp.close:0
+msgid "Cancel"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: view:account.voucher:0
+msgid "Cancel Receipt"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: view:contract.isp.close:0
+msgid "Close Contract"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: model:ir.actions.act_window,name:contract_isp_invoice.action_view_contract_isp_close
+msgid "Close contract"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: field:account.analytic.account,close_date:0
+#: field:contract.isp.close,close_date:0
+msgid "Close date"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_res_company
+#, python-format
+msgid "Companies"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: view:contract.isp.close:0
+msgid "Confirm"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: view:contract.isp.close:0
+msgid "Confirm the termination of this contract?"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: field:contract.isp.close,account_id:0
+msgid "Contract"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: model:email.template,subject:contract_isp_invoice.email_template_contract_isp_invoice_close
+msgid "Contract n. ${object.name}"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: view:account.analytic.account:0
+msgid "Create Initial Invoice"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_hr_timesheet_invoice_create
+#, python-format
+msgid "Create invoice from timesheet"
+msgstr ""
+
+#. module: contract_isp_invoice
 #: model:account.payment.term,name:contract_isp_invoice.account_payment_term_end_of_month
 msgid "End of Month"
 msgstr ""
 
 #. module: contract_isp_invoice
+#: model:account.payment.term,note:contract_isp_invoice.account_payment_term_end_of_month
+msgid "End of current month"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: field:hr.timesheet.invoice.create,factor_name:0
+msgid "Invoice Factor"
+msgstr ""
+
+#. module: contract_isp_invoice
 #: field:res.company,invoice_day:0
 msgid "Invoice day"
 msgstr ""
 
 #. module: contract_isp_invoice
-#: model:ir.model,name:contract_isp_invoice.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: contract_isp_invoice
-#: model:ir.model,name:contract_isp_invoice.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: contract_isp_invoice
-#: model:account.payment.term,note:contract_isp_invoice.account_payment_term_end_of_month
-msgid "End of current month"
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_account_journal
+#, python-format
+msgid "Journal"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: field:account.journal,later_validation:0
+#: field:account.voucher,later_validation:0
+msgid "Later Validation"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_res_partner
+#, python-format
+msgid "Partner"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: field:hr.timesheet.invoice.create,product_name:0
+msgid "Product Name"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: view:contract.isp.close:0
+#: field:contract.isp.close,close_reason:0
+msgid "Reason"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: field:account.analytic.account,close_reason:0
+msgid "Reasons"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: field:res.company,send_email_contract_invoice:0
+msgid "Send invoice by email"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: help:hr.timesheet.invoice.create,factor_name:0
+msgid "Show the invoice factor"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: help:hr.timesheet.invoice.create,product_name:0
+msgid "Show the product name"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_contract_isp_close
+#, python-format
+msgid "contract.isp.close"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_contract_service
+#, python-format
+msgid "contract.service"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_contract_service_activate
+#, python-format
+msgid "contract.service.activate"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_contract_service_deactivate
+#, python-format
+msgid "contract.service.deactivate"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: view:account.voucher:0
+msgid "object"
+msgstr ""
+
+#. module: contract_isp_invoice
+#: view:account.voucher:0
+msgid "{'invisible': [('later_validation', '=', True)]}"
 msgstr ""
 

=== added file 'contract_isp_invoice/i18n/fr.po'
--- contract_isp_invoice/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ contract_isp_invoice/i18n/fr.po	2014-11-24 15:05:14 +0000
@@ -0,0 +1,291 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* contract_isp_invoice
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-16 16:39+0000\n"
+"PO-Revision-Date: 2014-09-16 12:54-0500\n"
+"Last-Translator: Marc Cassuto <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: contract_isp_invoice
+#: model:email.template,body_html:contract_isp_invoice.email_template_contract_isp_invoice_close
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Dear Accountant,</p>\n"
+"    <p>\n"
+"    Please take notice that the following contract is being terminated.\n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"    <table>\n"
+"    <tr>\n"
+"    <td>Contract:</td><td>${object.name}</td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"    <td>Partner:</td><td>${object.partner_id.name}</td>\n"
+"    </tr> \n"
+"    <tr>\n"
+"    <td>Close date:</td><td>${object.close_date}</td>\n"
+"    </tr>\n"
+"    </table>\n"
+"    <h3>Reasons/Comments</h3>\n"
+"    <p>${object.close_reason}</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Bonjour,</p>\n"
+"    <p>\n"
+"    Prenez note que le contrat suivant vient d'être clôturé:\n"
+"\n"
+"    </p>\n"
+"<br/>\n"
+"    <table>\n"
+"    <tr>\n"
+"    <td>Contrat:</td><td>${object.name}</td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"    <td>Code client:</td><td>${object.partner_id.code}</td>\n"
+"    </tr> \n"
+"    <tr>\n"
+"    <td>Client:</td><td>${object.partner_id.name}</td>\n"
+"    </tr> \n"
+"    <tr>\n"
+"    <td>Date de clôture:</td><td>${object.close_date}</td>\n"
+"    </tr>\n"
+"    </table>\n"
+"    <h3>Raison / Commentaire</h3>\n"
+"    <p>${object.close_reason}</p>\n"
+"<br/>\n"
+"Meilleurs salutations,\n"
+"<br/>\n"
+"   <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_account_voucher
+#, python-format
+msgid "Accounting Voucher"
+msgstr "Paiement"
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_account_analytic_account
+#, python-format
+msgid "Analytic Account"
+msgstr "Contrat"
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_account_analytic_line
+#, python-format
+msgid "Analytic Line"
+msgstr "Ligne facturable"
+
+#. module: contract_isp_invoice
+#: view:contract.isp.close:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: contract_isp_invoice
+#: view:account.voucher:0
+msgid "Cancel Receipt"
+msgstr "Annuler le payment"
+
+#. module: contract_isp_invoice
+#: view:contract.isp.close:0
+msgid "Close Contract"
+msgstr "Clôturer le contrat"
+
+#. module: contract_isp_invoice
+#: model:ir.actions.act_window,name:contract_isp_invoice.action_view_contract_isp_close
+msgid "Close contract"
+msgstr "Clôturer le contrat"
+
+#. module: contract_isp_invoice
+#: field:account.analytic.account,close_date:0
+#: field:contract.isp.close,close_date:0
+msgid "Close date"
+msgstr "Date de Clôture"
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_res_company
+#, python-format
+msgid "Companies"
+msgstr "Companies"
+
+#. module: contract_isp_invoice
+#: view:contract.isp.close:0
+msgid "Confirm"
+msgstr "Confirmer"
+
+#. module: contract_isp_invoice
+#: view:contract.isp.close:0
+msgid "Confirm the termination of this contract?"
+msgstr "Souhaitez-vous clôturer ce contrat ?"
+
+#. module: contract_isp_invoice
+#: field:contract.isp.close,account_id:0
+msgid "Contract"
+msgstr "Contrat"
+
+#. module: contract_isp_invoice
+#: model:email.template,subject:contract_isp_invoice.email_template_contract_isp_invoice_close
+msgid "Contract n. ${object.name}"
+msgstr "Contrat # ${object.name}"
+
+#. module: contract_isp_invoice
+#: view:account.analytic.account:0
+msgid "Create Initial Invoice"
+msgstr "Créer la facture initiale"
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_hr_timesheet_invoice_create
+#, python-format
+msgid "Create invoice from timesheet"
+msgstr "Créer des factures à partir des feuilles de temps"
+
+#. module: contract_isp_invoice
+#: model:account.payment.term,name:contract_isp_invoice.account_payment_term_end_of_month
+msgid "End of Month"
+msgstr "Fin de Mois"
+
+#. module: contract_isp_invoice
+#: model:account.payment.term,note:contract_isp_invoice.account_payment_term_end_of_month
+msgid "End of current month"
+msgstr "Fin du mois courant"
+
+#. module: contract_isp_invoice
+#: field:hr.timesheet.invoice.create,factor_name:0
+msgid "Invoice Factor"
+msgstr "Taux facturable"
+
+#. module: contract_isp_invoice
+#: field:res.company,invoice_day:0
+msgid "Invoice day"
+msgstr "Jour de facturation"
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_account_journal
+#, python-format
+msgid "Journal"
+msgstr "Journal Comptable"
+
+#. module: contract_isp_invoice
+#: field:account.journal,later_validation:0
+#: field:account.voucher,later_validation:0
+msgid "Later Validation"
+msgstr "Validation Ultérieure"
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_res_partner
+#, python-format
+msgid "Partner"
+msgstr "Partenaire"
+
+#. module: contract_isp_invoice
+#: field:hr.timesheet.invoice.create,product_name:0
+msgid "Product Name"
+msgstr "Produit"
+
+#. module: contract_isp_invoice
+#: view:contract.isp.close:0 field:contract.isp.close,close_reason:0
+msgid "Reason"
+msgstr "Raison"
+
+#. module: contract_isp_invoice
+#: field:account.analytic.account,close_reason:0
+msgid "Reasons"
+msgstr "Raisons"
+
+#. module: contract_isp_invoice
+#: field:res.company,send_email_contract_invoice:0
+msgid "Send invoice by email"
+msgstr "Envoyer la facture par couriel"
+
+#. module: contract_isp_invoice
+#: help:hr.timesheet.invoice.create,factor_name:0
+msgid "Show the invoice factor"
+msgstr "Montre le taux facturable"
+
+#. module: contract_isp_invoice
+#: help:hr.timesheet.invoice.create,product_name:0
+msgid "Show the product name"
+msgstr "Montre le produit"
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_contract_isp_close
+#, python-format
+msgid "contract.isp.close"
+msgstr "contract.isp.close"
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_contract_service
+#, python-format
+msgid "contract.service"
+msgstr "contract.service"
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_contract_service_activate
+#, python-format
+msgid "contract.service.activate"
+msgstr "contract.service.activate"
+
+#. module: contract_isp_invoice
+#: code:_description:0
+#: model:ir.model,name:contract_isp_invoice.model_contract_service_deactivate
+#, python-format
+msgid "contract.service.deactivate"
+msgstr "contract.service.deactivate"
+
+#. module: contract_isp_invoice
+#: view:account.voucher:0
+msgid "object"
+msgstr "objet"
+
+#. module: contract_isp_invoice
+#: view:account.voucher:0
+msgid "{'invisible': [('later_validation', '=', True)]}"
+msgstr "{'invisible': [('later_validation', '=', True)]}"

=== added file 'contract_isp_invoice/invoice.py'
--- contract_isp_invoice/invoice.py	1970-01-01 00:00:00 +0000
+++ contract_isp_invoice/invoice.py	2014-11-24 15:05:14 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Savoir-faire Linux (<www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import orm, fields
+
+PROCESS_RECURRENT = 'recurrent'
+PROCESS_PRORATA = 'prorata'
+PROCESS_CRON = 'cron'
+PROCESS_MANUAL = 'manual'
+
+
+class Invoice(orm.Model):
+    _name = _inherit = 'account.invoice'
+    _columns = {
+        'source_process': fields.selection([
+            (PROCESS_RECURRENT, 'Recurrent Billing'),
+            (PROCESS_PRORATA, 'Pro Rata'),
+            (PROCESS_MANUAL, 'Manual'),
+            (PROCESS_CRON, 'Scheduled'),
+        ], 'Billing Process', required=False),
+    }

=== added directory 'contract_isp_invoice/tests'
=== added file 'contract_isp_invoice/tests/__init__.py'
--- contract_isp_invoice/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ contract_isp_invoice/tests/__init__.py	2014-11-24 15:05:14 +0000
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+###############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2014 Savoir-faire Linux
+#    (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 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 <http://www.gnu.org/licenses/>.
+#
+###############################################################################
+
+from . import (
+    test_prorata,
+    test_deactivate,
+    test_reseller,
+)
+
+checks = [
+    test_deactivate,
+    test_prorata,
+    test_reseller,
+]

=== added file 'contract_isp_invoice/tests/common.py'
--- contract_isp_invoice/tests/common.py	1970-01-01 00:00:00 +0000
+++ contract_isp_invoice/tests/common.py	2014-11-24 15:05:14 +0000
@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.addons.contract_isp.contract import (
+    LINE_TYPE_RECURRENT,
+    LINE_TYPE_ONETIME,
+)
+
+
+class ServiceSetup(object):
+    """ Mixin class to provide setup and utils for testing invoicing """
+
+    def _common_setup(self):
+        self._init_modules()
+        self._configure_company()
+        self._create_partner()
+        self._create_account()
+        self._create_products()
+
+    def _init_modules(self):
+        self.account_obj = self.registry("account.analytic.account")
+        self.analytic_line_obj = self.registry("account.analytic.line")
+        self.company_obj = self.registry("res.company")
+        self.service_obj = self.registry("contract.service")
+        self.partner_obj = self.registry("res.partner")
+        self.product_obj = self.registry("product.product")
+        self.invoice_obj = self.registry("account.invoice")
+        self.wiz_activate_obj = self.registry("contract.service.activate")
+        self.wiz_deactivate_obj = self.registry("contract.service.deactivate")
+
+    def _configure_company(self):
+        self.company = self.company_obj.browse(self.cr, self.uid, 1)
+        self.company.write({"cutoff_day": "7", "invoice_day": "14"})
+
+    def _create_partner(self):
+        self.partner_id = self.partner_obj.name_create(
+            self.cr, self.uid,
+            "Test Partner"
+        )[0]
+
+    def _get_last_invoice(self, query=None, partner_id=None):
+        domain = [("partner_id", "=", partner_id or self.partner_id)]
+        if query:
+            domain.extend(query)
+        invoice = self.invoice_obj.browse(
+            self.cr, self.uid,
+            self.invoice_obj.search(
+                self.cr, self.uid,
+                domain,
+                order="id desc",
+                limit=1,
+            )[0]
+        )
+        return invoice
+
+    def _create_products(self):
+        cr, uid = self.cr, self.uid
+        self.p_internet = self.product_obj.create(cr, uid, {
+            "name": "Cable Internet",
+            "type": "service",
+            "analytic_line_type": LINE_TYPE_RECURRENT,
+            "code": "CBL",
+            "list_price": 56.0,
+        })
+        self.p_inst = self.product_obj.create(cr, uid, {
+            "name": "Installation",
+            "type": "service",
+            "analytic_line_type": LINE_TYPE_ONETIME,
+            "code": "INST",
+            "list_price": 50.0,
+        })
+
+    def _create_account(self):
+        wr = self.account_obj.default_get(self.cr, self.uid,
+                                          self.account_obj._columns.keys())
+        wr.update({
+            "partner_id": self.partner_id,
+            "pricelist_id": 1,
+        })
+        onchange = self.account_obj.on_change_partner_id(
+            self.cr, self.uid, [],
+            self.partner_id, False, False,
+        )["value"]
+        wr.update(onchange)
+
+        self.account_id = self.account_obj.create(self.cr, self.uid, wr)
+
+    def _create_activate_service(self, product, activation_date, context=None):
+        context = context or {}
+        cr, uid = self.cr, self.uid
+        service = self.service_obj.on_change_product_id(
+            cr, uid, [],
+            self.p_internet,
+        )["value"]
+        service.update({
+            "product_id": self.p_internet,
+            "account_id": self.account_id,
+        })
+        service_id = self.service_obj.create(cr, uid, service, context=context)
+        wiz_id = self.wiz_activate_obj.create(
+            cr, uid, {
+                "account_id": self.account_id,
+                "service_id": service_id,
+                "activation_date": activation_date,
+            },
+            context=context,
+        )
+        self.wiz_activate_obj.activate(cr, uid, [wiz_id], context=context)
+        return service_id
+
+    def _get_invoice_date_range(self, invoice_id):
+        # Until we put a bit more common sense into period handling, this
+        # is our way of knowing the start/end dates of an invoice
+        cr, uid = self.cr, self.uid
+        invoice_line = self.analytic_line_obj.browse(
+            cr, uid,
+            self.analytic_line_obj.search(cr, uid, [
+                ('to_invoice', '!=', False),
+                ('invoice_id', '=', invoice_id),
+            ])[0]
+        )
+        date_from = invoice_line.name[-24:-14]
+        date_to = invoice_line.name[-11:-1]
+        return date_from, date_to

=== added file 'contract_isp_invoice/tests/test_deactivate.py'
--- contract_isp_invoice/tests/test_deactivate.py	1970-01-01 00:00:00 +0000
+++ contract_isp_invoice/tests/test_deactivate.py	2014-11-24 15:05:14 +0000
@@ -0,0 +1,165 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from __future__ import unicode_literals
+
+from datetime import date
+
+from openerp.tests.common import TransactionCase
+
+from .common import ServiceSetup
+
+
+class test_prorata_deactivate_service(TransactionCase, ServiceSetup):
+    """
+    Tests pro-rata crediting of services at deactivation
+    """
+    def setUp(self):
+        super(test_prorata_deactivate_service, self).setUp()
+        self._common_setup()
+
+    def _common_setup(self):
+        super(test_prorata_deactivate_service, self)._common_setup()
+        self._create_active_service()
+
+    def _create_active_service(self):
+        cr, uid = self.cr, self.uid
+        service = self.service_obj.on_change_product_id(
+            cr, uid, [],
+            self.p_internet,
+        )["value"]
+        service.update({
+            "product_id": self.p_internet,
+            "account_id": self.account_id,
+            "state": "active",
+        })
+        self.service_id = self.service_obj.create(cr, uid, service)
+
+    def _deactivate_service(self, deactivation_date, context=None):
+        context = context or {}
+        cr, uid = self.cr, self.uid
+        wiz_id = self.wiz_deactivate_obj.create(
+            cr, uid, {
+                "account_id": self.account_id,
+                "service_id": self.service_id,
+                "deactivation_date": deactivation_date,
+            },
+            context=context,
+        )
+        self.wiz_deactivate_obj.deactivate(cr, uid, [wiz_id], context=context)
+
+    def test_after_invoice_before_cutoff(self):
+        self.company.write({"invoice_day": "7", "cutoff_day": "21"})
+        self._deactivate_service("2014-02-14", {
+            "operation_date": date(2014, 2, 17),
+        })
+        invoice = self._get_last_invoice()
+        date_from, date_to = self._get_invoice_date_range(invoice.id)
+        self.assertEquals(invoice.date_invoice, "2014-02-07")
+        self.assertEquals(date_from, "2014-02-14", "Wrong start_date")
+        self.assertEquals(date_to, "2014-03-31", "Wrong end_date")
+        self.assertAlmostEquals(
+            invoice.amount_untaxed,
+            (1 + self.service_obj._prorata_rate(14, 28)) * 56,
+            msg="Expect refund for 14-28 feb + march")
+        self.assertEquals(invoice.type, "out_refund")
+
+    def test_after_invoice_after_cutoff(self):
+        self.company.write({"invoice_day": "7", "cutoff_day": "21"})
+        self._deactivate_service("2014-02-14", {
+            "operation_date": date(2014, 2, 23),
+        })
+        invoice = self._get_last_invoice()
+        date_from, date_to = self._get_invoice_date_range(invoice.id)
+        self.assertEquals(invoice.date_invoice, "2014-03-07")
+        self.assertEquals(date_from, "2014-02-14", "Wrong start_date")
+        self.assertEquals(date_to, "2014-03-31", "Wrong end_date")
+        self.assertAlmostEquals(
+            invoice.amount_untaxed,
+            (1 + self.service_obj._prorata_rate(14, 28)) * 56,
+            msg="Expect refund for 14-28 feb + march")
+        self.assertEquals(invoice.type, "out_refund")
+
+    def test_before_invoice_past_deactivation_curmonth(self):
+        self.company.write({"invoice_day": "14", "cutoff_day": "21"})
+        self._deactivate_service("2014-02-07", {
+            "operation_date": date(2014, 2, 8),
+        })
+        invoice = self._get_last_invoice()
+        date_from, date_to = self._get_invoice_date_range(invoice.id)
+        self.assertEquals(invoice.date_invoice, "2014-02-14")
+        self.assertEquals(date_from, "2014-02-07", "Wrong start_date")
+        self.assertEquals(date_to, "2014-02-28", "Wrong end_date")
+        self.assertAlmostEquals(
+            invoice.amount_untaxed,
+            self.service_obj._prorata_rate(21, 28) * 56,
+            msg="Expect refund for 7-28 feb")
+        self.assertEquals(invoice.type, "out_refund")
+
+    def test_before_invoice_past_deactivation_past_month(self):
+        self.company.write({"invoice_day": "14", "cutoff_day": "21"})
+        self._deactivate_service("2014-02-07", {
+            "operation_date": date(2014, 3, 8),
+        })
+        invoice = self._get_last_invoice()
+        date_from, date_to = self._get_invoice_date_range(invoice.id)
+        self.assertEquals(invoice.date_invoice, "2014-03-14")
+        self.assertEquals(date_from, "2014-02-07", "Wrong start_date")
+        self.assertEquals(date_to, "2014-03-31", "Wrong end_date")
+        self.assertAlmostEquals(
+            invoice.amount_untaxed,
+            (1 + self.service_obj._prorata_rate(21, 28)) * 56,
+            msg="Expect refund for 7-28 feb + march")
+        self.assertEquals(invoice.type, "out_refund")
+
+    def test_before_invoice_day_future_deactivation_same_month(self):
+        self.company.write({"invoice_day": "14", "cutoff_day": "21"})
+        self._deactivate_service("2014-02-14", {
+            "operation_date": date(2014, 2, 7),
+        })
+        invoice = self._get_last_invoice()
+        date_from, date_to = self._get_invoice_date_range(invoice.id)
+        self.assertEquals(invoice.date_invoice, "2014-02-14")
+        self.assertEquals(date_from, "2014-02-07", "Wrong start_date")
+        self.assertEquals(date_to, "2014-02-14", "Wrong end_date")
+        self.assertAlmostEquals(
+            invoice.amount_untaxed,
+            self.service_obj._prorata_rate(7, 28) * 56,
+            msg="Expect invoice for 7-14 feb")
+        self.assertEquals(invoice.type, "out_invoice")
+
+    def test_before_invoice_day_future_deactivation_future_month(self):
+        self.company.write({"invoice_day": "14", "cutoff_day": "21"})
+        self._deactivate_service("2014-04-16", {
+            "operation_date": date(2014, 2, 7),
+        })
+        invoice = self._get_last_invoice()
+        date_from, date_to = self._get_invoice_date_range(invoice.id)
+        self.assertEquals(invoice.date_invoice, "2014-02-14")
+        self.assertEquals(date_from, "2014-02-07", "Wrong start_date")
+        self.assertEquals(date_to, "2014-04-16", "Wrong end_date")
+        self.assertAlmostEquals(
+            invoice.amount_untaxed,
+            56 * (
+                self.service_obj._prorata_rate(21, 28) +
+                self.service_obj._prorata_rate(16, 30) +
+                1),
+            msg="Expect invoice for 7-28 feb, march, 1-16 apr")
+        self.assertEquals(invoice.type, "out_invoice")

=== added file 'contract_isp_invoice/tests/test_prorata.py'
--- contract_isp_invoice/tests/test_prorata.py	1970-01-01 00:00:00 +0000
+++ contract_isp_invoice/tests/test_prorata.py	2014-11-24 15:05:14 +0000
@@ -0,0 +1,179 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from __future__ import unicode_literals
+
+from datetime import date
+
+from openerp.tests.common import TransactionCase
+
+from .common import ServiceSetup
+
+
+class test_prorata_activate_service(TransactionCase, ServiceSetup):
+    """
+    Tests pro-rata invoicing of services
+    """
+
+    def setUp(self):
+        super(test_prorata_activate_service, self).setUp()
+        self._common_setup()
+
+    def test_prorata_after_invoice_before_cutoff_current_month(self):
+        """
+        Test prorata when:
+            invoice_day < operation_date <= end of month
+            operation date < cutoff date
+        """
+        cr, uid = self.cr, self.uid
+        self.company.write({"invoice_day": "7", "cutoff_day": "24"})
+        self._create_activate_service(self.p_internet, "2014-01-13", {
+            "operation_date": date(2014, 1, 14),
+        })
+
+        invoice = self.invoice_obj.browse(
+            cr, uid,
+            self.invoice_obj.search(cr, uid,
+                                    [('partner_id', '=', self.partner_id)])[0]
+        )
+        self.assertEquals(invoice.date_invoice, "2014-01-07")
+        date_from, date_to = self._get_invoice_date_range(invoice.id)
+        self.assertEquals(date_from, "2014-02-13", "Wrong start date")
+        self.assertEquals(date_to, "2014-02-28", "Wrong end date")
+        self.assertAlmostEquals(
+            invoice.amount_untaxed,
+            self.service_obj._prorata_rate(15, 28) * 56,
+            msg="~Half month, 15/28 of 56",
+            delta=0.01)
+
+    def test_prorata_after_invoice_before_cutoff_past_month(self):
+        """
+        Test prorata when:
+            invoice_day < operation_date <= end of month
+            operation date < cutoff date
+        """
+        cr, uid = self.cr, self.uid
+        self.company.write({"invoice_day": "7", "cutoff_day": "21"})
+        self._create_activate_service(self.p_internet, "2014-08-11", {
+            "operation_date": date(2014, 9, 10),
+        })
+
+        invoice = self.invoice_obj.browse(
+            cr, uid,
+            self.invoice_obj.search(cr, uid,
+                                    [('partner_id', '=', self.partner_id)])[0]
+        )
+        self.assertEquals(invoice.date_invoice, "2014-09-07")
+        date_from, date_to = self._get_invoice_date_range(invoice.id)
+        self.assertEquals(date_from, "2014-09-11",
+                          "Wrong start date, expected activation + 1 month")
+        self.assertEquals(date_to, "2014-10-31",
+                          "Wrong end date, end of (op) next month")
+
+        self.assertAlmostEquals(
+            invoice.amount_untaxed,
+            (1 + self.service_obj._prorata_rate(19, 30)) * 56,
+            msg="Oct 100%, Sept 11-30",
+            delta=0.01)
+
+    def test_prorata_after_invoice_after_cutoff(self):
+        """
+        Test prorata when:
+            invoice_day < operation_date <= end of month
+            operation date > cutoff date
+        """
+        cr, uid = self.cr, self.uid
+        self.company.write({"invoice_day": "7", "cutoff_day": "24"})
+        self._create_activate_service(self.p_internet, "2014-01-15", {
+            "operation_date": date(2014, 1, 26),
+        })
+
+        invoice = self.invoice_obj.browse(
+            cr, uid,
+            self.invoice_obj.search(cr, uid,
+                                    [('partner_id', '=', self.partner_id)])[0]
+        )
+        self.assertEquals(invoice.date_invoice, "2014-02-07")
+        date_from, date_to = self._get_invoice_date_range(invoice.id)
+        self.assertEquals(date_from, "2014-02-15", "Wrong start date")
+        self.assertEquals(date_to, "2014-02-28", "Wrong end date")
+        self.assertAlmostEquals(
+            invoice.amount_untaxed,
+            self.service_obj._prorata_rate(13, 28) * 56,
+            msg="13/28 of 56",
+            delta=0.01)
+
+    def test_prorata_before_invoice_past_month_activation(self):
+        """
+        Test prorata when:
+            1 <= operation_date <= invoice_day
+            activation is in the past month
+
+        """
+        cr, uid = self.cr, self.uid
+        self.company.write({"invoice_day": "7", "cutoff_day": "21"})
+        self._create_activate_service(self.p_internet, "2014-01-27", {
+            "operation_date": date(2014, 2, 1),
+        })
+
+        invoice = self.invoice_obj.browse(
+            cr, uid,
+            self.invoice_obj.search(cr, uid,
+                                    [('partner_id', '=', self.partner_id)])[0]
+        )
+        self.assertEquals(invoice.date_invoice, "2014-02-07")
+        date_from, date_to = self._get_invoice_date_range(invoice.id)
+        self.assertEquals(date_from, "2014-02-27", "Wrong start date")
+        self.assertEquals(date_to, "2014-02-28", "Wrong end date")
+        self.assertAlmostEquals(
+            invoice.amount_untaxed,
+            self.service_obj._prorata_rate(1, 28) * 56,
+            msg="1 day in feb",
+            delta=0.01)
+
+    def test_prorata_before_invoice_current_month_activation(self):
+        """
+        Test prorata when:
+            1 <= operation_date <= invoice_day
+            activation is in the current month and < invoice_day
+
+        """
+        cr, uid = self.cr, self.uid
+        self.company.write({"invoice_day": "21", "cutoff_day": "24"})
+        self._create_activate_service(self.p_internet, "2014-02-14", {
+            "operation_date": date(2014, 2, 10),
+        })
+
+        invoice = self.invoice_obj.browse(
+            cr, uid,
+            self.invoice_obj.search(cr, uid,
+                                    [('partner_id', '=', self.partner_id)])[0]
+        )
+        self.assertEquals(invoice.date_invoice, "2014-02-21")
+        date_from, date_to = self._get_invoice_date_range(invoice.id)
+        self.assertEquals(date_from, "2014-03-01", "Wrong start date")
+        self.assertEquals(date_to, "2014-03-14", "Wrong end date")
+        self.assertAlmostEquals(
+            invoice.amount_untaxed,
+            self.service_obj._prorata_rate(14, 31) * 56,
+            msg="credit for 1-14 in match",
+            delta=0.01)
+        self.assertEquals(invoice.type, "out_refund",
+                        msg="Expected Credit Note")

=== added file 'contract_isp_invoice/tests/test_reseller.py'
--- contract_isp_invoice/tests/test_reseller.py	1970-01-01 00:00:00 +0000
+++ contract_isp_invoice/tests/test_reseller.py	2014-11-24 15:05:14 +0000
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from __future__ import unicode_literals
+
+from datetime import date
+
+from openerp.tests.common import TransactionCase
+
+from .common import ServiceSetup
+
+
+class test_reseller_invoice(TransactionCase, ServiceSetup):
+    """
+    Tests specific reseller behaviors for invoices
+    """
+    def setUp(self):
+        super(test_reseller_invoice, self).setUp()
+        self._common_setup()
+
+    def _create_partner(self):
+        cr, uid = self.cr, self.uid
+        p_o = self.partner_obj
+        self.parent_id = p_o.create(cr, uid, {
+            "is_company": True,
+            "is_reseller": True,
+            "name": "Test Company",
+        })
+        self.partner_id = p_o.create(cr, uid, {
+            "name": "Test Partner",
+            "parent_id": self.parent_id,
+        })
+
+    def test_prorata_invoice(self):
+        self._create_activate_service(self.p_internet, "2014-02-08", {
+            "operation_date": date(2014, 2, 10),
+        })
+
+        self.assertEquals(
+            len(self.invoice_obj.search(self.cr, self.uid, [
+                ('partner_id', '=', self.parent_id),
+            ])),
+            1,
+            "Expected one new invoice on parent"
+        )
+
+        self.assertEquals(
+            len(self.invoice_obj.search(self.cr, self.uid, [
+                ('partner_id', '=', self.partner_id),
+            ])),
+            0,
+            "Expected no new invoice on child"
+        )

=== modified file 'contract_isp_invoice/wizard/activate_contract_service.py'
--- contract_isp_invoice/wizard/activate_contract_service.py	2013-10-04 16:19:20 +0000
+++ contract_isp_invoice/wizard/activate_contract_service.py	2014-11-24 15:05:14 +0000
@@ -20,10 +20,8 @@
 #
 ##############################################################################
 
-import time
-import datetime
-from openerp.osv import orm, fields
-from openerp.addons.contract_isp.contract import add_months
+from openerp.osv import orm
+from ..invoice import PROCESS_PRORATA
 
 
 class contract_service_activate(orm.TransientModel):
@@ -33,29 +31,39 @@
         if context is None:
             context = {}
 
-        account_invoice_obj = self.pool.get('account.invoice')
-        account_voucher_obj = self.pool.get('account.voucher')
-        account_move_obj = self.pool.get('account.move')
-        res_company_obj = self.pool.get('res.company')
         wizard = self.browse(cr, uid, ids[0], context)
 
         ret = super(contract_service_activate, self).activate(cr, uid,
                                                               ids,
                                                               context=context)
 
-        contract_service_obj = self.pool.get('contract.service')
-        account_analytic_account_obj = self.pool.get('account.analytic.account')
-        account_move_line_obj = self.pool.get('account.move.line')
-
-        query = [
-            ('account_id', '=', wizard.account_id.id),
-            ('state', '=', 'draft')
-        ]
-        # Check if all services were activated
-        if not contract_service_obj.search(cr, uid, query, context=context):
-
-            # jgama - Try to create the prorata invoice
-            pro_inv = account_analytic_account_obj.create_invoice(
-                cr, uid, wizard.account_id.id, prorata=True, context=context)
+        account_analytic_account_obj = self.pool.get('account.analytic.account')
+
+        account_analytic_account_obj.create_invoice(
+            cr, uid, wizard.account_id.id,
+            source_process=PROCESS_PRORATA,
+            context=context)
+
+        return ret
+
+
+class contract_service_deactivate(orm.TransientModel):
+    _inherit = 'contract.service.deactivate'
+
+    def deactivate(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        wizard = self.browse(cr, uid, ids[0], context)
+
+        ret = super(contract_service_deactivate, self).deactivate(
+            cr, uid, ids, context=context)
+
+        account_analytic_account_obj = self.pool.get('account.analytic.account')
+
+        account_analytic_account_obj.create_invoice(
+            cr, uid, wizard.account_id.id,
+            source_process=PROCESS_PRORATA,
+            context=context)
 
         return ret

=== modified file 'contract_isp_invoice/wizard/close_contract.py'
--- contract_isp_invoice/wizard/close_contract.py	2013-09-16 17:59:01 +0000
+++ contract_isp_invoice/wizard/close_contract.py	2014-11-24 15:05:14 +0000
@@ -27,7 +27,7 @@
 from openerp.report import report_sxw
 from openerp.tools import convert
 from openerp.tools.translate import _
-from openerp.addons.contract_isp.contract import date_interval
+from openerp.addons.contract_isp.contract import date_interval, format_interval
 
 
 class contract_isp_close(orm.TransientModel):
@@ -71,7 +71,8 @@
                                                       last_invoice_id[-1],
                                                       context=context)
             if last_invoice.date_invoice > wizard.close_date:
-                raise orm.except_orm(_('Error!'), _('Close date before last invoice date!'))
+                raise orm.except_orm(_('Error!'),
+                                     _('Close date before last invoice date!'))
 
             amount_untaxed = last_invoice.amount_untaxed
 
@@ -81,10 +82,12 @@
             used_days = month_days - int(wizard.close_date[8:10])
             ptx = (100 * used_days / month_days) / 100.0
             amount = amount_untaxed * ptx
-            interval = date_interval(datetime.date(int(wizard.close_date[:4]),
-                                                   int(wizard.close_date[5:7]),
-                                                   int(wizard.close_date[8:10])),
-                                     True)
+            start_date, end_date = date_interval(
+                datetime.date(int(wizard.close_date[:4]),
+                              int(wizard.close_date[5:7]),
+                              int(wizard.close_date[8:10])),
+                True)
+            interval = format_interval(start_date, end_date)
 
             line = {
                 'name': ' '.join([_('Credit refund'), interval]),
@@ -111,4 +114,4 @@
         mail_message.write({'type': 'email'})
         contract.write({'state': 'close'})
         return {}
-        
\ No newline at end of file
+        

=== modified file 'contract_isp_package_configurator/__init__.py'
--- contract_isp_package_configurator/__init__.py	2013-09-16 17:59:01 +0000
+++ contract_isp_package_configurator/__init__.py	2014-11-24 15:05:14 +0000
@@ -20,6 +20,10 @@
 #
 ##############################################################################
 
-import wizard
-import workflow
-import company
+from . import (
+    account_analytic,
+    company,
+    contract,
+    wizard,
+    workflow,
+)

=== modified file 'contract_isp_package_configurator/__openerp__.py'
--- contract_isp_package_configurator/__openerp__.py	2013-09-16 17:59:01 +0000
+++ contract_isp_package_configurator/__openerp__.py	2014-11-24 15:05:14 +0000
@@ -35,6 +35,7 @@
     'depends': ['contract_isp', 'product_dependencies', 'stock'],
     'data': [
         'security/ir.model.access.csv',
+        'security/groups.xml',
         'wizard/package_configurator.xml',
         'workflow/contract_isp_package_configurator.xml',
         'contract_isp_package_configurator_view.xml',

=== added file 'contract_isp_package_configurator/account_analytic.py'
--- contract_isp_package_configurator/account_analytic.py	1970-01-01 00:00:00 +0000
+++ contract_isp_package_configurator/account_analytic.py	2014-11-24 15:05:14 +0000
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Savoirfaire-Linux Inc. (<www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, orm
+
+
+class AccountAnalyticAccount(orm.Model):
+    _name = 'account.analytic.account'
+    _inherit = 'account.analytic.account'
+
+    def _get_ui_flags(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        for account in self.browse(cr, uid, ids, context=context):
+            res[account.id] = cur = {
+                'ui_reserve': False,
+                'ui_return': False,
+            }
+            for service in account.contract_service_ids:
+                if not service.product_id.type == "product":
+                    continue
+                if service.prodlot_id:
+                    cur['ui_return'] = True
+                else:
+                    cur['ui_reserve'] = True
+
+        return res
+
+    _columns = {
+        'prodlot_id': fields.many2one(
+            'stock.production.lot',
+            'Serial Number',
+            required=False,
+        ),
+        'ui_reserve': fields.function(
+            _get_ui_flags,
+            type='boolean', method=True, multi='ui_flags',
+        ),
+        'ui_return': fields.function(
+            _get_ui_flags,
+            type='boolean', method=True, multi='ui_flags',
+        ),
+    }

=== added file 'contract_isp_package_configurator/contract.py'
--- contract_isp_package_configurator/contract.py	1970-01-01 00:00:00 +0000
+++ contract_isp_package_configurator/contract.py	2014-11-24 15:05:14 +0000
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2014 Savoirfaire-Linux Inc. (<www.savoirfairelinux.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 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 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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, orm
+
+
+class ContractService(orm.Model):
+    _name = 'contract.service'
+    _inherit = 'contract.service'
+    _columns = {
+        'prodlot_id': fields.many2one(
+            'stock.production.lot',
+            'Serial Number',
+            required=False,
+        ),
+    }

=== modified file 'contract_isp_package_configurator/contract_isp_package_configurator_view.xml'
--- contract_isp_package_configurator/contract_isp_package_configurator_view.xml	2013-09-16 17:59:01 +0000
+++ contract_isp_package_configurator/contract_isp_package_configurator_view.xml	2014-11-24 15:05:14 +0000
@@ -1,28 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <record id="contract_isp_form_package_configurator_wizard" model="ir.ui.view">
-            <field name="name">contract.isp.form.package.configurator.wizard</field>
-            <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//div[@name='buttons']" position='inside'>
-		    <button string="Package Configurator"
-			    name="%(action_contract_isp_package_configurator)d"
-			    type="action" />
-		</xpath>
-	    </field>
-	</record>
-        <record id="view_company_form_package_configurator" model="ir.ui.view">
-            <field name="name">company.form.package.configurator</field>
-            <field name="model">res.company</field>
-            <field name="inherit_id" ref="contract_isp.view_company_contract_isp_form"/>
-            <field name="arch" type="xml">
-		<field name="parent_account_id" position="before">
-		    <field name="default_product_category" />
-		</field>
-	    </field>
-	</record>
+      <record id="contract_isp_form_package_configurator_wizard" model="ir.ui.view">
+        <field name="name">contract.isp.form.package.configurator.wizard</field>
+        <field name="model">account.analytic.account</field>
+        <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+        <field name="arch" type="xml">
+          <xpath expr="//div[@name='buttons']" position='inside'>
+            <field name="ui_reserve" invisible="1" />
+            <field name="ui_return" invisible="1" />
+            <button string="Package Configurator"
+              name="%(action_contract_isp_package_configurator)d"
+              type="action" />
+            <button string="Reserve Equipment"
+              name="%(action_contract_isp_reserve_equipment)d"
+              attrs="{'invisible': [('ui_reserve', '=', False)]}"
+              groups="contract_isp_package_configurator.group_isp_add_equipment"
+              type="action" />
+            <button string="Exchange Equipment"
+              name="%(action_contract_isp_exchange_equipment)d"
+              attrs="{'invisible': [('ui_return', '=', False)]}"
+              groups="contract_isp_package_configurator.group_isp_add_equipment"
+              type="action" />
+            <button string="Return Equipment"
+              name="%(action_contract_isp_return_equipment)d"
+              attrs="{'invisible': [('ui_return', '=', False)]}"
+              groups="contract_isp_package_configurator.group_isp_remove_equipment"
+              type="action" />
+          </xpath>
+        </field>
+      </record>
+
+      <record id="view_company_form_package_configurator" model="ir.ui.view">
+        <field name="name">company.form.package.configurator</field>
+        <field name="model">res.company</field>
+        <field name="inherit_id" ref="contract_isp.view_company_contract_isp_form"/>
+        <field name="arch" type="xml">
+          <field name="parent_account_id" position="before">
+            <field name="default_product_category" />
+          </field>
+        </field>
+      </record>
 
     </data>
 </openerp>

=== modified file 'contract_isp_package_configurator/i18n/contract_isp_package_configurator.pot'
--- contract_isp_package_configurator/i18n/contract_isp_package_configurator.pot	2013-09-16 17:59:01 +0000
+++ contract_isp_package_configurator/i18n/contract_isp_package_configurator.pot	2014-11-24 15:05:14 +0000
@@ -0,0 +1,343 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* contract_isp_package_configurator
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-23 00:06+0000\n"
+"PO-Revision-Date: 2014-09-23 00:06+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+msgid "Add"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: model:res.groups,name:contract_isp_package_configurator.group_isp_add_equipment
+msgid "Add Equipment"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator,current_product_id:0
+msgid "Add Product"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: selection:contract.service.configurator.dependency.line,state:0
+#: selection:contract.service.configurator.line,state:0
+msgid "Added"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: code:_description:0
+#: model:ir.model,name:contract_isp_package_configurator.model_account_analytic_account
+#, python-format
+msgid "Analytic Account"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+#: view:contract.service.equipment.manage:0
+msgid "Cancel"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+#: field:contract.service.configurator,product_category_id:0
+#: field:contract.service.configurator,root_category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+msgid "Click on add to view the available components"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: code:_description:0
+#: model:ir.model,name:contract_isp_package_configurator.model_res_company
+#, python-format
+msgid "Companies"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator,contract_id:0
+#: field:contract.service.equipment.manage,contract_id:0
+msgid "Contract"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:res.company,default_product_category:0
+msgid "Default Product Category"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator,dependency_ids:0
+msgid "Dependencies"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+#: selection:contract.service.configurator,state:0
+#: selection:contract.service.configurator.dependency.line,state:0
+#: selection:contract.service.configurator.line,state:0
+msgid "Done"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.equipment.manage:0
+msgid "Exchange"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:account.analytic.account:0
+#: model:ir.actions.act_window,name:contract_isp_package_configurator.action_contract_isp_exchange_equipment
+msgid "Exchange Equipment"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator.dependency.line,handle_dependency:0
+#: field:contract.service.configurator.line,handle_dependency:0
+msgid "Handle dependencies"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: selection:contract.service.configurator.dependency.line,state:0
+#: selection:contract.service.configurator.line,state:0
+msgid "Information"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator,is_level2:0
+msgid "Is level 2"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator,line_ids:0
+msgid "Line"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator.dependency.line,manager_id:0
+#: field:contract.service.configurator.line,manager_id:0
+msgid "Manage Equipment Wizard"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator.dependency.line,message:0
+#: field:contract.service.configurator.line,message:0
+msgid "Message"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator.dependency.line,name:0
+#: field:contract.service.configurator.line,name:0
+msgid "Name"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+msgid "Next"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: selection:contract.service.configurator.dependency.line,state:0
+#: selection:contract.service.configurator.line,state:0
+msgid "No Stock"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator.line:0
+msgid "Ok"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:account.analytic.account:0
+#: view:contract.service.configurator:0
+#: field:contract.service.configurator.dependency.line,configurator_id:0
+#: view:contract.service.configurator.line:0
+#: field:contract.service.configurator.line,configurator_id:0
+#: model:ir.actions.act_window,name:contract_isp_package_configurator.action_contract_isp_package_configurator
+msgid "Package Configurator"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator.dependency.line,parent_id:0
+#: field:contract.service.configurator.line,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+#: field:contract.service.configurator.dependency.line,product_id:0
+#: field:contract.service.configurator.line,product_id:0
+#: view:contract.service.equipment.manage:0
+msgid "Product"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+#: view:contract.service.configurator.line:0
+msgid "Products"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: model:res.groups,name:contract_isp_package_configurator.group_isp_remove_equipment
+msgid "Remove Equipment"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.equipment.manage:0
+msgid "Reserve"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:account.analytic.account:0
+#: view:contract.service.equipment.manage:0
+#: model:ir.actions.act_window,name:contract_isp_package_configurator.action_contract_isp_reserve_equipment
+msgid "Reserve Equipment"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.equipment.manage:0
+msgid "Return"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:account.analytic.account:0
+#: view:contract.service.equipment.manage:0
+#: model:ir.actions.act_window,name:contract_isp_package_configurator.action_contract_isp_return_equipment
+msgid "Return Equipment"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: selection:contract.service.configurator,state:0
+msgid "Select components"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: selection:contract.service.configurator,state:0
+msgid "Select product"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: selection:contract.service.configurator.dependency.line,state:0
+#: selection:contract.service.configurator.line,state:0
+msgid "Select serial number"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.equipment.manage,product_id:0
+msgid "Selected Product"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.equipment.manage:0
+msgid "Serial"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:account.analytic.account,prodlot_id:0
+#: field:contract.service,prodlot_id:0
+#: field:contract.service.configurator.dependency.line,serial:0
+#: view:contract.service.configurator.line:0
+#: field:contract.service.configurator.line,serial:0
+#: field:contract.service.equipment.manage,prodlot_id:0
+msgid "Serial Number"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: help:res.company,default_product_category:0
+msgid "Set the default starting point for the package configuration wizard"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: selection:contract.service.configurator,state:0
+msgid "Start"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator,state:0
+#: field:contract.service.configurator.dependency.line,state:0
+#: field:contract.service.configurator.line,state:0
+msgid "State"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator.dependency.line,stock_move_id:0
+#: field:contract.service.configurator.line,stock_move_id:0
+msgid "Stock Move"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: model:res.groups,comment:contract_isp_package_configurator.group_isp_add_equipment
+msgid "The users in this group will be able to assign customer equipment"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: model:res.groups,comment:contract_isp_package_configurator.group_isp_remove_equipment
+msgid "The users in this group will be able to unassign customers equipment"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator.line:0
+msgid "We don't have this product in stock at the moment!"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: code:_description:0
+#: model:ir.model,name:contract_isp_package_configurator.model_contract_service
+#, python-format
+msgid "contract.service"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: code:_description:0
+#: model:ir.model,name:contract_isp_package_configurator.model_contract_service_configurator
+#, python-format
+msgid "contract.service.configurator"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: code:_description:0
+#: model:ir.model,name:contract_isp_package_configurator.model_contract_service_configurator_dependency_line
+#, python-format
+msgid "contract.service.configurator.dependency.line"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: code:_description:0
+#: model:ir.model,name:contract_isp_package_configurator.model_contract_service_configurator_line
+#, python-format
+msgid "contract.service.configurator.line"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: code:_description:0
+#: model:ir.model,name:contract_isp_package_configurator.model_contract_service_equipment_manage
+#, python-format
+msgid "contract.service.equipment.manage"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.equipment.manage:0
+msgid "or"
+msgstr ""
+
+#. module: contract_isp_package_configurator
+#: field:account.analytic.account,ui_reserve:0
+#: field:account.analytic.account,ui_return:0
+#: field:contract.service.equipment.manage,products_all:0
+#: field:contract.service.equipment.manage,products_no_serial:0
+#: field:contract.service.equipment.manage,products_with_serial:0
+msgid "unknown"
+msgstr ""
+

=== added file 'contract_isp_package_configurator/i18n/fr.po'
--- contract_isp_package_configurator/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ contract_isp_package_configurator/i18n/fr.po	2014-11-24 15:05:14 +0000
@@ -0,0 +1,346 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* contract_isp_package_configurator
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-09-23 00:06+0000\n"
+"PO-Revision-Date: 2014-09-22 20:07-0500\n"
+"Last-Translator: Marc Cassuto <[e-mail]>\n"
+"Language-Team: \n"
+"Language: 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"
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+msgid "Add"
+msgstr "Ajouter"
+
+#. module: contract_isp_package_configurator
+#: model:res.groups,name:contract_isp_package_configurator.group_isp_add_equipment
+msgid "Add Equipment"
+msgstr "Ajouter un équipement"
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator,current_product_id:0
+msgid "Add Product"
+msgstr "Ajouter un produit"
+
+#. module: contract_isp_package_configurator
+#: selection:contract.service.configurator.dependency.line,state:0
+#: selection:contract.service.configurator.line,state:0
+msgid "Added"
+msgstr "Ajouté"
+
+#. module: contract_isp_package_configurator
+#: code:_description:0
+#: model:ir.model,name:contract_isp_package_configurator.model_account_analytic_account
+#, python-format
+msgid "Analytic Account"
+msgstr "Contrat"
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+#: view:contract.service.equipment.manage:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+#: field:contract.service.configurator,product_category_id:0
+#: field:contract.service.configurator,root_category_id:0
+msgid "Category"
+msgstr "Catégorie"
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+msgid "Click on add to view the available components"
+msgstr "Cliquer sur le bouton 'Ajouter' pour voir les produits disponibles"
+
+#. module: contract_isp_package_configurator
+#: code:_description:0
+#: model:ir.model,name:contract_isp_package_configurator.model_res_company
+#, python-format
+msgid "Companies"
+msgstr "Companies"
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator,contract_id:0
+#: field:contract.service.equipment.manage,contract_id:0
+msgid "Contract"
+msgstr "Contrat"
+
+#. module: contract_isp_package_configurator
+#: field:res.company,default_product_category:0
+msgid "Default Product Category"
+msgstr "Catégorie de Produit par défault"
+
+#. module: contract_isp_package_configurator
+#: field:contract.service.configurator,dependency_ids:0
+msgid "Dependencies"
+msgstr "Dépendances"
+
+#. module: contract_isp_package_configurator
+#: view:contract.service.configurator:0
+#: selection:contract.service.configurator,state:0