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

[hayat]

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

Hello, I think it's better if you can keep this in a separate module in your branches. I would suggest to register your branch on launchpad to give visibility to your modules. Your branch should contain only your own modules, and not a branch of addons.

Unmerged revisions

1. By root <root@y-phil-studio> on 2010-07-16

1e version sans le module Lawyer

=== added file '__init__.py'
--- __init__.py	1970-01-01 00:00:00 +0000
+++ __init__.py	2011-06-12 01:27:27 +0000
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+#coding: utf-8
+
+# (c) 2007 Sednacom <http://www.sednacom.fr>
+# author : [e-mail]
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+import business, inits

=== added file '__terp__.py'
--- __terp__.py	1970-01-01 00:00:00 +0000
+++ __terp__.py	2011-06-12 01:27:27 +0000
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+# coding : utf-8
+
+# (c) 2010 Sednacom, Sisalp, Prolibre et Open Net
+# author : [e-mail]
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+{
+	"name" : "Module business",
+	"version" : "2.0.05",
+	"author" : "Sednacom, Sisalp, Prolibre and Open Net",
+	"category" : "Generic Modules/Others",
+	"website": "http://open-net.ch/ERP-CRM-OpenERP/Nos-modules/business",
+	"description": "This module lets you regroup everything invoices, purchases, timesheets and analytic accounts within one affair",
+	"depends" : ["base","product","purchase","sale","account","project","hr_timesheet","hr_timesheet_sheet"],
+	"init_xml" : [],
+	"demo_xml" : [], 
+	"update_xml" : ["business_view.xml",
+			"business_sequence.xml"],
+	"active": False,
+	"installable": True
+}

