Merge lp:~rr.clearcorp/openerp-ccorp-addons/7.0-base_import_exchange_rates into lp:openerp-ccorp-addons/6.1

[Ronald Rubi]

[ADD] Add dependence res_currency_sequence in base_import_exchange_rates

Unmerged revisions

782. By Ronald Rubi on 2013-11-06

[ADD] Add dependence res_currency_sequence in base_import_exchange_rates

781. By Ronald Rubi on 2013-11-06

[MRG] Add module res_currency_sequence

780. By Ronald Rubi on 2013-11-01

[MRG] Fix account_move_reverse, bad matching lines

779. By Ronald Rubi on 2013-10-23

[MRG] Remove description_pad in project_report

778. By Ronald Rubi on 2013-10-21

[MRG] Fix duplicate in account_moves

777. By Ronald Rubi on 2013-10-09

[MRG] Added autogenerated sequence for Personel Actions

776. By Ronald Rubi on 2013-10-04

[MRG] Fixed unreconcile issue in budget_move that implied miscalculation of amounts. Also fixed state change for budget_move in case that payments are unreconciled

775. By Ronald Rubi on 2013-10-01

[MRG] New Module Personnel Actions Created

774. By Ronald Rubi on 2013-09-25

[MRG]Added expenses features

773. By Ronald Rubi on 2013-09-24

[MRG] Module project_search, Colors by Remmaing time in project_extended

=== removed directory 'TODO-6.1/company_webkit'
=== removed file 'TODO-6.1/company_webkit/__init__.py'
--- TODO-6.1/company_webkit/__init__.py	2012-06-30 22:41:06 +0000
+++ TODO-6.1/company_webkit/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-import company_webkit

=== removed file 'TODO-6.1/company_webkit/__openerp__.py'
--- TODO-6.1/company_webkit/__openerp__.py	2012-06-30 22:41:06 +0000
+++ TODO-6.1/company_webkit/__openerp__.py	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-# -*- 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,
-}

=== removed file 'TODO-6.1/company_webkit/company_webkit.py'
--- TODO-6.1/company_webkit/company_webkit.py	2012-06-30 22:41:06 +0000
+++ TODO-6.1/company_webkit/company_webkit.py	1970-01-01 00:00:00 +0000
@@ -1,282 +0,0 @@
-# -*- 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()

=== removed file 'TODO-6.1/company_webkit/company_webkit_view.xml'
--- TODO-6.1/company_webkit/company_webkit_view.xml	2012-06-30 22:41:06 +0000
+++ TODO-6.1/company_webkit/company_webkit_view.xml	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-<?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-7.0'
=== renamed directory 'account_account_rename' => 'TODO-7.0/account_account_rename'
=== renamed directory 'account_multicompany_relation' => 'TODO-7.0/account_multicompany_relation'
=== renamed directory 'account_parser_type' => 'TODO-7.0/account_parser_type'
=== renamed directory 'account_template_chart_name' => 'TODO-7.0/account_template_chart_name'
=== renamed directory 'account_webkit_report_library' => 'TODO-7.0/account_webkit_report_library'
=== renamed directory 'base_partner_code' => 'TODO-7.0/base_partner_code'
=== renamed directory 'base_partner_merge_ccorp' => 'TODO-7.0/base_partner_merge_ccorp'
=== renamed directory 'base_partner_search_extended' => 'TODO-7.0/base_partner_search_extended'
=== renamed directory 'base_partner_sequence_ccorp' => 'TODO-7.0/base_partner_sequence_ccorp'
=== renamed directory 'base_toolbar_custom_actions' => 'TODO-7.0/base_toolbar_custom_actions'
=== renamed directory 'bom_price_update' => 'TODO-7.0/bom_price_update'
=== renamed directory 'generic_instance_merge' => 'TODO-7.0/generic_instance_merge'
=== renamed directory 'hr_contract_name' => 'TODO-7.0/hr_contract_name'
=== renamed directory 'hr_payroll_sort_employees' => 'TODO-7.0/hr_payroll_sort_employees'
=== renamed directory 'magento_stadistic' => 'TODO-7.0/magento_stadistic'
=== renamed directory 'modules_magento_7' => 'TODO-7.0/modules_magento_7'
=== renamed directory 'mrp_production_sequence' => 'TODO-7.0/mrp_production_sequence'
=== renamed directory 'product_cost_group' => 'TODO-7.0/product_cost_group'
=== renamed directory 'product_search_improver' => 'TODO-7.0/product_search_improver'
=== renamed directory 'purchase_order_archive' => 'TODO-7.0/purchase_order_archive'
=== renamed directory 'purchase_order_sequence' => 'TODO-7.0/purchase_order_sequence'
=== renamed directory 'purchase_order_supplier_domain' => 'TODO-7.0/purchase_order_supplier_domain'
=== renamed directory 'rent' => 'TODO-7.0/rent'
=== renamed directory 'sale_order_line_ccorp' => 'TODO-7.0/sale_order_line_ccorp'
=== renamed directory 'sale_order_sequence' => 'TODO-7.0/sale_order_sequence'
=== renamed directory 'sneldev_magento' => 'TODO-7.0/sneldev_magento'
=== modified file 'TODO-7.0/sneldev_magento/wizard/export_tools.py'
--- sneldev_magento/wizard/export_tools.py	2012-09-10 15:35:49 +0000
+++ TODO-7.0/sneldev_magento/wizard/export_tools.py	2013-11-06 21:08:00 +0000
@@ -26,8 +26,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-
-import wizard
 import pooler
 import threading
 

=== modified file 'TODO-7.0/sneldev_magento/wizard/sneldev_magento_categories_export.py'
--- sneldev_magento/wizard/sneldev_magento_categories_export.py	2012-09-13 21:23:10 +0000
+++ TODO-7.0/sneldev_magento/wizard/sneldev_magento_categories_export.py	2013-11-06 21:08:00 +0000
@@ -21,8 +21,6 @@
 
 
 import pooler
-import wizard
-import pooler
 import os
 
 from export_tools import *

=== modified file 'TODO-7.0/sneldev_magento/wizard/sneldev_magento_categories_import.py'
--- sneldev_magento/wizard/sneldev_magento_categories_import.py	2012-09-10 15:35:49 +0000
+++ TODO-7.0/sneldev_magento/wizard/sneldev_magento_categories_import.py	2013-11-06 21:08:00 +0000
@@ -19,9 +19,6 @@
 #
 ##############################################################################
 
-
-import pooler
-import wizard
 import pooler
 import os
 
@@ -46,4 +43,4 @@
 
 wiz_sneldev_categories_import()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'TODO-7.0/sneldev_magento/wizard/sneldev_magento_customers_import.py'
--- sneldev_magento/wizard/sneldev_magento_customers_import.py	2012-10-03 21:45:53 +0000
+++ TODO-7.0/sneldev_magento/wizard/sneldev_magento_customers_import.py	2013-11-06 21:08:00 +0000
@@ -20,8 +20,6 @@
 ##############################################################################
 
 import pooler
-import wizard
-import pooler
 import os
 
 from export_tools import *

=== modified file 'TODO-7.0/sneldev_magento/wizard/sneldev_magento_orders_import.py'
--- sneldev_magento/wizard/sneldev_magento_orders_import.py	2012-10-03 21:45:53 +0000
+++ TODO-7.0/sneldev_magento/wizard/sneldev_magento_orders_import.py	2013-11-06 21:08:00 +0000
@@ -21,8 +21,6 @@
 
 
 import pooler
-import wizard
-import pooler
 import os
 
 from export_tools import *
@@ -54,4 +52,4 @@
 
 wiz_sneldev_orders_import()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'TODO-7.0/sneldev_magento/wizard/sneldev_magento_products_export.py'
--- sneldev_magento/wizard/sneldev_magento_products_export.py	2012-09-17 16:07:49 +0000
+++ TODO-7.0/sneldev_magento/wizard/sneldev_magento_products_export.py	2013-11-06 21:08:00 +0000
@@ -21,8 +21,6 @@
 
 
 import pooler
-import wizard
-import pooler
 import os
 
 from export_tools import *

=== modified file 'TODO-7.0/sneldev_magento/wizard/sneldev_magento_products_import.py'
--- sneldev_magento/wizard/sneldev_magento_products_import.py	2012-10-16 22:33:14 +0000
+++ TODO-7.0/sneldev_magento/wizard/sneldev_magento_products_import.py	2013-11-06 21:08:00 +0000
@@ -19,9 +19,6 @@
 #
 ##############################################################################
 
-
-import pooler
-import wizard
 import pooler
 import os
 

=== modified file 'TODO-7.0/sneldev_magento/wizard/sneldev_magento_stock_export.py'
--- sneldev_magento/wizard/sneldev_magento_stock_export.py	2012-09-11 15:05:32 +0000
+++ TODO-7.0/sneldev_magento/wizard/sneldev_magento_stock_export.py	2013-11-06 21:08:00 +0000
@@ -19,9 +19,6 @@
 #
 ##############################################################################
 
-
-import pooler
-import wizard
 import pooler
 import os
 
@@ -47,4 +44,4 @@
 
 wiz_sneldev_stock_export()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'TODO-7.0/sneldev_magento/wizard/sneldev_magento_stock_init.py'
--- sneldev_magento/wizard/sneldev_magento_stock_init.py	2012-09-10 15:35:49 +0000
+++ TODO-7.0/sneldev_magento/wizard/sneldev_magento_stock_init.py	2013-11-06 21:08:00 +0000
@@ -21,8 +21,6 @@
 
 
 import pooler
-import wizard
-import pooler
 import os
 
 from export_tools import *

=== modified file 'TODO-7.0/sneldev_magento/wizard/sneldev_magento_sync_start.py'
--- sneldev_magento/wizard/sneldev_magento_sync_start.py	2012-09-10 15:35:49 +0000
+++ TODO-7.0/sneldev_magento/wizard/sneldev_magento_sync_start.py	2013-11-06 21:08:00 +0000
@@ -21,8 +21,6 @@
 
 
 import pooler
-import wizard
-import pooler
 import os
 
 from export_tools import *
@@ -44,4 +42,4 @@
 
 wiz_sneldev_sync_start()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'TODO-7.0/sneldev_magento/wizard/sneldev_magento_sync_stop.py'
--- sneldev_magento/wizard/sneldev_magento_sync_stop.py	2012-09-10 15:35:49 +0000
+++ TODO-7.0/sneldev_magento/wizard/sneldev_magento_sync_stop.py	2013-11-06 21:08:00 +0000
@@ -21,8 +21,6 @@
 
 
 import pooler
-import wizard
-import pooler
 import os
 
 from export_tools import *
@@ -44,4 +42,4 @@
 
 wiz_sneldev_sync_stop()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== renamed directory 'stock_extended' => 'TODO-7.0/stock_extended'
=== added directory 'account_account_extended_ccorp'
=== added file 'account_account_extended_ccorp/__init__.py'
--- account_account_extended_ccorp/__init__.py	1970-01-01 00:00:00 +0000
+++ account_account_extended_ccorp/__init__.py	2013-11-06 21:08:00 +0000
@@ -0,0 +1,26 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import account_account_extended_ccorp
+import account_move_line_extended
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_account_extended_ccorp/__openerp__.py'
--- account_account_extended_ccorp/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_account_extended_ccorp/__openerp__.py	2013-11-06 21:08:00 +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': 'Account Account extended ccorp',
+    'version': '1.0',
+    'author' : 'CLEARCORP S.A.',
+    'complexity': 'normal',
+    'website': 'http://clearcorp.co.cr',
+    'category': 'Accounting & Finance',
+    'description': """
+Extends account account and account move line
+===============================================
+Adds a boolean attribute to diferentiate accounts that move cash.
+Adds filters to account move line: Currency and account type
+""",
+    'depends': ['account'],
+    'init_xml': [],
+    'demo_xml': [],
+    'data': [
+             'account_account_extended_ccorp_view.xml',
+             'account_move_line_extended.xml'],
+    'license': 'AGPL-3',
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_account_extended_ccorp/account_account_extended_ccorp.py'
--- account_account_extended_ccorp/account_account_extended_ccorp.py	1970-01-01 00:00:00 +0000
+++ account_account_extended_ccorp/account_account_extended_ccorp.py	2013-11-06 21:08:00 +0000
@@ -0,0 +1,31 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import osv,fields
+
+class AccountAccount(osv.osv):
+
+    _inherit = 'account.account'
+    _columns = {
+        'moves_cash': fields.boolean('Moves cash'),
+    }
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_account_extended_ccorp/account_account_extended_ccorp_view.xml'
--- account_account_extended_ccorp/account_account_extended_ccorp_view.xml	1970-01-01 00:00:00 +0000
+++ account_account_extended_ccorp/account_account_extended_ccorp_view.xml	2013-11-06 21:08:00 +0000
@@ -0,0 +1,20 @@
+<openerp>
+    <data>
+        
+        <!--
+            Account
+        -->
+        <record id="view_account_ccorp_form" model="ir.ui.view">
+            <field name="name">view.account.ccorp.form</field>
+            <field name="model">account.account</field>
+            <field name="inherit_id" ref="account.view_account_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="reconcile" position="after">
+                        <field name="moves_cash"/>
+                    </field>
+                </data>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'account_account_extended_ccorp/account_move_line_extended.py'
--- account_account_extended_ccorp/account_move_line_extended.py	1970-01-01 00:00:00 +0000
+++ account_account_extended_ccorp/account_move_line_extended.py	2013-11-06 21:08:00 +0000
@@ -0,0 +1,55 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import osv,fields, orm
+
+class accountMovelineInherit(orm.Model):
+    
+    _inherit = "account.move.line"
+    
+    #===== Add currency and account_type with two function fields
+     
+    #===== Currency -> get currency_id from company_id or account_id
+    def _currency_filter(self, cr, uid, ids, field_name, arg, context=None):
+        result = {}
+        for rec in self.browse(cr, uid, ids, context=context):
+            if rec.account_id.currency_id:
+                result[rec.id] = (rec.account_id.currency_id.id,rec.account_id.currency_id.name)
+            else:
+                result[rec.id] = (rec.company_id.currency_id.id,rec.company_id.currency_id.name)
+        return result
+    
+    #====== Account Type -> get user_type from account_id
+    def _account_type_filter(self, cr, uid, ids, field_name, arg, context=None):
+        result = {}
+        for rec in self.browse(cr, uid, ids, context=context):
+             result[rec.id] = (rec.account_id.user_type.id, rec.account_id.user_type.name)
+        return result
+
+    _columns = {        
+        'currency_filter':fields.function(_currency_filter, string='Currency', type="many2one", relation='res.currency',store=True),
+        'account_type':fields.function(_account_type_filter, string='Account Type', type='many2one', relation='account.account.type',store=True)
+        }
+    
+    
+    
+    
\ No newline at end of file

