Merge lp:~ss-dtic/openerp-costa-rica/6.1-bom-price-update into lp:openerp-costa-rica/6.1

[Miguel Gutierrez]

Unmerged revisions

668. By Miguel Gutierrez on 2013-01-10

[IMP] Add license to all pys

667. By Miguel Gutierrez on 2012-12-27

[ADD] Adding purchase import

666. By Miguel Gutierrez on 2012-12-26

[ADD] Adding product search improve module

665. By Launchpad Translations on behalf of clearcorp-drivers on 2012-12-15

Launchpad automatic translations update.

664. By Ronald Rubi on 2012-12-12

[MRG] Fix translations for hr_payroll_report module

663. By Ronald Rubi on 2012-12-12

[MRG] Add new module purchase_order_discount that add discount for purchase order and purchase order line.

662. By Ronald Rubi on 2012-12-07

[MRG] added sale_order_sequence to fix sequenciation in case that the order is not created. Added to improve sequentiation in case that the order is not created. Added mrp_production_sequence to fix sequentiation issues, modified sale_order_sequence to remove innecesary prints and remove comments

661. By Launchpad Translations on behalf of clearcorp-drivers on 2012-12-06

Launchpad automatic translations update.

660. By Ronald Rubi on 2012-12-06

[MRG] Fix translations ccorp_payment_receipt/i18n/es_CR.po

659. By Ronald Rubi on 2012-12-05

[MRG] Fix create account.invoice where vals don't have journal_id

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2013-01-15 16:49:27 +0000
@@ -0,0 +1,1 @@
+.~lock*

=== renamed file '.bzrignore' => '.bzrignore.moved'
=== added file 'LICENSE'
--- LICENSE	1970-01-01 00:00:00 +0000
+++ LICENSE	2013-01-15 16:49:27 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    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/>.
+#
+##############################################################################
+
+
+{
+    "name" : 'NAME',
+    "version" : '1.0',
+    "author" : 'CLEARCORP S.A.',
+    #easy, normal, expert
+    'complexity': 'normal',
+    "description": """
+LONG DESCRIPTION
+    """,
+    "category": 'Accounting & Finance',
+    "sequence": 4,
+    "website" : "http://clearcorp.co.cr",
+    "images" : [],
+    "icon" : False,
+    "depends" : [],
+    "init_xml" : [],
+    "demo_xml" : [],
+    "update_xml" : [],
+    "test" : [],
+    "auto_install": False,
+    "application": False,
+    "installable": True,
+    'license': 'AGPL-3',
+}
\ No newline at end of file

=== added directory 'TODO-6.1'
=== renamed directory 'TODO-6.1' => 'TODO-6.1.moved'
=== added directory 'TODO-6.1/account_analytic_plans_fix'
=== added file 'TODO-6.1/account_analytic_plans_fix/__init__.py'
--- TODO-6.1/account_analytic_plans_fix/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_analytic_plans_fix/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __init__.py
+#    account_analytic_plans_fix
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+import account_analytic_plans_fix

=== added file 'TODO-6.1/account_analytic_plans_fix/__openerp__.py'
--- TODO-6.1/account_analytic_plans_fix/__openerp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_analytic_plans_fix/__openerp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __openerp__.py
+#    account_analytic_plans_fix
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+{
+	'name': 'account_analytic_plans bug fix',
+	'version': '0.1',
+	'author': 'ClearCorp S.A.',
+	'website': 'http://clearcorp.co.cr',
+	'category': 'Generic Modules/Accounting',
+	'description': """Fixes a bug on account_analytic_plans that breaks manual account move entry UI.
+	""",
+	'depends': ['account_analytic_plans'],
+	'init_xml': [],
+	'demo_xml': [],
+	'update_xml': [],
+	'license': 'Other OSI approved licence',
+	'installable': True,
+	'active': False,
+}

=== added file 'TODO-6.1/account_analytic_plans_fix/account_analytic_plans_fix.py'
--- TODO-6.1/account_analytic_plans_fix/account_analytic_plans_fix.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_analytic_plans_fix/account_analytic_plans_fix.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    account_analytic_plans_fix.py
+#    account_analytic_plans_fix
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+from osv import osv,fields
+from account.account_move_line import *
+
+class account_analytic_plans_fix_move_line(osv.osv):
+	'''
+	fixes move line manual entry view
+	'''
+	_name = 'account.move.line'
+	_inherit = 'account.move.line'
+
+
+	def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+		return account_move_line.fields_view_get(self, cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
+	
+account_analytic_plans_fix_move_line()

=== added directory 'TODO-6.1/account_analytic_rename'
=== added file 'TODO-6.1/account_analytic_rename/__init__.py'
--- TODO-6.1/account_analytic_rename/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_analytic_rename/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,1 @@
+import account_analytic_rename

=== added file 'TODO-6.1/account_analytic_rename/__openerp__.py'
--- TODO-6.1/account_analytic_rename/__openerp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_analytic_rename/__openerp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    account_analytic_rename.py
+#    account_analytic_rename
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+{
+	"name"        : "Accounting Analytics rename",
+	"author"      : "ClearCorp S.A.",
+	"version"     : "1.0",
+	"depends"     : ["base","account"],
+	"init_xml"    : [],
+	"update_xml"  : ["account_analytic_rename_view.xml"],
+	"category"    : "Accounting",
+	"active"      : False,
+	"instalable"  : True,
+}

=== added file 'TODO-6.1/account_analytic_rename/account_analytic_rename.py'
--- TODO-6.1/account_analytic_rename/account_analytic_rename.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_analytic_rename/account_analytic_rename.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    account_analytic_rename.py
+#    account_analytic_rename
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+from osv import osv, fields
+from tools import debug
+from tools.translate import _
+
+class account_analytic_account(osv.osv):
+	_name = "account.analytic.account"
+	_inherit = "account.analytic.account"
+	
+	def name_get(self, cr, uid, ids, context=None):
+		if not ids:
+			return []
+		res = []
+		for obj_account in self.browse(cr,uid,ids):
+			data = []
+			account = obj_account.parent_id
+			while account:
+				data.insert(0,(account.shortcut or account.name))
+				account = account.parent_id
+			data.append(obj_account.name)
+			data = '/'.join(data)
+			res.append((obj_account.id, data))  
+		return res
+		
+	_columns = {
+		'shortcut': fields.char('Shortcut',size=10),
+	}
+account_analytic_account()

=== added file 'TODO-6.1/account_analytic_rename/account_analytic_rename_view.xml'
--- TODO-6.1/account_analytic_rename/account_analytic_rename_view.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_analytic_rename/account_analytic_rename_view.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,41 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<openerp>
+	<data>
+
+		<!--
+		======================================
+					accounts
+		======================================
+		-->
+		<record model = "ir.ui.view" id = "account_analytic_rename_form_view">
+			<field name = "name">account.analytic.account.form</field>
+			<field name = "model">account.analytic.account</field>
+			<field name = "type">form</field>
+			<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+			<field name = "arch" type = "xml">
+				<data>
+					<field name = "type" position = "after">
+						<field name = "shortcut"/>
+					</field>
+				</data>
+			</field>
+		</record>
+		
+		<record model = "ir.ui.view" id = "account_analytic_rename_tree_view">
+			<field name = "name">account.analytic.account.tree</field>
+			<field name = "model">account.analytic.account</field>
+			<field name = "type">tree</field>
+			<field name="inherit_id" ref="account.view_account_analytic_account_tree"/>
+			<field name = "arch" type = "xml">
+				<data>
+					<field name = "name" position = "after">
+						<field name = "complete_name"/>
+						<field name = "shortcut"/>
+					</field>
+					<field name = "name" position = "replace"/>
+				</data>
+			</field>
+		</record>
+	</data>
+</openerp>
+

=== added directory 'TODO-6.1/account_asset_product'
=== added file 'TODO-6.1/account_asset_product/__init__.py'
--- TODO-6.1/account_asset_product/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_asset_product/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,1 @@
+import account_asset_produt

=== added file 'TODO-6.1/account_asset_product/__openerp__.py'
--- TODO-6.1/account_asset_product/__openerp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_asset_product/__openerp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,11 @@
+{
+	"name"        : "account_asset_produt",
+	"author"      : "Clear Corp S.A.",
+	"version"     : "1.0",
+	"depends"     : ["base","account_asset","product_serial"],
+	"init_xml"    : [],
+	"update_xml"  : ["account_asset_produt_sequence.xml",],
+	"category"    : "Account Asset",
+	"active"      : False,
+	"instalable"  : True,
+}

=== added file 'TODO-6.1/account_asset_product/account_asset_produt.py'
--- TODO-6.1/account_asset_product/account_asset_produt.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_asset_product/account_asset_produt.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,104 @@
+from osv import osv, fields
+from tools import debug
+import time
+import pooler
+from dateutil import parser
+from datetime import date
+from datetime import timedelta
+import calendar
+from tools.translate import _
+
+
+
+class ccorp_addons_account_assets(osv.osv):
+	_name = 'account.asset.asset'
+	_inherit = 'account.asset.asset'
+	
+	
+	def _getCompany(self, cr, uid, vals, context=None):
+		user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid], context=context)[0]
+		if user.company_id:
+			return user.company_id.id
+	
+	# Metodos de  ir.sequence
+	# se utilizan para poder traer el numero de secuencia sin incrementarlo.
+	
+	def _process(self, s):
+		return (s or '') % {
+			'year':time.strftime('%Y'),
+			'month': time.strftime('%m'),
+			'day':time.strftime('%d'),
+			'y': time.strftime('%y'),
+			'doy': time.strftime('%j'),
+			'woy': time.strftime('%W'),
+			'weekday': time.strftime('%w'),
+			'h24': time.strftime('%H'),
+			'h12': time.strftime('%I'),
+			'min': time.strftime('%M'),
+			'sec': time.strftime('%S'),
+		}
+	
+	
+	
+	def get_id_search(self, cr, uid, sequence_id, test='id', context=None):
+		assert test in ('code','id')
+		company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
+		cr.execute('''SELECT id, number_next, prefix, suffix, padding
+					FROM ir_sequence
+					WHERE %s=%%s
+					AND active=true
+					AND (company_id in %%s or company_id is NULL)
+					ORDER BY company_id, id
+					FOR UPDATE NOWAIT''' % test,
+					(sequence_id, tuple(company_ids)))
+		res = cr.dictfetchone()
+		if res:
+			if res['number_next']:
+				return self._process(res['prefix']) + '%%0%sd' % res['padding'] % res['number_next'] + self._process(res['suffix'])
+			else:
+				return self._process(res['prefix']) + self._process(res['suffix'])
+		return False
+
+	
+	def get_search(self, cr, uid, context=None):
+		code='account.asset.asset'
+		return self.get_id_search(cr, uid, code, test='code')
+	
+	#################################33
+	
+	
+	
+	_columns = {
+		'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot'), #, domain="[('company_id','=',product_id)]",
+		'asset_product_id': fields.related('prod_lot_id', 'product_id', type='many2one', relation='product.product', string='Product', readonly=True),
+		'location_id': fields.related('prod_lot_id', 'last_location_id', type='many2one', relation='stock.location', string='Location', readonly=True),
+		
+	}
+	
+	_defaults = { 
+		'code': get_search,
+		'partner_id': _getCompany
+	}
+	
+	_sql_constraints = [ 
+		('unique_asset_company', 'UNIQUE (partner_id,code)', 'You can not have two asset with the same code in the same partner !') 
+	] 
+	
+	# Metodo: Create
+	#Descripcion: 
+	#		Revisa que el codigo que se quiere guardar sea igual al autogenerado si lo es incrementa el secuencial 
+	# 		si no lo es no incrementa el secuencial y lo guarda como viene.
+	#
+	def create(self, cr, uid, vals, context=None):
+		sentCode = vals['code']
+		debug(sentCode)
+		if sentCode == self.get_search(cr, uid, 'account.asset.asset'):
+			codep=self.pool.get('ir.sequence').get(cr, uid, 'account.asset.asset')
+		return super(ccorp_addons_account_assets, self).create(cr, uid, vals, context=None)
+	
+ccorp_addons_account_assets()
+
+
+
+
+

=== added file 'TODO-6.1/account_asset_product/account_asset_produt_sequence.xml'
--- TODO-6.1/account_asset_product/account_asset_produt_sequence.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_asset_product/account_asset_produt_sequence.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		
+        <record id="seq_type_asset_product" model="ir.sequence.type">
+            <field name="name">account.asset.asset</field>
+            <field name="code">account.asset.asset</field>
+        </record>
+        <record id="seq_master_item" model="ir.sequence">
+            <field name="name">account.asset.asset</field>
+            <field name="code">account.asset.asset</field>
+            <field name="padding">3</field>
+            <!--field name="company_id">user.company_id.id</field-->
+        </record>
+        
+        <record model="ir.ui.view" id="account_asset_product_assre_form">
+			<field name="name">account.asset.asset</field>
+			<field name="model">account.asset.asset</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="account_asset.view_account_asset_asset_form"/>
+			<field name="arch" type="xml">
+				<data>
+					<field name="code" position="after">
+						<!--newline/-->
+						<field name="prod_lot_id" /><!--on_change="on_change_search_location(prod_lot_id)"-->
+						<field name="asset_product_id" select="1"/>
+						<field name="location_id" select="1"/>
+						
+					</field>	
+					<field name="localisation" position="replace"/>
+						
+				</data>
+			</field>
+		</record>
+        
+        <record id="view_medical_zahha_laboratory_filter" model="ir.ui.view">
+			<field name="name">account.asset.asset search</field>
+			<field name="model">account.asset.asset</field>
+			<field name="type">search</field>
+			<field name="arch" type="xml">
+				<search string="Search Asset">
+					<separator orientation="vertical"/>
+						<filter string="Active" domain="[('active','=','True')]" icon="terp-project"/>
+						<filter string="Inactive" domain="[('active','=','False')]" icon="terp-project"/>
+					    <newline/>
+					    <field name="name"/>
+					    <field name="code" />
+					    <field name="location_id"/>
+					    <field name="asset_product_id" />
+					    <field name="category_id" />
+					    <field name="prod_lot_id" />
+					 
+					
+					
+					
+					
+					
+
+					<newline/>
+				</search>
+			</field>
+		</record>
+        
+        
+        
+        
+    </data>
+</openerp>

=== added directory 'TODO-6.1/account_company_shortcut'
=== added file 'TODO-6.1/account_company_shortcut/__init__.py'
--- TODO-6.1/account_company_shortcut/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_company_shortcut/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,1 @@
+import account_company_shortcut_rename

=== added file 'TODO-6.1/account_company_shortcut/__openerp__.py'
--- TODO-6.1/account_company_shortcut/__openerp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_company_shortcut/__openerp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    account_company_shorcut_rename.py
+#    account_company_shorcut_rename
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+{
+	"name"        : "Accounting Company Shorcut rename",
+	"author"      : "CLEARCORP S.A.",
+	"version"     : "1.0",
+	"description" : """
+	This module creates a field for the company shortcut to later use it a the chart of accounts as part for the complete name of each
+	account
+	""",
+	"depends"     : ["base","account"],
+	"init_xml"    : [],
+	"update_xml"  : ["account_company_shortcut_rename_view.xml"],
+	"category"    : "Accounting",
+	"active"      : False,
+	"instalable"  : True,
+}

=== added file 'TODO-6.1/account_company_shortcut/account_company_shortcut_rename.py'
--- TODO-6.1/account_company_shortcut/account_company_shortcut_rename.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_company_shortcut/account_company_shortcut_rename.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,80 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    account_company_shortcut_rename.py
+#    account_company_shortcut_rename
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+from osv import osv, fields
+from tools import debug
+from tools.translate import _
+
+class account_account(osv.osv):
+	_name = "account.account"
+	_inherit = "account.account"
+	
+	def name_get(self, cr, uid, ids, context=None):
+		if not ids:
+			return []
+		res = []
+		for obj_account in self.browse(cr,uid,ids):
+			data = []
+			account = obj_account.parent_id
+			if account.parent_id:
+				while account.parent_id:
+					data.insert(0,(account.shortcut or account.name))
+					account = account.parent_id
+			data.append(obj_account.name)
+			data = '/'.join(data)
+			company = obj_account.company_id
+			data = (company and company.shortcut + "-" or '')  + obj_account.code + ' ' + data
+			res.append((obj_account.id, data))  
+		return res
+	
+	def _complete_name(self, cr, uid, ids, name, args, context=None):
+		""" Forms complete name of account from parent account to child account.
+		@return: Dictionary of values
+		"""
+		res = {}
+		name_list = self.name_get(cr,uid,ids,context)
+		for name in name_list:
+			res[name[0]] = name[1]
+		return res
+	_columns = {
+		'complete_name': fields.function(_complete_name, method=True, type='char', size=100, string="Account Name"),
+	}
+account_account()
+
+class res_company(osv.osv):
+	_name = 'res.company'
+	_inherit = 'res.company'
+	_columns = {
+		'shortcut'  : fields.char('Shortcut', size=8,help='Shortcut for the company, It would be added on some places as part of the name that will be shown'),
+	}	
+res_company()