=== added file 'business.py'
--- business.py	1970-01-01 00:00:00 +0000
+++ business.py	2011-06-12 01:27:27 +0000
@@ -0,0 +1,360 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#coding: utf-8
+
+# (c) 2009 Prolibre <http://www.prolibre.com>
+# author : [e-mail]
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+from osv import osv, fields
+import tools
+from mx import DateTime
+import netsvc
+
+class business_business(osv.osv):
+	_name = "business.business"
+	_description = "business affair"
+
+	def make_list_partners(self, cr, uid, ids,business, arg, context):	
+		for busi in self.browse(cr, uid, ids):
+			business_id = busi.name
+		res1=[]	
+		if business_id:
+			crit = [('business_id','=',business_id)]		
+			res2 = self.pool.get('sale.order').search(cr, uid, crit)	
+			for sale in self.pool.get('sale.order').browse(cr, uid, res2):
+				res1.append(sale.partner_id.id)		
+			res3 = self.pool.get('purchase.order').search(cr, uid, crit)		
+			for purchase in self.pool.get('purchase.order').browse(cr, uid, res3):
+				res1.append(purchase.partner_id.id)			
+			res = unique(res1)
+			print res		
+		else:
+			return False
+		return res
+
+	_columns = {
+		'name' : fields.char('Business', size=64, required=True),
+		'code' : fields.char('Business Number', size=64, required=True),
+		'date_start': fields.date('Start Date'),
+		'date_end': fields.date('End Date'),
+		'analytic_account' : fields.many2one('account.analytic.account', 'Analytic Account',required=False),
+		#'list_partners' : fields.one2many('partner.from.list', 'business_id', 'Sale', readonly=True),
+		'sales' : fields.one2many('sale.order', 'business_id', 'Sales'),
+		'purchases' : fields.one2many('purchase.order', 'business_id', 'Purchases'),
+		'invoices' :fields.one2many('account.invoice', 'business_id', 'Invoices'),
+		'projects' : fields.one2many('project.project', 'business_id', 'Projects'),
+		'timesheet' : fields.one2many('hr.analytic.timesheet', 'business_id', 'Time Sheets'),
+		'main_partner':fields.many2one('res.partner','Main Partner',required=True),
+		'users': fields.many2many( 'res.users', 'business_users_rel', 'biz_id', 'user_id', 'Involved Users' ),
+		'state': fields.selection([
+				('draft','Draft'),
+				('open','Open'),
+				('close','Close'),
+				], 'Business State', readonly=True,),
+	}
+
+	_defaults={
+		'code': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'business.business'),
+		'state':lambda *a:'draft',
+	}
+
+	def create(self, cr, user, vals, context=None):
+		new_id = super(business_business,self).create(cr, user, vals, context)
+		if (new_id):
+			client_analytic_id = self.pool.get('ir.model.data')._get_id(cr,user,self.__module__.split('.')[0],'business_client_analytic_account')
+			res_id = self.pool.get('ir.model.data').browse(cr,user,client_analytic_id).res_id
+			main_partner_name = self.pool.get('res.partner').browse(cr,user,vals['main_partner']).name
+			parent_analytic_id = self.pool.get('account.analytic.account').search(cr,user,[('name','=',main_partner_name),('parent_id','=',res_id)])
+			if not (parent_analytic_id):
+				parent_analytic_id=[self.pool.get('account.analytic.account').create(cr,user,{'name':main_partner_name,'parent_id':res_id})]
+			anal_acc_id = self.pool.get('account.analytic.account').create(cr,user,{'name':vals['name'],'parent_id':parent_analytic_id[0]})
+			if anal_acc_id > 0 and (('analytic_account' not in vals) or not vals['analytic_account']):
+				super(business_business,self).write(cr, user, new_id, { 'analytic_account': anal_acc_id }, context=context)
+	  
+		return new_id
+  
+	def business_open(self, cr, uid, ids, *args):
+		self.write(cr,uid,ids,{'state':'open'})
+		return True
+
+	def business_close(self, cr, uid, ids, *args):
+		self.write(cr,uid,ids,{'state':'close'})
+		return True
+
+	def business_draft(self, cr, uid, ids, *args):
+		self.write(cr,uid,ids,{'state':'draft'})
+		return True
+
+business_business()
+
+class sale_order(osv.osv):
+	_name = "sale.order"
+	_inherit = "sale.order"
+	_description = "Sale order with business affair"
+	
+	_columns = {
+		'business_id' : fields.many2one('business.business','Business', required=False , readonly=True, states={'draft':[('readonly',False)]}),
+	}
+
+	def onchange_business_id(self, cr, uid, ids, business_id):
+		if not business_id:
+			return {}
+		analytic = self.pool.get('business.business').browse(cr, uid, business_id).analytic_account.id	
+		return {'value':{'project_id': analytic}}
+
+	def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed','done']):
+		res = super(sale_order, self).action_invoice_create(cr, uid, ids, grouped, states)			
+		for o in self.browse(cr, uid, ids):		
+			inv = self.pool.get('account.invoice').write(cr, uid, [res], {'business_id': o.business_id.id})		
+		return res
+
+sale_order()
+
+class purchase_order(osv.osv):
+	_inherit = "purchase.order"
+	_description = "Purchase order with business affair"
+
+	_columns = {
+		'business_id' : fields.many2one('business.business','Business', required=False, readonly=True, states={'draft':[('readonly',False)]}),
+	}
+
+	def action_invoice_create(self, cr, uid, ids, *args):
+		res = super(purchase_order, self).action_invoice_create(cr, uid, ids, *args)		
+		for o in self.browse(cr, uid, ids):		
+			inv = self.pool.get('account.invoice').write(cr, uid, [res], {'business_id': o.business_id.id})		
+		return res
+
+	def onchange_biz_partner_id(self, cr, uid, ids, part, biz_id):
+		if not part:
+			return {'value':{'partner_address_id': False, 'fiscal_position': False, 'business_id': biz_id}}
+		addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default'])
+		part = self.pool.get('res.partner').browse(cr, uid, part)
+		pricelist = part.property_product_pricelist_purchase.id
+		fiscal_position = part.property_account_position and part.property_account_position.id or False
+		return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position, 'business_id': biz_id}}
+
+purchase_order()
+
+class purchase_order_line(osv.osv):
+	_name = "purchase.order.line"
+	_inherit = "purchase.order.line"
+	_description = "purchase order line with business affair"
+
+	def _default_purchase_analytic( self, cr, uid, context):
+		#print '_default_purchase_analytic',context
+		business_id = context.get( 'business_id', False )
+		if business_id:
+			res = self.pool.get( 'business.business' ).browse( cr, uid, business_id, context ).analytic_account.id
+		else:
+			res = False
+		#purchase_order_obj = obj.pool.get('purchase.order').browse( cr, uid, context )
+		
+		#print purchase_order_obj
+		return res
+	
+	#_defaults = {
+	#	'account_analytic_id' : _default_purchase_analytic, 
+	#}
+
+purchase_order_line()
+
+class account_invoice(osv.osv):
+	_name = "account.invoice"
+	_inherit = "account.invoice"
+	_description = "invoice with business affair"
+	
+	_columns = {
+		'business_id' : fields.many2one('business.business','Business', required=False, readonly=True, states={'draft':[('readonly',False)]}),
+	}
+
+account_invoice()
+
+
+
+class project(osv.osv):
+	_name = "project.project"
+	_inherit="project.project"
+	_description = "Project with business affair"
+	
+	_columns = {
+		'business_id' : fields.many2one('business.business','Business', required=False),
+		'category_id': fields.many2one('account.analytic.account','Analytic Account'),	
+	}
+	
+	def onchange_business_id(self, cr, uid, ids, business_id):
+		if not business_id:
+			return {}
+		analytic = self.pool.get('business.business').browse(cr, uid, business_id).analytic_account.id	
+		return {'value':{'category_id': analytic}}
+
+project()
+
+class partner_from_sale(osv.osv):
+	_name = "partner.from.sale"
+	_description = "Partners from business sales"
+	_order='partner_id'
+	_auto = False
+	
+	_columns = {
+		'name': fields.one2many('sale.order', 'business_id', 'Sale Order', readonly=True),
+		'business_id': fields.many2one('business.business','Business'),
+		'partner_id' : fields.many2one('res.partner','Partner'),
+	}
+	
+	def init(self, cr):
+		cr.execute("""
+			create or replace view partner_from_sale as (
+				select
+					id, partner_id,business_id,name 
+						from 
+							sale_order 
+						)""")
+
+partner_from_sale()
+
+class partner_from_purchase(osv.osv):
+	_name = "partner.from.purchase"
+	_description = "Partners from business purchases"
+	_order='partner_id'
+	_auto = False
+	
+	_columns = {
+		'name': fields.one2many('purchase.order', 'business_id', 'Purchase Order', readonly=True),
+		'business_id': fields.many2one('business.business','Business'),
+		'partner_id' : fields.many2one('res.partner','Partner'),
+	}
+	def init(self, cr):
+		cr.execute("""
+			create or replace view partner_from_purchase as (
+				select
+					id, partner_id,business_id,name 
+						from 
+							purchase_order 
+						)""")
+
+partner_from_purchase()
+
+class partner_from_invoice(osv.osv):
+	_name = "partner.from.invoice"
+	_description = "Partners from business invoices"
+	_order='partner_id'
+	_auto = False
+
+	_columns = {
+		'name': fields.one2many('account_invoice', 'business_id', 'Purchase Order', readonly=True),
+		'business_id': fields.many2one('business.business','Business'),
+		'partner_id' : fields.many2one('res.partner','Partner'),
+	}
+
+	def init(self, cr):
+		cr.execute("""
+			create or replace view partner_from_invoice as (
+				select
+					id, partner_id,business_id,name 
+						from 
+							account_invoice 
+						)""")
+
+partner_from_invoice()
+
+class partner_from_list(osv.osv):
+	_name = "partner.from.list"
+	_description = "Partners from business"
+	_order='partner_id'
+	_auto = False
+	
+	_columns = {
+		'business_id': fields.many2one('business.business','Business'),		
+		'partner_id' : fields.many2one('res.partner','Partner'),
+	}
+
+	def init(self, cr):
+		cr.execute("""
+			create or replace view partner_from_list as (
+				SELECT DISTINCT r.id,r.id as partner_id,b.id as business_id
+					FROM res_partner r, business_business b, 
+						partner_from_invoice i, partner_from_sale s,
+						partner_from_purchase p
+					WHERE b.id=p.business_id and b.id=s.business_id and b.id=i.business_id
+						)""")
+
+partner_from_list()
+
+class hr_analytic_timesheet(osv.osv):
+	_inherit = "hr.analytic.timesheet"
+
+	_columns = {
+		'business_id': fields.many2one('business.business','Business'),		
+	}
+	
+	def onchange_biz_user_id(self, cr, uid, ids, user_id, biz_id):
+		if not user_id:
+			return {}
+		return {'value' : {
+			'product_id' : self._getEmployeeProduct(cr,user_id, context= {}),
+			'product_uom_id' : self._getEmployeeUnit(cr, user_id, context= {}),
+			'account_id' : biz_id,
+			'general_account_id' : self._getGeneralAccount(cr, user_id, context= {}),
+			'journal_id' : self._getAnalyticJournal(cr, user_id, context= {}),
+		}}
+
+hr_analytic_timesheet()
+
+class project_work(osv.osv):
+	_inherit = "project.task.work"
+
+	_columns = {
+		'business_id': fields.many2one('business.business','Business'),		
+	}
+	
+	def create(self, cr, uid, vals, *args, **kwargs):
+		business_id = False
+		if ('business_id' not in vals or ('business_id' in vals and not vals['business_id'])) and ('task_id' in vals):
+			task = self.pool.get('project.task').browse(cr, uid, vals['task_id'])
+			if task and task.project_id and task.project_id.business_id:
+				business_id = task.project_id.business_id.id
+				vals['business_id'] = business_id
+		ret = super(project_work,self).create(cr, uid, vals, *args, **kwargs)
+
+		if business_id:
+			task = self.browse(cr, uid, ret)
+			if task:
+				line_id = task.hr_analytic_timesheet_id
+				# in case,if a record is deleted from timesheet,but we change it from tasks!
+				list_avail_ids = self.pool.get('hr.analytic.timesheet').search(cr, uid, [])
+				if line_id in list_avail_ids:
+					obj = self.pool.get('hr.analytic.timesheet')
+					if obj:
+						obj.write(cr, uid, [line_id], { 'business_id': vals['business_id'] }, {})
+
+	def write(self, cr, uid, ids, vals, context={}):
+		ret = super(project_work,self).write(cr, uid, ids, vals, context)
+		
+		if 'business_id' in vals:
+			task = self.browse(cr, uid, ids)[0]
+			if task:
+				line_id = task.hr_analytic_timesheet_id
+				# in case,if a record is deleted from timesheet,but we change it from tasks!
+				list_avail_ids = self.pool.get('hr.analytic.timesheet').search(cr, uid, [])
+				if line_id in list_avail_ids:
+					obj = self.pool.get('hr.analytic.timesheet')
+					if obj:
+						obj.write(cr, uid, [line_id], { 'business_id': vals['business_id'] }, {})
+
+		return ret
+
+project_work()