=== added file 'account_account_extended_ccorp/account_move_line_extended.xml'
--- account_account_extended_ccorp/account_move_line_extended.xml	1970-01-01 00:00:00 +0000
+++ account_account_extended_ccorp/account_move_line_extended.xml	2013-11-06 21:08:00 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<openerp>
+    <data>
+        <record id="view_move_line_filter_inherit" model="ir.ui.view">
+            <field name="name">view.move.line.filter.inherit</field>
+            <field name="model">account.move.line</field>
+            <field name="inherit_id" ref="account.view_account_move_line_filter"/>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="name" position="after">
+                        <field name="account_type" context="{'account_type':self}" widget="selection"/>
+                    </field>
+                    <group string="Group By..." position="inside">
+                        <filter string="Currency" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'currency_filter'}"/> 
+                        <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'account_type'}"/>           
+                    </group>
+                </data>
+            </field>
+        </record>
+        
+        <record id="view_move_line_tree_inherit" model="ir.ui.view">
+            <field name="name">view.move.line.tree.inherit</field>
+            <field name="model">account.move.line</field>
+            <field name="inherit_id" ref="account.view_move_line_tree"/>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="reconcile" position="after">
+                        <field name="currency_filter"/>
+                        <field name="account_type"/>
+                    </field>
+                </data>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'account_account_extended_ccorp/i18n'
=== added file 'account_account_extended_ccorp/i18n/en_US.po'
--- account_account_extended_ccorp/i18n/en_US.po	1970-01-01 00:00:00 +0000
+++ account_account_extended_ccorp/i18n/en_US.po	2013-11-06 21:08:00 +0000
@@ -0,0 +1,27 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_account_extended_ccorp
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-16 20:51+0000\n"
+"PO-Revision-Date: 2013-08-16 20:51+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: account_account_extended_ccorp
+#: field:account.account,moves_cash:0
+msgid "Moves cash"
+msgstr "Moves cash"
+
+#. module: account_account_extended_ccorp
+#: model:ir.model,name:account_account_extended_ccorp.model_account_account
+msgid "Account"
+msgstr "Account"
+

=== added file 'account_account_extended_ccorp/i18n/es_CR.po'
--- account_account_extended_ccorp/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ account_account_extended_ccorp/i18n/es_CR.po	2013-11-06 21:08:00 +0000
@@ -0,0 +1,49 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_account_extended_ccorp
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-20 22:09+0000\n"
+"PO-Revision-Date: 2013-09-20 22:09+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: account_account_extended_ccorp
+#: field:account.account,moves_cash:0
+msgid "Moves cash"
+msgstr "Mueve efectivo"
+
+#. module: account_account_extended_ccorp
+#: model:ir.model,name:account_account_extended_ccorp.model_account_account
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: account_account_extended_ccorp
+#: view:account.move.line:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_account_extended_ccorp
+#: view:account.move.line:0
+#: field:account.move.line,currency_filter:0
+msgid "Currency"
+msgstr "Divisa"
+
+#. module: account_account_extended_ccorp
+#: model:ir.model,name:account_account_extended_ccorp.model_account_move_line
+msgid "Journal Items"
+msgstr "Elementos diario"
+
+#. module: account_account_extended_ccorp
+#: view:account.move.line:0
+#: field:account.move.line,account_type:0
+msgid "Account Type"
+msgstr "Tipo de Cuenta"
+

=== added directory 'account_asset_extended_ccorp'
=== added file 'account_asset_extended_ccorp/__init__.py'
--- account_asset_extended_ccorp/__init__.py	1970-01-01 00:00:00 +0000
+++ account_asset_extended_ccorp/__init__.py	2013-11-06 21:08:00 +0000
@@ -0,0 +1,25 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import account_asset_extended_ccorp
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_asset_extended_ccorp/__openerp__.py'
--- account_asset_extended_ccorp/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_asset_extended_ccorp/__openerp__.py	2013-11-06 21:08:00 +0000
@@ -0,0 +1,46 @@
+# -*- 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': 'Account Asset extended ccorp',
+    'version': '1.0',
+    'author' : 'CLEARCORP S.A.',
+    'complexity': 'normal',
+    'website': 'http://clearcorp.co.cr',
+    'category': 'Accounting & Finance',
+    'description': """
+Extend account asset
+==========================================
+Create relation asset with invoice line.
+Add model, asset number and responsible in assets.
+Modify in the creation of several assets on an invoice line.
+    """,
+    'depends': ['account_asset'],
+    'init_xml': [],
+    'demo_xml': [],
+    'data': ['account_asset_extended_ccorp_view.xml'],
+    'license': 'AGPL-3',
+    'installable': True,
+    'active': False,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_asset_extended_ccorp/account_asset_extended_ccorp.py'
--- account_asset_extended_ccorp/account_asset_extended_ccorp.py	1970-01-01 00:00:00 +0000
+++ account_asset_extended_ccorp/account_asset_extended_ccorp.py	2013-11-06 21:08:00 +0000
@@ -0,0 +1,77 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import osv,fields
+
+class AccountAssetAsset(osv.osv):
+
+    _inherit = 'account.asset.asset'
+    _columns = {
+        'account_invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line'),
+        'account_invoice_id': fields.related('account_invoice_line_id', 'invoice_id', type="many2one", relation="account.invoice", string="Invoice", store=False),
+        'responsible' : fields.many2one('res.partner', 'Responsible'),
+        'model': fields.char('Model', size=64),
+        'asset_number': fields.char('Asset Number', size=64),
+    }
+
+class AccountInvoiceLine(osv.osv):
+
+    _inherit = 'account.invoice.line'
+    _columns = {
+        'asset_ids': fields.one2many('account.asset.asset', 'account_invoice_line_id', 'Asset', readonly=True, states={'draft':[('readonly',False)]}),
+    }
+    def asset_create(self, cr, uid, lines, context=None):
+        context = context or {}
+        asset_obj = self.pool.get('account.asset.asset')
+        for line in lines:
+            if line.asset_category_id:
+                quantity = line.quantity
+                cont = 1
+                while cont <= quantity:
+                    vals = {
+                        'name': line.name,
+                        'code': line.invoice_id.number or False,
+                        'category_id': line.asset_category_id.id,
+                        'purchase_value': line.price_subtotal/quantity,
+                        'period_id': line.invoice_id.period_id.id,
+                        'partner_id': line.invoice_id.partner_id.id,
+                        'company_id': line.invoice_id.company_id.id,
+                        'currency_id': line.invoice_id.currency_id.id,
+                        'purchase_date' : line.invoice_id.date_invoice,
+                    }
+                    changed_vals = asset_obj.onchange_category_id(cr, uid, [], vals['category_id'], context=context)
+                    vals.update(changed_vals['value'])
+                    vals.update({'account_invoice_line_id': line.id})
+                    asset_id = asset_obj.create(cr, uid, vals, context=context)
+                    if line.asset_category_id.open_asset:
+                        asset_obj.validate(cr, uid, [asset_id], context=context)
+                    cont+=1
+        return True
+        
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        res = super(AccountInvoiceLine, self).copy_data(cr, uid, id, default=default, context=context)
+        res.update({
+            'asset_ids': [],
+        })
+        return res
+        
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_asset_extended_ccorp/account_asset_extended_ccorp_view.xml'
--- account_asset_extended_ccorp/account_asset_extended_ccorp_view.xml	1970-01-01 00:00:00 +0000
+++ account_asset_extended_ccorp/account_asset_extended_ccorp_view.xml	2013-11-06 21:08:00 +0000
@@ -0,0 +1,27 @@
+<openerp>
+    <data>
+        
+        <!--
+            Asset
+        -->
+        <record id="view_account_asset_asset_ccorp_form" model="ir.ui.view">
+            <field name="name">view.account.asset.asset.ccorp.form</field>
+            <field name="model">account.asset.asset</field>
+            <field name="inherit_id" ref="account_asset.view_account_asset_asset_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/sheet/group/group/field[@name='parent_id']" position="after">
+                        <field name="account_invoice_id" readonly="1"/>
+                    </xpath>
+                    <xpath expr="/form/sheet/group/group/field[@name='company_id']" position="after">
+                        <field name="responsible"/>
+                    </xpath>
+                    <xpath expr="/form/sheet/notebook/page/group/group/field[@name='partner_id']" position="after">
+                        <field name="model"/>
+                        <field name="asset_number"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'account_asset_extended_ccorp/i18n'
=== added file 'account_asset_extended_ccorp/i18n/account_asset_extended.pot'
--- account_asset_extended_ccorp/i18n/account_asset_extended.pot	1970-01-01 00:00:00 +0000
+++ account_asset_extended_ccorp/i18n/account_asset_extended.pot	2013-11-06 21:08:00 +0000
@@ -0,0 +1,49 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_asset_extended_ccorp
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-16 22:09+0000\n"
+"PO-Revision-Date: 2013-05-16 22:09+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: account_asset_extended_ccorp
+#: field:account.asset.asset,responsible:0
+msgid "Responsible"
+msgstr "Responsible"
+
+#. module: account_asset_extended_ccorp
+#: field:account.asset.asset,account_invoice_line_id:0
+#: model:ir.model,name:account_asset_extended_ccorp.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea factura"
+
+#. module: account_asset_extended_ccorp
+#: field:account.invoice.line,asset_ids:0
+#: model:ir.model,name:account_asset_extended_ccorp.model_account_asset_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: account_asset_extended_ccorp
+#: field:account.asset.asset,account_invoice_id:0
+msgid "Invoice"
+msgstr "Invoice"
+
+#. module: account_asset_extended_ccorp
+#: field:account.asset.asset,asset_number:0
+msgid "Asset Number"
+msgstr "Asset Number"
+
+#. module: account_asset_extended_ccorp
+#: field:account.asset.asset,model:0
+msgid "Model"
+msgstr "Model"
+

=== added symlink 'account_asset_extended_ccorp/i18n/es.po'
=== target is u'es_CR.po'
=== added file 'account_asset_extended_ccorp/i18n/es_CR.po'
--- account_asset_extended_ccorp/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ account_asset_extended_ccorp/i18n/es_CR.po	2013-11-06 21:08:00 +0000
@@ -0,0 +1,49 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_asset_extended_ccorp
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-16 22:09+0000\n"
+"PO-Revision-Date: 2013-05-16 22:09+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: account_asset_extended_ccorp
+#: field:account.asset.asset,responsible:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: account_asset_extended_ccorp
+#: field:account.asset.asset,account_invoice_line_id:0
+#: model:ir.model,name:account_asset_extended_ccorp.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea factura"
+
+#. module: account_asset_extended_ccorp
+#: field:account.invoice.line,asset_ids:0
+#: model:ir.model,name:account_asset_extended_ccorp.model_account_asset_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: account_asset_extended_ccorp
+#: field:account.asset.asset,account_invoice_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_asset_extended_ccorp
+#: field:account.asset.asset,asset_number:0
+msgid "Asset Number"
+msgstr "Número de Activo"
+
+#. module: account_asset_extended_ccorp
+#: field:account.asset.asset,model:0
+msgid "Model"
+msgstr "Modelo"
+

=== added directory 'account_general_ledger_report'
=== renamed directory 'account_general_ledger_report' => 'account_general_ledger_report.moved'
=== added file 'account_general_ledger_report/__init__.py'
--- account_general_ledger_report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/__init__.py	2013-11-06 21:08:00 +0000
@@ -0,0 +1,24 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import report
+import wizard
\ No newline at end of file