=== added file 'TODO-6.1/account_company_shortcut/account_company_shortcut_rename_view.xml'
--- TODO-6.1/account_company_shortcut/account_company_shortcut_rename_view.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_company_shortcut/account_company_shortcut_rename_view.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,25 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<openerp>
+	<data>
+
+		<!--
+		======================================
+					accounts
+		======================================
+		-->
+		<record model = "ir.ui.view" id = "account_company_rename_form_view">
+			<field name = "name">res.company.rename.form</field>
+			<field name = "model">res.company</field>
+			<field name = "type">tree</field>
+			<field name="inherit_id" ref="base.view_company_form"/>
+			<field name = "arch" type = "xml">
+				<data>
+					<field name = "parent_id" position = "after">
+						<field name = "shortcut"/>
+					</field>
+				</data>
+			</field>
+		</record>
+	</data>
+</openerp>
+

=== added directory 'TODO-6.1/account_journal_template'
=== added file 'TODO-6.1/account_journal_template/__init__.py'
--- TODO-6.1/account_journal_template/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_journal_template/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,1 @@
+import account_journal_template

=== added file 'TODO-6.1/account_journal_template/__openerp__.py'
--- TODO-6.1/account_journal_template/__openerp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_journal_template/__openerp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,11 @@
+{
+    "name" : "Account journal template module",
+    "author" : "CLEARCORP S.A",
+    "version" : "0.1",
+    "depends" : ["base", "account", "account_voucher_payment_method"],
+    "init_xml" : [],
+    "update_xml" : [],
+    "category" : "",
+    "active": False,
+    "installable": True
+}

=== added file 'TODO-6.1/account_journal_template/account_journal_template.py'
--- TODO-6.1/account_journal_template/account_journal_template.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_journal_template/account_journal_template.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,98 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Author: Nicolas Bessi. Copyright Camptocamp SA
+#    Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+#
+#    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/>.
+#
+##############################################################################
+import tools
+from osv import osv, fields
+import addons
+import os
+from tools import debug
+
+class account_journal_template(osv.osv):
+	
+	_name = 'account.journal.template'
+	_columns = {
+	
+		'name': fields.char('Journal Name', size=64),
+		'code': fields.char('Code', size=5),
+		'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation'), ('payment', 'Payment method')], 'Type'),
+		'allow_date':fields.boolean('Check Date not in the Period'),
+		'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries'),
+		'update_posted': fields.boolean('Allow Cancelling Entries'),
+		'group_invoice_lines': fields.boolean('Group Invoice Lines'),
+		'currency': fields.many2one('res.currency', 'Currency'),
+		'view_id': fields.many2one('account.journal.view', 'Display Mode'),
+		'centralisation': fields.boolean('Centralised counterpart'),
+		'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]", help="It acts as a default account for credit amount"),
+		'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"),
+		'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
+	}
+account_journal_template()
+
+class WizardMultiChartsAccounts(osv.osv_memory):
+
+	_inherit ='wizard.multi.charts.accounts'
+	
+	
+	def execute(self, cr, uid, ids, context=None):
+		
+		
+		res = super(WizardMultiChartsAccounts, self).execute(cr, uid, ids, context)
+		
+		#getting the wizard object
+		obj_self = self.browse(cr,uid,ids[0])
+		
+		#getting the id of the company from the wizard
+		id_companny = obj_self.company_id.id
+		
+		#getting the char_id from the wizard object
+		id_char_template = obj_self.chart_template_id
+		
+		#getting the list of journal_templates
+		lista = self.pool.get('account.journal.template').search(cr, uid, [('chart_template_id','=',id_char_template)])
+		
+		
+		for x in lista:
+			obj = self.pool.get('account.journal.template').browse(cr,uid,x)
+			vals = {
+				'name' : obj.name,
+				'code' : obj.code,
+				'type' : obj.type,
+				'currency' : obj.currency,
+				'allow_date' : obj.allow_date,
+				'centralisation' : obj.centralisation,
+				'entry_posted' : obj.entry_posted,
+				'update_posted' : obj.update_posted,
+				'group_invoice_lines' : obj.group_invoice_lines,
+				'sequence_id' : obj.sequence_id.id,
+				'view_id' : obj.view_id.id,
+				'default_credit_account_id': obj.default_credit_account_id.id,
+				'default_debit_account_id' : obj.default_debit_account_id.id,
+				'company_id': id_companny,
+			}
+			debug(obj.view_id.id)
+			journal = self.pool.get('account.journal')
+			journal.create(cr,uid,vals, context=context)
+			
+			
+		return res
+	
+WizardMultiChartsAccounts()
+
+

=== added file 'TODO-6.1/account_journal_template/account_journal_template_data.xml'
--- TODO-6.1/account_journal_template/account_journal_template_data.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_journal_template/account_journal_template_data.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,171 @@
+<openerp>
+	<data>
+		<record id="banks_cajas_journal" model="account.journal.template">
+			<field name="name">Bancos y Cajas</field>
+			<field name="code">BYC</field>
+			<field name="type">bank</field>
+			<field name="allow_date">False</field>
+			<field name="default_credit_account_id"></field>
+			<field name="default_debit_account_id"></field>
+			<field name="entry_posted">False</field>
+			<field name="update_posted">False</field>
+			<field name="group_invoice_lines">False</field>
+			<field name="view_id">2</field>
+			<field name="sequence_id">1</field>
+		</record>
+		
+		<record id="cierre_mensual_journal" model="account.journal.template">
+			<field name="name">Cierre mensual</field>
+			<field name="code">CM</field>
+			<field name="type">general</field>
+			<field name="allow_date">False</field>
+			<field name="default_credit_account_id"></field>
+			<field name="default_debit_account_id"></field>
+			<field name="entry_posted">False</field>
+			<field name="update_posted">False</field>
+			<field name="group_invoice_lines">False</field>
+			<field name="view_id">2</field>
+			<field name="sequence_id">1</field>
+		</record>
+		
+		<record id="cierre_anual_journal" model="account.journal.template">
+			<field name="name">Cierre anual</field>
+			<field name="code">CA</field>
+			<field name="type">general</field>
+			<field name="allow_date">False</field>
+			<field name="default_credit_account_id"></field>
+			<field name="default_debit_account_id"></field>
+			<field name="entry_posted">False</field>
+			<field name="update_posted">False</field>
+			<field name="group_invoice_lines">False</field>
+			<field name="view_id">2</field>
+			<field name="sequence_id">1</field>
+		</record>
+		
+		<record id="compras_gastos_journal" model="account.journal.template">
+			<field name="name">Compras y gastos</field>
+			<field name="code">CYG</field>
+			<field name="type">general</field>
+			<field name="allow_date">False</field>
+			<field name="default_credit_account_id"></field>
+			<field name="default_debit_account_id"></field>
+			<field name="entry_posted">False</field>
+			<field name="update_posted">False</field>
+			<field name="group_invoice_lines">False</field>
+			<field name="view_id">2</field>
+			<field name="sequence_id">1</field>
+		</record>
+		
+		<record id="devolucion_compra_gastos_journal" model="account.journal.template">
+			<field name="name">Devolucion compras y gastos</field>
+			<field name="code">DCYG</field>
+			<field name="type">general</field>
+			<field name="allow_date">False</field>
+			<field name="default_credit_account_id"></field>
+			<field name="default_debit_account_id"></field>
+			<field name="entry_posted">False</field>
+			<field name="update_posted">False</field>
+			<field name="group_invoice_lines">False</field>
+			<field name="view_id">2</field>
+			<field name="sequence_id">1</field>
+		</record>
+		
+		<record id="ventas_journal" model="account.journal.template">
+			<field name="name">Ventas</field>
+			<field name="code">VTAS</field>
+			<field name="type">general</field>
+			<field name="allow_date">False</field>
+			<field name="default_credit_account_id"></field>
+			<field name="default_debit_account_id"></field>
+			<field name="entry_posted">False</field>
+			<field name="update_posted">False</field>
+			<field name="group_invoice_lines">False</field>
+			<field name="view_id">2</field>
+			<field name="sequence_id">1</field>
+		</record>
+		
+		<record id="devolucion_ventas_journal" model="account.journal.template">
+			<field name="name">Devolucion ventas</field>
+			<field name="code">DV</field>
+			<field name="type">general</field>
+			<field name="allow_date">False</field>
+			<field name="default_credit_account_id"></field>
+			<field name="default_debit_account_id"></field>
+			<field name="entry_posted">False</field>
+			<field name="update_posted">False</field>
+			<field name="group_invoice_lines">False</field>
+			<field name="view_id">2</field>
+			<field name="sequence_id">1</field>
+		</record>
+		
+		<record id="balance_inicial_journal" model="account.journal.template">
+			<field name="name">Balance inicial</field>
+			<field name="code">BI</field>
+			<field name="type">general</field>
+			<field name="allow_date">False</field>
+			<field name="default_credit_account_id"></field>
+			<field name="default_debit_account_id"></field>
+			<field name="entry_posted">False</field>
+			<field name="update_posted">False</field>
+			<field name="group_invoice_lines">False</field>
+			<field name="view_id">2</field>
+			<field name="sequence_id">1</field>
+		</record>
+		
+		<record id="inter_comp_journal" model="account.journal.template">
+			<field name="name">Inter-comp</field>
+			<field name="code">IC</field>
+			<field name="type">general</field>
+			<field name="allow_date">False</field>
+			<field name="default_credit_account_id"></field>
+			<field name="default_debit_account_id"></field>
+			<field name="entry_posted">False</field>
+			<field name="update_posted">False</field>
+			<field name="group_invoice_lines">False</field>
+			<field name="view_id">2</field>
+			<field name="sequence_id">1</field>
+		</record>
+		
+		<record id="inventario_journal" model="account.journal.template">
+			<field name="name">Inventario</field>
+			<field name="code">INV</field>
+			<field name="type">general</field>
+			<field name="allow_date">False</field>
+			<field name="default_credit_account_id"></field>
+			<field name="default_debit_account_id"></field>
+			<field name="entry_posted">False</field>
+			<field name="update_posted">False</field>
+			<field name="group_invoice_lines">False</field>
+			<field name="view_id">2</field>
+			<field name="sequence_id">1</field>
+		</record>
+		
+		<record id="transito_cambio_journal" model="account.journal.template">
+			<field name="name">Transito y cambio</field>
+			<field name="code">TYC</field>
+			<field name="type">general</field>
+			<field name="allow_date">False</field>
+			<field name="default_credit_account_id"></field>
+			<field name="default_debit_account_id"></field>
+			<field name="entry_posted">False</field>
+			<field name="update_posted">False</field>
+			<field name="group_invoice_lines">False</field>
+			<field name="view_id">2</field>
+			<field name="sequence_id">1</field>
+		</record>
+		
+		<record id="conciliaciones_journal" model="account.journal.template">
+			<field name="name">Conciliaciones</field>
+			<field name="code">CONC</field>
+			<field name="type">general</field>
+			<field name="allow_date">False</field>
+			<field name="default_credit_account_id"></field>
+			<field name="default_debit_account_id"></field>
+			<field name="entry_posted">False</field>
+			<field name="update_posted">False</field>
+			<field name="group_invoice_lines">False</field>
+			<field name="view_id">2</field>
+			<field name="sequence_id">1</field>
+		</record>
+	</data>
+</openerp>

=== added directory 'TODO-6.1/account_period_extended_code'
=== added file 'TODO-6.1/account_period_extended_code/__init__.py'
--- TODO-6.1/account_period_extended_code/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_period_extended_code/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __init__.py
+#    account_journal_extended_code
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+import account_period_extended_code

=== added file 'TODO-6.1/account_period_extended_code/__openerp__.py'
--- TODO-6.1/account_period_extended_code/__openerp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_period_extended_code/__openerp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,50 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __openerp__.py
+#    account_journal_extended_code
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+{
+	'name': 'Account fiscal year and period code extended',
+	'version': '0.1',
+	'author': 'ClearCorp S.A.',
+	'website': 'http://clearcorp.co.cr',
+	'category': 'General Modules/Accounting',
+	'description': """Enables up to 64 chars in a fiscal year and period code
+	""",
+	'depends': ['account'],
+	'init_xml': [],
+	'demo_xml': [],
+	'update_xml': [],
+	'license': 'Other OSI approved licence',
+	'installable': True,
+	'active': False,
+}

=== added file 'TODO-6.1/account_period_extended_code/account_period_extended_code.py'
--- TODO-6.1/account_period_extended_code/account_period_extended_code.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/account_period_extended_code/account_period_extended_code.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    account_period_extended_code.py
+#    account_period_extended_code
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+from osv import osv,fields
+
+class fiscalyear(osv.osv):
+	'''
+	Adds up to 64 chars to code
+	'''
+	_name = 'account.fiscalyear'
+	_inherit = 'account.fiscalyear'
+	
+	_columns = {
+        'code': fields.char('Code', size=64, required=True, help="The code will be used to generate the code of the fiscal year."),
+	}
+fiscalyear()
+
+
+class period(osv.osv):
+	'''
+	Adds up to 64 chars to code
+	'''
+	_name = 'account.period'
+	_inherit = 'account.period'
+	
+	_columns = {
+        'code': fields.char('Code', size=64, required=True, help="The code will be used for the code of the period."),
+	}
+period()

=== added directory 'TODO-6.1/address_name_inc'
=== added file 'TODO-6.1/address_name_inc/__init__.py'
--- TODO-6.1/address_name_inc/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/address_name_inc/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,1 @@
+import address_name_inc

=== added file 'TODO-6.1/address_name_inc/__openerp__.py'
--- TODO-6.1/address_name_inc/__openerp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/address_name_inc/__openerp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    address_name_inc.py
+#    address_name_inc
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+{
+	"name"        : "Address name include",
+	"author"      : "ClearCorp S.A.",
+	"version"     : "0.1",
+	"depends"     : ["base","base_contact"],
+	"init_xml"    : [],
+	"update_xml"  : ["address_name_inc_view.xml"],
+	"category"    : "Base",
+	"active"      : False,
+	"instalable"  : True,
+}

=== added file 'TODO-6.1/address_name_inc/address_name_inc.py'
--- TODO-6.1/address_name_inc/address_name_inc.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/address_name_inc/address_name_inc.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,56 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    address_name_inc.py
+#    address_name_inc
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+from osv import osv, fields
+from tools import debug
+from tools.translate import _
+
+class address_name_inc(osv.osv):
+	_name = 'res.partner.address'
+	_inherit = 'res.partner.address'
+	
+	def name_get(self, cr, uid, ids, context=None):
+		if not ids:
+			return []
+		res = []
+		superdata = {}
+		for record in super(address_name_inc,self).name_get(cr,uid,ids):
+			superdata[record[0]] = record[1]
+		for obj_address in self.browse(cr,uid,ids):
+			data = []
+			data.append((obj_address.name and obj_address.name or superdata[obj_address.id]))
+			data = '/'.join(data)
+			res.append((obj_address.id, data))  
+		return res
+address_name_inc()
+

=== added file 'TODO-6.1/address_name_inc/address_name_inc_view.xml'
--- TODO-6.1/address_name_inc/address_name_inc_view.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/address_name_inc/address_name_inc_view.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,23 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<openerp>
+	<data>
+		<!--
+		======================================
+				res.partner address form
+		======================================
+		-->
+		<record model = "ir.ui.view" id = "address_form_view">
+			<field name = "name">res.partner.form1</field>
+			<field name = "model">res.partner</field>
+			<field name="inherit_id" ref="base.view_partner_form"/>
+			<field name="arch" type="xml">
+				<data>
+					<xpath expr="//field[@name='address']//field[@name='type']" position = "before">
+						<field name = "name"/>
+					</xpath>
+				</data>
+			</field>
+		</record>
+	</data>
+</openerp>
+

=== added directory 'TODO-6.1/ccorp_account'
=== added file 'TODO-6.1/ccorp_account/__init__.py'
--- TODO-6.1/ccorp_account/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __init__.py
+#    ccorp_account
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+import wizard
+import report