=== added file 'business_sequence.xml'
--- business_sequence.xml	1970-01-01 00:00:00 +0000
+++ business_sequence.xml	2011-06-12 01:27:27 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Sequences for Business No -->
+        <record id="seq_type_business" model="ir.sequence.type">
+            <field name="name">Business</field>
+            <field name="code">business.business</field>
+        </record>
+        <record id="seq_business" model="ir.sequence">
+            <field name="name">Business</field>
+            <field name="code">business.business</field>
+            <field name="prefix">Aff</field>
+            <field name="padding">4</field>
+        </record>
+    </data>
+</openerp>

=== added file 'business_view.xml'
--- business_view.xml	1970-01-01 00:00:00 +0000
+++ business_view.xml	2011-06-12 01:27:27 +0000
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		<!--        order view	-->
+		<record model="ir.ui.view" id="view_order_tree_business">
+			<field name="name">sale.order.tree</field>
+			<field name="model">sale.order</field>
+			<field name="inherit_id" ref="sale.view_order_tree" />
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<field name="partner_id" position="before" >
+					<field name="business_id"/>
+				</field>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="view_order_form_business">
+			<field name="name">sale.order.form</field>
+			<field name="model">sale.order</field>
+			<field name="inherit_id" ref="sale.view_order_form" />
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="project_id" position="before" >
+					<field name="business_id" select="1" on_change="onchange_business_id(business_id)"/>
+				</field>  
+			</field>
+		</record>
+
+		<!--	invoice view	-->
+		<record model="ir.ui.view" id="invoice_tree_business">
+			<field name="name">business.account.invoice.tree</field>
+			<field name="model">account.invoice</field>
+			<field name="inherit_id" ref="account.invoice_tree"/>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<field name="number" position="after" >
+					<field name="business_id" select="1"/>
+				</field>
+			</field>
+		</record>
+		
+		<record model="ir.ui.view" id="invoice_form_business_sales">
+			<field name="name">business.sales.account.invoice.form</field>
+			<field name="model">account.invoice</field>
+			<field name="inherit_id" ref="account.invoice_form"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="currency_id" position="after" >
+					<field name="business_id" select="1"/>
+				</field>
+			</field>
+		</record>
+
+		<record model="ir.ui.view" id="invoice_form_business_sales_purchases">
+			<field name="name">business.purchases.account.invoice.form</field>
+			<field name="model">account.invoice</field>
+			<field name="inherit_id" ref="account.invoice_supplier_form"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="account_id" position="after" >
+					<field name="business_id" select="1"/>
+				</field>
+			</field>
+		</record>
+
+	<!--	Project view	-->
+		<record model="ir.ui.view" id="edit_project_business">
+			<field name="name">project.project.form</field>
+			<field name="model">project.project</field>
+			<field name="inherit_id" ref="project.edit_project"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="state" position="after" >
+					<field name="business_id" select="1" on_change="onchange_business_id(business_id)"/>
+				</field>
+			</field>
+		</record>
+		
+		<record model="ir.ui.view" id="view_project_business">
+			<field name="name">project.project.tree</field>
+			<field name="model">project.project</field>
+			<field name="inherit_id" ref="project.view_project"/>     
+			<field name="type">tree</field>
+			<field name="field_parent">child_id</field>
+			<field name="arch" type="xml">
+				<field name="manager" position="after" >
+					<field name="business_id" select="1"/>
+				</field>
+			</field>
+		</record>
+
+	<!--	Account analytic account view	-->
+		<record model="ir.ui.view" id="biz_analytic_1-form">
+			<field name="name">biz_analytic_1.form</field>
+			<field name="model">account.analytic.account</field>
+			<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="partner_id" position="replace" >
+					<field name="partner_id" required="1"/>
+				</field>
+			</field>
+		</record>
+		
+		<record model="ir.ui.view" id="biz_analytic_2-form">
+			<field name="name">biz_analytic_2.form</field>
+			<field name="model">account.analytic.account</field>
+			<field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>     
+			<field name="type">tree</field>
+			<field name="field_parent">child_id</field>
+			<field name="arch" type="xml">
+				<field name="pricelist_id" position="replace" >
+					<field name="pricelist_id" required="1"/>
+				</field>
+			</field>
+		</record>
+
+		<!--	Business affair view	-->
+		<record model="ir.ui.view" id="business_form">
+			<field name="name">business.business.form</field>
+			<field name="model">business.business</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">      
+				<form string="Business!">
+					<notebook>
+						<page string="Affair">
+							<field name="name" select="1"/>
+							<field name="code" select="1"/>
+							<field name="date_start" select="1"/>
+							<field name="date_end" select="1"/>
+							<field name="analytic_account" select="2" required="1"/>
+							<field name="main_partner" select="1" required="1"/>
+		                    <group colspan="4" col="4">
+		                    	<separator string="Business State" colspan="4"/>
+		                        <field colspan="1" nolabel="1" name="state" select="2"/>
+		                        <button colspan="1" name="business_open" string="Open" states="draft" type="object"/>
+		                        <button colspan="1" name="business_close" string="Close" states="open" type="object"/>
+		                        <button colspan="1" name="business_draft" string="Draft" states="open,close" type="object"/>
+		                    </group>
+						</page>
+						<page string="Projects">
+							<field name="projects" select="2" nolabel="1"/>
+						</page>
+						<page string="TimeSheets">
+							<field name="timesheet" select="2" nolabel="1" widget="one2many_list" mode="tree,form">
+				                <tree editable="bottom" string="Timesheet Line">
+				                    <field name="user_id" on_change="onchange_biz_user_id(user_id, parent.analytic_account)" required="1"/>
+				                    <field name="date" on_change="on_change_date(date)"/>
+				                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id"/>
+				                    <field name="name"/>
+				                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total time"/>
+				                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
+				                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+				                    <field name="amount" sum="Total cost"/>
+				                    <field name="general_account_id"/>
+				                    <field name="journal_id"/>
+				                    <field name="to_invoice"/>
+				                </tree>
+				                <form string="Timesheet Lines">
+				                    <field colspan="4" name="name" select="2"/>
+				                    <field name="user_id" on_change="on_change_user_id(user_id)" required="1" select="1"/>
+				                    <field name="date" select="1" on_change="on_change_date(date)"/>
+				                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+				                    <newline/>
+				                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
+				                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+				                    
+				                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/>
+				                    <field name="amount" select="2"/>
+				                    <field name="general_account_id" select="2"/>
+				                    <field name="journal_id"/>
+				                    <field name="to_invoice"/>
+				                </form>
+							</field>
+						</page>
+						<page string="Involved Users">
+							<field name="users" select="2" nolabel="1"/>
+						</page>
+					</notebook>
+				</form>
+			</field>
+		</record> 
+
+		<record model="ir.ui.view" id="business_tree">
+			<field name="name">business.business.tree</field>
+			<field name="model">business.business</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">      
+				<tree string="Businesses">
+					<field name="name" select="1"/>
+					<field name="code" select="1"/>
+					<field name="date_start" select="1"/>
+					<field name="date_end" select="1"/>
+					<field name="analytic_account" select="2"/>            
+					<field name="sales" select="2"/>
+					<field name="purchases" select="2"/>
+					<field name="invoices" select="2"/>
+					<field name="projects" select="2"/>
+					<field name="timesheet" select="2"/>
+				</tree>
+			</field>
+		</record> 
+
+		<record model="ir.actions.act_window" id="business_all_form_action">
+			<field name="name">Business: all affairs</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">business.business</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="view_id" ref="business_tree"/>
+		</record>
+
+		<record model="ir.actions.act_window" id="business_draft_form_action">
+			<field name="name">Business: draft affairs</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">business.business</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="view_id" ref="business_tree"/>
+			<field name="domain">[('state','=','draft')]</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="business_open_form_action">
+			<field name="name">Business: opened affairs</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">business.business</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="view_id" ref="business_tree"/>
+			<field name="domain">[('state','=','open')]</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="business_close_form_action">
+			<field name="name">Business: closed affairs</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">business.business</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="view_id" ref="business_tree"/>
+			<field name="domain">[('state','=','close')]</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="business_my_form_action">
+			<field name="name">Business: my affairs</field>
+			<field name="type">ir.actions.act_window</field>
+			<field name="res_model">business.business</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="view_id" ref="business_tree"/>
+			<field name="domain">[('users','in',[uid])]</field>
+		</record>
+		<act_window
+			domain="[('users','in',[uid])]"
+			id="act_employee_2_business"
+			name="My Affairs"
+			res_model="business.business"
+			src_model="hr.employee"/>
+
+		<!-- stand-alone timesheet lines: add the link field to business -->
+        <record id="view_biz_account_analytic_line_tree_inherit" model="ir.ui.view">
+            <field name="name">biz.account.analytic.line.tree.to_invoice</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
+            <field name="arch" type="xml">
+                <field name="date" position="after">
+                    <field name="business_id"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_biz_account_analytic_line_form_inherit" model="ir.ui.view">
+            <field name="name">biz.account.analytic.line.form.to_invoice</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
+            <field name="arch" type="xml">
+                <field name="date" position="after">
+                    <field name="business_id"/>
+                </field>
+            </field>
+        </record>
+		
+		<!-- menu view -->
+		<menuitem name="Business"  id="menu_business_root" sequence="1"/>
+		<menuitem name="Business/All Affairs" id="menu_business_all_form_action" action="business_all_form_action"/>
+		<menuitem name="Business/Draft Affairs" id="menu_business_draft_form_action" action="business_draft_form_action"/>
+		<menuitem name="Business/Opened Affairs" id="menu_business_open_form_action" action="business_open_form_action"/>
+		<menuitem name="Business/Closed Affairs" id="menu_business_close_form_action" action="business_close_form_action"/>
+		<menuitem name="Business/My Affairs" id="menu_business_my_form_action" action="business_my_form_action"/>
+
+		<!-- list of views -->
+		<act_window name="Purchase Invoices"
+			domain="[('business_id', '=', active_id),('type','=','in_invoice')]"
+			res_model="account.invoice"
+			src_model="business.business"
+			view_type="form"
+			view_mode="tree,form"
+			id="act_business_to_purchases"/>
+			
+		<act_window name="Sale Invoices"
+			domain="[('business_id', '=', active_id),('type','=','out_invoice')]"
+			res_model="account.invoice"
+			src_model="business.business"
+			view_type="form"
+			view_mode="tree,form"
+			id="act_business_to_sales"/>
+			
+		<act_window name="Analytic Account"
+			domain="[('id', '=', analytic_account)]"
+			res_model="account.analytic.account"
+			src_model="business.business"
+			view_type="form"
+			view_mode="tree,form"
+			id="act_business_to_analytic_account"/>
+			
+		<record id="business_client_analytic_account" model="account.analytic.account">
+			<field name="name">Client</field>
+		</record>
+
+		<!-- Project's tasks -->
+		<record model="ir.ui.view" id="business_edit_project_business">
+			<field name="name">business.project.task.form</field>
+			<field name="model">project.task</field>
+			<field name="inherit_id" ref="project.view_task_form2"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<xpath expr="/form/notebook/page/field[@name='work_ids']/tree/field[@name='name']" position="before">
+					<field name="business_id" invisible="1"/>
+				</xpath>
+			</field>
+		</record>
+	
+	</data>
+</openerp> 