=== added file 'account_general_ledger_report/__openerp__.py'
--- account_general_ledger_report/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/__openerp__.py	2013-11-06 21:08:00 +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': 'General Ledger Report Webkit',
+    'version': '1.0',
+    'url': 'http://launchpad.net/openerp-ccorp-addons',
+    'author': 'ClearCorp S.A.',
+    'website': 'http://clearcorp.co.cr',
+    'category': 'Accounting & Finance',
+    'complexity': 'normal',
+    'description': """This module modifies the general ledger report""",
+    'depends': [
+        'account',
+        'account_report_lib',
+        'account_report_signatures'
+        ],
+    'init_xml': [],
+    'demo_xml': [],
+    'update_xml': [
+                   'report/report.xml',
+                   'wizard/account_general_ledger_report_wizard.xml',
+                   'report_menus.xml',
+                   ],
+    'license': 'AGPL-3',
+    'installable': True,
+    'active': False,
+}
\ No newline at end of file

=== added directory 'account_general_ledger_report/i18n'
=== added file 'account_general_ledger_report/i18n/es_CR.po'
--- account_general_ledger_report/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/i18n/es_CR.po	2013-11-06 21:08:00 +0000
@@ -0,0 +1,280 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_general_ledger_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-07 21:22+0000\n"
+"PO-Revision-Date: 2013-06-07 21:22+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: account_general_ledger_report
+#: view:general.ledger.wiz:0
+msgid "This report allows you to print or generate a pdf of your General Ledger"
+msgstr "Este reporte permite imprimir o generar un pdf del Libro mayor"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:31
+msgid "Filter by: "
+msgstr "Filtrado por: "
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,amount_currency:0
+msgid "With Currency"
+msgstr "Con moneda"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:104
+msgid "Label"
+msgstr "Etiqueta"
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,period_from:0
+msgid "Start Period"
+msgstr "Período inicial"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:109
+msgid "Debit"
+msgstr "Débito"
+
+#. module: account_general_ledger_report
+#: view:general.ledger.wiz:0
+msgid "General Ledger"
+msgstr "Libro mayor"
+
+#. module: account_general_ledger_report
+#: help:general.ledger.wiz,historic_strict:0
+msgid "If selected, will display a historical unreconciled lines, taking into account the end of the period or date selected"
+msgstr "Si está selecciondo, desplegará las líneas no conciliadas históricas, dentro de la cuenta al final del período o de la fecha seleccionada"
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,special_period:0
+msgid "Special period"
+msgstr "Período especial"
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_general_ledger_report
+#: model:ir.model,name:account_general_ledger_report.model_general_ledger_wiz
+msgid "General Ledger Report Wizard"
+msgstr "Asistente para el Libro Mayor"
+
+#. module: account_general_ledger_report
+#: help:general.ledger.wiz,special_period:0
+msgid "Include special period"
+msgstr "Includir períodos especiales"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:44
+msgid "Period: "
+msgstr "Período: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:100
+msgid "Period"
+msgstr "Período"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:59
+msgid "Target moves: "
+msgstr "Movimientos destino: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:113
+msgid "Curr. Am."
+msgstr "Mon. M."
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:99
+#: selection:general.ledger.wiz,filter:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,chart_account_id:0
+msgid "Chart of Account"
+msgstr "Catálogo de Cuentas"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:162
+msgid "TOTAL"
+msgstr "TOTAL"
+
+#. module: account_general_ledger_report
+#: view:general.ledger.wiz:0
+#: field:general.ledger.wiz,journal_ids:0
+msgid "Journals"
+msgstr "Diarios"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:114
+msgid "Curr. Bal."
+msgstr "Bal. M."
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:30
+msgid "Fiscal Year: "
+msgstr "Año fiscal: "
+
+#. module: account_general_ledger_report
+#: help:general.ledger.wiz,chart_account_id:0
+msgid "Select Charts of Accounts"
+msgstr "Selecccione el catálogo contable"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:50
+msgid "Accounts: "
+msgstr "Cuentas: "
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,date_to:0
+msgid "End Date"
+msgstr "Fecha final"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:15
+msgid "General Ledger Report "
+msgstr "Informe del libro mayor"
+
+#. module: account_general_ledger_report
+#: selection:general.ledger.wiz,target_move:0
+msgid "All Posted Entries"
+msgstr "Todos los apuntes publicados"
+
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:88
+msgid "No move lines for this account"
+msgstr "No existen líneas de asiento para esta cuenta"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:47
+msgid "No filter"
+msgstr "Sin filtros"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:111
+msgid "Cumul. Bal."
+msgstr "Bal Acumul."
+
+#. module: account_general_ledger_report
+#: help:general.ledger.wiz,fiscalyear_id:0
+msgid "Keep empty for all open fiscal year"
+msgstr "Mantener vacío para todos los años fiscales abiertos"
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,period_to:0
+msgid "End Period"
+msgstr "Período final"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:110
+msgid "Credit"
+msgstr "Crédito"
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr "Año fiscal"
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,historic_strict:0
+msgid "Strict History"
+msgstr "Histórico estricto"
+
+#. module: account_general_ledger_report
+#: selection:general.ledger.wiz,filter:0
+msgid "No Filters"
+msgstr "Sin filtros"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:101
+msgid "Entry"
+msgstr "Asiento"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:56
+msgid "All"
+msgstr "Todo"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:29
+msgid "Chart of Accounts: "
+msgstr "Catálogo de cuentas: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:107
+msgid "Reconcile"
+msgstr "Conciliación"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:37
+msgid "Dates: "
+msgstr "Fechas: "
+
+#. module: account_general_ledger_report
+#: help:general.ledger.wiz,amount_currency:0
+msgid "It adds the currency column on report if the currency differs from the company currency."
+msgstr "Añade una columna de moneda en el reporte si la moneda es diferente de la moneda de la compañía"
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,target_move:0
+msgid "Target Moves"
+msgstr "Movimientos destino"
+
+#. module: account_general_ledger_report
+#: model:ir.actions.act_window,name:account_general_ledger_report.action_general_ledger_report_wizard
+msgid "General Ledger Report"
+msgstr "Informe del libro mayor"
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,account_ids:0
+msgid "Accounts"
+msgstr "Cuentas"
+
+#. module: account_general_ledger_report
+#: selection:general.ledger.wiz,filter:0
+msgid "Periods"
+msgstr "Períodos"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:103
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account_general_ledger_report
+#: field:general.ledger.wiz,filter:0
+msgid "Filter by"
+msgstr "Filtrar por"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:84
+msgid "Initial balance:"
+msgstr "Balance inicial:"
+
+#. module: account_general_ledger_report
+#: selection:general.ledger.wiz,target_move:0
+msgid "All Entries"
+msgstr "Todos los apuntes"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:102
+msgid "Journal"
+msgstr "Diario"
+

=== added directory 'account_general_ledger_report/report'
=== added file 'account_general_ledger_report/report/__init__.py'
--- account_general_ledger_report/report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/report/__init__.py	2013-11-06 21:08:00 +0000
@@ -0,0 +1,23 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import account_general_ledger_report

=== added file 'account_general_ledger_report/report/account_general_ledger_report.mako'
--- account_general_ledger_report/report/account_general_ledger_report.mako	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/report/account_general_ledger_report.mako	2013-11-06 21:08:00 +0000
@@ -0,0 +1,182 @@
+<!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <link rel='stylesheet' href='addons/account_webkit_report_library/webkit_headers/main.css' />
+        <style>
+            ${css}
+        </style>
+    </head>
+    <body>
+        <div class="table header">
+           <div class="table-row">
+               <div class="table-cell logo">${helper.embed_logo_by_name('default_logo', height=70)|n}</div>
+               <br/>
+               <div class="table-cell text">
+                    <p class="title">${_('General Ledger Report ')}</p>
+               </div>
+           </div>
+        </div>
+        <br/>
+        <%
+            chart_account = get_chart_account_id(data)
+            fiscalyear = get_fiscal_year(data)
+            filter = get_filter(data)
+        %>
+        
+        <div class="table list">
+            <div class="table-header">
+                <div class="table-row labels no-wrap">
+                    <div class="table-cell first-column" style="width: 70px">${_('Chart of Accounts: ')}<br/>${chart_account.name}</div>
+                    <div class="table-cell" style="width: 70px">${_('Fiscal Year: ')}<br/>${fiscalyear.name}</div>
+                    <div class="table-cell" style="width: 70px">${_('Filter by: ')}<br/>
+                         %if filter == 'filter_date':
+                             <%
+                                start_date = get_date_from(data)
+                                stop_date = get_date_to(data)
+                             %>
+                             ${_('Dates: ')}<br/>
+                             ${formatLang(start_date, date=True) if start_date else u'' }&nbsp;-&nbsp;${formatLang(stop_date, date=True) if start_date else u'' }
+                         %elif filter == 'filter_period':
+                             <%
+                                start_period = get_start_period(data)
+                                stop_period = get_end_period(data)
+                             %>
+                             ${_('Period: ')}<br/>
+                             ${start_period.name if start_period else u''}&nbsp;-&nbsp;${stop_period.name if stop_period else u'' }
+                         %else:
+                             ${_('No filter')}
+                        %endif
+                    </div>
+                    <div class="table-cell" style="width: 70px">${_('Accounts: ')}<br/>
+                         %if get_accounts_ids(cr, uid, data):
+                           %for account in get_accounts_ids(cr, uid, data):
+                                ${(account.code) + ','}<br/>
+                           %endfor
+                        %else:
+                            ${_('All')}
+                        %endif
+                    </div>
+                    <div class="table-cell" style="width: 70px">${_('Target moves: ')}<br/>${ display_target_move(data) }</div>
+                </div>
+            </div>            
+        </div>
+        <%
+            account_list_obj, account_lines, account_conciliation, account_balance = get_data(cr, uid, data) 
+            cumul_balance_curr = 0.0
+        %> 
+        %for account in account_list_obj:
+           <%
+                cumul_balance = account_balance[account.id]['balance'] or 0.0
+                
+                if 'foreign_balance' in account_balance[account.id].keys():
+                    cumul_balance_curr = account_balance[account.id]['foreign_balance']                
+                
+                amount_total_debit = amount_total_credit = amount_total_curr = 0.0
+                print_column = False
+                move_lines = []
+           %>
+           %if account.type != 'view':
+               <br/><br/>
+               <div class="table header">
+                    <div class="table-row">
+                       <div class="table-cell text">
+                            <p class="subtitle">${account.code +' - ' +account.name}</p>
+                            <p class="subtitle">${_('Initial balance:')}&nbsp;&nbsp;${formatLang(cumul_balance)}&nbsp;&nbsp;
+                                %if account.report_currency_id:
+                                    ${account.report_currency_id.position == 'before' and (account.report_currency_id.symbol+'&nbsp;') or ''}${formatLang(cumul_balance_curr)}${account.report_currency_id.position == 'after' and ('&nbsp;'+account.report_currency_id.symbol) or ''}&nbsp;&nbsp;
+                                %endif   
+                                ${account.id not in account_lines.keys() and _('No move lines for this account') or ''}                                
+                            </p>                           
+                       </div>
+                    </div>
+               </div>
+               %if account.id in account_lines.keys():
+                   <% move_lines = account_lines[account.id] %>                     
+                       
+                    <div class="table list">
+                        <div class="table-header">
+                            <div class="table-row labels no-wrap">                       
+                                <div class="table-cell first-column" style="width: 55px">${_('Date')}</div>
+                                <div class="table-cell" style="width: 70px">${_('Period')}</div>
+                                <div class="table-cell" style="width: 100px">${_('Entry')}</div>
+                                <div class="table-cell" style="width: 70px">${_('Journal')}</div>
+                                <div class="table-cell" style="width: 100px">${_('Partner')}</div>                    
+                                <div class="table-cell" style="width: 100px">${_('Label')}</div>
+                                %if account.reconcile or (account.id in account_conciliation.keys() and account_conciliation[account.id]):
+                                    <% print_column = True %>
+                                    <div class="table-cell" style="width: 75px">${_('Reconcile')}</div>
+                                %endif
+                                <div class="table-cell amount" style="width: 60px">${_('Debit')}</div>
+                                <div class="table-cell amount" style="width: 60px">${_('Credit')}</div>
+                                <div class="table-cell amount" style="width: 60px">${_('Cumul. Bal.')}</div>                        
+                                %if account.report_currency_id:
+                                    <div class="table-cell amount" style="width: 60px">${_('Curr. Am.')}</div>                                                        
+                                    <div class="table-cell amount last-column" style="width: 60px">${_('Curr. Bal.')}</div>                        
+                                %endif
+                            </div>
+                        </div>                        
+                        <div class="table-body"> 
+                            %for line in move_lines:
+                                <% 
+                                    amount_total_debit += line.debit
+                                    amount_total_credit += line.credit
+                                    
+                                    cumul_balance = cumul_balance + line.debit - line.credit      
+                                    if line.amount_currency:                         
+                                        cumul_balance_curr = cumul_balance_curr + line.amount_currency
+                                        amount_total_curr += line.amount_currency
+                                %>
+                                <div class="table-row ${row_even and 'even' or 'odd'}">
+                                    <div class="table-cell first-column">${formatLang(line.date, date=True)}</div>
+                                    <div class="table-cell">${line.period_id.name or ''}</div>
+                                    <div class="table-cell">${line.move_id.name or ''}</div>                                    
+                                    <div class="table-cell">${line.journal_id.name}</div>    
+                                    <div class="table-cell">${line.partner_id.name or ''}</div>
+                                    <div class="table-cell">${line.name or ''}</div> 
+                                    %if print_column:
+                                        <div class="table-cell">
+                                            ${line.id in account_conciliation[account.id].keys() and account_conciliation[account.id][line.id] or ''}
+                                        </div>
+                                    %endif 
+                                    <div class="table-cell amount">${formatLang(line.debit)}</div>
+                                    <div class="table-cell amount">&nbsp;${formatLang(line.credit)}</div>                                  
+                                    <div class="table-cell amount last-column">&nbsp;${formatLang(cumul_balance)}</div> 
+                                    %if account.report_currency_id:
+                                        <div class="table-cell amount">&nbsp;${line.amount_currency and formatLang(line.amount_currency) or ''}</div>                                                        
+                                        <div class="table-cell amount last-column">&nbsp;${formatLang(cumul_balance_curr)}</div>                        
+                                    %endif  
+                               </div>
+                           %endfor                   
+                           <div class="table-row spacer">
+                                <div class="table-cell">&nbsp;</div>
+                           </div>
+                            <div class="table-row subtotal">
+                                <div class="table-cell first-column">&nbsp;</div>
+                                <div class="table-cell">&nbsp;</div>
+                                <div class="table-cell">&nbsp;</div>
+                                <div class="table-cell">&nbsp;</div>
+                                <div class="table-cell">&nbsp;</div>
+                                %if print_column:
+                                    <div class="table-cell">&nbsp;</div>
+                                %endif
+                                <div class="table-cell">${_('TOTAL')}</div>
+                                <div class="table-cell amount" >${formatLang(amount_total_debit)}</div>
+                                <div class="table-cell amount" >&nbsp;${formatLang(amount_total_credit)}</div>
+                                %if account.report_currency_id:                                
+                                    <div class="table-cell amount">&nbsp;${formatLang(cumul_balance)}</div>
+                                    <div class="table-cell amount">&nbsp;${formatLang(amount_total_curr)}</div>
+                                    <div class="table-cell amount last-column">&nbsp;${formatLang(cumul_balance_curr)}</div>
+                                %else:
+                                    <div class="table-cell amount last-column">&nbsp;${formatLang(cumul_balance)}</div>                                    
+                                %endif
+                            </div>
+                            <% 
+                               amount_total_debit = amount_total_credit = 0.0
+                            %>
+                        </div>                    
+                    </div>    
+                %endif                             
+            %endif
+        %endfor 
+    </body>
+</html>