=== added file 'TODO-6.1/ccorp_account/__terp__.py'
--- TODO-6.1/ccorp_account/__terp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/__terp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,61 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __terp__.py
+#    ccorp_account
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Second author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+{
+    'name': 'ClearCorp account module modifications',
+    'version': '0.1',
+    'url': 'http://launchpad.net/openerp-costa-rica',
+    'author': 'ClearCorp S.A.',
+    'website': 'http://clearcorp.co.cr',
+    'category': '',
+    'description': """ClearCorp 'account' modifications:
+    Reports:
+      * Invoice
+    """,
+    'depends': [
+        'account',
+        'ccorp_report_fonts',
+        'report_webkit',
+        'account_invoice_global_discount',
+        ],
+    'init_xml': [],
+    'demo_xml': ['ccorp_account_demo.xml'],
+    'update_xml': [
+        'ccorp_account_webkit_report.xml', 'ccorp_account_view.xml',
+        ],
+    'license': 'Other OSI approved licence',
+    'installable': True,
+    'active': False,
+}

=== added file 'TODO-6.1/ccorp_account/ccorp_account.py'
--- TODO-6.1/ccorp_account/ccorp_account.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/ccorp_account.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,53 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    ccorp_account.py
+#    ccorp_account
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+from osv import osv,fields
+
+class account_invoice(osv.osv):
+	_inherit = 'account.invoice'
+	
+	def name_get(self, cr, uid, ids, context={}):
+		if not len(ids):
+			return []
+		reads = self.read(cr, uid, ids, ['name', 'number'], context)
+		res = []
+		for record in reads:
+			name = ""
+			if record['number']:
+				name = record['number']
+			if record['name']:
+				name = name + ' ' + record['name']
+			res.append((record['id'], name))
+		return res
+account_invoice()

=== added file 'TODO-6.1/ccorp_account/ccorp_account_demo.xml'
--- TODO-6.1/ccorp_account/ccorp_account_demo.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/ccorp_account_demo.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+	<!--
+	Resource: res.company
+	Reset main_company currency to USD, demo data in account sets it as EUR
+	-->
+	<record id="base.main_company" model="res.company">
+	    <field name="currency_id" ref="base.CRC"/>
+	</record>
+    </data>
+</openerp>

=== added file 'TODO-6.1/ccorp_account/ccorp_account_report.xml'
--- TODO-6.1/ccorp_account/ccorp_account_report.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/ccorp_account_report.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+		<report id="account.account_invoices"
+				string="Invoice"
+				model="account.invoice"
+				name="account.invoice.layout_ccorp"
+				rml="ccorp_account/report/invoice.rml"
+				auto="False"
+				header="False"
+				attachment="(object.state in ('open','paid')) and ('Fac.'+(object.number or '').replace('/',''))"
+				attachment_use="1"/>
+
+		<!--
+		Deletes entries from account_invoice_layout
+		-->
+		<delete model="ir.actions.wizard" search="[('wiz_name','=','wizard.notify_message')]"/>
+		<delete model="ir.actions.report.xml" search="[('report_name','=','account.invoice.layout')]"/>
+	</data>
+</openerp>

=== added file 'TODO-6.1/ccorp_account/ccorp_account_view.xml'
--- TODO-6.1/ccorp_account/ccorp_account_view.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/ccorp_account_view.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+		<record model = "ir.ui.view" id = "view_char_account_inactive">
+			<field name = "name">account.search.chart.inactive</field>
+			<field name = "model">account.account</field>
+			<field name = "type">search</field>
+			<field name = "inherit_id" ref = "account.view_account_search"/>
+			<field name = "arch" type = "xml">
+				<data>
+					<xpath expr = "/search/group/separator" position = "before">
+						<filter icon="gtk-cancel" string="Inactive Accounts" domain="[('active','=',False)]"/>
+					</xpath>
+				</data>
+			</field>
+		</record>
+	</data>
+</openerp>

=== added file 'TODO-6.1/ccorp_account/ccorp_account_webkit_report.xml'
--- TODO-6.1/ccorp_account/ccorp_account_webkit_report.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/ccorp_account_webkit_report.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+		<report auto="False" id="account_invoice_ccorp" model="account.invoice" name="account.invoice.layout_ccorp"  file="ccorp_account/report/invoice.mako" string="Invoice HTML" report_type="webkit" 				attachment="(object.state in ('open','paid')) and ('Fac.'+(object.number or '').replace('/',''))"
+				attachment_use="1"/>
+		<!--
+		Deletes entries from account_invoice_layout
+		-->
+		<delete model="ir.actions.wizard" search="[('wiz_name','=','wizard.notify_message')]"/>
+		<delete model="ir.actions.report.xml" search="[('report_name','=','account.invoice.layout')]"/>
+	</data>
+</openerp>

=== added directory 'TODO-6.1/ccorp_account/i18n'
=== added file 'TODO-6.1/ccorp_account/i18n/ccorp_account.pot'
--- TODO-6.1/ccorp_account/i18n/ccorp_account.pot	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/i18n/ccorp_account.pot	2013-01-15 16:49:27 +0000
@@ -0,0 +1,179 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* ccorp_account
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.12\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2010-08-23 20:49:00+0000\n"
+"PO-Revision-Date: 2010-08-23 20:49: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: ccorp_account
+#: model:ir.module.module,description:ccorp_account.module_meta_information
+msgid "ClearCorp 'account' modifications:\n"
+"    Reports:\n"
+"      * Invoice\n"
+"    "
+msgstr ""
+
+#. module: ccorp_account
+#: model:ir.module.module,shortdesc:ccorp_account.module_meta_information
+msgid "ClearCorp account module modifications"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Electronic Invoice"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Num.: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Date: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "ID Num.: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Tel-fax: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Email: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Web: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Address:"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Phone: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Fax: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Salesman: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Payment tems: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Due date: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Exchange rate: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Page: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Thank you for choosing us."
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Qty."
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Description / (Taxes)"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Disc."
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Total Price"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Discount"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Taxes"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "TOTAL"
+msgstr ""

=== added file 'TODO-6.1/ccorp_account/i18n/ccorp_account_webkit.pot'
--- TODO-6.1/ccorp_account/i18n/ccorp_account_webkit.pot	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/i18n/ccorp_account_webkit.pot	2013-01-15 16:49:27 +0000
@@ -0,0 +1,190 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* ccorp_account
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-10-06 19:15+0000\n"
+"PO-Revision-Date: 2011-10-06 19:15+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: ccorp_account
+#: report:report.account.invoice.layout_ccorp:93
+#: report:report.account.invoice.layout_ccorp:98
+msgid "Sub Total"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:39
+msgid "Date:"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:36
+msgid "ID Num."
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:47
+msgid "Payment tems"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:81
+msgid "Note"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:23
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: ccorp_account
+#: model:ir.module.module,description:ccorp_account.module_meta_information
+msgid "ClearCorp 'account' modifications:\n"
+"    Reports:\n"
+"      * Invoice\n"
+"    "
+msgstr "ClearCorp 'account' modifications:\n"
+"    Reports:\n"
+"      * Invoice\n"
+"    "
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:63
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:48
+msgid "Email"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:63
+#: report:report.account.invoice.layout_ccorp:65
+msgid "Total Price"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:17
+msgid "PROFORMA"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:44
+msgid "Fax"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:94
+msgid "Discount"
+msgstr ""
+
+#. module: ccorp_account
+#: model:ir.actions.report.xml,name:ccorp_account.account_invoice_ccorp
+msgid "Invoice HTML"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:21
+msgid "Canceled Invoice"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:40
+msgid "Phone"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:107
+msgid "Invoice Note"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:63
+#: report:report.account.invoice.layout_ccorp:65
+msgid "[Code] Description / (Taxes)"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:19
+msgid "Draft Inovice"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:55
+msgid "Address"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:15
+msgid "Electronic Invoice"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:95
+#: report:report.account.invoice.layout_ccorp:99
+msgid "Taxes"
+msgstr ""
+
+#. module: ccorp_account
+#: model:ir.module.module,shortdesc:ccorp_account.module_meta_information
+msgid "ClearCorp account module modifications"
+msgstr "ClearCorp account module modifications"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:110
+msgid "Payment Note"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:25
+msgid "Refund"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:43
+msgid "Due date"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:63
+#: report:report.account.invoice.layout_ccorp:65
+msgid "Qty"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:63
+#: report:report.account.invoice.layout_ccorp:65
+msgid "Unit Price"
+msgstr ""
+
+#. module: ccorp_account
+#: view:account.account:0
+msgid "Inactive Accounts"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:27
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:96
+#: report:report.account.invoice.layout_ccorp:100
+msgid "Total"
+msgstr ""
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:51
+msgid "Salesman"
+msgstr ""
+

=== added file 'TODO-6.1/ccorp_account/i18n/es.po'
--- TODO-6.1/ccorp_account/i18n/es.po	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/i18n/es.po	2013-01-15 16:49:27 +0000
@@ -0,0 +1,182 @@
+# Spanish translation for openerp-ccorp-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-23 20:49+0000\n"
+"PO-Revision-Date: 2012-06-25 08:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-15 05:23+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
+
+#. module: ccorp_account
+#: model:ir.module.module,description:ccorp_account.module_meta_information
+msgid ""
+"ClearCorp 'account' modifications:\n"
+"    Reports:\n"
+"      * Invoice\n"
+"    "
+msgstr ""
+
+#. module: ccorp_account
+#: model:ir.module.module,shortdesc:ccorp_account.module_meta_information
+msgid "ClearCorp account module modifications"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Electronic Invoice"
+msgstr "Factura Electrónica"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "PRO-FORMA"
+msgstr "Proforma"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Draft Invoice"
+msgstr "Factura BORRADOR"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Cancelled Invoice"
+msgstr "Factura CANCELADA"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Supplier Refund"
+msgstr "Nota de crédito PROVEEDOR"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Supplier Invoice"
+msgstr "Factura PROVEEDOR"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Num.: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Date: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "ID Num.: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Tel-fax: "
+msgstr "Tel-fax: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Email: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Web: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Address:"
+msgstr "Dirección:"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Phone: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Fax: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Salesman: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Payment tems: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Due date: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Exchange rate: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Page: "
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Thank you for choosing us."
+msgstr "Gracias por escoger nuestros servicios."
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Qty."
+msgstr "Cant."
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Description / (Taxes)"
+msgstr ""
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Disc."
+msgstr "Desc."
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Unit Price"
+msgstr "Precio Unit."
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Total Price"
+msgstr "Precio Total"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Discount"
+msgstr "Descuento"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "TOTAL"
+msgstr "TOTAL"

=== added file 'TODO-6.1/ccorp_account/i18n/es_CR.po'
--- TODO-6.1/ccorp_account/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/i18n/es_CR.po	2013-01-15 16:49:27 +0000
@@ -0,0 +1,190 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* ccorp_account
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-10-06 19:15+0000\n"
+"PO-Revision-Date: 2011-10-06 19:15+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: ccorp_account
+#: report:report.account.invoice.layout_ccorp:93
+#: report:report.account.invoice.layout_ccorp:98
+msgid "Sub Total"
+msgstr "Sub Total"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:39
+msgid "Date:"
+msgstr "Fecha:"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:36
+msgid "ID Num."
+msgstr "Céd. Jur.."
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:47
+msgid "Payment tems"
+msgstr "Plazo de pago"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:81
+msgid "Note"
+msgstr "Nota"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:23
+msgid "Supplier Invoice"
+msgstr "Factura de proveedor"
+
+#. module: ccorp_account
+#: model:ir.module.module,description:ccorp_account.module_meta_information
+msgid "ClearCorp 'account' modifications:\n"
+"    Reports:\n"
+"      * Invoice\n"
+"    "
+msgstr "ClearCorp 'account' modifications:\n"
+"    Reports:\n"
+"      * Invoice\n"
+"    "
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:63
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:48
+msgid "Email"
+msgstr "Email"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:63
+#: report:report.account.invoice.layout_ccorp:65
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:17
+msgid "PROFORMA"
+msgstr "PROFORMA"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:44
+msgid "Fax"
+msgstr "Fax"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:94
+msgid "Discount"
+msgstr "Descuento"
+
+#. module: ccorp_account
+#: model:ir.actions.report.xml,name:ccorp_account.account_invoice_ccorp
+msgid "Invoice HTML"
+msgstr "Factura"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:21
+msgid "Canceled Invoice"
+msgstr "Factura cancelada"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:40
+msgid "Phone"
+msgstr "Tel."
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:107
+msgid "Invoice Note"
+msgstr "Nota de factura"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:63
+#: report:report.account.invoice.layout_ccorp:65
+msgid "[Code] Description / (Taxes)"
+msgstr "[Cód.] Descripción / (Imp.)"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:19
+msgid "Draft Inovice"
+msgstr "Factura Borrador"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:55
+msgid "Address"
+msgstr "Dirección"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:15
+msgid "Electronic Invoice"
+msgstr "Factura Electrónica"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:95
+#: report:report.account.invoice.layout_ccorp:99
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: ccorp_account
+#: model:ir.module.module,shortdesc:ccorp_account.module_meta_information
+msgid "ClearCorp account module modifications"
+msgstr "ClearCorp account module modifications"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:110
+msgid "Payment Note"
+msgstr "Nota de pago"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:25
+msgid "Refund"
+msgstr "Reembolso"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:43
+msgid "Due date"
+msgstr "Vence"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:63
+#: report:report.account.invoice.layout_ccorp:65
+msgid "Qty"
+msgstr "Cant."
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:63
+#: report:report.account.invoice.layout_ccorp:65
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: ccorp_account
+#: view:account.account:0
+msgid "Inactive Accounts"
+msgstr "Cuentas inactivas"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:27
+msgid "Supplier Refund"
+msgstr "Reembolso de proveedor"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:96
+#: report:report.account.invoice.layout_ccorp:100
+msgid "Total"
+msgstr "Total"
+
+#. module: ccorp_account
+#: report:report.account.invoice.layout_ccorp:51
+msgid "Salesman"
+msgstr "Vendedor"
+

=== added directory 'TODO-6.1/ccorp_account/report'
=== added file 'TODO-6.1/ccorp_account/report/__init__.py'
--- TODO-6.1/ccorp_account/report/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/report/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __init__.py
+#    ccorp_account
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+import invoice