=== added directory 'i18n'
=== added file 'i18n/fr_FR.csv'
--- i18n/fr_FR.csv	1970-01-01 00:00:00 +0000
+++ i18n/fr_FR.csv	2011-06-12 01:27:27 +0000
@@ -0,0 +1,33 @@
+"field","account.invoice,business_id",0,"Business","Affaire"
+"field","business.business,purchases",0,"Purchases","Achats"
+"field","business.business,code",0,"Business Number","Numéro Affaire"
+"field","business.business,name",0,"Business","Affaire"
+"field","business.business,invoices",0,"Invoices","Factures"
+"field","business.business,date_end",0,"End Date","Date fin"
+"field","business.business,date_start",0,"Start Date","Date Début"
+"field","business.business,sales",0,"Sales","Ventes"
+"field","business.business,analytic_account",0,"Analytic Account","Compte Analytique"
+"field","business.business,projects",0,"Projects","Projets"
+"model","ir.model,name",191,"business affair","Affaire"
+"model","ir.model,name",192,"business affair","Affaire"
+"model","ir.model,name",193,"Make a supplier product list","Faire une liste de produit fournisseur"
+"model","ir.model,name",194,"Partners from business sales","Partenaires des ventes d'une affaire"
+"model","ir.model,name",195,"Partners from business sales","Partenaires des ventes d'une affaire"
+"model","ir.model,name",196,"Partners from business purchases","Partenaire des achats d'une affaire"
+"model","ir.model,name",197,"Partners from business invoices","Partenaires des factures d'une affaire"
+"model","ir.model,name",198,"Partners from business","Partenaires d'une affaire"
+"model","ir.ui.menu,name",438,"Business","Affaire"
+"model","ir.ui.menu,name",439,"Business Affair","Affaire"
+"field","partner.from.invoice,business_id",0,"Business","Affaire"
+"field","partner.from.list,business_id",0,"Business","Affaire"
+"field","partner.from.purchase,business_id",0,"Business","Affaire"
+"field","partner.from.sale,business_id",0,"Business","Affaire"
+"field","purchase.order,business_id",0,"Business","Affaire"
+"field","sale.order,business_id",0,"Business","Affaire"
+"view","business.business",0,"Business","Affaire"
+"view","business.business",0,"Affair","Affaire"
+"view","business.business",0,"Sales","Ventes"
+"view","business.business",0,"Purchases","Achats"
+"view","business.business",0,"Invoices","Factures"
+"view","business.business",0,"Projects","Projets"
+"view","business.business",0,"Business","Affaire"