=== added file 'account_general_ledger_report/report/account_general_ledger_report.py'
--- account_general_ledger_report/report/account_general_ledger_report.py	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/report/account_general_ledger_report.py	2013-11-06 21:08:00 +0000
@@ -0,0 +1,179 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    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 pooler
+from openerp.addons.account_report_lib.account_report_base import accountReportbase
+from report import report_sxw
+
+class GeneralLedgerReportWebkit(accountReportbase):
+
+    def __init__(self, cr, uid, name, context):
+        super(GeneralLedgerReportWebkit, self).__init__(cr, uid, name, context=context)
+        self.pool = pooler.get_pool(self.cr.dbname)
+        self.cursor = self.cr
+
+        self.localcontext.update({
+            'cr': cr,
+            'uid': uid,
+            'get_chart_account_id': self.get_chart_account_id,
+            'get_fiscalyear': self.get_fiscalyear,
+            'get_filter': self.get_filter,
+            'get_accounts_ids': self.get_accounts_ids,
+            'get_data':self.get_data,           
+        })
+
+    def get_data(self, cr, uid, data):
+        filter_data = []
+        account_list = []        
+        account_selected = []
+        
+        account_lines = {}
+        account_balance = {}
+        account_conciliation = {}
+                
+        library_obj = self.pool.get('account.webkit.report.library')
+        
+        filter_type = self.get_filter(data)
+        chart_account = self.get_chart_account_id(data)
+        
+        if filter_type == 'filter_date':
+            start_date = self.get_date_from(data)
+            stop_date = self.get_date_to(data)
+            
+            filter_data.append(start_date)
+            filter_data.append(stop_date)
+            
+        elif filter_type == 'filter_period':
+            
+            start_period = self.get_start_period(data) #return the period object
+            stop_period = self.get_end_period(data)
+            
+            filter_data.append(start_period)
+            filter_data.append(stop_period)
+            
+        else:
+            filter_type = ''
+        
+        fiscalyear = self.get_fiscalyear(data)
+        target_move = self.get_target_move(data)
+        
+        #From the wizard can select specific account, extract this accounts
+        account_selected = self.get_accounts_ids(cr, uid, data)
+        
+        if not account_selected:
+            account_selected = [chart_account.id]
+            account_list_ids = library_obj.get_account_child_ids(cr, uid, account_selected) #get all the accounts in the chart_account_id
+        
+        #Extract the id for the browse record
+        else:
+            account_ids = []
+            for account in account_selected:
+                account_ids.append(account.id)
+                account_list_ids = library_obj.get_account_child_ids(cr, uid, account_ids) #get all the accounts in the chart_account_id
+        
+        account_list_obj = self.pool.get('account.account').browse(cr, uid, account_list_ids)
+          
+        #Get the move_lines for each account.
+        move_lines = library_obj.get_move_lines(cr, 1,
+                                                account_list_ids, 
+                                                filter_type=filter_type, 
+                                                filter_data=filter_data, 
+                                                fiscalyear=fiscalyear, 
+                                                target_move=target_move,
+                                                order_by='account_id asc, date asc, ref asc')
+        
+       
+        #Reconcile -> show reconcile in the mako.
+        '''
+        First, if the account permit reconcile (reconcile == True), add to the dictionary.
+        If the account don't allow the reconcile, search if the lines have reconcile_id or partial_reconcile_id
+        If the account allow the reconcile or the lines have reconcile_id or partial_reconcile_id, add in the dictionary
+        and show in the mako the column "Reconcile"
+        
+        the final result is:
+           {account_id: {line.id: [conciliation_name]}}
+        '''        
+        #Search if the move_lines have partial or reconcile id
+        for line in move_lines:           
+            #If the account have reconcile, add to the dictionary              
+            if line.account_id.id not in account_conciliation:
+                account_conciliation[line.account_id.id] = {}
+            
+            if line.reconcile_id and line.reconcile_id.name != '':
+                 account_conciliation[line.account_id.id][line.id] = line.reconcile_id.name
+             
+            elif line.reconcile_partial_id and line.reconcile_partial_id.name != '':
+                str_name = 'P: ' + line.reconcile_partial_id.name
+                #conciliation_lines.append(str_name)
+                account_conciliation[line.account_id.id][line.id] = str_name             
+            
+            if line.account_id.id not in account_lines:
+                account_lines[line.account_id.id] = []
+            
+            account_lines[line.account_id.id].append(line)
+        
+        fields = ['balance']            
+        if self.get_amount_currency(data):
+            fields.append('foreign_balance')
+        
+        if filter_type == 'filter_date':
+            account_balance = library_obj.get_account_balance(cr, uid, 
+                                                              account_list_ids,
+                                                              fields,
+                                                              initial_balance=True,
+                                                              company_id=chart_account.company_id.id,
+                                                              fiscal_year_id = fiscalyear.id,
+                                                              state = target_move,
+                                                              start_date = start_date,
+                                                              end_date = stop_date,
+                                                              chart_account_id = chart_account.id,
+                                                              filter_type=filter_type)
+        elif filter_type == 'filter_period':
+            account_balance = library_obj.get_account_balance(cr, uid, 
+                                                              account_list_ids,
+                                                              fields,
+                                                              initial_balance=True,
+                                                              company_id=chart_account.company_id.id,
+                                                              fiscal_year_id = fiscalyear.id,
+                                                              state = target_move,
+                                                              start_period_id = start_period.id,
+                                                              end_period_id = stop_period.id,
+                                                              chart_account_id = chart_account.id,
+                                                              filter_type=filter_type)
+        else:
+            account_balance = library_obj.get_account_balance(cr, uid, 
+                                                              account_list_ids,
+                                                              fields,
+                                                              initial_balance=True,
+                                                              company_id=chart_account.company_id.id,
+                                                              fiscal_year_id = fiscalyear.id,
+                                                              state = target_move,
+                                                              chart_account_id = chart_account.id,
+                                                              filter_type=filter_type)
+        
+        
+        return account_list_obj, account_lines, account_conciliation, account_balance
+    
+report_sxw.report_sxw('report.account_general_ledger_webkit',
+                             'account.account',
+                             'addons/account_general_ledger_report/report/account_general_ledger_report.mako',
+                             parser=GeneralLedgerReportWebkit)
\ No newline at end of file

=== added file 'account_general_ledger_report/report/report.xml'
--- account_general_ledger_report/report/report.xml	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/report/report.xml	2013-11-06 21:08:00 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+       <record id="account.account_general_ledger" model="ir.actions.report.xml">
+            <field name="report_type">webkit</field>
+            <field name="report_name">account_general_ledger_webkit</field>
+            <field eval="[(6,0,[])]" name="groups_id"/>
+            <field name="model">account.account</field>
+            <field name="type">ir.actions.report.xml</field>
+            <field name="name">General Ledger Webkit</field>
+            <field name="report_rml">account_general_ledger_report/report/account_general_ledger_report.mako</field>
+            <field name="report_file">account_general_ledger_report/report/account_general_ledger_report.mako</field>
+            <field name="webkit_header" ref="report_webkit_lib.webkit_header_clearcorp_official_portrait" />  
+        </record> 
+    </data>
+</openerp>

=== added file 'account_general_ledger_report/report_menus.xml'
--- account_general_ledger_report/report_menus.xml	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/report_menus.xml	2013-11-06 21:08:00 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+          <menuitem icon="STOCK_PRINT" 
+            name="General Ledger"
+            parent="account.final_accounting_reports" 
+            action="action_general_ledger_report_wizard"
+            groups="account.group_account_user,account.group_account_manager"
+            id="account.menu_general_ledger"/>
+                    
+    </data>
+</openerp>

=== added directory 'account_general_ledger_report/wizard'
=== added file 'account_general_ledger_report/wizard/__init__.py'
--- account_general_ledger_report/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/wizard/__init__.py	2013-11-06 21:08:00 +0000
@@ -0,0 +1,23 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    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 account_general_ledger_report_wizard
\ No newline at end of file

=== added file 'account_general_ledger_report/wizard/account_general_ledger_report_wizard.py'
--- account_general_ledger_report/wizard/account_general_ledger_report_wizard.py	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/wizard/account_general_ledger_report_wizard.py	2013-11-06 21:08:00 +0000
@@ -0,0 +1,39 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class AccountReportGeneralLedgerWizard(osv.osv_memory):
+    
+    _inherit = "account.report.wiz"
+    _name = "general.ledger.wiz"
+    _description = "General Ledger Report Wizard"
+    
+    def _print_report(self, cursor, uid, ids, data, context=None):
+        context = context or {}
+
+        return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account_general_ledger_webkit',
+                'datas': data
+                }
+    
\ No newline at end of file

=== added file 'account_general_ledger_report/wizard/account_general_ledger_report_wizard.xml'
--- account_general_ledger_report/wizard/account_general_ledger_report_wizard.xml	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/wizard/account_general_ledger_report_wizard.xml	2013-11-06 21:08:00 +0000
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id ="account_report_general_ledger_report_inherit" model="ir.ui.view">
+            <field name="name">General Ledger Report </field>
+            <field name="model">general.ledger.wiz</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_report_lib.account_report_lib_wizard_view"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/label[@string='']" position="replace">
+                        <separator string="General Ledger" colspan="4"/>
+                        <label nolabel="1" colspan="4" string="This report allows you to print or generate a pdf of your General Ledger"/>
+                    </xpath>
+                    <field name="chart_account_id" position="attributes">
+                        <attribute name="attrs">{'required': True}</attribute>                      
+                    </field>                    
+                    <field name="fiscalyear_id" position="attributes">
+                        <attribute name="attrs">{'required': True}</attribute>
+                    </field>
+                    <field name="target_move" position="attributes">
+                        <attribute name="attrs">{'required': True}</attribute>
+                    </field>
+                    <field name="historic_strict" position="attributes">
+                        <attribute name="attrs">{'invisible': True}</attribute>
+                    </field>
+                    <field name="period_from" position="replace">
+                         <field name="period_from" domain="[('special', '=', False)]" attrs="{'required':[('filter', '=', 'filter_period')]}"/>
+                    </field>
+                    <field name="date_from" position="attributes">
+                        <attribute name="attrs">{'required': [('filter', '=', 'filter_date')]}</attribute>
+                    </field>
+                     <field name="period_to" position="replace">
+                        <field name="period_to" domain="[('special', '=', False)]" attrs="{'required':[('filter', '=', 'filter_period')]}"/>
+                    </field>
+                    <field name="date_to" position="attributes">
+                        <attribute name="attrs">{'required': [('filter', '=', 'filter_date')]}</attribute>
+                    </field>
+                    <field name="special_period" position="attributes">
+                        <attribute name="attrs">{'invisible': True}</attribute>
+                    </field>
+                    <group string="Journals" position="attributes">                   
+                        <attribute name="attrs">{'invisible': True}</attribute>
+                    </group>
+                     <group string="Account Financial Report" position="attributes">                   
+                        <attribute name="attrs">{'invisible': True}</attribute>
+                    </group>
+                </data>
+            </field>
+        </record>
+        
+        <record id="action_general_ledger_report_wizard" model="ir.actions.act_window">
+            <field name="name">General Ledger Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">general.ledger.wiz</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_report_general_ledger_report_inherit"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>