=== added file 'TODO-6.1/ccorp_account/report/invoice.mako'
--- TODO-6.1/ccorp_account/report/invoice.mako	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/report/invoice.mako	2013-01-15 16:49:27 +0000
@@ -0,0 +1,117 @@
+<html>
+<head>
+	<style type="text/css">
+		${css}
+	</style>
+</head>
+<body class = "data">
+	%for inv in objects :
+	<% setLang(inv.partner_id.lang) %>
+	<div id="wrapper">
+		<table width = "100%" class = "document_data">
+			<tr class = "title">
+				<td class = "document_data">
+					%if inv.type == 'out_invoice' and (inv.state == 'open' or inv.state == 'paid') :
+					<span class="title">${_("Electronic Invoice")} ${inv.number or ''|entity}</span>
+					%elif inv.type == 'out_invoice' and inv.state == 'proforma2' :
+					<span class="title">${_("PROFORMA")} ${inv.number or ''|entity}</span>
+					%elif inv.type == 'out_invoice' and inv.state == 'draft' :
+					<span class="title">${_("Draft Inovice")} ${inv.number or ''|entity}</span>
+					%elif inv.type == 'out_invoice' and inv.state == 'cancel':
+					<span class="title">${_("Canceled Invoice")} ${inv.number or ''|entity}</span>
+					%elif inv.type == 'in_invoice' :
+					<span class="title">${_("Supplier Invoice")} ${inv.number or ''|entity}</span>   
+					%elif inv.type == 'out_refund' :
+					<span class="title">${_("Refund")} ${inv.number or ''|entity}</span> 
+					%elif inv.type == 'in_refund' :
+					<span class="title">${_("Supplier Refund")} ${inv.number or ''|entity}</span> 
+					%endif
+				</td>
+				<td>
+					${inv.partner_id.name}
+				</td>
+			</tr>
+			<tr>
+				<td>${inv.name or '' |entity}</td>
+				<td>${_("ID Num.")}: ${inv.partner_id.ref or '-'|entity}</td>
+			</tr>
+			<tr>
+				<td>${_("Date:")} ${formatLang(inv.date_invoice, date=True)|entity}</td>
+				<td>${_("Phone")}:${inv.address_invoice_id.phone or '-'|entity}</td>
+			</tr>
+			<tr>
+				<td>${_("Due date")}: ${formatLang(inv.date_due, date=True)|entity}</td>
+				<td>${_("Fax")}: ${inv.address_invoice_id.fax or '-' | entity}</td>
+			</tr>
+			<tr>
+				<td>${_("Payment tems")}: ${inv.payment_term.name or '-' |entity}</td>
+				<td colspan = "2">${_("Email")}: ${inv.address_invoice_id.email or '-'|entity}</td><td> </td>
+			</tr>
+			<tr>
+				<td>${_("Salesman")}: ${inv.partner_id.user_id.name or  ' '|entity}</td>
+				<td>&nbsp;</td>
+			</tr>
+			<tr class = "zone_break"><td>&nbsp;</td><td>&nbsp;</td></tr>
+			<tr class = "title"><td>${_("Address")}</td><td>&nbsp;</td></tr>
+			<tr><td>${inv.address_invoice_id.street or ''}</td><td>&nbsp;</td></tr>
+			<tr><td>${inv.address_invoice_id.street2 or ''}</td><td>&nbsp;</td></tr>
+			<tr><td>${(inv.address_invoice_id.zip and format(inv.address_invoice_id.zip) + ((inv.address_invoice_id.city or inv.address_invoice_id.state_id or inv.address_invoice_id.country_id) and ' ' or '') or '') + (inv.address_invoice_id.city and format(inv.address_invoice_id.city) + ((inv.address_invoice_id.state_id or inv.address_invoice_id.country_id) and ', ' or '') or '') + (inv.address_invoice_id.state_id and format(inv.address_invoice_id.state_id.name) + (inv.address_invoice_id.country_id and ', ' or '') or '') + (inv.address_invoice_id.country_id and format(inv.address_invoice_id.country_id.name) or '')}</td><td>&nbsp;</td></tr>
+			<tr><td>&nbsp;</td><td>&nbsp;</td></tr>
+		</table>
+		<table id ="data-table" cellspacing = "3">
+		%if inv.amount_discounted != 0:
+				<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Disc.(%)")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+		%else:
+				<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+		%endif
+		<tbody>
+		<%i = 0 %>
+		%for line in inv.invoice_line :
+			%if i% 2 == 0:
+				<tr class = "even">
+			%else:
+				<tr class = "odd">
+			%endif
+				<td valign = "top">${formatLang(line.quantity)} ${format(line.uos_id.name)}</td>
+				<td valign = "top" id="desc_col">${line.name} 
+					%if line.invoice_line_tax_id != []:
+						${ ', '.join([ tax.name or '' for tax in line.invoice_line_tax_id ])|entity}
+					%endif
+					%if line.note :
+						<br/><span class = "notes"><b>${_("Note")}:</b> ${format(line.note)}</span>
+					%endif
+				</td>
+				%if inv.amount_discounted != 0:
+					<td valign = "top" style="text-align:right;">${line.discount and formatLang(line.discount) + '%' or '-'}</td>
+				%endif
+				<td style="text-align:right;" valign = "top">${inv.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_unit)} ${inv.currency_id.symbol_suffix or ''|entity }</td>
+				<td style="text-align:right;" valign = "top">${inv.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_subtotal_not_discounted)} ${inv.currency_id.symbol_suffix or ''|entity }</td>
+			</tr>
+		<%i += 1%>
+		%endfor
+		%if inv.amount_discounted != 0:
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_untaxed_not_discounted)} ${inv.currency_id.symbol_suffix or ''|entity}</td></tr>
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Discount")}:</b></td><td style="text-align:right">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_discounted)} ${inv.currency_id.symbol_suffix or ''|entity}</td></tr>
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_tax)} ${inv.currency_id.symbol_suffix or ''|entity}</td></tr>
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Total")}:</b></td><td style="border-top:2px solid;text-align:right">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_total)} ${inv.currency_id.symbol_suffix or ''|entity}</td></tr>
+		%else:
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_untaxed_not_discounted)} ${inv.currency_id.symbol_suffix or ''|entity}</td></tr>
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_tax)} ${inv.currency_id.symbol_suffix or ''|entity}</td></tr>
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Total")}:</b></td><td style="border-top:2px solid;text-align:right">${inv.currency_id.symbol_prefix or ''|entity} ${formatLang(inv.amount_total)} ${inv.currency_id.symbol_suffix or ''|entity}</td></tr>
+		%endif
+		
+		</tbody>
+		</table>
+		<table id = "notes_table">
+			%if inv.comment:
+				<tr><td><b>${_("Invoice Note")}:</b> ${format(inv.comment)}</td></tr>
+			%endif
+			%if inv.payment_term and inv.payment_term.note:
+				<tr><td><b>${_("Payment Note")}:</b> ${format(inv.payment_term and inv.payment_term.note)}</td></tr>
+			%endif
+		</table>
+	</div>
+	<p style="page-break-after:always"></p>
+	%endfor
+</body>
+</html>

=== added file 'TODO-6.1/ccorp_account/report/invoice.py'
--- TODO-6.1/ccorp_account/report/invoice.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/report/invoice.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    invoice.py
+#    ccorp_account
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Second author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+import time
+import pooler
+from report import report_sxw
+import locale
+
+class account_invoice_ccorp(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(account_invoice_ccorp, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'time': time,
+            'cr' : cr,
+            'uid': uid,
+        })
+            
+report_sxw.report_sxw(
+    'report.account.invoice.layout_ccorp',
+    'account.invoice',
+    'addons/ccorp_account/report/invoice.mako',
+    parser=account_invoice_ccorp)