=== added file 'i18n/fr_FR.po'
--- i18n/fr_FR.po	1970-01-01 00:00:00 +0000
+++ i18n/fr_FR.po	2011-06-12 01:27:27 +0000
@@ -0,0 +1,388 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* business
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.5-bzr\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-09-15 13:35:00+0000\n"
+"PO-Revision-Date: 2009-09-15 13:35:00+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: business
+#: view:business.business:0
+msgid "Sale invoice"
+msgstr "Facture de vente"
+
+#. module: business
+#: model:ir.model,name:business.model_partner_from_sale
+msgid "Partners from business sales"
+msgstr "Partenaires depuis les ventes de l'affaire"
+
+#. module: business
+#: constraint:ir.model:0
+msgid "The Object name must start with x_ and not contain any special character !"
+msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+
+#. module: business
+#: view:business.business:0
+msgid "(keep empty to use the current period)"
+msgstr "(laisser vide pour la période courante)"
+
+#. module: business
+#: view:business.business:0
+msgid "Other Info"
+msgstr "Autres informations"
+
+#. module: business
+#: view:business.business:0
+msgid "Create"
+msgstr "Créer"
+
+#. module: business
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom du Modèle non valide dans la définition de l'action."
+
+#. module: business
+#: view:business.business:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: business
+#: view:business.business:0
+msgid "Untaxed amount"
+msgstr "Montant hors-taxe"
+
+#. module: business
+#: field:hr.analytic.timesheet,business_id:0
+#: model:ir.ui.menu,name:business.menu_business_root
+msgid "Business"
+msgstr "Affaires"
+
+#. module: business
+#: field:account.invoice,business_id:0
+msgid "Business"
+msgstr "Affaire"
+
+#. module: business
+#: view:business.business:0
+msgid "Timesheet Lines"
+msgstr "Lignes horaires"
+
+#. module: business
+#: view:business.business:0
+msgid "Set to Draft"
+msgstr "Passer en brouillon"
+
+#. module: business
+#: view:business.business:0
+msgid "Re-Open"
+msgstr "Réouvrir"
+
+#. module: business
+#: view:business.business:0
+msgid "Validate"
+msgstr "Valider"
+
+#. module: business
+#: view:business.business:0
+msgid "Invoice lines"
+msgstr "Lignes de facture"
+
+#. module: business
+#: view:business.business:0
+msgid "Projects"
+msgstr "Projets"
+
+#. module: business
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue"
+
+#. module: business
+#: view:business.business:0
+msgid "Purchase invoices"
+msgstr "Factures d'achat"
+
+#. module: business
+#: view:business.business:0
+msgid "Total time"
+msgstr "Temps total"
+
+#. module: business
+#: model:ir.ui.menu,name:business.menu_business_all_form_action
+msgid "All Affairs"
+msgstr "Toutes les affaires"
+
+#. module: business
+#: model:ir.model,name:business.model_partner_from_list
+msgid "Partners from business"
+msgstr "Partenaires d'une affaire"
+
+#. module: business
+#: view:business.business:0
+msgid "Total amount"
+msgstr "Montant total"
+
+#. module: business
+#: view:business.business:0
+msgid "Compute Taxes"
+msgstr "Calculer les taxes"
+
+#. module: business
+#: view:business.business:0
+msgid "Taxes"
+msgstr "Taxes"
+
+#. module: business
+#: view:business.business:0
+msgid "TimeSheets"
+msgstr "Feuilles d'heures"
+
+#. module: business
+#: view:business.business:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: business
+#: model:ir.model,name:business.model_business_business
+msgid "business affair"
+msgstr "Affaire"
+
+#. module: business
+#: view:business.business:0
+msgid "Payments"
+msgstr "Payements"
+
+#. module: business
+#: view:business.business:0
+msgid "Sale invoices"
+msgstr "Factures de vente"
+
+#. module: business
+#: view:business.business:0
+msgid "Total cost"
+msgstr "Coût total"
+
+#. module: business
+#: view:business.business:0
+msgid "Additionnal Information"
+msgstr "Information additionnelle"
+
+#. module: business
+#: view:business.business:0
+msgid "Affair"
+msgstr "Affaire"
+
+#. module: business
+#: model:ir.module.module,description:business.module_meta_information
+msgid "regroup partner, invoice, purchase, timesheet and analytic account within an affair"
+msgstr "Regroupe partenaire, facturation, achat, timesheet et comptabilité analytique dans une affaire"
+
+#. module: business
+#: model:ir.model,name:business.model_partner_from_invoice
+msgid "Partners from business invoices"
+msgstr "Partenaires depuis les factures de l'affaire"
+
+#. module: business
+#: model:ir.module.module,shortdesc:business.module_meta_information
+msgid "Module business"
+msgstr "Module Affaire"
+
+#. module: business
+#: model:ir.ui.menu,name:business.menu_business_open_form_action
+msgid "Opened Affairs"
+msgstr "Affaires en cours"
+
+#. module: business
+#: view:business.business:0
+msgid "Businesses"
+msgstr "Affaires"
+
+#. module: business
+#: view:business.business:0
+msgid "Invoice"
+msgstr "Facture"
+
+#. module: business
+#: model:ir.ui.menu,name:business.menu_business_close_form_action
+msgid "Closed Affairs"
+msgstr "Affaires closes"
+
+#. module: business
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursivement."
+
+#. module: business
+#: model:ir.model,name:business.model_partner_from_purchase
+msgid "Partners from business purchases"
+msgstr "Partenaires depuis les devis"
+
+#. module: business
+#: view:business.business:0
+msgid "Timesheet Line"
+msgstr "Ligne horaire"
+
+#. module: business
+#: model:ir.ui.menu,name:business.menu_business_draft_form_action
+msgid "Draft Affairs"
+msgstr "Affaires démarrées"
+
+#. module: business
+#: model:ir.ui.menu,name:business.menu_business_draft_form_action
+msgid "My Affairs"
+msgstr "Mes affaires"
+
+#. module: business
+#: view:business.business:0
+msgid "Additional Information"
+msgstr "Information additionnelle"
+
+#. module: business
+#: view:business.business:0
+msgid "Business State"
+msgstr "Etat de l'affaire"
+
+#. module: batiplus_products
+#: selection:business.business,state:0
+msgid "Open"
+msgstr "Ouvert"
+
+#. module: batiplus_products
+#: selection:business.business,state:0
+msgid "Close"
+msgstr "Fermé"
+
+#. module: batiplus_products
+#: selection:business.business,state:0
+#: view:business.business:0
+msgid "Draft"
+msgstr "Proposition"
+
+#. module: business
+#: model:ir.actions.act_window,name:business.act_business_to_purchases
+msgid "Purchase Invoices"
+msgstr "Factures d'achat"
+
+#. module: business
+#: model:ir.actions.act_window,name:business.act_business_to_sales
+msgid "Sale Invoices"
+msgstr "Factures de vente"
+
+#. module: business
+#: model:ir.actions.act_window,name:business.act_business_to_analytic_account
+msgid "Analytic Account"
+msgstr "Compte analytique"
+
+#. module: business
+#: field:business.business,name:0
+msgid "Business"
+msgstr "Affaire"
+
+#. module: business
+#: field:business.business,code:0
+msgid "Business Number"
+msgstr "N° d'affaire"
+
+#. module: business
+#: field:business.business,date_start:0
+msgid "Start Date"
+msgstr "Date de démarrage"
+
+#. module: business
+#: field:business.business,date_end:0
+msgid "End Date"
+msgstr "Date de fin"
+
+#. module: business
+#: field:business.business,analytic_account:0
+msgid "Analytic Account"
+msgstr "Compte Analytique"
+
+#. module: business
+#: field:business.business,sales:0
+msgid "Sales"
+msgstr "Ventes"
+
+#. module: business
+#: field:business.business,purchases:0
+msgid "Purchases"
+msgstr "Achats"
+
+#. module: business
+#: field:business.business,invoices:0
+msgid "Invoices"
+msgstr "Factures"
+
+#. module: business
+#: field:business.business,projects:0
+msgid "Projects"
+msgstr "Projets"
+
+#. module: business
+#: field:business.business,timesheet:0
+msgid "Time Sheets"
+msgstr "Feuilles d'heures"
+
+#. module: business
+#: field:business.business,main_partner:0
+msgid "Main Partner"
+msgstr "Partenaire principal"
+
+#. module: business
+#: field:business.business,users:0
+msgid "Involved Users"
+msgstr "Utilisateurs concernés"
+
+#. module: business
+#: view:business.business:0
+msgid "Involved Users"
+msgstr "Utilisateurs concernés"
+
+#. module: business
+#: view:business.business:0
+msgid "Open"
+msgstr "Ouvrir"
+
+#. module: business
+#: view:business.business:0
+msgid "Close"
+msgstr "Clore"
+
+#. module: business
+#: view:business.business:0
+msgid "Draft"
+msgstr "Démarrer"
+
+#. module: business
+#: model:ir.actions.act_window,name:ons_business.business_all_form_action
+msgid "Business: all affairs"
+msgstr "Affaires: toutes"
+
+#. module: business
+#: model:ir.actions.act_window,name:ons_business.business_all_form_action
+msgid "Business: draft affairs"
+msgstr "Affaires: démarrées"
+
+#. module: business
+#: model:ir.actions.act_window,name:ons_business.business_all_form_action
+msgid "Business: opened affairs"
+msgstr "Affaires en cours"
+
+#. module: business
+#: model:ir.actions.act_window,name:ons_business.business_all_form_action
+msgid "Business: closed affairs"
+msgstr "Affaires closes"
+
+#. module: business
+#: model:ir.actions.act_window,name:ons_business.business_all_form_action
+msgid "Business: my affairs"
+msgstr "Mes affaires"