=== modified file 'account_invoice_global_discount/__init__.py'
--- account_invoice_global_discount/__init__.py	2012-06-30 22:41:06 +0000
+++ account_invoice_global_discount/__init__.py	2013-11-06 21:08:00 +0000
@@ -22,3 +22,6 @@
 
 import account_invoice_global_discount
 import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== modified file 'account_invoice_global_discount/__openerp__.py'
--- account_invoice_global_discount/__openerp__.py	2012-06-30 22:41:06 +0000
+++ account_invoice_global_discount/__openerp__.py	2013-11-06 21:08:00 +0000
@@ -24,7 +24,6 @@
     "name" : 'Global invoice discount',
     "version" : '1.0',
     "author" : 'CLEARCORP S.A',
-    #easy, normal, expert
     'complexity': 'normal',
     "description": """
 Adds a discount feature for invoice.
@@ -37,16 +36,20 @@
     "website" : "http://clearcorp.co.cr",
     "images" : [],
     "icon" : False,
-    "depends" : ['account'],
+    "depends" : ['account',
+                'product_visible_discount'],
     "init_xml" : [],
     "demo_xml" : [],
-    "update_xml" : [
-        'account_invoice_global_discount_wizard.xml',
+    "update_xml" : [],
+    "data" : [
         'account_invoice_global_discount_view.xml',
-        ],
+        'wizard/discount_wizard_view.xml',
+    ],
     "test" : [],
     "auto_install": False,
     "application": False,
     "installable": True,
     'license': 'AGPL-3',
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_invoice_global_discount/account_invoice_global_discount.py'
--- account_invoice_global_discount/account_invoice_global_discount.py	2012-06-30 22:41:06 +0000
+++ account_invoice_global_discount/account_invoice_global_discount.py	2013-11-06 21:08:00 +0000
@@ -18,7 +18,6 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-##############################################################################
 
 from osv import osv,fields
 from tools import config
@@ -103,3 +102,5 @@
             },
             multi='ccorp'),
     }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_invoice_global_discount/account_invoice_global_discount_view.xml'
--- account_invoice_global_discount/account_invoice_global_discount_view.xml	2012-06-30 22:41:06 +0000
+++ account_invoice_global_discount/account_invoice_global_discount_view.xml	2013-11-06 21:08:00 +0000
@@ -1,115 +1,157 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp><data>
-	<!--
-	Resource: account.invoice
-	Adds fields with not discounted amounts
-	-->
-	<record id="invoice_tree_ccorp1" model="ir.ui.view">
-		<field name="name">account.invoice.tree_ccorp1</field>
-		<field name="model">account.invoice</field>
-		<field name="inherit_id" ref="account.invoice_tree"/>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<field name="amount_untaxed" position="replace">
-				<field name="amount_untaxed_not_discounted" sum="Untaxed amount"/>
-			</field>
-		</field>
-	</record>
-	<record id="invoice_tree_ccorp2" model="ir.ui.view">
-		<field name="name">account.invoice.tree_ccorp2</field>
-		<field name="model">account.invoice</field>
-		<field name="inherit_id" ref="account.invoice_tree"/>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<field name="amount_total" position="before">
-				<field name="invoice_discount"/>
-				<field name="amount_discounted" sum="Discounted amount"/>
-			</field>
-		</field>
-	</record>
-	
-	<record id="invoice_supplier_form_ccorp_line1" model="ir.ui.view">
-		<field name="name">account.invoice.supplier.form_ccorp1</field>
-		<field name="model">account.invoice</field>
-		<field name="inherit_id" ref="account.invoice_supplier_form"/>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<xpath expr="/form/notebook/page/field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="before">
-				<field name="discount"/>
-			</xpath>
-		</field>
-	</record>
-	<record id="invoice_supplier_form_ccorp_line2" model="ir.ui.view">
-		<field name="name">account.invoice.supplier.form_ccorp1</field>
-		<field name="model">account.invoice</field>
-		<field name="inherit_id" ref="account.invoice_supplier_form"/>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<xpath expr="/form/notebook/page/field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="after">
-				<field name="price_subtotal_not_discounted"/>
-			</xpath>
-		</field>
-	</record>
-    
-	<record id="invoice_supplier_form_ccorp1" model="ir.ui.view">
-		<field name="name">account.invoice.supplier.form_ccorp1</field>
-		<field name="model">account.invoice</field>
-		<field name="inherit_id" ref="account.invoice_supplier_form"/>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<xpath expr="/form/notebook/page/group/button[@name='button_reset_taxes']" position="replace">
-                <button colspan="2" name="%(invoice_discount)d" states="draft" string="Apply Discount" type="action"/>
-                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Totals" type="object"/>
-			</xpath>
-		</field>
-	</record>
-	<record id="invoice_supplier_form_ccorp2" model="ir.ui.view">
-		<field name="name">account.invoice.supplier.form_ccorp2</field>
-		<field name="model">account.invoice</field>
-		<field name="inherit_id" ref="account.invoice_supplier_form"/>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-			<xpath expr="/form/notebook/page/group/field[@name='amount_untaxed']" position="replace">
-                <label colspan="2"/>
-                <field name="amount_untaxed_not_discounted"/>
-                <field name="invoice_discount"/>
-                <field name="amount_discounted"/>
-			</xpath>
-		</field>
-	</record>
-    
-	<record id="invoice_form_ccorp1" model="ir.ui.view">
-		<field name="name">account.invoice.form_ccorp1</field>
-		<field name="model">account.invoice</field>
-		<field name="inherit_id" ref="account.invoice_form"/>
-		<field name="type">form</field>
-		<field name="arch" type="xml">
-            <xpath expr="/form/notebook/page/group/field[@name='amount_untaxed']" position="replace">
-                <field name="amount_untaxed_not_discounted"/>
-                <group colspan="2" col="1">
-                    <button colspan="2" name="%(invoice_discount)d" states="draft" string="Apply Discount" type="action"/>
-                </group>
-                <field name="invoice_discount"/>
-                <label colspan="2" string=""/>
-                <field name="amount_discounted"/>
-            </xpath>
-		</field>
-	</record>
-
-	<!--
-	Resource: account.invoice.line
-	Adds the subtotal not discounted to tree and form views
-	-->
-	<record id="view_invoice_line_tree_ccorp" model="ir.ui.view">
-		<field name="name">account.invoice.line.tree_ccorp</field>
-		<field name="model">account.invoice.line</field>
-		<field name="inherit_id" ref="account.view_invoice_line_tree"/>
-		<field name="type">tree</field>
-		<field name="arch" type="xml">
-			<field name="price_subtotal" position="after">
-				<field name="price_subtotal_not_discounted"/>
-			</field>
-		</field>
-	</record>
-</data>
+<openerp>
+    <data>
+        
+        <record id="account_invoice_supplier_form_ccorp_attributes" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.form.ccorp.attributes</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/sheet/notebook/page/field[@name='invoice_line']/tree[@string='Invoice lines']" position="attributes">
+                        <attribute name="editable"></attribute>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        
+        <record id="account_invoice_form_ccorp_attributes" model="ir.ui.view">
+            <field name="name">account.invoice.form.ccorp.attributes</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/sheet/notebook/page/field[@name='invoice_line']/tree[@string='Invoice Lines']" position="attributes">
+                        <attribute name="editable"></attribute>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+    
+        <record id="invoice_tree_ccorp1" model="ir.ui.view">
+            <field name="name">account.invoice.tree_ccorp1</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_tree"/>
+            <field name="arch" type="xml">
+                <field name="amount_untaxed" position="replace">
+                    <field name="amount_untaxed_not_discounted" sum="Untaxed amount"/>
+                </field>
+                <field name="amount_total" position="before">
+                    <field name="invoice_discount"/>
+                    <field name="amount_discounted" sum="Discounted amount"/>
+                </field>
+            </field>
+        </record>
+        
+        <record id="account_invoice_supplier_form_ccorp_line1" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.form.ccorp.line1</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/sheet/notebook/page/field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="before">
+                        <field name="discount"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        
+        <record id="account_invoice_supplier_form_ccorp_line2" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.form.ccorp.line2</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/sheet/notebook/page/field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="after">
+                        <field name="price_subtotal_not_discounted"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        
+        <record id="account_invoice_supplier_form_ccorp1" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.form.ccorp1</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//button[@name='button_reset_taxes']" position="replace">
+                        <button colspan="2" name="invoice_discount" states="draft" string="Apply Discount" type="action"/>
+                        <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Totals" type="object"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        
+        <record id="account_invoice_supplier_form_ccorp2" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.form.ccorp2</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/sheet/notebook/page/group/field[@name='amount_untaxed']" position="replace">
+                        <field name="amount_untaxed_not_discounted"/>
+                        <field name="invoice_discount"/>
+                        <field name="amount_discounted"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        
+        <record id="account_invoice_form_ccorp_line1" model="ir.ui.view">
+            <field name="name">account.invoice.form.ccorp.line1</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/sheet/notebook/page/field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="before">
+                        <field name="discount"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        
+        <record id="account_invoice_form_ccorp_line2" model="ir.ui.view">
+            <field name="name">account.invoice.form.ccorp.line2</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/sheet/notebook/page/field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="after">
+                        <field name="price_subtotal_not_discounted"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        
+        <record id="account_invoice_form_ccorp1" model="ir.ui.view">
+            <field name="name">account.invoice.form.ccorp1</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//button[@name='button_reset_taxes']" position="replace">
+                        <button colspan="2" name="invoice_discount" states="draft" string="Apply Discount" type="action"/>
+                        <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Totals" type="object"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        
+        <record id="account_invoice_form_ccorp2" model="ir.ui.view">
+            <field name="name">account.invoice.form.ccorp2</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="/form/sheet/notebook/page/group/field[@name='amount_untaxed']" position="replace">
+                        <field name="amount_untaxed_not_discounted"/>
+                        <field name="invoice_discount"/>
+                        <field name="amount_discounted"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+        
+    </data>
 </openerp>

=== removed file 'account_invoice_global_discount/account_invoice_global_discount_wizard.xml'
--- account_invoice_global_discount/account_invoice_global_discount_wizard.xml	2012-06-30 22:41:06 +0000
+++ account_invoice_global_discount/account_invoice_global_discount_wizard.xml	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-	<data noupdate="1">
-		<!--
-		Resource: account.invoice
-		-->
-		<wizard string="Discount" model="account.invoice" name="invoice.discount" id="invoice_discount" menu="False"/>
-	</data>
-</openerp>

=== modified file 'account_invoice_global_discount/wizard/__init__.py'
--- account_invoice_global_discount/wizard/__init__.py	2012-06-30 22:41:06 +0000
+++ account_invoice_global_discount/wizard/__init__.py	2013-11-06 21:08:00 +0000
@@ -1,35 +1,25 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    __init__.py
-#    account_invoice_global_discount
-#    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..
-#    
+#    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/>.
+#
 ##############################################################################
 
 import discount_wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_invoice_global_discount/wizard/discount_wizard.py'
--- account_invoice_global_discount/wizard/discount_wizard.py	2012-06-30 22:41:06 +0000
+++ account_invoice_global_discount/wizard/discount_wizard.py	2013-11-06 21:08:00 +0000
@@ -1,87 +1,49 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    wizard_discount.py
-#    account_invoice_global_discount
-#    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 pooler
-import wizard
-
-
-_form = """<?xml version="1.0"?>
-<form string="Discount:">
-    <field name="discount"/>
-</form>
-"""
-
-_fields = {
-    'discount': {
-        'string': 'Discount percentage',
-        'type': 'float',
-        'required': True,
-        'default': lambda *args: 0
-    },
-}
-
-
-def apply_discount(self, cr, uid, data, context):
-    pool = pooler.get_pool(cr.dbname)
-    invoice_obj = pool.get('account.invoice')
-    invoice_line_obj = pool.get('account.invoice.line')
-    for invoice in invoice_obj.browse(cr, uid, data['ids'], context=context):
-        invoice_line_obj.write(cr, uid, [line.id for line in invoice.invoice_line], {'discount': data['form']['discount']}, context=context,)
-    return {}
-
-
-class discount_wizard(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                'type': 'form',
-                'arch': _form,
-                'fields': _fields,
-                'state': (('end', 'Cancel'),
-                          ('apply_discount', 'Apply Discount', 'gtk-ok', True)
-                         )
-            }
-        },
-        'apply_discount': {
-            'actions': [],
-            'result': {
-                'type': 'action',
-                'action': apply_discount,
-                'state': "end",
-            }
-        },
-    }
-
-discount_wizard('invoice.discount')
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+class DiscountWizard(osv.osv):
+
+    _name = "discount.wizard"
+    _description = "Discount Wizard"
+    
+    _columns = {
+        'discount': fields.float('Discount percentage', required=True),
+        'period_from': fields.many2one('account.period', 'Start Period'),
+        'period_to': fields.many2one('account.period', 'End Period'),
+    }
+    
+    _default = {
+        'discount': lambda *args: 0
+    }
+                
+        
+    def apply_discount(self, cr, uid, data, context):
+        invoice_obj = self.pool.get('account.invoice')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        for invoice in invoice_obj.browse(cr, uid, data['ids'], context=context):
+            invoice_line_obj.write(cr, uid, [line.id for line in invoice.invoice_line], {'discount': data['form']['discount']}, context=context,)
+        return {}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_invoice_global_discount/wizard/discount_wizard_view.xml'
--- account_invoice_global_discount/wizard/discount_wizard_view.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_global_discount/wizard/discount_wizard_view.xml	2013-11-06 21:08:00 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="discount_wizard_view" model="ir.ui.view">
+            <field name="name">Discount Wizard View</field>
+            <field name="model">discount.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Discount Wizard" version="7.0">
+                    <field name="discount" />
+                    <footer>
+                        <button name="apply_discount" string="Discount" type="object"/>
+                        or 
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_discount_wizard_view" model="ir.actions.act_window">
+            <field name="name">Action Discount Wizard View</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">discount.wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="discount_wizard_view"/>
+            <field name="target">new</field>
+        </record>
+        
+    </data>
+</openerp>

=== modified file 'account_invoice_journal_defaults/__openerp__.py'
--- account_invoice_journal_defaults/__openerp__.py	2012-06-29 21:17:48 +0000
+++ account_invoice_journal_defaults/__openerp__.py	2013-11-06 21:08:00 +0000
@@ -25,14 +25,12 @@
     'category': 'Accounting & Finance',
     "sequence": 4,
     'complexity': "normal",
-    'description': """
-account_invoice_journal_defaults.
-=======================
-    * Currency changed to readonly
-    * Change button removed
-    * account_id removed in onchange_partner
-    * account_id added in onchange_journal
-    """,
+    'description': '''
+                * account_id and journal_id added to onchange_partner
+                * account_id added in onchange_journal 
+                * account_id associated with the journal or with the account in the partner
+                * account_id change to read-only                
+                ''',
     "author" : 'CLEARCORP S.A',
     'website':'http://www.clearcorp.co.cr',
     "depends" : ['account'],

=== modified file 'account_invoice_journal_defaults/account_invoice_journal_defaults.py'
--- account_invoice_journal_defaults/account_invoice_journal_defaults.py	2013-01-14 21:57:42 +0000
+++ account_invoice_journal_defaults/account_invoice_journal_defaults.py	2013-11-06 21:08:00 +0000
@@ -29,30 +29,88 @@
     _inherit = 'account.invoice'
 
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
-            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False, journal_id = False, account_id = False):
 
         result = super(AccountInvoice, self).onchange_partner_id(cr, uid, ids, type, partner_id, date_invoice, payment_term, partner_bank_id, company_id)
-        if 'account_id' in result['value']:
+        
+        #If the partner have account_id, but the journal doesn't have one, put the account that appears
+        #in result dictionary.
+        
+        if not account_id:                
+            journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
+            acc_id = False
+            
+            if journal.type == 'sale':
+                acc_id = journal.default_receivable_account_id
+            elif journal.type == 'purchase':
+                acc_id = journal.default_payable_account_id
+            elif journal.type == 'sale_refund':
+                acc_id = journal.default_payable_account_id
+            elif journal.type == 'purchase_refund':
+                acc_id = journal.default_receivable_account_id
+            
+            if not acc_id:
+                if partner_id:
+                    partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
+                    
+                    if partner.id != uid: 
+                        if journal.type == 'sale':
+                            acc_id = partner.property_account_receivable
+                        elif journal.type == 'purchase':
+                            acc_id = partner.property_account_payable
+                        elif journal.type == 'sale_refund':
+                            acc_id = partner.property_account_payable
+                        elif journal.type == 'purchase_refund':
+                            acc_id = partner.property_account_receivable
+                                    
+                    else:
+                        result['value']['account_id'] = False
+                        
+            result['value']['account_id'] = acc_id.id 
+            
+        else:
             del result['value']['account_id']
-
+                
         return result
 
-    def onchange_journal_id(self, cr, uid, ids, journal_id=False, context=None):
+    def onchange_journal_id(self, cr, uid, ids, journal_id=False, partner_id = False, context=None):
+        
         result = super(AccountInvoice, self).onchange_journal_id(cr, uid, ids, journal_id, context)
-
-        journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
-
-        if journal.type == 'sale':
-            acc_id = journal.default_receivable_account_id.id
-        elif journal.type == 'purchase':
-            acc_id = journal.default_payable_account_id.id
-        elif journal.type == 'sale_refund':
-            acc_id = journal.default_payable_account_id.id
-        elif journal.type == 'purchase_refund':
-            acc_id = journal.default_receivable_account_id.id
-
-        result['value']['account_id'] = acc_id
-
+        
+        if journal_id is not False:
+            journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+    
+            if journal.type == 'sale':
+                acc_id = journal.default_receivable_account_id
+            elif journal.type == 'purchase':
+                acc_id = journal.default_payable_account_id
+            elif journal.type == 'sale_refund':
+                acc_id = journal.default_payable_account_id
+            elif journal.type == 'purchase_refund':
+                acc_id = journal.default_receivable_account_id        
+           
+            if not acc_id:
+                if partner_id:
+                    partner = self.pool.get('res.partner').browse(cr, uid, partner_id['uid'], context)
+                    
+                    if partner.id != uid:                    
+                        if journal.type == 'sale':
+                            acc_id = partner.property_account_receivable
+                        elif journal.type == 'purchase':
+                            acc_id = partner.property_account_payable
+                        elif journal.type == 'sale_refund':
+                            acc_id = partner.property_account_payable
+                        elif journal.type == 'purchase_refund':
+                            acc_id = partner.property_account_receivable
+                    
+                        result['value']['account_id'] = acc_id.id
+                    
+                    else:
+                        result['value']['account_id'] = False
+            
+            else:
+                result['value']['account_id'] = acc_id.id
+                
         return result
 
     def create(self, cr, uid, vals, context=None):
@@ -118,11 +176,8 @@
     _inherit = 'account.journal'
 
     _columns = {
-        'default_receivable_account_id': fields.many2one('account.account', 'Default Receivable Account', domain="[('type','!=','view')]", help="It acts as a default receivable account"),
-        'default_payable_account_id': fields.many2one('account.account', 'Default Payable Account', domain="[('type','!=','view')]", help="It acts as a default payable account"),
+        'default_receivable_account_id': fields.many2one('account.account', 'Default Receivable Account', help="It acts as a default receivable account"),
+        'default_payable_account_id': fields.many2one('account.account', 'Default Payable Account', help="It acts as a default payable account"),
     }
 
-
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_invoice_journal_defaults/account_invoice_journal_defaults_view.xml'
--- account_invoice_journal_defaults/account_invoice_journal_defaults_view.xml	2012-06-29 21:17:48 +0000
+++ account_invoice_journal_defaults/account_invoice_journal_defaults_view.xml	2013-11-06 21:08:00 +0000
@@ -10,16 +10,22 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <data>                
+                    <field name = "journal_id" position = "replace">
+                         <field name="journal_id" on_change="onchange_journal_id(journal_id, partner_id)" widget="selection"/>
+                    </field>
+                    
+                    <field name = "partner_id" position="replace">
+                        <field string="Supplier" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id, journal_id,account_id)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" options='{"quick_create": false}' domain="[('supplier', '=', True)]"/>                      
+                    </field>
+                    
                     <field name = "currency_id" position = "replace">
                         <field name="currency_id" width="50" readonly="1"/>
                     </field>
+                    
                     <field name = "account_id" position = "replace">
                         <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" readonly="1" groups="account.group_account_user"/>
                     </field>
-                    <button string="Change" position = "replace">
-                        <button invisible = "True" type="action" icon="terp-stock_effects-object-colorize" string="Change" groups="account.group_account_user"/>
-                    </button>
-                </data>
+                 </data>
             </field>
         </record>
         <!-- End Supplier Invoice -->        
@@ -31,16 +37,22 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <data>                
+                <data>          
+                    <field name="journal_id" position="replace">
+                        <field name="journal_id" groups="base.group_user" on_change="onchange_journal_id(journal_id, context, partner_id)" widget="selection"/>
+                    </field>
+                    
+                    <field name="partner_id" positon="replace">
+                        <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id,journal_id,account_id)" groups="base.group_user" context="{'search_default_customer': 1}" options='{"quick_create": false}' domain="[('customer', '=', True)]"/>
+                    </field>
+                          
                     <field name = "currency_id" position = "replace">
                         <field name="currency_id" width="50" readonly="1"/>
                     </field>
+                    
                     <field name = "account_id" position = "replace">
                         <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]" name="account_id" readonly="1" groups="account.group_account_user"/>
                     </field>
-                    <button string="Change" position = "replace">
-                        <button invisible = "True" type="action" icon="terp-stock_effects-object-colorize" string="Change" groups="account.group_account_user"/>
-                    </button>
                 </data>
             </field>
         </record>
@@ -54,11 +66,11 @@
             <field name="inherit_id" ref="account.view_account_journal_form"/>
             <field name="arch" type="xml">
                 <data>                
-                    <field name="default_credit_account_id" position = "after">
+                    <field name="type" position = "after">
                         <group colspan="2" col="2" attrs="{'invisible':[('type','not in', ('sale', 'purchase', 'sale_refund', 'purchase_refund'))]}">
                             <separator string="Default Accounts Receivable/Payable" colspan="4"/>
-                            <field name="default_receivable_account_id" attrs="{'required':[('type','in', ('sale', 'purchase', 'sale_refund', 'purchase_refund'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="default_payable_account_id" attrs="{'required':[('type','in', ('sale', 'purchase', 'sale_refund', 'purchase_refund'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="default_receivable_account_id" domain="[('type','=', 'receivable')]"/>
+                            <field name="default_payable_account_id" domain="[('type','=', 'payable')]"/>
                         </group>
                     </field>
                 </data>

=== modified file 'account_invoice_webkit_report/__openerp__.py'
--- account_invoice_webkit_report/__openerp__.py	2012-12-04 18:01:04 +0000
+++ account_invoice_webkit_report/__openerp__.py	2013-11-06 21:08:00 +0000
@@ -24,10 +24,9 @@
     "name" : 'Invoice Webkit Report',
     "version" : '1.0',
     "author" : 'CLEARCORP S.A',
-    #easy, normal, expert
     'complexity': 'normal',
     "description": """