=== added file 'TODO-6.1/ccorp_account/report/invoice.rml'
--- TODO-6.1/ccorp_account/report/invoice.rml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/report/invoice.rml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,319 @@
+<?xml version="1.0"?>
+<document filename="invoice.pdf">[[ repeatIn(objects,'o') ]]
+	<template pageSize="(612.0,792.0)" title="Invoice" author="Carlos Vasquez" allowSplitting="20">
+		<pageTemplate id="letter">
+			<frame id="letter" x1="28.0" y1="78" width="556" height="535"/>
+<!--
+	Substract 324 to all heights and y coords from letter
+	<template pageSize="(612.0,468.0)" title="Invoice" author="Carlos Vasquez" allowSplitting="20">
+		<pageTemplate id="half-legal">
+			<frame id="half-legal" x1="28.0" y1="60.0" width="556" height="256"/>
+-->
+			<pageGraphics>
+				<!-- Translation -->
+				<drawCentredString x="240.25" y="756">[[ setLang(o.partner_id.lang) ]]</drawCentredString>
+				<!-- Logos -->
+				<image x="32" y="708" height="62" >[[ o.company_id.logo ]]</image>
+				<!-- Header main data -->
+				<setFont name="Helvetica-Bold" size="13"/>
+		 		<drawCentredString x="240.25" y="756">Electronic Invoice[[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('drawCentredString')) and '' ]]</drawCentredString>
+				<drawCentredString x="240.25" y="756">PRO-FORMA[[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('drawCentredString')) and '' ]]</drawCentredString>
+				<drawCentredString x="240.25" y="756">Draft Invoice[[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('drawCentredString')) and '' ]]</drawCentredString>
+				<drawCentredString x="240.25" y="756">Cancelled Invoice[[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('drawCentredString')) and '' ]]</drawCentredString>
+				<drawCentredString x="240.25" y="756">Refund[[ (o.type=='out_refund' or removeParentNode('drawCentredString')) and '' ]]</drawCentredString>
+				<drawCentredString x="240.25" y="756">Supplier Refund[[ (o.type=='in_refund' or removeParentNode('drawCentredString')) and '' ]]</drawCentredString>
+				<drawCentredString x="240.25" y="756">Supplier Invoice[[ (o.type=='in_invoice' or removeParentNode('drawCentredString')) and '' ]]</drawCentredString>
+				<setFont name="Helvetica" size="12"/>
+				<drawCentredString x="240.25" y="736">Num.: [[ o.number or removeParentNode('drawCentredString') ]]</drawCentredString>
+				<setFont name="Helvetica" size="10"/>
+				<drawCentredString x="240.25" y="724">Date: [[ (o.date_invoice != 'False' and formatLang(o.date_invoice,date=True)) or removeParentNode('drawCentredString') ]]</drawCentredString>
+				<drawCentredString x="240.25" y="712">[[ o.name ]]</drawCentredString>
+				<!-- Header Company data -->
+				<setFont name="Helvetica-Bold" size="10"/> 
+				<drawCentredString x="390" y="760">[[ o.company_id.partner_id.name ]]</drawCentredString>
+				<setFont name="Helvetica" size="10"/> 
+				<drawCentredString x="390" y="748">ID Num.: [[ o.company_id.partner_id.ref ]]</drawCentredString>
+				<drawCentredString x="390" y="736">Tel-fax: [[ o.company_id.partner_id.address[0].phone ]]</drawCentredString>
+				<drawCentredString x="390" y="724">Email: [[ o.company_id.partner_id.address[0].email ]]</drawCentredString>
+				<drawCentredString x="390" y="712">Web: [[ o.company_id.partner_id.website ]]</drawCentredString>
+				<!-- Header Company address -->
+				<setFont name="Helvetica-Bold" size="10"/> 
+				<drawRightString x="584" y="760">Address:</drawRightString>
+				<setFont name="Helvetica" size="10"/> 
+				<drawRightString x="584" y="748">[[ o.company_id.partner_id.address[0].street ]]</drawRightString>
+				<drawRightString x="584" y="736">[[ o.company_id.partner_id.address[0].street2 ]]</drawRightString>
+				<drawRightString x="584" y="724">[[ o.company_id.partner_id.address[0].zip ]] [[ o.company_id.partner_id.address[0].city ]]</drawRightString>
+				<drawRightString x="584" y="712">[[ o.company_id.partner_id.address[0].state_id.name ]], [[ o.company_id.partner_id.address[0].country_id.name ]]</drawRightString>
+				<!-- Header slogan -->
+				<setFont name="Times-BoldItalic" size="10"/>
+				<drawString x="28" y="694">[[ o.company_id.rml_header1 ]]</drawString>
+				<!-- Header lines -->
+				<stroke color='#7E7E7E'></stroke>
+				<lineMode width="0.5" />
+				<lines>16 690 612 690</lines>
+				<!-- Header partner data -->
+				<setFont name="Helvetica-Bold" size="10"/> 
+				<drawString x="28" y="672">[[ o.partner_id.name ]]</drawString>
+				<setFont name="Helvetica" size="10"/> 
+				<drawString x="28" y="660">ID Num.: [[ o.partner_id.ref or '-' ]]</drawString>
+				<drawString x="28" y="648">Phone: [[ o.address_invoice_id.phone or '-' ]]</drawString>
+				<drawString x="28" y="636">Fax: [[ o.address_invoice_id.fax or '-' ]]</drawString>
+				<drawString x="28" y="624">Email: [[ o.address_invoice_id.email or '-' ]]</drawString>
+				<!-- Header partner address -->
+				<setFont name="Helvetica" size="10"/>
+				<drawString x="180" y="660">Address: [[ o.address_invoice_id.street or '' ]]</drawString>
+				<drawString x="180" y="648">[[ o.address_invoice_id.street2 or '' ]]</drawString>
+				<drawString x="180" y="636">[[ (o.address_invoice_id.zip and format(o.address_invoice_id.zip) + ((o.address_invoice_id.city or o.address_invoice_id.state_id or o.address_invoice_id.country_id) and ' ' or '') or '') + (o.address_invoice_id.city and format(o.address_invoice_id.city) + ((o.address_invoice_id.state_id or o.address_invoice_id.country_id) and ', ' or '') or '') + (o.address_invoice_id.state_id and format(o.address_invoice_id.state_id.name) + (o.address_invoice_id.country_id and ', ' or '') or '') + (o.address_invoice_id.country_id and format(o.address_invoice_id.country_id.name) or '') ]]</drawString>
+				<!-- Header invoice data -->
+				<setFont name="Helvetica" size="10"/> 
+				<drawRightString x="584" y="672">Salesman: [[ o.partner_id.user_id.name or removeParentNode('drawRightString') ]]</drawRightString>
+				<drawRightString x="584" y="660">Payment tems: [[ o.payment_term.name or '-' ]]</drawRightString>
+				<drawRightString x="584" y="648">Due date: [[ formatLang(o.date_due,date=True) or '-' ]]</drawRightString>
+				<drawRightString x="584" y="636">Exchange rate: [[ '-' ]]</drawRightString>
+				<drawRightString x="584" y="624">Page: <pageNumber/></drawRightString>
+				<!-- Footer greeting -->
+				<setFont name="Helvetica" size="10"/>
+				<drawCentredString x="306" y="62">Thank you for choosing us.</drawCentredString>
+				<!-- Footer line -->
+				<stroke color='#7E7E7E'/>
+				<lineMode width="0.5" />
+				<lines>16 56 596 56</lines>
+				<!-- Footer text -->
+				<setFont name="Helvetica" size="8"/>
+				<drawCentredString x="306" y="44">Ctas. Bancarias: HSBC $ 40129749 SINPE 10400740511348127 - HSBC ¢ 40129749 SINPE 10400740511347211   |   Todos los cheques a nombre de ClearCorp S.A.</drawCentredString>
+				<drawCentredString x="306" y="34">Si realiza el pago en colones (CRC), por favor utilizar el tipo de cambio al día de la fecha de pago del BCCR.</drawCentredString>
+				<setFont name="Times-LightItalic" size="8"/> 
+				<drawCentredString x="306" y="22">Emitida conforme lo establecido en la resolución de Facturación Electrónica, N° DGT-22-07 del diecisiete de setiembre de dos mil siete de la Dirección General de Tributación</drawCentredString>
+			</pageGraphics>
+		</pageTemplate>
+	</template>
+	<stylesheet>
+
+		<blockTableStyle id="invoice_tbl_main">
+			<blockAlignment value="CENTER"/><blockValign value="TOP"/>
+			<blockLeftPadding length="0"/><blockRightPadding length="0"/><blockTopPadding length="0"/><blockBottomPadding length="0"/>
+			<lineStyle kind="LINEBELOW" colorName="black" thickness="1" start="0,0" stop="-1,0"/>
+			<lineStyle kind="LINEBELOW" colorName="#AAAAAA" thickness="0.3" start="0,1" stop="0,-3"/>
+		</blockTableStyle>
+		<blockTableStyle id="invoice_tbl_header">
+			<blockAlignment value="CENTER"/><blockValign value="MIDDLE"/>
+			<blockLeftPadding length="0"/><blockRightPadding length="0"/><blockTopPadding length="0"/><blockBottomPadding length="3"/>
+		</blockTableStyle>
+		<blockTableStyle id="invoice_tbl_content">
+			<blockAlignment value="LEFT"/><blockValign value="MIDDLE"/>
+			<blockLeftPadding length="2"/><blockRightPadding length="2"/><blockTopPadding length="2.5"/><blockBottomPadding length="2.5"/>
+		</blockTableStyle>
+		<blockTableStyle id="invoice_tbl_content_note">
+			<blockAlignment value="LEFT"/><blockValign value="MIDDLE"/>
+			<blockLeftPadding length="15"/><blockRightPadding length="200"/><blockTopPadding length="3"/><blockBottomPadding length="3"/>
+			<blockBackground colorName="#F6F6F6"/>
+		</blockTableStyle>
+		<blockTableStyle id="invoice_tbl_content_text">
+			<blockAlignment value="LEFT"/><blockValign value="MIDDLE"/>
+			<blockLeftPadding length="15"/><blockRightPadding length="200"/><blockTopPadding length="3"/><blockBottomPadding length="3"/>
+			<blockBackground colorName="#F6F6F6"/>
+			<lineStyle kind="LINEABOVE" colorName="black" thickness="0.5"/>
+			<lineStyle kind="LINEBELOW" colorName="black" thickness="0.5"/>
+		</blockTableStyle>
+		<blockTableStyle id="invoice_tbl_content_title">
+			<blockAlignment value="LEFT"/><blockValign value="MIDDLE"/>
+			<blockLeftPadding length="15"/><blockRightPadding length="200"/><blockTopPadding length="3"/><blockBottomPadding length="3"/>
+			<lineStyle kind="LINEABOVE" colorName="black" thickness="0.5"/>
+			<lineStyle kind="LINEBELOW" colorName="black" thickness="0.5"/>
+		</blockTableStyle>
+		<blockTableStyle id="invoice_tbl_content_line">
+			<blockLeftPadding length="0"/><blockRightPadding length="0"/><blockTopPadding length="0"/><blockBottomPadding length="0"/>
+			<blockBackground colorName="#666666"/>
+		</blockTableStyle>
+		<blockTableStyle id="invoice_tbl_content_subtotal">
+			<blockAlignment value="LEFT"/><blockValign value="MIDDLE"/>
+			<blockLeftPadding length="15"/><blockRightPadding length="200"/><blockTopPadding length="2.5"/><blockBottomPadding length="2.5"/>
+			<lineStyle kind="LINEABOVE" colorName="black" thickness="0.5"/>
+			<lineStyle kind="LINEBELOW" colorName="black" thickness="0.5"/>
+		</blockTableStyle>
+		<blockTableStyle id="invoice_tbl_end">
+			<blockAlignment value="CENTER"/><blockValign value="TOP"/>
+			<blockLeftPadding length="0"/><blockRightPadding length="0"/><blockTopPadding length="0"/><blockBottomPadding length="0"/>
+			<lineStyle kind="LINEABOVE" colorName="black" thickness="1" start="2,0" stop="2,0"/>
+		</blockTableStyle>
+		<blockTableStyle id="invoice_tbl_tax">
+			<blockAlignment value="CENTER"/><blockValign value="TOP"/>
+			<blockLeftPadding length="0"/><blockRightPadding length="0"/><blockTopPadding length="0"/><blockBottomPadding length="0"/>
+			<lineStyle kind="LINEBELOW" colorName="black" thickness="1" start="0,0" stop="-1,0"/>
+			<lineStyle kind="LINEBELOW" colorName="#AAAAAA" thickness="0.3" start="0,1" stop="-1,-2"/>
+		</blockTableStyle>
+		<blockTableStyle id="invoice_tbl_total">
+			<blockAlignment value="CENTER"/><blockValign value="TOP"/>
+			<blockLeftPadding length="0"/><blockRightPadding length="0"/><blockTopPadding length="0"/><blockBottomPadding length="0"/>
+			<lineStyle kind="LINEBELOW" colorName="#AAAAAA" thickness="0.3" start="0,0" stop="-1,-3"/>
+			<lineStyle kind="LINEBELOW" colorName="#000000" thickness="1" start="0,-2" stop="-1,-2"/>
+		</blockTableStyle>
+		<blockTableStyle id="invoice_tbl_comment">
+			<blockAlignment value="LEFT"/><blockValign value="MIDDLE"/>
+			<blockLeftPadding length="14"/><blockRightPadding length="14"/><blockTopPadding length="7"/><blockBottomPadding length="7"/>
+			<lineStyle kind="GRID" colorName="#AAAAAA" thickness="0.3"/>
+			<blockBackground colorName="#F6F6F6"/>
+		</blockTableStyle>
+		<blockTableStyle id="invoice_tbl_space">
+			<blockAlignment value="LEFT"/><blockValign value="MIDDLE"/>
+			<blockLeftPadding length="0"/><blockRightPadding length="0"/><blockTopPadding length="0"/><blockBottomPadding length="0"/>
+		</blockTableStyle>
+		
+		<initialize>
+			<paraStyle name="all" alignment="justify" fontSize="10" spaceBefore="0" spaceAfter="0" leading="14"/>
+		</initialize>
+		<paraStyle name="invoice_tbl_header_txt_left" fontName="Helvetica-Bold" alignment="LEFT" spaceBefore="-2.0"/>
+		<paraStyle name="invoice_tbl_header_txt_center" fontName="Helvetica-Bold" alignment="CENTER" spaceBefore="-2.0"/>
+		<paraStyle name="invoice_tbl_header_txt_right" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="-2.0"/>
+		<paraStyle name="invoice_tbl_content_txt_left" fontName="Helvetica" alignment="LEFT"/>
+		<paraStyle name="invoice_tbl_content_txt_center" fontName="Helvetica" alignment="CENTER"/>
+		<paraStyle name="invoice_tbl_content_txt_right" fontName="Helvetica" alignment="RIGHT"/>
+		<paraStyle name="invoice_tbl_content_txt_note" fontName="Times-Italic" alignment="JUSTIFY"/>
+		<paraStyle name="invoice_tbl_content_txt_title" fontName="Helvetica-Bold" alignment="LEFT"/>
+		<paraStyle name="invoice_tbl_content_txt_line" fontName="Helvetica" alignment="LEFT" leading="1"/>
+		<paraStyle name="invoice_tbl_comment_text" fontName="Times-Italic" alignment="JUSTIFY"/>
+	</stylesheet>
+	<images/>
+	<story>[[ repeatIn(objects,'o') ]]
+		<!-- Translation -->
+		<para>[[ setLang(o.partner_id.lang) ]]</para>
+		<blockTable colWidths="556" style="invoice_tbl_main" repeatRows="1"><tr><td>
+			<blockTable colWidths="50,328,38,70,70" style="invoice_tbl_header">[[ o.amount_discounted != 0 or removeParentNode('blockTable') ]]
+				<tr>
+					<td><para style="invoice_tbl_header_txt_center">Qty.</para></td>
+					<td><para style="invoice_tbl_header_txt_center">[Code] Description / (Taxes)</para></td>
+					<td><para style="invoice_tbl_header_txt_center">Disc.</para></td>
+					<td><para style="invoice_tbl_header_txt_right">Unit Price</para></td>
+					<td><para style="invoice_tbl_header_txt_right">Total Price</para></td>
+				</tr>
+			</blockTable>
+			<blockTable colWidths="50,366,70,70" style="invoice_tbl_header">[[ o.amount_discounted == 0 or removeParentNode('blockTable') ]]
+				<tr>
+					<td><para style="invoice_tbl_header_txt_center">Qty.</para></td>
+					<td><para style="invoice_tbl_header_txt_center">[Code] Description / (Taxes)</para></td>
+					<td><para style="invoice_tbl_header_txt_right">Unit Price</para></td>
+					<td><para style="invoice_tbl_header_txt_right">Total Price</para></td>
+				</tr>
+			</blockTable>
+		</td></tr>
+		<tr><td>[[ repeatIn(o.invoice_line, 'line') ]]
+<!--
+			<blockTable colWidths="50,328,38,70,70" style="invoice_tbl_content">[[ (line.state == 'article' and o.amount_discounted != 0) or removeParentNode('blockTable') ]]
+-->
+			<blockTable colWidths="50,328,38,70,70" style="invoice_tbl_content">[[ (o.amount_discounted != 0) or removeParentNode('blockTable') ]]
+				<tr>
+					<td><para style="invoice_tbl_content_txt_right">[[ formatLang(line.quantity) ]] [[ format(line.uos_id.name) ]]</para></td>
+					<td><para style="invoice_tbl_content_txt_left">[[ format(line.name) ]][[ (line.invoice_line_tax_id != []) and (' / (' + (', '.join([ lt.description for lt in line.invoice_line_tax_id ])) + ')') ]]</para></td>
+					<td><para style="invoice_tbl_content_txt_center">[[ (line.discount == 0 and '-') or formatLang(line.discount) + ' %' ]]</para></td>
+					<td><para style="invoice_tbl_content_txt_right">[[ o.currency_id.symbol_prefix or '' ]][[ formatLang(line.price_unit) ]][[ o.currency_id.symbol_suffix or '' ]]</para></td>
+					<td><para style="invoice_tbl_content_txt_right">[[ o.currency_id.symbol_prefix or '' ]][[ formatLang(line.price_subtotal_not_discounted) ]][[ o.currency_id.symbol_suffix or '' ]]</para></td>
+				</tr>
+			</blockTable>
+			<blockTable colWidths="50,366,70,70" style="invoice_tbl_content">[[ (o.amount_discounted == 0) or removeParentNode('blockTable') ]]
+				<tr>
+					<td><para style="invoice_tbl_content_txt_right">[[ formatLang(line.quantity) ]] [[ format(line.uos_id.name) ]]</para></td>
+					<td><para style="invoice_tbl_content_txt_left">[[ format(line.name) ]][[ (line.invoice_line_tax_id != []) and (' / (' + (', '.join([ lt.description for lt in line.invoice_line_tax_id ])) + ')') ]]</para></td>
+					<td><para style="invoice_tbl_content_txt_right">[[ o.currency_id.symbol_prefix or '' ]][[ formatLang(line.price_unit) ]][[ o.currency_id.symbol_suffix or '' ]]</para></td>
+					<td><para style="invoice_tbl_content_txt_right">[[ o.currency_id.symbol_prefix or '' ]][[ formatLang(line.price_subtotal_not_discounted) ]][[ o.currency_id.symbol_suffix or '' ]]</para></td>
+				</tr>
+			</blockTable>
+			<blockTable colWidths="556" style="invoice_tbl_content_note">[[ line.note or removeParentNode('blockTable') ]]
+				<tr>
+					<td><para style="invoice_tbl_content_txt_note">[[ line.product_id and line.product_id.code and '[' + format(line.product_id.code) + '] ' ]]<b>Note:</b> [[ format(line.note) ]]</para></td>
+				</tr>
+			</blockTable>
+<!--
+			<blockTable colWidths="556" style="invoice_tbl_content_text">[[ line.state == 'text' or removeParentNode('blockTable') ]]
+				<tr>
+					<td><para style="invoice_tbl_content_txt_note">[[ format(line.name) ]]</para></td>
+				</tr>
+			</blockTable>
+			<blockTable colWidths="556" style="invoice_tbl_content_title">[[ line.state == 'title' or removeParentNode('blockTable') ]]
+				<tr>
+					<td><para style="invoice_tbl_content_txt_title">[[ format(line.name) ]]</para></td>
+				</tr>
+			</blockTable>
+			<blockTable colWidths="556" rowHeights="4" style="invoice_tbl_content_line">[[ line.state == 'line' or removeParentNode('blockTable') ]]
+				<tr>
+					<td><para style="invoice_tbl_content_txt_line">.</para></td>
+				</tr>
+			</blockTable>
+			<blockTable colWidths="496,60" style="invoice_tbl_content_subtotal">[[ line.state == 'subtotal' or removeParentNode('blockTable') ]]
+				<tr>
+					<td><para style="invoice_tbl_content_right"><b>Subtotal</b></para></td>
+					<td><para style="invoice_tbl_content_right">[[ format(line.price_subtotal) ]]</para></td>
+				</tr>
+			</blockTable>
+			<pageBreak>[[ line.state == 'break' or removeParentNode('pageBreak')]]</pageBreak>
+-->
+		</td></tr>
+		<tr><td>
+			<blockTable colWidths="396,20,140" style="invoice_tbl_end">
+				<tr>
+					<td>
+						<blockTable colWidths="396" rowHeights="17" style="invoice_tbl_space">
+							<tr>
+								<td> </td>
+							</tr>
+						</blockTable>
+						<blockTable colWidths="396" style="invoice_tbl_comment">[[ o.comment or removeParentNode('blockTable') ]]
+							<tr>
+								<td><para style="invoice_tbl_comment_text"><b>Nota de factura: </b>[[ format(o.comment) ]]</para></td>
+							</tr>
+						</blockTable>
+						<blockTable colWidths="396" style="invoice_tbl_comment">[[ (o.payment_term and o.payment_term.note) or removeParentNode('blockTable') ]]
+							<tr>
+								<td><para style="invoice_tbl_comment_text"><b>Nota de pago: </b>[[ format(o.payment_term and o.payment_term.note) ]]</para></td>
+							</tr>
+						</blockTable>
+					</td>
+					<td> </td>
+					<td>
+						<blockTable colWidths="140" style="invoice_tbl_total">
+							<tr>
+								<td>
+									<blockTable colWidths="70,70" style="invoice_tbl_content">
+										<tr>
+											<td><para style="invoice_tbl_content_txt_right">Subtotal</para></td>
+											<td><para style="invoice_tbl_content_txt_right">[[ o.currency_id.symbol_prefix or '' ]][[ formatLang(o.amount_untaxed_not_discounted) ]][[ o.currency_id.symbol_suffix or '' ]]</para></td>
+										</tr>
+									</blockTable>
+								</td>
+							</tr>
+							<tr>[[ o.amount_discounted != 0 or removeParentNode('tr') ]]
+								<td>
+									<blockTable colWidths="70,70" style="invoice_tbl_content">
+										<tr>
+											<td><para style="invoice_tbl_content_txt_right">Discount</para></td>
+											<td><para style="invoice_tbl_content_txt_right">[[ o.currency_id.symbol_prefix or '' ]][[ formatLang(o.amount_discounted) ]][[ o.currency_id.symbol_suffix or '' ]]</para></td>
+										</tr>
+									</blockTable>
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<blockTable colWidths="70,70" style="invoice_tbl_content">
+										<tr>
+											<td><para style="invoice_tbl_content_txt_right">Taxes</para></td>
+											<td><para style="invoice_tbl_content_txt_right">[[ o.currency_id.symbol_prefix or '' ]][[ formatLang(o.amount_tax) ]][[ o.currency_id.symbol_suffix or '' ]]</para></td>
+										</tr>
+									</blockTable>
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<blockTable colWidths="70,70" style="invoice_tbl_content">
+										<tr>
+											<td><para style="invoice_tbl_content_txt_right"><b>TOTAL</b></para></td>
+											<td><para style="invoice_tbl_content_txt_right"><b>[[ o.currency_id.symbol_prefix or '' ]][[ formatLang(o.amount_total) ]][[ o.currency_id.symbol_suffix or '' ]]</b></para></td>
+										</tr>
+									</blockTable>
+								</td>
+							</tr>
+						</blockTable>
+					</td>
+				</tr>
+			</blockTable>
+		</td></tr></blockTable>
+	</story>
+</document>

=== added directory 'TODO-6.1/ccorp_account_payment_term'
=== added file 'TODO-6.1/ccorp_account_payment_term/__init__.py'
--- TODO-6.1/ccorp_account_payment_term/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account_payment_term/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,1 @@
+import ccorp_account_payment_term

=== added file 'TODO-6.1/ccorp_account_payment_term/__openerp__.py'
--- TODO-6.1/ccorp_account_payment_term/__openerp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account_payment_term/__openerp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    address_name_inc.py
+#    address_name_inc
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+{
+	"name"        : "Accounting",
+	"author"      : "ClearCorp S.A.",
+	"version"     : "0.1",
+	"depends"     : ["base","account"],
+	"init_xml"    : [],
+	"update_xml"  : [],
+	"category"    : "Base",
+	"active"      : False,
+	"instalable"  : True,
+}

=== added file 'TODO-6.1/ccorp_account_payment_term/ccorp_account_payment_term.py'
--- TODO-6.1/ccorp_account_payment_term/ccorp_account_payment_term.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account_payment_term/ccorp_account_payment_term.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    address_name_inc.py
+#    address_name_inc
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+from osv import osv, fields
+from tools import debug
+from tools.translate import _
+
+class account_invoice_payment(osv.osv):
+	_name = 'account.invoice'
+	_inherit = 'account.invoice'
+	
+	_columns = {
+		'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True, states={'draft':[('readonly',False)]},
+			help="If you use payment terms, the due date will be computed automatically at the generation "\
+				"of accounting entries. If you keep the payment term and the due date empty, it means direct payment. "\
+				"The payment term may compute several due dates, for example 50% now, 50% in one month.", required=True),
+	}
+account_invoice_payment()
+

=== added directory 'TODO-6.1/ccorp_main_company'
=== added file 'TODO-6.1/ccorp_main_company/__init__.py'
--- TODO-6.1/ccorp_main_company/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_main_company/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __init__.py
+#    ccorp_main_company
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+

=== added file 'TODO-6.1/ccorp_main_company/__openerp__.py'
--- TODO-6.1/ccorp_main_company/__openerp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_main_company/__openerp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,51 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __terp__.py
+#    ccorp_seisa_main_company
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+{
+    'name': 'Changes default main company to ClearCorp',
+    'version': '0.1',
+    'url': 'http://launchpad.net/openerp-costa-rica',
+    'author': 'ClearCorp S.A.',
+    'website': 'http://clearcorp.co.cr',
+    'category': 'Generic Modules/Base',
+    'description': """Changes default main company to ClearCorp on demo data
+    """,
+    'depends': ['base','l10n_cr_base'],
+    'init_xml': [],
+    'demo_xml': ['ccorp_main_company_data.xml'],
+    'update_xml': [],
+    'license': 'Other OSI approved licence',
+    'installable': True,
+    'active': True,
+}