=== added file 'inits.py'
--- inits.py	1970-01-01 00:00:00 +0000
+++ inits.py	2011-06-12 01:27:27 +0000
@@ -0,0 +1,45 @@
+# -*- encoding: utf-8 -*-
+#
+#  File: inits.py
+#  Module: business
+#
+#  Created by [e-mail]
+#
+#  Copyright (c) 2010 Open-Net Ltd. All rights reserved.
+##############################################################################
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from account import invoice
+from osv import fields, osv
+
+class opennet_own_inits(osv.osv):
+	_inherit = 'account.invoice'
+	_auto = False
+
+	def __init__(self, pool, cr):
+		super(opennet_own_inits, self).__init__(pool, cr)
+		cr.execute("Update ir_act_report_xml set report_rml='ons_business/report/invoices.rml' Where model='account.invoice' and report_name='account.invoice'")
+
+opennet_own_inits()

=== added directory 'report'
=== added file 'report/invoices.rml'
--- report/invoices.rml	1970-01-01 00:00:00 +0000
+++ report/invoices.rml	2011-06-12 01:27:27 +0000
@@ -0,0 +1,421 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+<!--
+  <docinit>
+    <registerFont fontName="ocrb" fontFile="/home/openerp/addons/business/report/myfont.ttf"/>
+  </docinit>
+-->
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Partner_Address">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Invoice_General_Header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_General_Detail_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Header_Invoice_Line">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Invoice_Line_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Format_2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="0,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,1" stop="1,1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="0,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,4" stop="0,4"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,4" stop="1,4"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,4" stop="2,4"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_format_Table_Line_total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_eclu_Taxes_Total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Taxes_Total">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Total_Include_Taxes">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Main_Table">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,2" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Tax_Header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Tax_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Table_Border_White">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Final_Border">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Coment_Payment_Term">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Payment_Terms">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Right_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]] </para>
+    <blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
+      <tr>
+        <td><para style="P8"><font color="white"> </font></para></td>
+        <td>
+          <para style="terp_default_8">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_8">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
+          <para style="terp_default_8">[[ o.address_invoice_id.street ]]</para>
+          <para style="terp_default_8">[[ o.address_invoice_id.street2 or '' ]]</para>
+          <para style="terp_default_8">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
+          <para style="terp_default_8">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
+          <para style="terp_default_8">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
+          <para style="P8"><font color="white"> </font></para>
+          <para style="terp_default_8">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_header">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="P8"><font color="white"> </font></para>
+    <blockTable colWidths="177.0,177.0,177.0" style="Table_Invoice_General_Header">
+      <tr>
+        <td><para style="terp_tblheader_General_Centre">Document</para></td>
+        <td><para style="terp_tblheader_General_Centre">Invoice Date</para></td>
+        <td><para style="terp_tblheader_General_Centre">Partner Ref.</para></td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="177.0,177.0,177.0" style="Table_General_Detail_Content">
+      <tr>
+        <td><para style="terp_default_Centre_9">[[ o.name ]]</para></td>
+        <td><para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para></td>
+        <td><para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para></td>
+      </tr>
+    </blockTable>
+    <para style="P8"><font color="white"></font></para>
+    <para style="P8"><font color="white"> </font></para>
+    <blockTable colWidths="313.0,53.0,73.0,84.0" style="Table_Header_Invoice_Line">
+      <tr>
+        <td><para style="terp_tblheader_Details">Description</para></td>
+        <td><para style="terp_tblheader_Details">Quantity</para></td>
+        <td><para style="terp_tblheader_Details_Centre">Unit Price</para></td>
+        <td><para style="terp_tblheader_Details_Centre">Price</para></td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.invoice_line,'l') ]]</para>
+      <blockTable colWidths="313.0,36.0,27.0,63.0,59.0,26.0" style="Table_Invoice_Line_Content">
+        <tr>
+          <td><para style="terp_default_9">[[ l.name ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(l.quantity)]]</para></td>
+          <td><para style="terp_default_Right_9">[[ (l.uos_id and l.uos_id.name) or '' ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]]</para></td>
+          <td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
+        </tr>
+        <tr>
+          <td><para style="terp_default_Note">[[ format(l.note) or removeParentNode('tr') ]]</para></td>
+          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
+          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
+          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
+          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
+          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="371.0,153.0" style="Table_Format_2">
+      <tr>
+        <td>
+          <blockTable colWidths="176.0,258.0" style="Table_format_Table_Line_total">
+            <tr>
+              <td><para style="terp_default_2"><font color="white"> </font></para></td>
+              <td><para style="terp_default_2"><font color="white"> </font></para></td>
+            </tr>
+          </blockTable>
+        </td>
+        <td>
+          <blockTable colWidths="62.0,59.0,25.0" style="Table_eclu_Taxes_Total">
+            <tr>
+              <td><para style="terp_default_Bold_9">Net Total:</para></td>
+              <td><para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para></td>
+              <td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="63.0,58.0,26.0" style="Table_Taxes_Total">
+            <tr>
+              <td><para style="terp_default_Bold_9">Taxes:</para></td>
+              <td><para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para></td>
+              <td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="63.0,58.0,26.0" style="Table_Total_Include_Taxes">
+            <tr>
+              <td><para style="terp_default_Bold_9">Total:</para></td>
+              <td><para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para></td>
+              <td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
+            </tr>
+          </blockTable>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="530.0" style="Table_Main_Table">
+      <tr>
+        <td>
+          <blockTable colWidths="54.0,80.0,67.0" style="Table_Tax_Header">
+            <tr>
+              <td><para style="terp_tblheader_Details_Centre">Tax</para></td>
+              <td><para style="terp_tblheader_Details_Right">Base</para></td>
+              <td><para style="terp_tblheader_Details_Right">Amount</para></td>
+            </tr>
+          </blockTable>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
+          <blockTable colWidths="53.0,80.0,65.0" style="Table_Tax_Content">
+            <tr>
+              <td><para style="terp_default_Centre_8">[[ t.name ]] </para></td>
+              <td><para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para></td>
+              <td><para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]]</para></td>
+            </tr>
+          </blockTable>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <blockTable colWidths="53.0,60.0,65.0" style="Table_Table_Border_White">
+            <tr>
+              <td><para style="terp_default_2"><font color="white"> </font></para></td>
+              <td><para style="terp_default_2"><font color="white"> </font></para></td>
+              <td><para style="terp_default_2"><font color="white"> </font></para></td>
+            </tr>
+          </blockTable>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="180.0,350.0" style="Table_Final_Border">
+      <tr>
+        <td><para style="terp_default_2"><font color="white"> </font></para></td>
+        <td><para style="terp_default_2"><font color="white"> </font></para></td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="530.0" style="Table_Coment_Payment_Term">
+      <tr>
+        <td><para style="terp_default_9">[[ format(o.comment or removeParentNode('blockTable')) ]]</para></td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="530.0" style="Table_Payment_Terms">
+      <tr>
+        <td><para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]</para></td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="128.0,402.0" style="Standard_Outline">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Fiscal Position Remark :</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ format(o.fiscal_position and o.fiscal_position.note or removeParentNode('blockTable')) ]]</para>
+        </td>
+       </tr>
+     </blockTable>
+     <para style="terp_default_2">
+       <font color="white"> </font>
+     </para>
+    
+  </story>
+</document>