-Invoice webkit report
+            Invoice webkit report
     """,
     "category": 'Accounting & Finance',
     "sequence": 4,
@@ -36,12 +35,16 @@
     "icon" : False,
     "depends" : [
         'base',
-        'report_webkit',
+        'account_report_lib',
         'account_invoice_global_discount',
         ],
     "init_xml" : [],
     "demo_xml" : [],
-    "update_xml" : ['ccorp_account_webkit_report.xml'],
+    "update_xml" : [
+                    'data/account_invoice_webkit_report_header.xml',
+                    'account_invoice_webkit_report.xml',
+                    'report/report.xml'
+                    ],
     "test" : [],
     "auto_install": False,
     "application": False,

=== modified file 'account_invoice_webkit_report/account_invoice_webkit_report.py'
--- account_invoice_webkit_report/account_invoice_webkit_report.py	2012-12-04 18:01:04 +0000
+++ account_invoice_webkit_report/account_invoice_webkit_report.py	2013-11-06 21:08:00 +0000
@@ -29,4 +29,5 @@
     _columns = {
            'use_email_invoice':fields.boolean('Use user email',help="In the invoice, if it is selected appears the user's mail is logged in. If not selected, do not appear any associated email"),
            }
+    
 res_company()
\ No newline at end of file

=== added file 'account_invoice_webkit_report/account_invoice_webkit_report.xml'
--- account_invoice_webkit_report/account_invoice_webkit_report.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_webkit_report/account_invoice_webkit_report.xml	2013-11-06 21:08:00 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+	   <record id="view_company_form_inherit" model="ir.ui.view">
+            <field name="name">res.company.form.inherit</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <data>                
+                    <page string="General Information" position="after">
+                        <page string="Configuration Report" groups="base.group_extended">
+                            <separator colspan="4" string="Invoices"/>
+                            <field colspan="4" name="use_email_invoice"/>
+                        </page>
+                    </page>
+                </data>
+            </field>
+        </record> 	
+	</data>
+</openerp>

=== removed file 'account_invoice_webkit_report/ccorp_account_webkit_report.xml'
--- account_invoice_webkit_report/ccorp_account_webkit_report.xml	2013-01-17 15:31:51 +0000
+++ account_invoice_webkit_report/ccorp_account_webkit_report.xml	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-	<data>
-	
-	    <record id="account.account_invoices" model="ir.actions.report.xml">
-		<field name="auto" eval="False" />
-		<field name="multi" eval="False" />
-		<field name="model">account.invoice</field>
-		<field name="name">account.invoice.layout_ccorp</field>
-		<field name="report_file">account_invoice_webkit_report/report/invoice.mako</field>
-		<field name="report_rml">account_invoice_webkit_report/report/invoice.mako</field>
-		<field name="report_type">webkit</field>
-	    </record> 
-				
-				
-	   <record id="view_company_form_inherit" model="ir.ui.view">
-            <field name="name">res.company.form.inherit</field>
-            <field name="model">res.company</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="arch" type="xml">
-                <data>                
-                    <page string="General Information" position="after">
-                        <page string="Configuration Report" groups="base.group_extended">
-                            <separator colspan="4" string="Invoices"/>
-                            <field colspan="4" name="use_email_invoice"/>
-                        </page>
-                    </page>
-                </data>
-            </field>
-        </record> 
-	
-	</data>
-</openerp>

=== added directory 'account_invoice_webkit_report/data'
=== added file 'account_invoice_webkit_report/data/account_invoice_webkit_report_header.xml'
--- account_invoice_webkit_report/data/account_invoice_webkit_report_header.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_webkit_report/data/account_invoice_webkit_report_header.xml	2013-11-06 21:08:00 +0000
@@ -0,0 +1,239 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+        <record id="invoice_header_webkit" model="ir.header_webkit">
+            <field name="name">Invoice CLEARCORP official header</field>
+            <field name="orientation">Portrait</field>
+            <field name="format">Letter</field>
+            <field name="margin_top">70.00</field>
+            <field name="margin_bottom">24.00</field>
+            <field name="margin_left">0</field>
+            <field name="margin_right">0</field>
+            <field name="css"><![CDATA[ 
+                            .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;
+            }
+
+            td.company_logo{
+                width : 100%;
+                padding-top: 20px;
+                padding-bottom: 5px;
+            }
+            .company_address{
+                width : 100%;
+                text-align: right;
+                font-family: Arial,Verdana, Sans, Serif;
+                font-size: 13;
+            }
+
+            .company_data {
+                width : 100%;
+                text-align: left;
+                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;
+            }
+            
+            #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 : 440px;
+            }
+            #desc_col_po{
+                width : 380px;
+            }                
+            ]]>
+            </field>
+            <field name="html"><![CDATA[ 
+<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 class="company_logo">
+                        ${helper.embed_logo_by_name('default_logo', height=40, width=150)|n} 
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <table class="company_data">
+                            <tr class = "title">
+                                <td>${company.partner_id.name or '-'}</td>
+                                <td>${_("Address")}</td>
+                            </tr>
+                            <tr>
+                                <td>${_("ID Num")}: ${company.company_registry or '-'}</td>
+                                <td>${company.partner_id.street or '-'}</td>
+                            </tr>
+                            <tr>
+                                <td>${_("Tel-fax")}: ${company.partner_id.phone or '-'}</td>
+                                <td>${company.partner_id.zip or ''} ${company.partner_id.city or ''}</td>
+                            </tr>
+                            <tr>
+                                <td>${_("E-mail")}: ${company.partner_id.email or '-'}</td>
+                                %if company.partner_id.country_id :
+                                    <td>${company.partner_id.state_id.name  or ''|entity}, ${company.partner_id.country_id.name or ''} </td>
+                                %else:
+                                    <td>&nbsp;</td>
+                                %endif
+                            </tr>
+                            <tr>
+                                <td>${_("Web")}: ${company.website or '-'}</td>
+                                <td></td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        
+        <p class = "slogan">${company.rml_header1}</p>
+        <hr />${_debug or ''|n} </body>
+</html>]]></field>
+            <field name="footer_html"><![CDATA[
+<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 colspan="2"><p class ="company_footer">Favor realizar pagos a nombre de ${company.name} cédula jurídica ${company.company_registry}. CUENTAS BANCARIAS: ${company.accounts_footer}</p></td>
+            </tr>
+            <tr>
+                <td colspan="2"><p class ="company_footer">Si realiza el pago en colones (CRC), por favor utilizar el tipo de cambio al día de la fecha de pago del BCCR.</p></td>
+            </tr>
+            <tr>
+                <td><p class ="company_footer">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 </p></td>
+                <td style="text-align:right;font-size:10;">Página&nbsp;<span class="page"/></td><td style="text-align:left;font-size:10;">&nbsp;de&nbsp;<span class="topage"/></td>
+            </tr>
+        </table>
+    </body>
+</html> ]]></field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== removed file 'account_invoice_webkit_report/i18n/ccorp_account.pot'
--- account_invoice_webkit_report/i18n/ccorp_account.pot	2012-06-30 22:41:06 +0000
+++ account_invoice_webkit_report/i18n/ccorp_account.pot	1970-01-01 00:00:00 +0000
@@ -1,179 +0,0 @@
-# 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 ""

=== removed file 'account_invoice_webkit_report/i18n/ccorp_account_webkit.pot'
--- account_invoice_webkit_report/i18n/ccorp_account_webkit.pot	2012-06-30 22:41:06 +0000
+++ account_invoice_webkit_report/i18n/ccorp_account_webkit.pot	1970-01-01 00:00:00 +0000
@@ -1,190 +0,0 @@
-# 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 ""
-

=== removed file 'account_invoice_webkit_report/i18n/es.po'
--- account_invoice_webkit_report/i18n/es.po	2012-06-30 22:41:06 +0000
+++ account_invoice_webkit_report/i18n/es.po	1970-01-01 00:00:00 +0000
@@ -1,182 +0,0 @@
-# Spanish translation for openerp-ccorp-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openerp-ccorp-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-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: 2011-11-16 05:10+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: 2011-11-29 06:07+0000\n"
-"X-Generator: Launchpad (build 14399)\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"

=== modified file 'account_invoice_webkit_report/i18n/es_CR.po'
--- account_invoice_webkit_report/i18n/es_CR.po	2012-12-04 18:01:04 +0000
+++ account_invoice_webkit_report/i18n/es_CR.po	2013-11-06 21:08:00 +0000
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
+"Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 17:11+0000\n"
-"PO-Revision-Date: 2012-12-04 17:11+0000\n"
+"POT-Creation-Date: 2013-04-30 16:38+0000\n"
+"PO-Revision-Date: 2013-04-30 16:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@
 "Plural-Forms: \n"
 
 #. module: account_invoice_webkit_report
-#: report:addons/account_invoice_webkit_report/report/invoice.mako:93
-#: report:addons/account_invoice_webkit_report/report/invoice.mako:98
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:94
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:99
 msgid "Sub Total"
-msgstr "Sub Total"
+msgstr "Subtotal"
 
 #. module: account_invoice_webkit_report
 #: field:res.company,use_email_invoice:0
 msgid "Use user email"
-msgstr "Usar email del usuario logueado"
+msgstr "Usar email del usuario"
 
 #. module: account_invoice_webkit_report
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:39
@@ -32,19 +32,14 @@
 msgstr "Fecha:"
 
 #. module: account_invoice_webkit_report
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:36
+msgid "ID Num."
+msgstr "Código cliente"
 
 #. module: account_invoice_webkit_report
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:47
 msgid "Payment tems"
-msgstr "Plazo de pago"
-
-#. module: account_invoice_webkit_report
-#: report:addons/account_invoice_webkit_report/report/invoice.mako:81
-msgid "Note"
-msgstr "Nota"
+msgstr "Condiciones de pago"
 
 #. module: account_invoice_webkit_report
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:23
@@ -65,7 +60,7 @@
 #. module: account_invoice_webkit_report
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:48
 msgid "Email"
-msgstr "Email"
+msgstr "Correo electrónico"
 
 #. module: account_invoice_webkit_report
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:63
@@ -86,12 +81,7 @@
 #. module: account_invoice_webkit_report
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:40
 msgid "Phone"
-msgstr "Phone"
-
-#. module: account_invoice_webkit_report
-#: model:ir.actions.report.xml,name:account_invoice_webkit_report.account_invoice_ccorp
-msgid "Invoice HTML"
-msgstr "Facturas"
+msgstr "Teléfono"
 
 #. module: account_invoice_webkit_report
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:21
@@ -99,12 +89,12 @@
 msgstr "Factura cancelada"
 
 #. module: account_invoice_webkit_report
-#: report:addons/account_invoice_webkit_report/report/invoice.mako:94
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:95
 msgid "Discount"
 msgstr "Descuento"
 
 #. module: account_invoice_webkit_report
-#: report:addons/account_invoice_webkit_report/report/invoice.mako:107
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:108
 msgid "Invoice Note"
 msgstr "Nota de factura"
 
@@ -112,12 +102,7 @@
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:63
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:65
 msgid "[Code] Description / (Taxes)"
-msgstr "[Cód.] Descripción / (Imp.)"
-
-#. module: account_invoice_webkit_report
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "¡El nombre de la compañía debe ser único!"
+msgstr "[Código] Descripción / (Impuestos)"
 
 #. module: account_invoice_webkit_report
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:19
@@ -125,11 +110,6 @@
 msgstr "Factura borrador"
 
 #. module: account_invoice_webkit_report
-#: report:addons/account_invoice_webkit_report/report/invoice.mako:36
-msgid "ID Num."
-msgstr "ID Num."
-
-#. module: account_invoice_webkit_report
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:55
 msgid "Address"
 msgstr "Dirección"
@@ -145,35 +125,35 @@
 msgstr "Factura electrónica"
 
 #. module: account_invoice_webkit_report
-#: report:addons/account_invoice_webkit_report/report/invoice.mako:95
-#: report:addons/account_invoice_webkit_report/report/invoice.mako:99
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:96
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:100
 msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: account_invoice_webkit_report
 #: help:res.company,use_email_invoice:0
 msgid "In the invoice, if it is selected appears the user's mail is logged in. If not selected, do not appear any associated email"
-msgstr "En la factura, si está seleccionado aparece el email del usuario logueado. Si no está seleccionado no aparece ningún email"
+msgstr "En la factura, si está seleccionada, aparece el correo del usuario logueado. Si no está seleccionado, no aparece ningún correo asociado."
 
 #. module: account_invoice_webkit_report
 #: view:res.company:0
 msgid "Configuration Report"
-msgstr "Configuración de reportes"
+msgstr "Configuración de reporte"
 
 #. module: account_invoice_webkit_report
-#: report:addons/account_invoice_webkit_report/report/invoice.mako:111
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:112
 msgid "Payment Note"
 msgstr "Nota de pago"
 
 #. module: account_invoice_webkit_report
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:25
 msgid "Refund"
-msgstr "Reembolso"
+msgstr "Nota de crédito"
 
 #. module: account_invoice_webkit_report
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:43
 msgid "Due date"
-msgstr "Vence"
+msgstr "Fecha de vencimiento"
 
 #. module: account_invoice_webkit_report
 #: view:res.company:0
@@ -194,11 +174,11 @@
 #. module: account_invoice_webkit_report
 #: report:addons/account_invoice_webkit_report/report/invoice.mako:27
 msgid "Supplier Refund"
-msgstr "Reembolso de proveedor"
+msgstr "Nota de débito"
 
 #. module: account_invoice_webkit_report
-#: report:addons/account_invoice_webkit_report/report/invoice.mako:96
-#: report:addons/account_invoice_webkit_report/report/invoice.mako:100
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:97
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:101
 msgid "Total"
 msgstr "Total"
 

=== modified file 'account_invoice_webkit_report/report/__init__.py'
--- account_invoice_webkit_report/report/__init__.py	2012-06-30 22:41:06 +0000
+++ account_invoice_webkit_report/report/__init__.py	2013-11-06 21:08:00 +0000
@@ -1,35 +1,23 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: 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..
-#    
+#    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/>.
+#
 ##############################################################################
 
-import invoice
+import account_invoice_report

=== added file 'account_invoice_webkit_report/report/account_invoice_report.mako'
--- account_invoice_webkit_report/report/account_invoice_report.mako	1970-01-01 00:00:00 +0000
+++ account_invoice_webkit_report/report/account_invoice_report.mako	2013-11-06 21:08:00 +0000
@@ -0,0 +1,137 @@
+<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 '-'}</td>
+                <td>${_("ID Num.")}: ${inv.partner_id.ref or '-'}</td>
+            </tr>
+            <tr>
+                <td>${_("Date:")} ${formatLang(inv.date_invoice, date=True)|entity}</td>
+                <td>${_("Phone")}:${inv.partner_id.phone or '-'}</td>
+            </tr>
+            <tr>
+                <td>${_("Due date")}: ${formatLang(inv.date_due, date=True)|entity}</td>
+                <td>${_("Fax")}: ${inv.partner_id.fax or '-'}</td>
+            </tr>
+            <tr>
+                <td>${_("Payment tems")}: ${inv.payment_term.name or '-'}</td>
+                <td colspan = "2">${_("Email")}: ${inv.partner_id.email or '-'}</td><td> </td>
+            </tr>
+            <tr>
+                <td>${_("Salesman")}: ${inv.partner_id.user_id.name or '-'}</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.partner_id.street or ''}</td><td>&nbsp;</td></tr>
+            <tr><td>${inv.partner_id.street2 or ''}</td><td>&nbsp;</td></tr>
+            <tr><td>${(inv.partner_id.zip and format(inv.partner_id.zip) + ((inv.partner_id.city or inv.partner_id.state_id or inv.partner_id.country_id) and ' ' or '') or '') + (inv.partner_id.city and format(inv.partner_id.city) + ((inv.partner_id.state_id or inv.partner_id.country_id) and ', ' or '') or '') + (inv.partner_id.state_id and format(inv.partner_id.state_id.name) + (inv.partner_id.country_id and ', ' or '') or '') + (inv.partner_id.country_id and format(inv.partner_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
+            %if line.uos_id:
+                <td valign = "top">${formatLang(line.quantity)} ${format(line.uos_id.name)}</td>
+            %else:
+                <td valign = "top">${formatLang(line.quantity)}</td>
+            %endif
+                <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
+                </td>
+                %if inv.amount_discounted != 0:
+                    <td valign = "top" style="text-align:right;">${line.discount and formatLang(line.discount) + '%' or '-'}</td>
+                %endif
+                %if inv.currency_id.position == 'before':
+                    <td style="text-align:right;" valign = "top">${inv.currency_id.symbol or ''|entity }&nbsp;${formatLang(line.price_unit)}</td>
+                    <td style="text-align:right;" valign = "top">${inv.currency_id.symbol or ''|entity }&nbsp;${formatLang(line.price_subtotal_not_discounted)}</td> 
+                %else:          
+                    <td style="text-align:right;" valign = "top">${formatLang(line.price_unit)}&nbsp;${inv.currency_id.symbol or ''|entity } </td>
+                    <td style="text-align:right;" valign = "top">${formatLang(line.price_subtotal_not_discounted)}&nbsp;${inv.currency_id.symbol or ''|entity }</td> 
+                %endif
+             </tr>
+        <%i += 1%>
+        %endfor
+        %if inv.amount_discounted != 0:
+            %if inv.currency_id.position == 'before':
+                <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 or ''|entity}&nbsp;${formatLang(inv.amount_untaxed_not_discounted)}</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 or ''|entity}&nbsp;${formatLang(inv.amount_discounted)}</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 or ''|entity}&nbsp;${formatLang(inv.amount_tax)}</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 or ''|entity}&nbsp;${formatLang(inv.amount_total)}</td></tr>
+            %else:
+                <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">${formatLang(inv.amount_untaxed_not_discounted)}&nbsp;${inv.currency_id.symbol 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">${formatLang(inv.amount_discounted)}&nbsp;${inv.currency_id.symbol 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">${formatLang(inv.amount_tax)}&nbsp;${inv.currency_id.symbol 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">${formatLang(inv.amount_total)}&nbsp;${inv.currency_id.symbol or ''|entity}</td></tr>    
+            %endif
+        %else:
+            %if inv.currency_id.position == 'before':
+                <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 or ''|entity} ${formatLang(inv.amount_untaxed_not_discounted)}</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 or ''|entity} ${formatLang(inv.amount_tax)}</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 or ''|entity} ${formatLang(inv.amount_total)}</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">${formatLang(inv.amount_untaxed_not_discounted)} ${inv.currency_id.symbol 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">${formatLang(inv.amount_tax)} ${inv.currency_id.symbol 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">${formatLang(inv.amount_total)} ${inv.currency_id.symbol or ''|entity}</td></tr>
+            %endif
+        %endif        
+        </tbody>
+        </table>
+        <table id = "notes_table">
+            %if inv.comment:
+                <tr><td><b>${_("Invoice Note")}:</b><br />
+                ${format(inv.comment)}</td></tr>
+            %endif
+            %if inv.payment_term and inv.payment_term.note:
+                <tr><td><b>${_("Payment Note")}:</b><br />
+                ${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 'account_invoice_webkit_report/report/account_invoice_report.py'
--- account_invoice_webkit_report/report/account_invoice_report.py	1970-01-01 00:00:00 +0000
+++ account_invoice_webkit_report/report/account_invoice_report.py	2013-11-06 21:08:00 +0000
@@ -0,0 +1,41 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import time
+import pooler
+import locale
+from report import report_sxw
+
+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/account_invoice_webkit_report/report/account_invoice_report.mako',
+    parser=account_invoice_ccorp)

=== removed file 'account_invoice_webkit_report/report/invoice.mako'
--- account_invoice_webkit_report/report/invoice.mako	2012-12-03 20:31:03 +0000
+++ account_invoice_webkit_report/report/invoice.mako	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-<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
-            %if line.uos_id:
-                <td valign = "top">${formatLang(line.quantity)} ${format(line.uos_id.name)}</td>
-            %else:
-                <td valign = "top">${formatLang(line.quantity)}</td>
-            %endif
-                <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><br />
-                ${format(inv.comment)}</td></tr>
-            %endif
-            %if inv.payment_term and inv.payment_term.note:
-                <tr><td><b>${_("Payment Note")}:</b><br />
-                ${format(inv.payment_term and inv.payment_term.note)}</td></tr>
-            %endif
-        </table>
-    </div>
-    <p style="page-break-after:always"></p>
-    %endfor
-</body>
-</html>

=== removed file 'account_invoice_webkit_report/report/invoice.py'
--- account_invoice_webkit_report/report/invoice.py	2012-06-30 22:41:06 +0000
+++ account_invoice_webkit_report/report/invoice.py	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-# -*- 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/account_invoice_webkit_report/report/invoice.mako',
-    parser=account_invoice_ccorp)

=== added file 'account_invoice_webkit_report/report/report.xml'
--- account_invoice_webkit_report/report/report.xml	1970-01-01 00:00:00 +0000
+++ account_invoice_webkit_report/report/report.xml	2013-11-06 21:08:00 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+         <report
+            auto = "False"
+            id = "account.account_invoices"
+            model = "account.invoice"
+            name = "account.invoice.layout_ccorp"
+            file = "account_invoice_webkit_report/report/account_invoice_report.mako"
+            string = "Account Invoice"
+            report_type = "webkit"
+            webkit_header = "invoice_header_webkit"/>        
+    </data>            
+</openerp>

=== modified file 'account_journal_extended_code/__init__.py'
--- account_journal_extended_code/__init__.py	2012-06-30 22:41:06 +0000
+++ account_journal_extended_code/__init__.py	2013-11-06 21:08:00 +0000
@@ -1,35 +1,25 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: 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..
-#    
+#    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/>.
+#
 ##############################################################################
 
 import account_journal_extended_code
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_journal_extended_code/__openerp__.py'
--- account_journal_extended_code/__openerp__.py	2012-06-30 22:41:06 +0000
+++ account_journal_extended_code/__openerp__.py	2013-11-06 21:08:00 +0000
@@ -1,50 +1,40 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: 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..
-#    
+#    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': 'Journal 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 journal code
-	""",
-	'depends': ['account'],
-	'init_xml': [],
-	'demo_xml': [],
-	'update_xml': [],
-	'license': 'Other OSI approved licence',
-	'installable': True,
-	'active': False,
+    'name': 'Journal code extended',
+    'version': '1.0',
+    'author': 'ClearCorp S.A.',
+    'website': 'http://clearcorp.co.cr',
+    'category': 'General Modules/Accounting',
+    'description': """Enables up to 64 chars in a journal code
+    """,
+    'depends': ['account'],
+    'init_xml': [],
+    'demo_xml': [],
+    'update_xml': [],
+    'license': 'AGPL-3',
+    'installable': True,
+    'active': False,
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_journal_extended_code/account_journal_extended_code.py'
--- account_journal_extended_code/account_journal_extended_code.py	2012-06-30 22:41:06 +0000
+++ account_journal_extended_code/account_journal_extended_code.py	2013-11-06 21:08:00 +0000
@@ -1,47 +1,36 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    account_journal_extended_code.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..
-#    
+#    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/>.
+#
 ##############################################################################
 
 from osv import osv,fields
 