=== added file 'TODO-6.1/ccorp_main_company/ccorp_main_company_data.xml'
--- TODO-6.1/ccorp_main_company/ccorp_main_company_data.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_main_company/ccorp_main_company_data.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+		<!-- Basic Company  -->
+		<record id="base.main_partner" model="res.partner">
+			<field name="name">CLEARCORP S.A.</field>
+			<field name="website">http://clearcorp.co.cr</field>
+			<field name="ref">3-101-000000</field>
+			<field name="title" ref="base.res_partner_title_pvt_ltd"/>
+			<field eval="time.strftime('%Y-01-01')" name="date"/>
+		</record>
+		<record id="base.main_address" model="res.partner.address">
+			<field name="name">CLEARCORP S.A.</field>
+			<field name="street">15 m. Este de la esq. NE</field>
+			<field name="street2">De las Inst. Deportivas de la UCR</field>
+			<field name="zip">11502</field>
+			<field name="city">Sabanilla, Montes de Oca</field>
+			<field name="fax">+(506) 4000-2677</field>
+			<field name="phone">+(506) 4000-2677</field>
+			<field name="email">[e-mail]</field>
+			<field name="type">default</field>
+			<field model="res.country" name="state_id" ref="l10n_cr_base.state_SJ"/>
+			<field model="res.country" name="country_id" ref="base.cr"/>
+		</record>
+		<record id="base.main_company" model="res.company">
+			<field name="name">CLEARCORP S.A.</field>
+			<field name="rml_header1">Soluciones Realmente Integrales, a la medida y en Software Libre</field>
+			<field name="rml_footer1"></field>
+			<field name="rml_footer2"></field>
+			<field name="currency_id" ref="base.CRC"/>
+		</record>
+	</data>
+</openerp>

=== added directory 'TODO-6.1/ccorp_partner_payment_term'
=== added file 'TODO-6.1/ccorp_partner_payment_term/__init__.py'
--- TODO-6.1/ccorp_partner_payment_term/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_partner_payment_term/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,1 @@
+import ccorp_partner_payment_term

=== added file 'TODO-6.1/ccorp_partner_payment_term/__openerp__.py'
--- TODO-6.1/ccorp_partner_payment_term/__openerp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_partner_payment_term/__openerp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    address_name_inc.py
+#    address_name_inc
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+{
+	"name"        : "Accounting",
+	"author"      : "ClearCorp S.A.",
+	"version"     : "0.1",
+	"depends"     : ["base","account"],
+	"init_xml"    : [],
+	"update_xml"  : [],
+	"category"    : "Accounting",
+	"active"      : False,
+	"instalable"  : True,
+}

=== added file 'TODO-6.1/ccorp_partner_payment_term/ccorp_partner_payment_term.py'
--- TODO-6.1/ccorp_partner_payment_term/ccorp_partner_payment_term.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_partner_payment_term/ccorp_partner_payment_term.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,54 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    address_name_inc.py
+#    address_name_inc
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+from osv import osv, fields
+from tools import debug
+from tools.translate import _
+
+class partnert_payment(osv.osv):
+	_name = 'res.partner'
+	_inherit = 'res.partner'
+	
+	_columns = {
+		'property_payment_term': fields.property(
+            'account.payment.term',
+            type='many2one',
+            relation='account.payment.term',
+            string ='Payment Term',
+            method=True,
+            view_load=True,
+            help="This payment term will be used instead of the default one for the current partner", required=True),
+
+	}
+partnert_payment()
+

=== added directory 'TODO-6.1/ccorp_purchase'
=== added file 'TODO-6.1/ccorp_purchase/__init__.py'
--- TODO-6.1/ccorp_purchase/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __init__.py
+#    ccorp_sale
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+import report

=== added file 'TODO-6.1/ccorp_purchase/__terp__.py'
--- TODO-6.1/ccorp_purchase/__terp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/__terp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,59 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __terp__.py
+#    ccorp_purchase
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+{
+    'name': 'ClearCorp sale module modifications',
+    'version': '0.1',
+    'author': 'ClearCorp S.A.',
+    'website': 'http://clearcorp.co.cr',
+    'category': '',
+    'description': """ClearCorp 'sale' modifications:
+    Reports:
+      * Sale Order / Quotation
+    """,
+    'depends': [
+        'purchase',
+        'ccorp_report_fonts',
+        'report_webkit',
+        ],
+    'init_xml': [],
+    'demo_xml': [],
+    'update_xml': [
+        'ccorp_purchase_webkit_report.xml',
+        'ccorp_purchase_quotation_webkit_report.xml',
+        ],
+    'license': 'Other OSI approved licence',
+    'installable': True,
+    'active': False,
+}

=== added file 'TODO-6.1/ccorp_purchase/ccorp_purchase.py'
--- TODO-6.1/ccorp_purchase/ccorp_purchase.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/ccorp_purchase.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,53 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    ccorp_account.py
+#    ccorp_account
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+from osv import osv,fields
+
+class account_invoice(osv.osv):
+	_inherit = 'account.invoice'
+	
+	def name_get(self, cr, uid, ids, context={}):
+		if not len(ids):
+			return []
+		reads = self.read(cr, uid, ids, ['name', 'number'], context)
+		res = []
+		for record in reads:
+			name = ""
+			if record['number']:
+				name = record['number']
+			if record['name']:
+				name = name + ' ' + record['name']
+			res.append((record['id'], name))
+		return res
+account_invoice()

=== added file 'TODO-6.1/ccorp_purchase/ccorp_purchase_quotation_webkit_report.xml'
--- TODO-6.1/ccorp_purchase/ccorp_purchase_quotation_webkit_report.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/ccorp_purchase_quotation_webkit_report.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+		<report auto="False" 
+				id="purchase.report_quotation_order" 
+				model="purchase.order" 
+				name="purchase.order.quotation.layout_ccorp"  
+				file="ccorp_purchase/report/purchase_order.mako" 
+				string="Purchase Quotation" 
+				report_type="webkit"
+				/>
+	</data>
+</openerp>

=== added file 'TODO-6.1/ccorp_purchase/ccorp_purchase_webkit_report.xml'
--- TODO-6.1/ccorp_purchase/ccorp_purchase_webkit_report.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/ccorp_purchase_webkit_report.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+		<report auto="False" 
+				id="purchase.report_sale_order" 
+				model="purchase.order" 
+				name="purchase.order.layout_ccorp"  
+				file="ccorp_purchase/report/purchase_order.mako" 
+				string="Purchase Order" 
+				report_type="webkit"
+				/>
+	</data>
+</openerp>

=== added directory 'TODO-6.1/ccorp_purchase/i18n'
=== added file 'TODO-6.1/ccorp_purchase/i18n/ccorp_purchase_webkit.pot'
--- TODO-6.1/ccorp_purchase/i18n/ccorp_purchase_webkit.pot	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/i18n/ccorp_purchase_webkit.pot	2013-01-15 16:49:27 +0000
@@ -0,0 +1,143 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* ccorp_purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-10-06 19:16+0000\n"
+"PO-Revision-Date: 2011-10-06 19:16+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: ccorp_purchase
+#: model:ir.module.module,description:ccorp_purchase.module_meta_information
+msgid "ClearCorp 'sale' modifications:\n"
+"    Reports:\n"
+"      * Sale Order / Quotation\n"
+"    "
+msgstr "ClearCorp 'sale' modifications:\n"
+"    Reports:\n"
+"      * Sale Order / Quotation\n"
+"    "
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:87
+msgid "Sub Total"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:32
+msgid "ID Num."
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:78
+msgid "Note"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "Date Req."
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:18
+msgid "Order N°"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:47
+msgid "Email"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "Total Price"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:35
+msgid "Date Ordered:"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:42
+msgid "Validated By."
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:39
+msgid "Phone"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:46
+msgid "TVA"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "[Code] Description / (Taxes)"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:94
+msgid "Order Notes:"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:52
+msgid "Shipping address"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:43
+msgid "Fax"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:88
+msgid "Taxes"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:52
+msgid "Partner address"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:89
+msgid "Total"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "Qty"
+msgstr ""
+
+#. module: ccorp_purchase
+#: model:ir.module.module,shortdesc:ccorp_purchase.module_meta_information
+msgid "ClearCorp sale module modifications"
+msgstr "ClearCorp sale module modifications"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "Unit Price"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:26
+msgid "Partnert Order Ref"
+msgstr ""
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:15
+msgid "Order Ref"
+msgstr ""
+

=== added file 'TODO-6.1/ccorp_purchase/i18n/es_CR.po'
--- TODO-6.1/ccorp_purchase/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/i18n/es_CR.po	2013-01-15 16:49:27 +0000
@@ -0,0 +1,143 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* ccorp_purchase
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-10-06 19:16+0000\n"
+"PO-Revision-Date: 2011-10-06 19:16+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: ccorp_purchase
+#: model:ir.module.module,description:ccorp_purchase.module_meta_information
+msgid "ClearCorp 'sale' modifications:\n"
+"    Reports:\n"
+"      * Sale Order / Quotation\n"
+"    "
+msgstr "ClearCorp 'sale' modifications:\n"
+"    Reports:\n"
+"      * Sale Order / Quotation\n"
+"    "
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:87
+msgid "Sub Total"
+msgstr "Sub Total"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:32
+msgid "ID Num."
+msgstr "Céd. Jur."
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:78
+msgid "Note"
+msgstr "Nota"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "Date Req."
+msgstr "Fecha Req."
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:18
+msgid "Order N°"
+msgstr "Orden N°"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:47
+msgid "Email"
+msgstr "Email"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:35
+msgid "Date Ordered:"
+msgstr "Fecha:"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:42
+msgid "Validated By."
+msgstr "Validado por"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:39
+msgid "Phone"
+msgstr "Tel."
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:46
+msgid "TVA"
+msgstr "TVA"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "[Code] Description / (Taxes)"
+msgstr "[Cód] Descripción / (Imp)"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:94
+msgid "Order Notes:"
+msgstr "Notas:"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:52
+msgid "Shipping address"
+msgstr "Dirección de envío"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:43
+msgid "Fax"
+msgstr "Fax"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:88
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:52
+msgid "Partner address"
+msgstr "Dirección origen"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:89
+msgid "Total"
+msgstr "Total"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "Qty"
+msgstr "Cant."
+
+#. module: ccorp_purchase
+#: model:ir.module.module,shortdesc:ccorp_purchase.module_meta_information
+msgid "ClearCorp sale module modifications"
+msgstr "ClearCorp purchase module modifications"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:26
+msgid "Partnert Order Ref"
+msgstr "Ref."
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:15
+msgid "Order Ref"
+msgstr "Orden de Ref"
+

=== added directory 'TODO-6.1/ccorp_purchase/report'
=== added file 'TODO-6.1/ccorp_purchase/report/__init__.py'
--- TODO-6.1/ccorp_purchase/report/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/report/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __init__.py
+#    ccorp_purchase
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+import purchase_order
+import purchase_quotation