-class journal(osv.osv):
-	'''
-	Adds up to 64 chars to a journal code
-	'''
-	_name = 'account.journal'
-	_inherit = 'account.journal'
-	
-	_columns = {
+class AccountJournal(osv.osv):
+    '''
+    Adds up to 64 chars to a journal code
+    '''
+    _name = 'account.journal'
+    _inherit = 'account.journal'
+    
+    _columns = {
         'code': fields.char('Code', size=64, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."),
-	}
-journal()
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account_journal_period_report/__openerp__.py'
--- account_journal_period_report/__openerp__.py	2013-01-17 19:12:32 +0000
+++ account_journal_period_report/__openerp__.py	2013-11-06 21:08:00 +0000
@@ -29,11 +29,12 @@
     'complexity': 'normal',
     'description': """This module modifies the account journal period report """,
     'depends': [
-        'account',
+        'account','account_report_lib',
     ],
     'init_xml': [],
     'demo_xml': [],
-    'update_xml': ['report/report.xml',],
+    'update_xml': ['wizard/account_journal_period_report_wizard_view.xml',
+                   'report/report.xml',],
     'license': 'AGPL-3',
     'installable': True,
     'active': False,

=== added directory 'account_journal_period_report/i18n'
=== renamed directory 'account_journal_period_report/i18n' => 'account_journal_period_report/i18n.moved'
=== added file 'account_journal_period_report/i18n/es_CR.po'
--- account_journal_period_report/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ account_journal_period_report/i18n/es_CR.po	2013-11-06 21:08:00 +0000
@@ -0,0 +1,105 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_journal_period_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-05 03:02+0000\n"
+"PO-Revision-Date: 2013-05-05 03:02+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: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:62
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:70
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:108
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:118
+msgid "TOTAL"
+msgstr "TOTAL"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:31
+msgid "Chart of Accounts: "
+msgstr "Catálogo contable: "
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:33
+msgid "Selected period: "
+msgstr "Períodos seleccionados: "
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:34
+msgid "Entries Sorted By:"
+msgstr "Apuntes ordenados por:"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:60
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:68
+msgid "Move"
+msgstr "Asiento"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:61
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:69
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:66
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:74
+msgid "Credit"
+msgstr "Crédito"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:75
+msgid "Amount Currency"
+msgstr "Monto divisa"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:24
+msgid "Journal Report "
+msgstr "Reporte de Diario(s) "
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:35
+msgid "Target Moves: "
+msgstr "Movimientos destino: "
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:65
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:73
+msgid "Debit"
+msgstr "Débito"
+
+#. module: account_journal_period_report
+#: model:ir.model,name:account_journal_period_report.model_account_print_journal
+msgid "Account Print Journal"
+msgstr "Contabilidad. Imprimir diario"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:63
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:71
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:64
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:72
+msgid "Label"
+msgstr "Etiqueta"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:32
+msgid "Fiscal Year: "
+msgstr "Año fiscal: "
+

=== modified file 'account_journal_period_report/report/account_journal_period_report.mako'
--- account_journal_period_report/report/account_journal_period_report.mako	2013-03-19 22:31:39 +0000
+++ account_journal_period_report/report/account_journal_period_report.mako	2013-11-06 21:08:00 +0000
@@ -7,7 +7,7 @@
         </style>
     </head>
     <body>
-        <%setLang(user.context_lang)%>
+        <%setLang(user.lang)%>
         <%
             fiscalyear = get_fiscalyear(data)
             company = get_account(data)
@@ -18,13 +18,14 @@
         %>
        <div class="table header">
            <div class="table-row">
-               <div class="table-cell logo">${helper.embed_logo_by_name('internal_reports_logo', height=100)|n}</div>
+               <div class="table-cell logo">${helper.embed_logo_by_name('default_logo', height=100)|n}</div>
                <br/>
                <div class="table-cell text">
                     <p class="title">${_('Journal Report ')}</p>
                </div>
            </div>
        </div>
+       <br/><br/>
        <div class="table list">
             <div class="table-header">
                 <div class="table-row labels no-wrap">

=== modified file 'account_journal_period_report/report/report.xml'
--- account_journal_period_report/report/report.xml	2013-01-17 19:12:32 +0000
+++ account_journal_period_report/report/report.xml	2013-11-06 21:08:00 +0000
@@ -6,14 +6,12 @@
              <field name="report_type">webkit</field>
              <field name="report_name">account_journal_period_print_inherit</field>
              <field eval="[(6,0,[])]" name="groups_id"/>
-             <field eval="0" name="multi"/>
-             <field eval="0" name="auto"/>
-             <field eval="1" name="header"/>
              <field name="model">account.print.journal</field>
              <field name="type">ir.actions.report.xml</field>
              <field name="name">Journal</field>
              <field name="report_rml">account_journal_period_report/report/account_journal_period_report.mako</field>
              <field name="report_file">account_journal_period_report/report/account_journal_period_report.mako</field>
+             <field name="webkit_header" ref="report_webkit_lib.webkit_header_clearcorp_official_portrait"/>
          </record>       
     </data>
 </openerp>

=== modified file 'account_journal_period_report/wizard/__init__.py'
--- account_journal_period_report/wizard/__init__.py	2013-01-17 19:12:32 +0000
+++ account_journal_period_report/wizard/__init__.py	2013-11-06 21:08:00 +0000
@@ -20,5 +20,4 @@
 #
 ##############################################################################
 
-
 import account_journal_period_report_wizard

=== added file 'account_journal_period_report/wizard/account_journal_period_report_wizard_view.xml'
--- account_journal_period_report/wizard/account_journal_period_report_wizard_view.xml	1970-01-01 00:00:00 +0000
+++ account_journal_period_report/wizard/account_journal_period_report_wizard_view.xml	2013-11-06 21:08:00 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+       <record id="account_report_print_journal_inherit" model="ir.ui.view">
+            <field name="name">account.report.print.journal.inherit</field>
+            <field name="model">account.print.journal</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.account_report_print_journal"/>
+            <field name="arch" type="xml">
+                <data>                
+                   <field name="fiscalyear_id" position="attributes">
+                       <attribute name="required">True</attribute>
+                   </field>
+                </data>
+            </field>
+        </record> 
+    </data>
+</openerp>

=== removed directory 'account_journal_view_extended'
=== removed file 'account_journal_view_extended/__init__.py'
--- account_journal_view_extended/__init__.py	2012-06-30 22:41:06 +0000
+++ account_journal_view_extended/__init__.py	1970-01-01 00:00:00 +0000