=== added file 'TODO-6.1/ccorp_purchase/report/purchase_order.mako'
--- TODO-6.1/ccorp_purchase/report/purchase_order.mako	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/report/purchase_order.mako	2013-01-15 16:49:27 +0000
@@ -0,0 +1,103 @@
+<html>
+<head>
+	<style type="text/css">
+		${css}
+	</style>
+</head>
+<body class = "data">
+	%for po in objects :
+	<% setLang(po.partner_id.lang) %>
+	<div id="wrapper">
+		<table width = "100%" class = "document_data">
+			<tr class = "title">
+				<td class = "document_data">
+					%if po.state =='draft' :
+					<span class="title">${_("Request for Quotation")} ${po.name or ''|entity}</span><br/>
+					%endif
+					%if po.state != 'draft' :
+					<span class="title">${_("Order N°")} ${po.name or ''|entity}</span>
+					%endif
+				</td>
+				<td>
+					${(po.partner_id and po.partner_id.title and po.partner_id.title.name) or ''} ${po.partner_id and po.partner_id.name or ''}
+				</td>
+			</tr>
+			<tr>
+				%if po.state != 'draft' :
+				<td><span class="title">${_("Partnert Order Ref")}
+					 ${po.partner_ref or ''|entity}					
+					</span><br/>   
+				</td>
+				%else:
+					<td>&nbsp;</td>
+				%endif
+				<td>${_("ID Num.")}: ${po.partner_id.ref or '-'|entity}</td>
+			</tr>
+			<tr>
+				<td>${_("Date Ordered:")}
+					%if po.date_order:
+						${formatLang(po.date_order, date=True)|entity}
+					%endif</td>
+				<td>${_("Phone")}:${po.partner_address_id and po.partner_address_id.phone or '-'|entity}</td>
+			</tr>
+			<tr>
+				<td>${_("Validated By.")}: ${po.validator and po.validator.name or ''|entity}</td>
+				<td>${_("Fax")}:${po.partner_address_id and po.partner_address_id.fax or '-'|entity}</td>
+			</tr>
+			<tr>
+				<td>${_("TVA")}: ${(po.partner_id and po.partner_id.vat) or '-'|entity}</td>
+				<td>${_("Email")}: ${po.partner_id.email or '-'|entity}</td>
+			</tr>
+			<tr class = "zone_break"><td>&nbsp;</td><td>&nbsp;</td></tr>
+			<!-- Shipping partner address -->
+			<!-- Invoice partner address -->
+			<tr class = "title"><td>${_("Partner address")}</td><td>${_("Shipping address")}</td></tr>
+			<tr><td>${(po.partner_address_id and po.partner_address_id.street ) or ''}</td><td>${(po.dest_address_id and po.dest_address_id.street ) or ''}</td></tr>
+			<tr><td>${(po.partner_address_id and po.partner_address_id.street2 ) or ''}</td><td>${(po.dest_address_id and po.dest_address_id.street2 ) or ''}</td></tr>
+			<tr>
+				<td>${(po.partner_address_id.zip and format(po.partner_address_id.zip) + ((po.partner_address_id.city or po.partner_address_id.state_id or po.partner_address_id.country_id) and ' ' or '') or '') + (po.partner_address_id.city and format(po.partner_address_id.city) or '')}</td>
+				<td>${(po.dest_address_id.zip and format(po.dest_address_id.zip) + ((po.dest_address_id.city or po.dest_address_id.state_id or po.dest_address_id.country_id) and ' ' or '') or '') + (po.dest_address_id.city and format(po.dest_address_id.city) or '')}</td>
+			</tr>
+			<tr>
+				<td>${(po.partner_address_id.state_id and format(po.partner_address_id.state_id.name) + (po.partner_address_id.country_id and ', ' or '') or '') + (po.partner_address_id.country_id and format(po.partner_address_id.country_id.name) or '')}</td>
+				<td>${(po.dest_address_id.state_id and format(po.dest_address_id.state_id.name) + (po.dest_address_id.country_id and ', ' or '') or '') + (po.dest_address_id.country_id and format(po.dest_address_id.country_id.name) or '')}</td>
+			</tr>
+		</table>
+		
+		<table id="data-table" cellspacing="3">
+			<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Date Req.")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+		<tbody>
+		<%i = 0 %>
+		%for line in po.order_line :
+			%if i% 2 == 0:
+				<tr class = "even">
+			%else:
+				<tr class = "odd">
+			%endif
+				<td valign = "top">${formatLang(line.product_qty)} ${format(line.product_uom.name)}</td>
+				<td valign = "top" id="desc_col_po">${line.name} ${', '.join(map(lambda x: x.name, line.taxes_id))|entity}
+					%if line.notes :
+						<br/><span class = "notes"><b>${_("Note")}:</b> ${format(line.notes)}</span>
+					%endif
+				</td>
+				<td valign = "top">${formatLang( line.date_planned, date=True)}</td>
+				<td valign = "top" style="text-align:right;">${po.pricelist_id.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_unit,digits=get_digits(dp='Purchase Price'))} ${po.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
+				<td valign = "top" style="text-align:right;">${po.pricelist_id.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_subtotal)} ${po.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
+			</tr>
+		<%i +=1%>
+		%endfor
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${po.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(po.amount_untaxed)} ${po.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${po.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(po.amount_tax)} ${po.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${po.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(po.amount_total)} ${po.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+		</tbody>
+		</table>
+		<table id="notes_table">
+			%if po.notes:
+				<tr><td><b>${_("Order Notes:")}</b>${format(po.notes)}</td></tr>
+			%endif
+		</table>
+	</div>
+	<p style="page-break-after:always"></p>
+%endfor
+</body>
+</html>

=== added file 'TODO-6.1/ccorp_purchase/report/purchase_order.py'
--- TODO-6.1/ccorp_purchase/report/purchase_order.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/report/purchase_order.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,104 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    invoice.py
+#    ccorp_sale
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+import time
+import pooler
+from report import report_sxw
+import locale
+
+class purchase_order_ccorp(report_sxw.rml_parse):
+
+	def _get_line_tax(self, line_obj):
+		self.cr.execute("SELECT tax_id FROM purchase_order_taxe WHERE order_line_id=%s", (line_obj.id))
+		res = self.cr.fetchall() or None
+		if not res:
+			return ""
+		if isinstance(res, list):
+			tax_ids = [t[0] for t in res]
+		else:
+			tax_ids = res[0]
+		res = [tax.name for tax in pooler.get_pool(self.cr.dbname).get('account.tax').browse(self.cr, self.uid, tax_ids)]
+		return ",\n ".join(res)
+	
+	def _get_tax(self, order_obj):
+		self.cr.execute("SELECT DISTINCT tax_id FROM purchase_order_taxe, purchase_order_line, purchase_order \
+			WHERE (purchase_order_line.order_id=purchase_order.id) AND (purchase_order.id=%s)", (order_obj.id))
+		res = self.cr.fetchall() or None
+		if not res:
+			return []
+		if isinstance(res, list):
+			tax_ids = [t[0] for t in res]
+		else:
+			tax_ids = res[0]
+		tax_obj = pooler.get_pool(self.cr.dbname).get('account.tax')
+		res = []
+		for tax in tax_obj.browse(self.cr, self.uid, tax_ids):
+			self.cr.execute("SELECT DISTINCT order_line_id FROM purchase_order_line, purchase_order_taxe \
+				WHERE (purchase_order_taxe.tax_id=%s) AND (purchase_order_line.order_id=%s)", (tax.id, order_obj.id))
+			lines = self.cr.fetchall() or None
+			if lines:
+				if isinstance(lines, list):
+					line_ids = [l[0] for l in lines]
+				else:
+					line_ids = lines[0]
+				base = 0
+				for line in pooler.get_pool(self.cr.dbname).get('purchase.order.line').browse(self.cr, self.uid, line_ids):
+					base += line.price_subtotal
+				res.append({'code':tax.name,
+					'base':base,
+					'amount':base*tax.amount})
+		return res
+	def _get_product_code(self, product_id, partner_id):
+		product_obj=pooler.get_pool(self.cr.dbname).get('product.product')
+		return product_obj._product_code(self.cr, self.uid, [product_id], name=None, arg=None, context={'partner_id': partner_id})[product_id]
+
+	def __init__(self, cr, uid, name, context):
+		super(purchase_order_ccorp, self).__init__(cr, uid, name, context=context)
+		self.localcontext.update({
+			'time': time,
+			'get_line_tax': self._get_line_tax,
+			'get_tax': self._get_tax,
+			'get_product_code': self._get_product_code,
+			'cr'  : cr,
+			'uid' : uid,
+		})
+		self.context = context
+		self._node = None
+
+report_sxw.report_sxw(
+    'report.purchase.order.layout_ccorp',
+    'purchase.order',
+    'addons/ccorp_purchase/report/purchase_order.mako',
+    parser=purchase_order_ccorp
+)

=== added file 'TODO-6.1/ccorp_purchase/report/purchase_quotation.mako'
--- TODO-6.1/ccorp_purchase/report/purchase_quotation.mako	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/report/purchase_quotation.mako	2013-01-15 16:49:27 +0000
@@ -0,0 +1,103 @@
+<html>
+<head>
+	<style type="text/css">
+		${css}
+	</style>
+</head>
+<body class = "data">
+	%for po in objects :
+	<% setLang(po.partner_id.lang) %>
+	<div id="wrapper">
+		<table width = "100%" class = "document_data">
+			<tr class = "title">
+				<td class = "document_data">
+					%if po.state =='draft' :
+					<span class="title">${_("Request for Quotation")} ${po.name or ''|entity}</span><br/>
+					%endif
+					%if po.state != 'draft' :
+					<span class="title">${_("Order N°")} ${po.name or ''|entity}</span>
+					%endif
+				</td>
+				<td>
+					${(po.partner_id and po.partner_id.title and po.partner_id.title.name) or ''} ${po.partner_id and po.partner_id.name or ''}
+				</td>
+			</tr>
+			<tr>
+				%if po.state != 'draft' :
+				<td><span class="title">${_("Partnert Order Ref")}
+					 ${po.partner_ref or ''|entity}					
+					</span><br/>   
+				</td>
+				%else:
+					<td>&nbsp;</td>
+				%endif
+				<td>${_("ID Num.")}: ${po.partner_id.ref or '-'|entity}</td>
+			</tr>
+			<tr>
+				<td>${_("Date Ordered:")}
+					%if po.date_order:
+						${formatLang(po.date_order, date=True)|entity}
+					%endif</td>
+				<td>${_("Phone")}:${po.partner_address_id and po.partner_address_id.phone or '-'|entity}</td>
+			</tr>
+			<tr>
+				<td>${_("Validated By.")}: ${po.validator and po.validator.name or ''|entity}</td>
+				<td>${_("Fax")}:${po.partner_address_id and po.partner_address_id.fax or '-'|entity}</td>
+			</tr>
+			<tr>
+				<td>${_("TVA")}: ${(po.partner_id and po.partner_id.vat) or '-'|entity}</td>
+				<td>${_("Email")}: ${po.partner_id.email or '-'|entity}</td>
+			</tr>
+			<tr class = "zone_break"><td>&nbsp;</td><td>&nbsp;</td></tr>
+			<!-- Shipping partner address -->
+			<!-- Invoice partner address -->
+			<tr class = "title"><td>${_("Partner address")}</td><td>${_("Shipping address")}</td></tr>
+			<tr><td>${(po.partner_address_id and po.partner_address_id.street ) or ''}</td><td>${(po.dest_address_id and po.dest_address_id.street ) or ''}</td></tr>
+			<tr><td>${(po.partner_address_id and po.partner_address_id.street2 ) or ''}</td><td>${(po.dest_address_id and po.dest_address_id.street2 ) or ''}</td></tr>
+			<tr>
+				<td>${(po.partner_address_id.zip and format(po.partner_address_id.zip) + ((po.partner_address_id.city or po.partner_address_id.state_id or po.partner_address_id.country_id) and ' ' or '') or '') + (po.partner_address_id.city and format(po.partner_address_id.city) or '')}</td>
+				<td>${(po.dest_address_id.zip and format(po.dest_address_id.zip) + ((po.dest_address_id.city or po.dest_address_id.state_id or po.dest_address_id.country_id) and ' ' or '') or '') + (po.dest_address_id.city and format(po.dest_address_id.city) or '')}</td>
+			</tr>
+			<tr>
+				<td>${(po.partner_address_id.state_id and format(po.partner_address_id.state_id.name) + (po.partner_address_id.country_id and ', ' or '') or '') + (po.partner_address_id.country_id and format(po.partner_address_id.country_id.name) or '')}</td>
+				<td>${(po.dest_address_id.state_id and format(po.dest_address_id.state_id.name) + (po.dest_address_id.country_id and ', ' or '') or '') + (po.dest_address_id.country_id and format(po.dest_address_id.country_id.name) or '')}</td>
+			</tr>
+		</table>
+		
+		<table id="data-table" cellspacing="3">
+			<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Date Req.")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+		<tbody>
+		<%i = 0 %>
+		%for line in po.order_line :
+			%if i% 2 == 0:
+				<tr class = "even">
+			%else:
+				<tr class = "odd">
+			%endif
+				<td valign = "top">${formatLang(line.product_qty)} ${format(line.product_uom.name)}</td>
+				<td valign = "top" id="desc_col_po">${line.name} ${', '.join(map(lambda x: x.name, line.taxes_id))|entity}
+					%if line.notes :
+						<br/><span class = "notes"><b>${_("Note")}:</b> ${format(line.notes)}</span>
+					%endif
+				</td>
+				<td valign = "top">${formatLang( line.date_planned, date=True)}</td>
+				<td valign = "top" style="text-align:right;">${po.pricelist_id.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_unit,digits=get_digits(dp='Purchase Price'))} ${po.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
+				<td valign = "top" style="text-align:right;">${po.pricelist_id.currency_id.symbol_prefix or ''|entity } ${formatLang(line.price_subtotal)} ${po.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
+			</tr>
+		<%i +=1%>
+		%endfor
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${po.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(po.amount_untaxed)} ${po.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${po.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(po.amount_tax)} ${po.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+		<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${po.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(po.amount_total)} ${po.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+		</tbody>
+		</table>
+		<table id="notes_table">
+			%if po.notes:
+				<tr><td><b>${_("Order Notes:")}</b>${format(po.notes)}</td></tr>
+			%endif
+		</table>
+	</div>
+	<p style="page-break-after:always"></p>
+%endfor
+</body>
+</html>

=== added file 'TODO-6.1/ccorp_purchase/report/purchase_quotation.py'
--- TODO-6.1/ccorp_purchase/report/purchase_quotation.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/report/purchase_quotation.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,104 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    invoice.py
+#    ccorp_sale
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+import time
+import pooler
+from report import report_sxw
+import locale
+
+class purchase_order_quotation_ccorp(report_sxw.rml_parse):
+
+	def _get_line_tax(self, line_obj):
+		self.cr.execute("SELECT tax_id FROM purchase_order_taxe WHERE order_line_id=%s", (line_obj.id))
+		res = self.cr.fetchall() or None
+		if not res:
+			return ""
+		if isinstance(res, list):
+			tax_ids = [t[0] for t in res]
+		else:
+			tax_ids = res[0]
+		res = [tax.name for tax in pooler.get_pool(self.cr.dbname).get('account.tax').browse(self.cr, self.uid, tax_ids)]
+		return ",\n ".join(res)
+	
+	def _get_tax(self, order_obj):
+		self.cr.execute("SELECT DISTINCT tax_id FROM purchase_order_taxe, purchase_order_line, purchase_order \
+			WHERE (purchase_order_line.order_id=purchase_order.id) AND (purchase_order.id=%s)", (order_obj.id))
+		res = self.cr.fetchall() or None
+		if not res:
+			return []
+		if isinstance(res, list):
+			tax_ids = [t[0] for t in res]
+		else:
+			tax_ids = res[0]
+		tax_obj = pooler.get_pool(self.cr.dbname).get('account.tax')
+		res = []
+		for tax in tax_obj.browse(self.cr, self.uid, tax_ids):
+			self.cr.execute("SELECT DISTINCT order_line_id FROM purchase_order_line, purchase_order_taxe \
+				WHERE (purchase_order_taxe.tax_id=%s) AND (purchase_order_line.order_id=%s)", (tax.id, order_obj.id))
+			lines = self.cr.fetchall() or None
+			if lines:
+				if isinstance(lines, list):
+					line_ids = [l[0] for l in lines]
+				else:
+					line_ids = lines[0]
+				base = 0
+				for line in pooler.get_pool(self.cr.dbname).get('purchase.order.line').browse(self.cr, self.uid, line_ids):
+					base += line.price_subtotal
+				res.append({'code':tax.name,
+					'base':base,
+					'amount':base*tax.amount})
+		return res
+	def _get_product_code(self, product_id, partner_id):
+		product_obj=pooler.get_pool(self.cr.dbname).get('product.product')
+		return product_obj._product_code(self.cr, self.uid, [product_id], name=None, arg=None, context={'partner_id': partner_id})[product_id]
+
+	def __init__(self, cr, uid, name, context):
+		super(purchase_order_quotation_ccorp, self).__init__(cr, uid, name, context=context)
+		self.localcontext.update({
+			'time': time,
+			'get_line_tax': self._get_line_tax,
+			'get_tax': self._get_tax,
+			'get_product_code': self._get_product_code,
+			'cr'  : cr,
+			'uid' : uid,
+		})
+		self.context = context
+		self._node = None
+
+report_sxw.report_sxw(
+    'report.purchase.order.quotation.layout_ccorp',
+    'purchase.order',
+    'addons/ccorp_purchase/report/purchase_quotation.mako',
+    parser=purchase_order_quotation_ccorp
+)

=== added directory 'TODO-6.1/ccorp_report_fonts'
=== added file 'TODO-6.1/ccorp_report_fonts/__init__.py'
--- TODO-6.1/ccorp_report_fonts/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_report_fonts/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __init__.py
+#    ccorp_report_fonts
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+import ccorp_report_fonts

=== added file 'TODO-6.1/ccorp_report_fonts/__terp__.py'
--- TODO-6.1/ccorp_report_fonts/__terp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_report_fonts/__terp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,51 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    __terp__.py
+#    ccorp_report_fonts
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+{
+    'name': 'ClearCorp report fonts',
+    'version': '0.1',
+    'url': 'http://launchpad.net/openerp-costa-rica',
+    'author': 'ClearCorp S.A.',
+    'website': 'http://clearcorp.co.cr',
+    'category': 'General Modules',
+    'description': """Replaces standard fonts with ClearCorp fonts.
+    """,
+    'depends': ['base'],
+    'init_xml': [],
+    'demo_xml': [],
+    'update_xml': [],
+    'license': 'Other OSI approved licence',
+    'installable': True,
+    'active': False,
+}

=== added file 'TODO-6.1/ccorp_report_fonts/ccorp_report_fonts.py'
--- TODO-6.1/ccorp_report_fonts/ccorp_report_fonts.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_report_fonts/ccorp_report_fonts.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,124 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    ccorp_report_fonts.py
+#    ccorp_report_fonts
+#    First author: Carlos Vásquez <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2010-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+
+from tools.config import config
+import report
+import os
+
+import reportlab
+import reportlab.rl_config
+from reportlab.pdfbase import pdfmetrics
+from reportlab.pdfbase.ttfonts import TTFont
+from reportlab.lib.fonts import addMapping
+
+reportlab.rl_config.warnOnMissingFontGlyphs = 0
+enc = 'UTF-8'
+
+def wrap_trml2pdf(method):
+    """We have to wrap the original parseString() to modify the rml data
+    before it generates the pdf."""
+    #AppleGaramond
+    pdfmetrics.registerFont(TTFont('AppleGaramond', os.path.join(os.path.abspath(config['addons_path']), 'ccorp_report_fonts', 'fonts', 'AppleGaramond-Regular.ttf'),enc))
+    pdfmetrics.registerFont(TTFont('AppleGaramond-Bold', os.path.join(os.path.abspath(config['addons_path']), 'ccorp_report_fonts', 'fonts', 'AppleGaramond-Bold.ttf'),enc))
+    pdfmetrics.registerFont(TTFont('AppleGaramond-Light', os.path.join(os.path.abspath(config['addons_path']), 'ccorp_report_fonts', 'fonts', 'AppleGaramond-Light.ttf'),enc))
+    pdfmetrics.registerFont(TTFont('AppleGaramond-Italic', os.path.join(os.path.abspath(config['addons_path']), 'ccorp_report_fonts', 'fonts', 'AppleGaramond-Italic.ttf'),enc))
+    pdfmetrics.registerFont(TTFont('AppleGaramond-BoldItalic', os.path.join(os.path.abspath(config['addons_path']), 'ccorp_report_fonts', 'fonts', 'AppleGaramond-BoldItalic.ttf'),enc))
+    pdfmetrics.registerFont(TTFont('AppleGaramond-LightItalic', os.path.join(os.path.abspath(config['addons_path']), 'ccorp_report_fonts', 'fonts', 'AppleGaramond-LightItalic.ttf'),enc))
+    addMapping('AppleGaramond', 0, 0, 'AppleGaramond')
+    addMapping('AppleGaramond', 1, 0, 'AppleGaramond-Bold')
+    addMapping('AppleGaramond', 0, 1, 'AppleGaramond-Italic')
+    addMapping('AppleGaramond', 1, 1, 'AppleGaramond-BoldItalic')
+    addMapping('AppleGaramond-Light', 0, 0, 'AppleGaramond-Light')
+    addMapping('AppleGaramond-Light', 0, 1, 'AppleGaramond-LightItalic')
+    #MyriadPro
+    pdfmetrics.registerFont(TTFont('MyriadPro', os.path.join(os.path.abspath(config['addons_path']), 'ccorp_report_fonts', 'fonts', 'MyriadPro-Regular.ttf'),enc))
+    pdfmetrics.registerFont(TTFont('MyriadPro-Bold', os.path.join(os.path.abspath(config['addons_path']), 'ccorp_report_fonts', 'fonts', 'MyriadPro-Bold.ttf'),enc))
+    pdfmetrics.registerFont(TTFont('MyriadPro-Italic', os.path.join(os.path.abspath(config['addons_path']), 'ccorp_report_fonts', 'fonts', 'MyriadPro-Italic.ttf'),enc))
+    pdfmetrics.registerFont(TTFont('MyriadPro-BoldItalic', os.path.join(os.path.abspath(config['addons_path']), 'ccorp_report_fonts', 'fonts', 'MyriadPro-BoldItalic.ttf'),enc))
+    addMapping('MyriadPro', 0, 0, 'MyriadPro')
+    addMapping('MyriadPro', 1, 0, 'MyriadPro-Bold')
+    addMapping('MyriadPro', 0, 1, 'MyriadPro-Italic')
+    addMapping('MyriadPro', 1, 1, 'MyriadPro-BoldItalic')
+    #Inconsolata
+    pdfmetrics.registerFont(TTFont('Inconsolata', os.path.join(os.path.abspath(config['addons_path']), 'ccorp_report_fonts', 'fonts', 'Inconsolata.ttf'), enc))
+    addMapping('Inconsolata', 0, 0, 'Inconsolata')
+    addMapping('Inconsolata', 1, 0, 'Inconsolata')
+    addMapping('Inconsolata', 0, 1, 'Inconsolata')
+    addMapping('Inconsolata', 1, 1, 'Inconsolata')
+    
+    def convertClearCorpFonts(*args, **argv):
+        """This function replaces the type1 font names with their truetype
+        substitutes and puts a font registration section at the beginning
+        of the rml file. The rml file is acually a string (data)."""
+        data = args[0]
+        fontmap = {
+            'Times-Roman':                  'AppleGaramond',
+            'Times-BoldItalic':             'AppleGaramond-BoldItalic',
+            'Times-Bold':                   'AppleGaramond-Bold',
+            'Times-Italic':                 'AppleGaramond-Italic',
+            'Times-Light':		    'AppleGaramond-Light',
+            'Times-LightItalic':    'AppleGaramond-LightItalic',
+
+            'TimesCondensed-Roman':         'AppleGaramond',
+            'TimesCondensed-BoldItalic':    'AppleGaramond-BoldItalic',
+            'TimesCondensed-Bold':          'AppleGaramond-Bold',
+            'TimesCondensed-Italic':        'AppleGaramond-Italic',
+
+            'Helvetica-BoldItalic':         'MyriadPro-BoldItalic',
+            'Helvetica-BoldOblique':        'MyriadPro-BoldItalic',
+            'Helvetica-Bold':               'MyriadPro-Bold',
+            'Helvetica-Italic':             'MyriadPro-Italic',
+            'Helvetica-Oblique':            'MyriadPro-Italic',
+            'Helvetica':                    'MyriadPro',
+
+            'Helvetica-ExtraLight':         'MyriadPro',
+
+            'HelveticaCondensed-BoldItalic':'MyriadPro-BoldCondItalic',
+            'HelveticaCondensed-Bold':      'MyriadPro-BoldCond',
+            'HelveticaCondensed-Italic':    'MyriadPro-CondItalic',
+            'HelveticaCondensed':           'MyriadPro-Cond',
+
+            'Courier':                      'Inconsolata',
+            'Courier-Bold':                 'Inconsolata',
+            'Courier-BoldItalic':           'Inconsolata',
+            'Courier-Italic':               'Inconsolata',
+        }
+        for  old, new in fontmap.iteritems():
+            data = data.replace(old, new)
+        return method(data, args[1:] if len(args) > 2 else args[1], **argv)
+    return convertClearCorpFonts
+
+report.render.rml2pdf.parseString = wrap_trml2pdf(report.render.rml2pdf.parseString)
+
+report.render.rml2pdf.parseNode = wrap_trml2pdf(report.render.rml2pdf.parseNode)

=== added directory 'TODO-6.1/ccorp_report_fonts/fonts'
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-Bold.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-Bold.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-Bold.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-BoldItalic.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-BoldItalic.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-BoldItalic.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-Italic.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-Italic.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-Italic.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-Light.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-Light.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-Light.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-LightItalic.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-LightItalic.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-LightItalic.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-Regular.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-Regular.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/AppleGaramond-Regular.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/Inconsolata.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/Inconsolata.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/Inconsolata.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Bold.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Bold.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Bold.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-BoldCond.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-BoldCond.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-BoldCond.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-BoldCondItalic.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-BoldCondItalic.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-BoldCondItalic.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-BoldItalic.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-BoldItalic.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-BoldItalic.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Cond.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Cond.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Cond.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-CondItalic.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-CondItalic.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-CondItalic.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Italic.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Italic.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Italic.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Regular.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Regular.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Regular.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Semibold.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Semibold.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-Semibold.ttf	2013-01-15 16:49:27 +0000 differ
=== added file 'TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-SemiboldItalic.ttf'
Binary files TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-SemiboldItalic.ttf	1970-01-01 00:00:00 +0000 and TODO-6.1/ccorp_report_fonts/fonts/MyriadPro-SemiboldItalic.ttf	2013-01-15 16:49:27 +0000 differ
=== added directory 'TODO-6.1/ccorp_sale_payment_term'
=== added file 'TODO-6.1/ccorp_sale_payment_term/__init__.py'
--- TODO-6.1/ccorp_sale_payment_term/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_sale_payment_term/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,1 @@
+import ccorp_sale_payment_term

=== added file 'TODO-6.1/ccorp_sale_payment_term/__openerp__.py'
--- TODO-6.1/ccorp_sale_payment_term/__openerp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_sale_payment_term/__openerp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    address_name_inc.py
+#    address_name_inc
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+{
+	"name"        : "Payterm required for sale",
+	"author"      : "ClearCorp S.A.",
+	"version"     : "0.1",
+	"depends"     : ["base","sale"],
+	"init_xml"    : [],
+	"update_xml"  : [],
+	"category"    : "Sale",
+	"active"      : False,
+	"instalable"  : True,
+}

=== added file 'TODO-6.1/ccorp_sale_payment_term/ccorp_sale_payment_term.py'
--- TODO-6.1/ccorp_sale_payment_term/ccorp_sale_payment_term.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_sale_payment_term/ccorp_sale_payment_term.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    address_name_inc.py
+#    address_name_inc
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+from osv import osv, fields
+from tools import debug
+from tools.translate import _
+
+class sale_payment(osv.osv):
+	_name = 'sale.order'
+	_inherit = 'sale.order'
+	
+	_columns = {
+		'payment_term': fields.many2one('account.payment.term', 'Payment Term', required=True),
+	}
+sale_payment()
+

=== added directory 'TODO-6.1/company_webkit'
=== added file 'TODO-6.1/company_webkit/__init__.py'
--- TODO-6.1/company_webkit/__init__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/company_webkit/__init__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,1 @@
+import company_webkit

=== added file 'TODO-6.1/company_webkit/__openerp__.py'
--- TODO-6.1/company_webkit/__openerp__.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/company_webkit/__openerp__.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    account_rename.py
+#    account_rename
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+{
+	"name"        : "Company fields for report webkit",
+	"author"      : "ClearCorp S.A.",
+	"version"     : "1.0",
+	"depends"     : ["base","report_webkit"],
+	"init_xml"    : [],
+	"update_xml"  : ["company_webkit_view.xml"],
+	"category"    : "Report",
+	"active"      : False,
+	"instalable"  : True,
+}

=== added file 'TODO-6.1/company_webkit/company_webkit.py'
--- TODO-6.1/company_webkit/company_webkit.py	1970-01-01 00:00:00 +0000
+++ TODO-6.1/company_webkit/company_webkit.py	2013-01-15 16:49:27 +0000
@@ -0,0 +1,282 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    company_webkit.py
+#    company_webkit
+#    First author: Mag Guevara <[e-mail]> (ClearCorp S.A.)
+#    Copyright (c) 2011-TODAY ClearCorp S.A. (http://clearcorp.co.cr). All rights reserved.
+#    
+#    Redistribution and use in source and binary forms, with or without modification, are
+#    permitted provided that the following conditions are met:
+#    
+#       1. Redistributions of source code must retain the above copyright notice, this list of
+#          conditions and the following disclaimer.
+#    
+#       2. Redistributions in binary form must reproduce the above copyright notice, this list
+#          of conditions and the following disclaimer in the documentation and/or other materials
+#          provided with the distribution.
+#    
+#    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+#    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+#    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+#    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+#    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+#    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#    
+#    The views and conclusions contained in the software and documentation are those of the
+#    authors and should not be interpreted as representing official policies, either expressed
+#    or implied, of ClearCorp S.A..
+#    
+##############################################################################
+from osv import osv, fields
+from tools import debug
+from tools.translate import _
+
+class company_webkit(osv.osv):
+	_name = "res.company"
+	_inherit = "res.company"
+	
+	def _get_default_header(self,cr,uid,ids):
+		return """
+<html>
+	<head>
+		<meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+		<script>
+			function subst() {
+			var vars={};
+			var x=document.location.search.substring(1).split('&');
+			for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+			var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+			for(var i in x) {
+			var y = document.getElementsByClassName(x[i]);
+			for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+				}
+			}
+		</script>
+		<style type="text/css">
+			${css}
+		</style>
+		</head>
+	<body class = "header" onload="subst()">
+		<table class="header-table" cellspacing = "3">
+			<tbody>
+				<tr>
+					<td>
+						${helper.embed_logo_by_name('company_logo')|n}	
+					</td>
+					<td>
+						<table class="company_data">
+							<tr class = "title">
+								<td>${company.partner_id.name |entity}</td>
+								<td style = "text-align : right;">${_("Address")}</td>
+							</tr>
+							<tr>
+								<td>${_("ID Num")}: ${company.partner_id.ref | entity}</td>
+								<td style = "text-align : right;">${company.partner_id.address[0].street or ''|entity}</td>
+							</tr>
+							<tr>
+								<td>${_("Tel-fax")}: ${company.partner_id.address[0].phone or '-'|entity}</td>
+								<td style = "text-align : right;">${company.partner_id.address[0].street2 or ''|entity}</td>
+							</tr>
+							<tr>
+								<td>${_("E-mail")}: ${company.partner_id.address[0].email or '-'|entity}</td>
+								<td style = "text-align : right;">${company.partner_id.address[0].zip or ''|entity} ${company.partner_id.address[0].city or ''|entity}</td>
+							</tr>
+							<tr>
+								<td>${_("Web")}: ${company.partner_id.website or '-'|entity}</td>
+								%if company.partner_id.address[0].country_id :
+									<td style = "text-align : right;">${company.partner_id.address[0].state_id.name  or ''|entity}, ${company.partner_id.address[0].country_id.name or ''|entity} </td>
+								%else:
+									<td style = "text-align : right;">&nbsp;</td>
+								%endif
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+		
+		<p class = "slogan">${company.rml_header1}</p>
+		<hr />${_debug or ''|n} </body>
+</html>
+"""
+	
+	def _get_default_footer(self,cr,uid,ids):
+		return """
+<html>
+	<head>
+		<meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+		<script>
+			function subst() {
+			var vars={};
+			var x=document.location.search.substring(1).split('&');
+			for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);}
+			var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+			for(var i in x) {
+			var y = document.getElementsByClassName(x[i]);
+			for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+				}
+			}
+		</script>
+		<style type="text/css">
+			${css}
+		</style>
+	</head>
+	<body class = "footer" onload="subst()">
+		<table class = "footer_table">
+			<tr><td><p class ="company_footer">${company.webkit_footer1 or '&nbsp;'}</p></td></tr>
+			<tr><td><p class ="company_footer">${company.webkit_footer2 or '&nbsp;'}</p></td><td style="text-align:right;font-size:12;">Page <span class="page"/></td><td style="text-align:left;font-size:12;">  of <span class="topage"/></td></tr>
+			<tr><td><p class ="company_footer">${company.webkit_footer3 or '&nbsp;'}</p></td></tr>
+        </table>
+    </body>
+</html>
+		"""
+	def _get_default_css(self,cr,uid,ids):
+		return """
+			.header {
+				padding : 200px 10px 5px 10px;
+				border:0; margin: 0;
+			}
+			.header-table {
+				width: 100%;
+				padding-top: 8%;
+			}
+			.partner-table {
+				width: 100%;
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 12;
+			}
+
+			#data-table {
+				width: 100%;
+				padding-top: 20px;
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 12;
+			}
+			#data-table th{
+				border-bottom:2px solid black;
+				text-align:center;
+				font-size:12;
+				font-weight:bold;
+				padding-right:3px;
+				padding-left:3px;
+			}
+			#data-table thead {
+				display:table-header-group;
+			}
+
+			.title {
+				font-size:16;
+				font-weight: bold;
+			}
+
+			.company_address{
+				width : 100%;
+				text-align: right;
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 13;
+			}
+
+			.company_data {
+				width : 100%;
+				text-align: center;
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 13;
+				
+			}
+			
+			.company_footer {
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 8.4;
+				font-style : italic;
+			}
+			.footer {
+				border-top: 1px solid black; 
+				width: 100%;
+				border:0; margin: 0;
+				padding-bottom: 300px;
+			}
+
+			.data {
+				padding : 5px 10px 10px 10px;
+				border:0; margin: 0;
+			}
+
+			.footer_table {
+				width: 100%;
+				padding-bottom: 150px;
+				border-top: 1px solid black;
+			}
+			
+			.slogan {
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 10;
+				font-style : italic;
+				color : #888888;
+			}
+			
+			#notes_table {
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 12;
+				font-style : italic;
+				width:65%;
+				border-collapse:separate;
+				border-spacing:10px;
+			}
+			#notes_table td{
+				background-color: #eee;
+				padding: 10px
+			}
+			
+			.document_data {
+				font-family: Arial,Verdana, Sans, Serif;
+				font-size: 13;
+				width : 100%;
+			}
+			
+			#data-table tbody tr.even td {
+				background-color: #eee;
+			}
+			#data-table tbody tr.odd  td {
+				background-color: #fff;
+			}
+			
+			.notes{
+				padding-top : 0px;
+				margin-left: 5px;
+				font-style : italic;
+			}
+			#desc_col{
+				width : 380px;
+			}
+
+		"""
+	def create(self,cr,uid, vals,context=None):
+		company_id = super(company_webkit,self).create(cr,uid,vals,context)
+		obj_company = self.pool.get('res.company').browse(cr,uid,company_id)
+		
+		vals = {
+			'name' : 'Base ' + obj_company.name, 
+			'html': obj_company._get_default_header(), 
+			'css' : obj_company._get_default_css(),
+			'footer_html' : obj_company._get_default_footer(),
+			'margin_top' : 55.00,
+			'margin_bottom' : 24.00,
+			'orientation' : 'Portrait',
+			'format' : 'Letter',
+		}
+		register_id = self.pool.get('ir.header_webkit').search(cr,uid,[('name','=', 'Base ' + obj_company.name)])
+		if not register_id:
+			#obj_header = super(rent_contract,self).create(cr,uid,vals,context) 
+			obj_company.write({'header_webkit' : [(0,0, vals)]})
+		return obj_company.id
+		
+	_columns = {
+		'webkit_footer1': fields.char('Report Footer 1', size=200),
+		'webkit_footer2': fields.char('Report Footer 2', size=200),
+		'webkit_footer3': fields.char('Report Footer 3', size=200),
+	}
+company_webkit()

=== added file 'TODO-6.1/company_webkit/company_webkit_view.xml'
--- TODO-6.1/company_webkit/company_webkit_view.xml	1970-01-01 00:00:00 +0000
+++ TODO-6.1/company_webkit/company_webkit_view.xml	2013-01-15 16:49:27 +0000
@@ -0,0 +1,28 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<openerp>
+	<data>
+
+		<!--
+		======================================
+					accounts
+		======================================
+		-->
+		
+		<record model = "ir.ui.view" id = "view_webkit_company_form">
+			<field name = "name">res.company.form</field>
+			<field name = "model">res.company</field>
+			<field name = "type">form</field>
+			<field name="inherit_id" ref="report_webkit.currency_del_img"/>
+			<field name = "arch" type = "xml">
+				<data>
+					<field name = "lib_path" position = "after">
+						<field name = "webkit_footer1"/>
+						<field name = "webkit_footer2"/>
+						<field name = "webkit_footer3"/>
+					</field>
+				</data>
+			</field>
+		</record>
+	</data>
+</openerp>
+

=== added directory 'TODO-6.1/purchase_change_pricelist'
=== added file 'TODO-6.1/purchase_change_pricelist/__init__.py'
--- TODO-6.1/purchase_change_pricelist/__init__.py	1970-01-01 00:00:00 +0000