Merge lp:~andres-calle/openerp-ecuador/6.0 into lp:openerp-ecuador/6.0

[Christopher Ormaza - (Ecuadorenlinea.net)]

Cambios propuestos por TRESCLOUD

[Christopher Ormaza - (Ecuadorenlinea.net) (chris-ormaza)]

Estimado Andres

Te recomendaria que si estas usando modulos de otros desarrollos, solo agregues la dependencia, ya que nuestra rama es de localización, a menos que esos modulos de Domsense sean personalizados para nuestra legislación, deberias agregar tambien tu participación en la modificación y mantenerlos de manera indenpendiente

Con respecto al contexto en las funciones de redondeo, nosotros la usamos con nuestra rama del openerp en la versión 6, para evitar problemas con los cálculos de decimales, te pido revises el repositorio en https://bitbucket.org/cormaza/openerp_base, por favor has los cambios para que estas funciones de calculo sean usadas con este contexto

review: Needs Fixing

Unmerged revisions

4. By Andres Calle (TRESCLOUD) on 2013-05-02

Mejoras varias realizadas por TRESCLOUD, y agregado cheques, automatizacion de posiciones fiscales para clientes/proveedores ecuatorianos, cierre de caja, otros

=== added file 'README.md'
--- README.md	1970-01-01 00:00:00 +0000
+++ README.md	2013-05-03 13:54:27 +0000
@@ -0,0 +1,9 @@
+OpenERP-EC-NIIF-PYMES 6.0
+=========================
+Branch 6.0 - Contabilidad y RRHH Niif Pymes para OpenERP 6.0
+
+Incluye para la versión 6.0:
+
+- Modulos contables
+- Modulos de recursos humanos
+- Otros modulos relacionados a PYMES
\ No newline at end of file

=== added directory 'account_fiscal_position_country'
=== added file 'account_fiscal_position_country/AUTHORS.txt'
--- account_fiscal_position_country/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country/AUTHORS.txt	2013-05-03 13:54:27 +0000
@@ -0,0 +1,1 @@
+Leonardo Pistone <[e-mail]>

=== added file 'account_fiscal_position_country/__init__.py'
--- account_fiscal_position_country/__init__.py	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country/__init__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 country
+import account
+import invoice
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_fiscal_position_country/__openerp__.py'
--- account_fiscal_position_country/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country/__openerp__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': 'Fiscal Position by country',
+    'version': '0.2',
+    'category': 'Generic Modules/Accounting',
+    'description': """A rule to select automatically the fiscal position based on the country
+    In the configuration of the country, choose a default fiscal position for it.
+    When selecting a partner in an invoice, if the fiscal position for the partner is not set, the one 
+    from the country will be used.
+    
+    For more info: http://planet.domsense.com/en/2011/12/account_fiscal_position_country/""",
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+
+    'depends': ['base','account'],
+    'init_xml': [],
+    'update_xml': 
+                [
+                'account_view.xml',
+                'account_invoice_view.xml',
+                'country_view.xml',
+                ],
+    'demo_xml': [],
+    "active": False,
+
+    'installable': True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_fiscal_position_country/account.py'
--- account_fiscal_position_country/account.py	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country/account.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 account_fiscal_position(osv.osv):
+    _inherit = "account.fiscal.position"
+    _columns = {
+        'country_ids': fields.one2many('res.country', 'property_account_position', 'Countries', readonly=True),
+    }
+account_fiscal_position()

=== added file 'account_fiscal_position_country/account_invoice_view.xml'
--- account_fiscal_position_country/account_invoice_view.xml	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country/account_invoice_view.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="invoice_form_position_country" model="ir.ui.view">
+            <field name="name">account.invoice.form.position.country</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="replace">
+                    <field string="Customer" name="partner_id" on_change="onchange_partner_id_fiscal_position(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" context="{'search_default_customer': 1}"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="invoice_supplier_form_position_country" model="ir.ui.view">
+            <field name="name">account.invoice.supplier.form.position.country</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="replace">
+                    <field string="Supplier" name="partner_id" on_change="onchange_partner_id_fiscal_position(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added file 'account_fiscal_position_country/account_view.xml'
--- account_fiscal_position_country/account_view.xml	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country/account_view.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+
+		<record id="view_account_position_form_country" model="ir.ui.view">
+			<field name="name">account.fiscal.position.form.country</field>
+			<field name="model">account.fiscal.position</field>
+			<field name="inherit_id" ref="account.view_account_position_form"/>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<field name="note" position="after">
+					<field name="country_ids" colspan="4" nolabel="1"/>
+				</field>
+			</field>
+		</record>
+
+	</data>
+</openerp>

=== added file 'account_fiscal_position_country/country.py'
--- account_fiscal_position_country/country.py	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country/country.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 Country(osv.osv):
+    _inherit = 'res.country'
+    _columns = {
+     #   'fiscal_position_id': fields.many2one('account.fiscal.position','Default fiscal position'),
+        'property_account_position': fields.property(
+            'account.fiscal.position',
+            type='many2one',
+            relation='account.fiscal.position',
+            string="Default Fiscal Position",
+            method=True,
+            view_load=True,
+            help="The fiscal position will determine taxes and the accounts used for the country, if not set specifically elsewere.",
+        ),
+    }
+Country()

=== added file 'account_fiscal_position_country/country_view.xml'
--- account_fiscal_position_country/country_view.xml	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country/country_view.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+
+		<record model="ir.ui.view" id="view_country_fiscal_position_form">
+			<field name="name">country.fiscal.position.form</field>
+			<field name="model">res.country</field>
+			<field name="inherit_id" ref="base.view_country_form"/>
+			<field name="arch" type="xml">
+				<field name="code" position="after">
+					<field name="property_account_position" widget="selection"/>
+				</field>
+			</field>
+		</record>
+
+	</data>
+</openerp>

=== added file 'account_fiscal_position_country/invoice.py'
--- account_fiscal_position_country/invoice.py	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country/invoice.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 account_invoice(osv.osv):
+    _inherit = "account.invoice"
+
+    def onchange_partner_id_fiscal_position(self, cr, uid, ids, type, partner_id,\
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
+
+        result = super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,\
+            date_invoice, payment_term, partner_bank_id, company_id)
+
+        if not result['value']['fiscal_position']:
+            if partner_id:
+                partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
+                addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id])
+                address = self.pool.get('res.partner.address').browse(cr, uid, addr['default'])
+                result['value']['fiscal_position'] = address.country_id and address.country_id.property_account_position and address.country_id.property_account_position.id or False
+
+        return result
+
+account_invoice()

=== added directory 'account_fiscal_position_country_sale'
=== added file 'account_fiscal_position_country_sale/AUTHORS.txt'
--- account_fiscal_position_country_sale/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country_sale/AUTHORS.txt	2013-05-03 13:54:27 +0000
@@ -0,0 +1,1 @@
+Leonardo Pistone <[e-mail]>

=== added file 'account_fiscal_position_country_sale/__init__.py'
--- account_fiscal_position_country_sale/__init__.py	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country_sale/__init__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 sale
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_fiscal_position_country_sale/__openerp__.py'
--- account_fiscal_position_country_sale/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country_sale/__openerp__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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': 'Fiscal Position by country, sales',
+    'version': '0.2',
+    'category': 'Generic Modules/Accounting',
+    'description': """A rule to select automatically the fiscal position in a sale order
+    This module extends the account_fiscal_position_country_sale to sale orders. The modules are
+    kept separate to reduce dependencies
+    """,
+    'author': 'Agile Business Group & Domsense',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+
+    'depends': ['account_fiscal_position_country','sale'],
+    'init_xml': [],
+    'update_xml': 
+                [
+                'sale_view.xml',
+                ],
+    'demo_xml': [],
+    'active': False,
+
+    'installable': True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_fiscal_position_country_sale/sale.py'
--- account_fiscal_position_country_sale/sale.py	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country_sale/sale.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2011 Agile Business Group sagl (<http://www.agilebg.com>)
+#    Copyright (C) 2011 Domsense srl (<http://www.domsense.com>)
+#    All Rights Reserved
+#
+#    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 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 sale_order(osv.osv):
+    _inherit = "sale.order"
+
+    def onchange_partner_id_fiscal_position(self, cr, uid, ids, partner_id):
+        result = super(sale_order, self).onchange_partner_id(cr, uid, ids, partner_id)
+
+        if not result['value']['fiscal_position']:
+        	if partner_id:
+	        	partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
+	        	addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id])
+	        	address = self.pool.get('res.partner.address').browse(cr, uid, addr['default'])
+	        	result['value']['fiscal_position'] = address.country_id and address.country_id.property_account_position and address.country_id.property_account_position.id or False
+
+        return result
+
+sale_order()

=== added file 'account_fiscal_position_country_sale/sale_view.xml'
--- account_fiscal_position_country_sale/sale_view.xml	1970-01-01 00:00:00 +0000
+++ account_fiscal_position_country_sale/sale_view.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+
+	<data>
+
+        <record id="view_order_form_position_country" model="ir.ui.view">
+            <field name="name">view.order.form.position.country</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                <field name="partner_id" position="replace">
+                    <field name="partner_id" on_change="onchange_partner_id_fiscal_position(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" required="1"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+
+</openerp>

=== added directory 'ecua_cash_register_report'
=== added file 'ecua_cash_register_report/__init__.py'
--- ecua_cash_register_report/__init__.py	1970-01-01 00:00:00 +0000
+++ ecua_cash_register_report/__init__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+########################################################################
+#                                                                       
+# @authors: Patricio Rangles                                                                           
+# Copyright (C) 2012 TRESCLOUD CIA. LTDA.                                  
+#                                                                       
+#This program is free software: you can redistribute it and/or modify   
+#it under the terms of the GNU General Public License as published by   
+#the Free Software Foundation, either version 3 of the License, or      
+#(at your option) any later version.                                    
+#
+# This module is GPLv3 or newer and incompatible
+# with OpenERP SA "AGPL + Private Use License"!
+#                                                                       
+#This program is distributed in the hope that it will be useful,        
+#but WITHOUT ANY WARRANTY; without even the implied warranty of         
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          
+#GNU General Public License for more details.                           
+#                                                                       
+#You should have received a copy of the GNU General Public License      
+#along with this program.  If not, see http://www.gnu.org/licenses.
+########################################################################
+import object
\ No newline at end of file

=== added file 'ecua_cash_register_report/__openerp__.py'
--- ecua_cash_register_report/__openerp__.py	1970-01-01 00:00:00 +0000
+++ ecua_cash_register_report/__openerp__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,51 @@
+
+# -*- encoding: utf-8 -*-
+########################################################################
+#                                                                       
+# @authors: Patricio Rangles                                                                           
+# Copyright (C) 2012  TRESCloud Cia. Ltda.                                 
+#                                                                       
+#This program is free software: you can redistribute it and/or modify   
+#it under the terms of the GNU General Public License as published by   
+#the Free Software Foundation, either version 3 of the License, or      
+#(at your option) any later version.                                    
+#
+# This module is GPLv3 or newer and incompatible
+# with OpenERP SA "AGPL + Private Use License"!
+#                                                                       
+#This program is distributed in the hope that it will be useful,        
+#but WITHOUT ANY WARRANTY; without even the implied warranty of         
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          
+#GNU General Public License for more details.                           
+#                                                                       
+#You should have received a copy of the GNU General Public License      
+#along with this program.  If not, see http://www.gnu.org/licenses.
+########################################################################
+{
+    "name" : "Reporte para Control de Registro de Caja",
+    "version" : "1.0",
+    "author" : "TRESCloud Cia. Ltda.",
+    "website": "http://www.trescloud.com",
+    "category" : "Reportes",
+    "description": """Reporte para Control de Registro de Caja
+    Permite generar un reporte imprimible de los movimientos realizados por cada usuario
+    en la fecha indicada. Este reporte es unico por que captura el estado actual de las 
+    facturas, ordenes de venta movimiento de diarios entre otros.
+    
+    Autor:
+    Patricio Rangles
+    """,
+    "depends": ['base',
+                'ecua_autorizaciones_sri',
+                ],
+    "init_xml": [],
+    "update_xml": [
+        'report/report_data.xml',
+        'view/ecua_cash_register_report_view.xml',
+    ],
+    "installable": True,
+    "active": False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+

=== added directory 'ecua_cash_register_report/object'
=== added file 'ecua_cash_register_report/object/__init__.py'
--- ecua_cash_register_report/object/__init__.py	1970-01-01 00:00:00 +0000
+++ ecua_cash_register_report/object/__init__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+########################################################################
+#                                                                       
+# @authors: Patricio Rangles                                                                           
+# Copyright (C) 2012 TRESCLOUD CIA. LTDA.                                  
+#                                                                       
+#This program is free software: you can redistribute it and/or modify   
+#it under the terms of the GNU General Public License as published by   
+#the Free Software Foundation, either version 3 of the License, or      
+#(at your option) any later version.                                    
+#
+# This module is GPLv3 or newer and incompatible
+# with OpenERP SA "AGPL + Private Use License"!
+#                                                                       
+#This program is distributed in the hope that it will be useful,        
+#but WITHOUT ANY WARRANTY; without even the implied warranty of         
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          
+#GNU General Public License for more details.                           
+#                                                                       
+#You should have received a copy of the GNU General Public License      
+#along with this program.  If not, see http://www.gnu.org/licenses.
+########################################################################
+import caja_reporte
\ No newline at end of file

=== added file 'ecua_cash_register_report/object/caja_reporte.py'
--- ecua_cash_register_report/object/caja_reporte.py	1970-01-01 00:00:00 +0000
+++ ecua_cash_register_report/object/caja_reporte.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,526 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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
+from datetime import date
+#from datetime import datetime
+#from dateutil.relativedelta import relativedelta
+
+#import pooler
+#import tools
+from osv import fields,osv
+
+class caja_reporte(osv.osv_memory):
+    
+    _name = 'caja.reporte'
+
+    def is_today(self, date_compare, reference):
+        """
+        This function checks if a giving date falls in the actual date (now)
+        """
+        
+        if not date_compare:
+            return False
+
+        return date_compare == reference[0:10]
+    
+    def onchange_date_user_id(self, cr, uid, ids, date, user_id, context=None):
+        #this function make the calculate of every field needed
+        # and return the changes to the view
+        
+        if not context:
+            context={}
+            
+        #asign the value into variable
+        context['date_new'] = date
+        context['user_id_new'] = user_id
+        
+        value = {}
+        
+        value['ovsf_ids'] = self._Ordenes_venta_sin_facturar(cr, uid, context = context)
+        value['fsc_ids'] = self._facturas_sin_cancelar(cr, uid, context = context)
+        value['cobros_efectivo_cheque'] = self._cobros_efectivo_cheque(cr, uid, context = context)
+        value['facturas_emitidas'] = self._facturas_emitidas(cr, uid, context = context)
+        value['ordenes_venta_emitidas'] = self._ordenes_venta_emitidas(cr, uid, context = context)
+        value['cobros_efec_cheq_consolidado'] = self._cobros_efectivo_cheque_consolidado(cr, uid, context = context)
+        
+        return {'value': value}
+
+    def _Ordenes_venta_sin_facturar(self, cr, uid, context = None):
+        # the Idea is search in sale.order all rows from this user (id) and
+        # load the field. 
+        
+        user_id_to_use = uid
+        referencia = time.strftime('%Y-%m-%d %H:%M:%S')
+            
+        if 'user_id_new' in context:
+            user_id_to_use = context['user_id_new']
+
+        if 'date_new' in context:
+            referencia = context['date_new']
+            
+        #resource to return
+        res = []
+        
+        #This dict is for easy work whit repeats names
+        res_dic = {}
+        
+        sale_orden_obj = self.pool.get('sale.order')
+        
+        #order by name (represent the number of order of sale)
+        list_ids = sale_orden_obj.search(cr, uid, [('state','!=','progress'),
+                                                   '&',('state','!=','cancel'),
+                                                   ('user_id','=',user_id_to_use),],
+                                         order='name')
+         
+        for orden_sin_factura in sale_orden_obj.browse(cr, uid, list_ids):
+        
+            #Verify the date
+            if self.is_today(orden_sin_factura.date_order, referencia):
+                
+                temp = {
+                    'name': orden_sin_factura.partner_id.name,
+                    'sale_number': orden_sin_factura.name,
+                    'reference': orden_sin_factura.client_order_ref,
+                    'total': orden_sin_factura.amount_total,
+                }
+        
+                res.append(temp)    
+ 
+        return res
+    
+    def _facturas_sin_cancelar(self, cr, uid, context = None):
+        # the Idea is search in account.invoice all rows from this user (id) and
+        # load the field. 
+        
+        user_id_to_use = uid
+        referencia = time.strftime('%Y-%m-%d %H:%M:%S')
+            
+        if 'user_id_new' in context:
+            user_id_to_use = context['user_id_new']
+
+        if 'date_new' in context:
+            referencia = context['date_new']
+
+        #resource to return
+        res = []
+        
+        #This dict is for easy work whit repeats names
+        res_dic = {}
+        
+        account_invoice_obj = self.pool.get('account.invoice')
+        
+        # order by invoice_number
+        list_ids = account_invoice_obj.search(cr, uid, [('reconciled','=',False),
+                                                        ('state','!=','cancel'),
+                                                        ('type','=','out_invoice'),
+                                                        ('user_id','=',user_id_to_use),],
+                                              order='invoice_number')
+         
+        for factura_sin_cancelar in account_invoice_obj.browse(cr, uid, list_ids):
+        
+            #Verify the date
+            if self.is_today(factura_sin_cancelar.date_invoice, referencia):
+                
+                temp = {
+                    'name': factura_sin_cancelar.partner_id.name,
+                    'invoice_number': factura_sin_cancelar.invoice_number,
+                    'reference': factura_sin_cancelar.name, 
+                    'total': factura_sin_cancelar.amount_total,
+                }
+
+                res.append(temp)    
+
+        return res
+
+        
+    def _cobros_efectivo_cheque(self, cr, uid, context = None):
+        # the Idea is search in account.vouchert all rows from this user (id) and
+        # load the fields grouping by journal and "Efectivo" and/or "Cheques". 
+
+        user_id_to_use = uid
+        referencia = time.strftime('%Y-%m-%d %H:%M:%S')
+            
+        if 'user_id_new' in context:
+            user_id_to_use = context['user_id_new']
+
+        if 'date_new' in context:
+            referencia = context['date_new']
+        
+        #resource to return
+        res = []
+        
+        voucher_obj = self.pool.get('account.voucher')
+        voucher_line_obj = self.pool.get('account.voucher.line')
+
+        # first search the account_voucher in state posted, type receip and created by user_id
+        voucher_list = voucher_obj.search(cr, uid, [('state','=','posted'),
+                                                    ('type','=','receipt'),
+                                                    ('create_uid','=',user_id_to_use),],)
+                                          #order='journal_id')
+        
+        voucher_list = tuple(voucher_list)
+
+        # each one contain voucher_lines, search the lines (Could filter using cr or dr type)
+        voucher_line_list = voucher_line_obj.search(cr, uid, [('voucher_id','in',voucher_list),],
+                                                        order='name')
+                                                        
+        for lineas in voucher_line_obj.browse(cr, uid, voucher_line_list):
+        
+            #Verify the date
+            if self.is_today(lineas.voucher_id.date, referencia):
+                
+                temp = {
+                    'partner': lineas.partner_id.name,
+                    'name': lineas.voucher_id.journal_id.name,
+                    'factura': lineas.name,
+                    'importe': lineas.amount,
+                    'saldo': lineas.amount_original - lineas.amount,
+                 }
+                
+                res.append(temp)    
+
+        #Order by journal_id
+        def __cmpTexto(x, y):
+            if x['name'] < y['name']:
+                return -1
+            elif x['name'] == y['name']:
+                return 0
+            else:
+                return 1
+              
+        cmp = lambda x,y: __cmpTexto(x, y)
+        
+        res.sort(cmp)
+ 
+        return res
+
+
+    def _facturas_emitidas(self, cr, uid, context = None):
+        # the Idea is search in account.invoice all rows from this user (id) and
+        # load the field, in this case present a list of emiting invoice showing
+        # the actual state 
+
+        user_id_to_use = uid
+        referencia = time.strftime('%Y-%m-%d %H:%M:%S')
+            
+        if 'user_id_new' in context:
+            user_id_to_use = context['user_id_new']
+
+        if 'date_new' in context:
+            referencia = context['date_new']
+        
+        #resource to return
+        res = []
+        
+        #This dict is for easy work whit repeats names
+        res_dic = {}
+        
+        object_obj = self.pool.get('account.invoice')
+        
+        list_ids = object_obj.search(cr, uid, [('state','!=','draft'),
+                                               ('type','=','out_invoice'),
+                                               ('user_id','=',user_id_to_use),],
+                                     order='invoice_number,name,state')
+         
+        #Need a internal id for every client id (name can be the same twice)
+        i = 0 
+        
+        for element in object_obj.browse(cr, uid, list_ids):
+        
+            #Verify the date
+            if self.is_today(element.date_invoice, referencia):
+                
+                res_dic[i] = {
+                    'name': element.partner_id.name,
+                    'number': element.invoice_number,
+                    'reference': element.name, 
+                    'total': element.amount_total,
+                    'estado': element.state,
+                }
+                
+                i = i + 1
+                
+        for elem in res_dic:
+            res.append(res_dic[elem])    
+ 
+        return res
+
+
+
+    def _ordenes_venta_emitidas(self, cr, uid, context = None):
+        # the Idea is search in sale.order all rows from this user (id) and
+        # load the field, in this case present a list of emiting sale oreder showing
+        # the actual state 
+
+        user_id_to_use = uid
+        referencia = time.strftime('%Y-%m-%d %H:%M:%S')
+            
+        if 'user_id_new' in context:
+            user_id_to_use = context['user_id_new']
+
+        if 'date_new' in context:
+            referencia = context['date_new']
+        
+        #resource to return
+        res = []
+        
+        #This dict is for easy work whit repeats names
+        res_dic = {}
+        
+        object_obj = self.pool.get('sale.order')
+        
+        list_ids = object_obj.search(cr, uid, [('state','!=','draft'),
+                                               ('user_id','=',user_id_to_use),],
+                                     order='name,state')
+         
+        #Need a internal id for every client id (name can be the same twice)
+        i = 0 
+        
+        for element in object_obj.browse(cr, uid, list_ids):
+        
+            #Verify the date
+            if self.is_today(element.date_order, referencia):
+                
+                res_dic[i] = {
+                    'name': element.partner_id.name,
+                    'reference': element.client_order_ref,
+                    'number': element.name,
+                    'total': element.amount_total,
+                    'tarifa': element.pricelist_id.name,
+                    'estado': element.state,
+                }
+                
+                i = i + 1
+                
+        for elem in res_dic:
+            res.append(res_dic[elem])    
+ 
+        return res
+
+
+    def _cobros_efectivo_cheque_consolidado(self, cr, uid, context = None):
+        # the Idea is search in account.vouchert all rows from this user (id) and
+        # load the fields grouping by journal and "Efectivo" and/or "Cheques".
+        
+        user_id_to_use = uid
+        referencia = time.strftime('%Y-%m-%d %H:%M:%S')
+            
+        if 'user_id_new' in context:
+            user_id_to_use = context['user_id_new']
+
+        if 'date_new' in context:
+            referencia = context['date_new']
+
+        #resource to return
+        res = []
+        
+        #This dict is for easy work whit repeats names
+        res_dic = {}
+        
+        object_obj = self.pool.get('account.voucher')
+        
+        list_ids = object_obj.search(cr, uid, [('state','=','posted'),
+                                               ('create_uid','=',user_id_to_use),],
+                                     order='create_uid')
+                                                        
+        for lineas in object_obj.browse(cr, uid, list_ids):
+        
+            #Verify the date
+            if self.is_today(lineas.date, referencia):
+                
+                #Group by consumer and sum
+                if lineas.journal_id.name in res_dic:
+
+                    temp = res_dic[lineas.journal_id.name]
+                    
+                    res_dic[lineas.journal_id.name] = {
+                        'name': lineas.journal_id.name,
+                        'number': temp['number'] + 1,
+                        'total': temp['total'] + lineas.amount,
+                     }
+                    
+                #first element
+                else:
+                    res_dic[lineas.journal_id.name] = {
+                        'name': lineas.journal_id.name,
+                        'number': 1,
+                        'total': lineas.amount,
+                        #'tipo': 'cec',
+                    }
+        
+        for elem in res_dic:
+            res.append(res_dic[elem])
+ 
+        return res
+
+
+    _columns = {
+        'date': fields.datetime('fecha', required=True),
+        'user_id': fields.many2one('res.users', 'Usuario', required=True),
+        'shop_id': fields.many2one('sale.shop', 'Tienda', required=True),
+        'ovsf_ids': fields.one2many('caja.ordenes.sin.factura', 'caja_id', 'Ordenes de Venta sin facturar', readonly=True),# required=False, domain=[('tipo','=','ov')]),
+        'fsc_ids': fields.one2many('caja.factura.sin.pago', 'caja_id', 'Facturas sin cobrar', readonly=True),# required=False, domain=[('tipo','=','fc')]),
+        'cobros_efectivo_cheque': fields.one2many('caja.diarios.pagos', 'caja_id', 'Cobros en Efectivo y Cheque', readonly=True),# required=False, domain=[('tipo','=','cec')]),
+        #
+        'facturas_emitidas': fields.one2many('caja.facturas.emitidas', 'caja_id', 'Facturas Emitidas', readonly=True),# required=False, domain=[('tipo','=','cec')]),
+        'ordenes_venta_emitidas': fields.one2many('caja.ordenes.venta.emitidas', 'caja_id', 'Notas de Venta Emitidas', readonly=True),# required=False, domain=[('tipo','=','cec')]),
+        'cobros_efec_cheq_consolidado': fields.one2many('caja.diarios.pagos.consolidado', 'caja_id', 'Cobros en Efectivo y Cheque Consolidado', readonly=True),# required=False, domain=[('tipo','=','cec')]),
+        
+#        'tarjetas_ids': fields.one2many('caja.ordenes.facturas', 'caja_id', 'Cobros Tarjetas', required=False, domain=[('tipo','=','ct')]),
+#        'bancos_ids': fields.one2many('caja.ordenes.facturas', 'caja_id', 'Cobros Bancos', required=False, domain=[('tipo','=','cb')]),
+#        'retenciones_ids': fields.one2many('caja.ordenes.facturas', 'caja_id', 'Cobros Retenciones', required=False, domain=[('tipo','=','cr')]),
+                }
+    
+    _defaults = { 
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'user_id': lambda s, cr, uid, c: uid,
+        'ovsf_ids': _Ordenes_venta_sin_facturar,
+        'fsc_ids': _facturas_sin_cancelar,
+        'cobros_efectivo_cheque': _cobros_efectivo_cheque,
+        'facturas_emitidas': _facturas_emitidas,
+        'ordenes_venta_emitidas': _ordenes_venta_emitidas,
+        'cobros_efec_cheq_consolidado': _cobros_efectivo_cheque_consolidado,
+#        'tarjetas_ids': _tarjetas_ids,  
+#        'bancos_ids': _bancos_ids,
+#        'retenciones_ids': _retenciones_ids,
+                 }
+
+#    def imprimir(self, cr, uid, ids, context=None):
+#        
+#        if context is None:
+#            context = {}
+#        
+#        data = {}
+#        data['model'] = 'account.invoice'
+#        data['ids'] = context.get('active_ids', False)
+#        
+#        return {
+#               'type': 'ir.actions.report.xml',
+#               'report_name': 'caja_reporte',    # the 'Service Name' from the report
+#               'datas' : data,
+#               'context': context,
+#           }
+
+    def imprimir(self, cr, uid, ids, context=None):
+        
+        # create the data for the report, only when the system print the report
+        # use the ids to instance this object and complete the info for the search
+        
+        
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'caja_reporte',    # the 'Service Name' from the report
+            'datas' : {
+                    'model' : 'caja.reporte',    # Report Model
+                    'res_ids' : ids
+                    }
+               }
+
+caja_reporte()
+
+class caja_ordenes_sin_factura(osv.osv_memory):
+
+    _name = 'caja.ordenes.sin.factura'
+   
+    _columns = {
+        'name': fields.char('Cliente', size=256, required=False, readonly=False),
+        'sale_number': fields.char('Orden de Venta', size=256, required=False, readonly=False),
+        'reference': fields.char('Referencia', size=256, required=False, readonly=False),
+        'total': fields.float('Total', digits=(2,5)),
+        'caja_id':fields.many2one('caja.reporte', 'Reporte Caja', required=False),
+
+                }
+
+caja_ordenes_sin_factura()
+
+class caja_facturas_sin_pago(osv.osv_memory):
+
+    _name = 'caja.factura.sin.pago'
+   
+    _columns = {
+        'name': fields.char('Cliente', size=256, required=False, readonly=False),
+        'invoice_number': fields.char('Facturas', size=256, required=False, readonly=False),
+        'reference': fields.char('Descripcion', size=256, required=False, readonly=False),
+        'total': fields.float('Total', digits=(2,5)),
+        'caja_id':fields.many2one('caja.reporte', 'Reporte Caja', required=False),
+                }
+
+caja_facturas_sin_pago()
+
+class caja_diarios_pagos(osv.osv_memory):
+
+    _name = 'caja.diarios.pagos'
+   
+    _columns = {
+        'partner': fields.char('Cliente', size=256, required=False, readonly=False),
+        'name': fields.char('Diario', size=256, required=False, readonly=False),
+        'factura': fields.char('Numero de Factura', size=256, required=False, readonly=False),
+        'importe': fields.float('Importe', digits=(2,5)),
+        'saldo': fields.float('Saldo', digits=(2,5)),
+        'caja_id':fields.many2one('caja.reporte', 'Reporte Caja', required=False),
+                }
+
+caja_diarios_pagos()
+
+class caja_facturas_emitidas(osv.osv_memory):
+
+    _name = 'caja.facturas.emitidas'
+   
+    _columns = {
+        'name': fields.char('Cliente', size=256, required=False, readonly=False),
+        'number': fields.char('Numero de Factura', size=32, required=False, readonly=False),
+        'reference': fields.char('Descripcion', size=256, required=False, readonly=False),
+        'total': fields.float('Total', digits=(2,5)),
+        'estado': fields.char('Estado', size=32, required=False, readonly=False),
+        'caja_id':fields.many2one('caja.reporte', 'Reporte Caja', required=False),
+                }
+
+caja_facturas_emitidas()
+
+class caja_ordenes_venta_emitidas(osv.osv_memory):
+
+    _name = 'caja.ordenes.venta.emitidas'
+   
+    _columns = {
+        'name': fields.char('Cliente', size=256, required=False, readonly=False),
+        'number': fields.char('Numero de Orden de Venta', size=32, required=False, readonly=False),
+        'reference': fields.char('Referencia', size=256, required=False, readonly=False),
+        'total': fields.float('Total', digits=(2,5)),
+        'estado': fields.char('Estado', size=32, required=False, readonly=False),
+        'tarifa': fields.char('Tarifa', size=256, required=False, readonly=False),
+        'caja_id':fields.many2one('caja.reporte', 'Reporte Caja', required=False),
+                }
+
+caja_ordenes_venta_emitidas()
+
+class caja_diarios_pagos_consolidado(osv.osv_memory):
+
+    _name = 'caja.diarios.pagos.consolidado'
+   
+    _columns = {
+        'name': fields.char('Cliente', size=256, required=False, readonly=False),
+        'number': fields.integer('Numero'),
+        'total': fields.float('Total', digits=(2,5)),
+        'caja_id':fields.many2one('caja.reporte', 'Reporte Caja', required=False),
+                }
+
+caja_diarios_pagos_consolidado()
+

=== added directory 'ecua_cash_register_report/report'
=== added file 'ecua_cash_register_report/report/caja_report.odt'
Binary files ecua_cash_register_report/report/caja_report.odt	1970-01-01 00:00:00 +0000 and ecua_cash_register_report/report/caja_report.odt	2013-05-03 13:54:27 +0000 differ
=== added file 'ecua_cash_register_report/report/report_data.xml'
--- ecua_cash_register_report/report/report_data.xml	1970-01-01 00:00:00 +0000
+++ ecua_cash_register_report/report/report_data.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!  REPORTE - CAJA  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+
+		<record id="caja_report" model="ir.actions.report.xml">
+			<field name="name">Reporte de Caja</field>
+			<field name="type">ir.actions.report.xml</field>
+			<field name="model">caja.reporte</field>
+			<field name="report_name">caja_reporte</field>
+			<field name="report_type">aeroo</field>
+			<field name="in_format">oo-odt</field>
+			<field name='out_format' eval="ref('report_aeroo_ooo.report_mimetypes_pdf_odt')" />
+			<field name="report_rml">ecua_cash_register_report/report/caja_report.odt</field>
+			<field name="parser_state">default</field>
+			<field name="tml_source">file</field>
+		</record>
+
+	</data>
+</openerp>
\ No newline at end of file

=== added directory 'ecua_cash_register_report/view'
=== added file 'ecua_cash_register_report/view/ecua_cash_register_report_view.xml'
--- ecua_cash_register_report/view/ecua_cash_register_report_view.xml	1970-01-01 00:00:00 +0000
+++ ecua_cash_register_report/view/ecua_cash_register_report_view.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+
+	    <record model="ir.ui.view" id="caja_reporte_form_view">
+	         <field name="name">caja.reporte.form</field>
+	         <field name="model">caja.reporte</field>
+	         <field name="type">form</field>
+	         <field name="arch" type="xml">
+	             <form string="Reporte de Caja">
+	             	<group col="6" colspan="4">
+		                <field name="date" readonly="0" 
+		                on_change="onchange_date_user_id(date, user_id)"
+		                groups="account.group_account_user"/>
+		                <field name="user_id" readonly="0" 
+		                on_change="onchange_date_user_id(date, user_id)"
+		                groups="account.group_account_user"/>
+				 	</group>
+				 	<newline/>
+	             	<group col="6" colspan="4">
+						<button name="imprimir" string="Imprimir Reporte de Caja" type="object"/>
+			 		</group>
+				 	<newline/>
+                 	<notebook colspan="4">
+                    	<page string="Ordenes de Venta sin factura">
+ 	                 		<field name="ovsf_ids" nolabel="1"/>
+ 	                  	</page>
+                    	<page string="Facturas sin Cancelar">
+		 		        	<field name="fsc_ids" nolabel="1"/>
+ 	                  	</page>
+                    	<page string="Cobros Efectuados">
+		                	<field name="cobros_efectivo_cheque" nolabel="1"/>
+ 	                  	</page>
+                    	<page string="Resumen Cobros Efectuados">
+		                	<field name="cobros_efec_cheq_consolidado" nolabel="1"/>
+ 	                  	</page>
+                    	<page string="Facturas Emitidas">
+ 	                 		<field name="facturas_emitidas" nolabel="1"/>
+ 	                 	</page>
+                    	<page string="Ordenes de Venta Emitidas">
+	 	                	<field name="ordenes_venta_emitidas" nolabel="1"/>                         
+ 	                  	</page>
+					</notebook>
+			 	</form>
+	         </field>
+	     </record>
+
+			<record model="ir.ui.view" id="caja_ordenes_sin_factura_tree_view">
+			     <field name="name">caja.ordenes.sin.factura.tree</field>
+			     <field name="model">caja.ordenes.sin.factura</field>
+			     <field name="type">tree</field>
+			     <field name="arch" type="xml">
+			         <tree string="Detalle">
+			             <field name="name" select="1"/>
+			             <field name="sale_number" select="1"/>
+			             <field name="reference" select="1"/>
+			             <field name="total" select="1"/>
+			         </tree>
+			     </field>
+			 </record>
+
+			<record model="ir.ui.view" id="caja_factura_sin_pago_tree_view">
+			     <field name="name">caja.factura.sin.pago.tree</field>
+			     <field name="model">caja.factura.sin.pago</field>
+			     <field name="type">tree</field>
+			     <field name="arch" type="xml">
+			         <tree string="Detalle">
+			             <field name="name" select="1"/>
+			             <field name="invoice_number" select="1"/>
+			             <field name="reference" select="1"/>
+			             <field name="total" select="1"/>
+			         </tree>
+			     </field>
+			 </record>
+
+			<record model="ir.ui.view" id="caja_diarios_pagos_tree_view">
+			     <field name="name">caja.diarios.pagos.tree</field>
+			     <field name="model">caja.diarios.pagos</field>
+			     <field name="type">tree</field>
+			     <field name="arch" type="xml">
+			         <tree string="Detalle">
+			             <field name="partner" select="1"/>
+			             <field name="name" select="1"/>
+			             <field name="factura" select="1"/>
+			             <field name="importe" select="1"/>
+			             <field name="saldo" select="1"/>
+			         </tree>
+			     </field>
+			 </record>
+
+			<record model="ir.ui.view" id="caja_diarios_pagos_consolidado_tree_view">
+				<field name="name">caja.diarios.pagos.consolidado.tree</field>
+				<field name="model">caja.diarios.pagos.consolidado</field>
+				<field name="type">tree</field>
+				<field name="arch" type="xml">
+					<tree string="Detalle">
+						<field name="name" select="1"/>
+						<field name="number" select="1"/>
+						<field name="total" select="1"/>
+					</tree>
+				</field>
+			</record>
+
+
+
+			<record model="ir.ui.view" id="caja_facturas_emitidas_view">
+			     <field name="name">caja.facturas.emitidas.tree</field>
+			     <field name="model">caja.facturas.emitidas</field>
+			     <field name="type">tree</field>
+			     <field name="arch" type="xml">
+			         <tree string="Detalle">
+			             <field name="name" select="1"/>
+			             <field name="number" select="1"/>
+			             <field name="reference" select="1"/>
+			             <field name="total" select="1"/>
+			             <field name="estado" select="1"/>
+			         </tree>
+			     </field>
+			 </record>
+
+			<record model="ir.ui.view" id="caja_ordenes_venta_emitidas_view">
+			     <field name="name">caja.ordenes.venta.emitidas.tree</field>
+			     <field name="model">caja.ordenes.venta.emitidas</field>
+			     <field name="type">tree</field>
+			     <field name="arch" type="xml">
+			         <tree string="Detalle">
+			             <field name="name" select="1"/>
+			             <field name="number" select="1"/>
+			             <field name="reference" select="1"/>
+			             <field name="total" select="1"/>
+			             <field name="estado" select="1"/>
+			             <field name="tarifa" select="1"/>
+			         </tree>
+			     </field>
+			 </record>
+
+         <record model="ir.actions.act_window" id="action_caja_reporte_tree_view">
+             <field name="name">caja.reporte</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="res_model">caja.reporte</field>
+		  <!-- <field name="domain">[('field_name','condition',criteria)]</field>-->
+             <field name="view_type">form</field>
+             <field name="view_mode">tree,form</field>
+             <field name="view_id" ref="caja_reporte_form_view"/>
+             <field name="target">new</field>
+         </record>
+
+
+<!-- MENU -->
+
+        <menuitem id="caja_reporte" name="Reporte de Caja" action="action_caja_reporte_tree_view" parent="base.next_id_64"/>
+
+	</data>
+</openerp>

=== modified file 'ecua_facturas_ice_manual/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/__openerp__.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/data/ice_codes.xml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/data/ice_tax.xml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/docs/formulario 105.xls' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/docs/instruc 105.doc' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/i18n/es.po' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/objects/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/objects/invoice.py' (properties changed: -x to +x)
--- ecua_facturas_ice_manual/objects/invoice.py	2013-04-21 14:26:15 +0000
+++ ecua_facturas_ice_manual/objects/invoice.py	2013-05-03 13:54:27 +0000
@@ -217,7 +217,7 @@
                     taxes.append(tax)
             #computo de ice
             if ice:
-                for tax in tax_obj.compute_all(cr, uid, taxes, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id, {'skip_round':True})['taxes']:
+                for tax in tax_obj.compute_all(cr, uid, taxes, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']:#, {'skip_round':True})['taxes']:
                     tax_browse = tax_obj.browse(cr, uid, tax['id'], context)
                     val={}
                     val['invoice_id'] = inv.id
@@ -261,7 +261,7 @@
                 ice_value = 1
                 if line.product_id.ice_type_id:
                     ice_value = 1+line.product_id.ice_type_id.rate
-                for tax in tax_obj.compute_all(cr, uid, tax_iva, (line.price_unit * (ice_value) * (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id,{'skip_round':True})['taxes']:
+                for tax in tax_obj.compute_all(cr, uid, tax_iva, (line.price_unit * (ice_value) * (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']:#,{'skip_round':True})['taxes']:
                     tax_browse = tax_obj.browse(cr, uid, tax['id'], context)
                     val={}
                     val['invoice_id'] = inv.id
@@ -302,7 +302,7 @@
                         tax_grouped[key]['tax_amount'] += val['tax_amount']
 
             else:
-                for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id,{'skip_round':True})['taxes']:
+                for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id,)['taxes']:#context={'skip_round':True})['taxes']:
                     tax_browse = tax_obj.browse(cr, uid, tax['id'], context)
                     val={}
                     val['invoice_id'] = inv.id

=== modified file 'ecua_facturas_ice_manual/objects/product.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/objects/purchase_order.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/objects/sale_order.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/report/factura_ice_report.odt' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/report/factura_ice_report.xml' (properties changed: -x to +x)
--- ecua_facturas_ice_manual/report/factura_ice_report.xml	2013-02-16 14:02:25 +0000
+++ ecua_facturas_ice_manual/report/factura_ice_report.xml	2013-05-03 13:54:27 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-	<data>
+	<!-- no actualizar ya que en multicompania o multidb debe poder personalizarse -->
+	<data noupdate="1">
 		<record id="invoice_ice_report" model="ir.actions.report.xml">
 			<field name="name">Facturas ICE</field>
 			<field name="type">ir.actions.report.xml</field>

=== modified file 'ecua_facturas_ice_manual/security/ir.model.access.csv' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/views/account_invoice_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/views/product_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/views/purchase_order_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/views/sale_order_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/wizard/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/wizard/invoice_print_wizard.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/wizard/wizard_invoice_ice.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/wizard/wizard_invoice_ice.xml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/wizard/wizard_sale_order_ice.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_ice_manual/wizard/wizard_sale_order_ice.xml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/Revision' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/__openerp__.py' (properties changed: -x to +x)
--- ecua_facturas_manual/__openerp__.py	2013-02-16 14:02:25 +0000
+++ ecua_facturas_manual/__openerp__.py	2013-05-03 13:54:27 +0000
@@ -24,6 +24,7 @@
     "depends" : [
                  'base',
                  'account',
+                 'account_voucher',
                  'sale',
                  'stock',
                  'purchase',
@@ -52,6 +53,7 @@
                    'views/purchase_order_view.xml',
                    'views/sale_order_view.xml',
                    'views/account_invoice_line_view.xml',
+                   'views/account_voucher.xml'
     ],
     "installable": True,
     "active": False,

=== modified file 'ecua_facturas_manual/i18n/es.po' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/objects/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/objects/company.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/objects/invoice.py' (properties changed: -x to +x)
--- ecua_facturas_manual/objects/invoice.py	2013-04-21 14:05:46 +0000
+++ ecua_facturas_manual/objects/invoice.py	2013-05-03 13:54:27 +0000
@@ -376,7 +376,6 @@
                         for node in nodes:
                             node.set('invisible', "0")
                         res['arch'] = etree.tostring(doc)
-        res['arch']
         return res
     
     def _get_automatic(self, cr, uid, context=None):

=== modified file 'ecua_facturas_manual/objects/invoice_line.py' (properties changed: -x to +x)
--- ecua_facturas_manual/objects/invoice_line.py	2013-04-21 14:26:15 +0000
+++ ecua_facturas_manual/objects/invoice_line.py	2013-05-03 13:54:27 +0000
@@ -45,6 +45,8 @@
     _columns = {
                 'price_unit_final': fields.function(_price_unit_final, method=True, type='float', digits_compute= dp.get_precision('Invoice Line Price'), string='Price Unit Final', store=True), 
                     }
+   
     def onchange_account_id(self, cr, uid, ids, fposition_id, account_id):
         return {}
+
 account_invoice_line()
\ No newline at end of file

=== modified file 'ecua_facturas_manual/objects/picking.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/objects/purchase_order.py' (properties changed: -x to +x)
--- ecua_facturas_manual/objects/purchase_order.py	2013-04-21 14:26:15 +0000
+++ ecua_facturas_manual/objects/purchase_order.py	2013-05-03 13:54:27 +0000
@@ -49,7 +49,7 @@
             cur = order.pricelist_id.currency_id
             for line in order.order_line:
                 val1 += line.price_subtotal
-                for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id.id, order.partner_id, context={'skip_round':True})['taxes']:
+                for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id.id, order.partner_id)['taxes']:#, context={'skip_round':True})['taxes']:
                     tax = c.get('amount', 0.0)
                     val += c.get('amount', 0.0)
                     if tax == 0.0 and c.get('type_ec', False) == 'iva':

=== modified file 'ecua_facturas_manual/objects/sale_order.py' (properties changed: -x to +x)
--- ecua_facturas_manual/objects/sale_order.py	2013-04-21 14:26:15 +0000
+++ ecua_facturas_manual/objects/sale_order.py	2013-05-03 13:54:27 +0000
@@ -36,7 +36,7 @@
 
     def _amount_line_tax(self, cr, uid, line, context=None):
         val = 0.0
-        for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id,{'skip_round':True})['taxes']:
+        for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)['taxes']:#,{'skip_round':True})['taxes']:
             val += c.get('amount', 0.0)
         return val
     
@@ -185,7 +185,15 @@
         if automatic:
             automatic_number = doc_obj.get_next_value_secuence(cr, uid, 'invoice', False, order.company_id.id, order.shop_id.id, order.printer_id.id, 'account.invoice', 'invoice_number_out', context)
             invoice_number_out = automatic_number
+            date_invoice = time.strftime('%Y-%m-%d') 
+        else:
+            #Is useful in the case of there are not automatic, that happens when you choice generate_automatic 
+            curr_shop = self.pool.get('sale.shop').browse(cr, uid, [order.shop_id.id], context)[0]
+            printer_obj = self.pool.get('sri.printer.point')
+            automatic_number =curr_shop.number + "-" + printer_obj.browse(cr, uid,order.printer_id.id, context).number + "-000000000"
+            invoice_number_out = automatic_number
             date_invoice = time.strftime('%Y-%m-%d')
+        
         inv = {
             'name': order.client_order_ref or '',
             'origin': order.name,

=== modified file 'ecua_facturas_manual/report/factura.jrxml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/report/factura_report.odt' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/report/factura_report.xml' (properties changed: -x to +x)
--- ecua_facturas_manual/report/factura_report.xml	2013-02-16 14:02:25 +0000
+++ ecua_facturas_manual/report/factura_report.xml	2013-05-03 13:54:27 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-	<data>
+	<!-- no actualizar ya que en multicompania o multidb debe poder personalizarse -->
+	<data noupdate="1">
 		<record id="invoice_report" model="ir.actions.report.xml">
 			<field name="name">Facturas</field>
 			<field name="type">ir.actions.report.xml</field>

=== modified file 'ecua_facturas_manual/security/ir.model.access.csv' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/views/account_invoice_line_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/views/account_invoice_view.xml' (properties changed: -x to +x)
--- ecua_facturas_manual/views/account_invoice_view.xml	2013-04-21 14:05:46 +0000
+++ ecua_facturas_manual/views/account_invoice_view.xml	2013-05-03 13:54:27 +0000
@@ -22,7 +22,7 @@
 							context="{'search_default_customer': 1}" />
 						<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" />
 						<field name="fiscal_position" groups="base.group_extended"
-							widget="selection" />
+							widget="selection" required="1"/>
 						<newline />
 						<field name="date_invoice" />
 						<field name="period_id" domain="[('state', '=', 'draft')]"
@@ -133,6 +133,7 @@
 							widget="selection" />
 						<field name="number" readonly="1" />
 						<field name="type" invisible="1" />
+						<newline />
 						<field name="currency_id" width="50" />
 						<button name="%(account.action_account_change_currency)d"
 							type="action" icon="terp-stock_effects-object-colorize" string="Change"
@@ -143,7 +144,7 @@
 							context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
 						<field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" />
 						<field name="fiscal_position" groups="base.group_extended"
-							widget="selection" />
+							widget="selection" required="1"/>
 						<newline />
 						<field name="date_invoice" />
 						<field name="period_id" domain="[('state', '=', 'draft')]"
@@ -262,6 +263,12 @@
 		</record>
 
 
+<!-- P.R Modificado Herencia: 
+El modulo account_cancel hereda primero el boton invoice_cancel y el sistema hace caso omiso
+a la modificacion hecha por esta herencia en el boton cancelar (invoice_form_cancel_inherit). 
+Se crea una vista que herede de account_cancel para los 2 botones existentes alli. Tambien se 
+comenta los botones para modificarlos en la nueva vista -->
+
 		<record model="ir.ui.view" id="account_invoice_sales_form_view">
 			<field name="name">account.invoice.form</field>
 			<field name="model">account.invoice</field>
@@ -293,25 +300,25 @@
 					<field name="invoice_number_out" required="1"
 						on_change="onchange_number(invoice_number_out, automatic, company_id, shop_id, printer_id)"></field>
 				</xpath>
-				<xpath
+<!-- 				<xpath
 					expr="/form/notebook/page/group/group//button[@name='invoice_cancel']"
 					position="replace">
 					<button name="invoice_cancel" states="proforma2,sale,open"
 						string="Cancel" icon="gtk-cancel" groups="account.group_account_manager" />
-				</xpath>
+				</xpath>  -->
 
 				<xpath
 					expr="/form/group//button[@name='%(account.action_account_change_currency)d']"
 					position="replace" />
 
-				<xpath
+<!-- 				<xpath
 					expr="/form/notebook/page/group/group//button[@name='%(account.action_account_state_open)d']"
 					position="replace">
 					<button name="%(account.action_account_state_open)d" type='action'
 						string='Re-Open' states='paid' icon="gtk-convert"
 						groups="account.group_account_manager" />
-				</xpath>
-
+				</xpath> -->
+ 
 				<xpath expr="/form/group//field[@name='journal_id']" position="replace">
 					<field name="journal_id" groups="base.group_user" invisible="1"
 						on_change="onchange_journal_id(journal_id)" widget="selection" />
@@ -345,6 +352,38 @@
 			</field>
 		</record>
 
+<!-- P.R Creado Herencia: 
+El modulo account_cancel hereda primero el boton invoice_cancel, por eso se construye una vista que
+herede y modifique esta herencia en el boton cancelar (invoice_form_cancel_inherit). 
+-->
+		<record model="ir.ui.view" id="invoice_form_cancel_groups_inherit">
+			<field name="name">invoice.form.cancel.groups.inherit</field>
+			<field name="model">account.invoice</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="account_cancel.invoice_form_cancel_inherit" />
+			<field name="arch" type="xml">
+ 				<xpath
+					expr="//button[@name='invoice_cancel']"
+					position="replace">
+					<button name="invoice_cancel" states="proforma2,sale,open"
+						string="Cancel" icon="gtk-cancel" groups="account.group_account_manager" />
+				</xpath> 
+ 				<xpath
+					expr="//button[@name='%(account.action_account_state_open)d']"
+					position="replace">
+					<button name="%(account.action_account_state_open)d" type='action'
+						string='Re-Open' states='paid' icon="gtk-convert"
+						groups="account.group_account_manager" />
+				</xpath>
+			</field>
+		</record>
+
+
+<!-- P.R. Domain que no permite seleccionar todos los proveedores, eliminado
+						on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
+						domain="['|',('type_ref','=','ruc'),('foreing','=',True)]"
+						context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
+-->
 		<record model="ir.ui.view" id="account_invoice_purchase_form_view">
 			<field name="name">account.invoice.form</field>
 			<field name="model">account.invoice</field>
@@ -364,7 +403,6 @@
 				<xpath expr="/form/group//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)"
-						domain="['|',('type_ref','=','ruc'),('foreing','=',True)]"
 						context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}" />
 				</xpath>
 				<xpath expr="/form/group/field[@name='number']" position="replace">

=== added file 'ecua_facturas_manual/views/account_voucher.xml'
--- ecua_facturas_manual/views/account_voucher.xml	1970-01-01 00:00:00 +0000
+++ ecua_facturas_manual/views/account_voucher.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+		
+		<record model="ir.ui.view" id="view_vendor_receipt_form_groups_inherit">
+			<field name="name">view.vendor.receipt.form.groups.inherit</field>
+			<field name="model">account.voucher</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="account_voucher.view_vendor_receipt_form" />
+			<field name="arch" type="xml">
+ 				<xpath expr="//button[@string='Unreconcile']" position="replace">
+					<button name="cancel_voucher" string="Unreconcile" type="object" 
+					states="posted" icon="terp-stock_effects-object-colorize" 
+					confirm="Are you sure to unreconcile this record ?"
+					groups="account.group_account_manager" />
+				</xpath> 
+ 				<xpath expr="//button[@string='Cancel']" position="replace">
+					<button name="cancel_voucher" string="Cancel" states="draft,proforma" 
+					icon="gtk-cancel" groups="account.group_account_manager" />
+				</xpath>
+			</field>
+		</record>
+
+		
+		<record model="ir.ui.view" id="view_vendor_payment_form_groups_inherit">
+			<field name="name">view.vendor.payment.form.groups.inherit</field>
+			<field name="model">account.voucher</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
+			<field name="arch" type="xml">
+ 				<xpath expr="//button[@string='Unreconcile']" position="replace">
+					<button name="cancel_voucher" string="Unreconcile" type="object" 
+					states="posted" icon="terp-stock_effects-object-colorize" 
+					confirm="Are you sure to unreconcile this record ?"
+					groups="account.group_account_manager" />
+				</xpath> 
+ 				<xpath expr="//button[@string='Cancel']" position="replace">
+					<button name="cancel_voucher" string="Cancel" states="draft,proforma" 
+					icon="gtk-cancel" groups="account.group_account_manager" />
+				</xpath>
+			</field>
+		</record>
+
+
+	</data>
+</openerp>
+		
\ No newline at end of file

=== modified file 'ecua_facturas_manual/views/authorization_supplier_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/views/purchase_order_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/views/sale_order_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/wizard/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/wizard/invoice_print_wizard.py' (properties changed: -x to +x)
=== modified file 'ecua_facturas_manual/wizard/invoice_print_wizard.xml' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/__openerp__.py' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/data/location_data.xml' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/i18n/es.po' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/object/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/object/invoice.py' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/object/location.py' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/object/product.py' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/object/sale.py' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/object/stock.py' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/report/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/secutiry/ir.model.access.csv' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/views/invoice_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/views/location_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/wizard/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/wizard/delivery_note_wizard.py' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/wizard/delivery_note_wizard.xml' (properties changed: -x to +x)
=== modified file 'ecua_inventarios/workflow/invoice_workflow.xml' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/Revision' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/__openerp__.py' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/data/data.xml' (properties changed: -x to +x)
--- ecua_liquidacion_compras/data/data.xml	2013-02-16 14:02:25 +0000
+++ ecua_liquidacion_compras/data/data.xml	2013-05-03 13:54:27 +0000
@@ -18,6 +18,7 @@
             <field name="code">DLIQ</field>
             <field name="type">purchase</field>
             <field name="liquidation">True</field>
+            <field name="update_posted">True</field>
             <field name="view_id" ref="account.account_journal_view"/>
             <field name="sequence_id" ref="liquidacion_sequence"/>
             <field name="user_id" ref="base.user_root"/>

=== modified file 'ecua_liquidacion_compras/i18n/es.mo' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/i18n/es.po' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/objects/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/objects/account_journal.py' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/objects/liquidacion_compra.py' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/objects/shop.py' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/report/liquidacion_reporte.odt' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/report/liquidacion_reporte.xml' (properties changed: -x to +x)
--- ecua_liquidacion_compras/report/liquidacion_reporte.xml	2013-02-16 14:02:25 +0000
+++ ecua_liquidacion_compras/report/liquidacion_reporte.xml	2013-05-03 13:54:27 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data>
+	<!-- no actualizar ya que en multicompania o multidb debe poder personalizarse -->
+	<data noupdate="1">
 		<record id="liquidacion_report" model="ir.actions.report.xml">
 			<field name="name">Liquidación de Compras</field>
 			<field name="type">ir.actions.report.xml</field>

=== modified file 'ecua_liquidacion_compras/security/ir.model.access.csv' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/views/account_journal_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/views/liquidacion_compra.xml' (properties changed: -x to +x)
=== modified file 'ecua_liquidacion_compras/views/shop_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/Analisis Notas de Facturas Rectificativas OERP.odt' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/Requisitos' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/Revision' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/__openerp__.py' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/data/data.xml' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/data/data_init.xml' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/data/formato nota de credito.pdf' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/i18n/es.po' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/objects/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/objects/invoice.py' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/objects/shop.py' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/report/credit_note_report.odt' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/report/credit_note_report.xml' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/security/ir.model.access.csv' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/views/invoice_refund_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/views/invoice_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/views/shop_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/wizard/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/wizard/wizard_credit_note.py' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/wizard/wizard_credit_note_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_notas_credito_manual/workflow/invoice_workflow.xml' (properties changed: -x to +x)
=== modified file 'ecua_pagos/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_pagos/__openerp__.py' (properties changed: -x to +x)
=== modified file 'ecua_pagos/data/init.xml' (properties changed: -x to +x)
=== modified file 'ecua_pagos/data/journal_data.xml' (properties changed: -x to +x)
=== modified file 'ecua_pagos/objects/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_pagos/objects/deposit_slip.py' (properties changed: -x to +x)
=== modified file 'ecua_pagos/objects/invoice.py' (properties changed: -x to +x)
=== modified file 'ecua_pagos/objects/journal.py' (properties changed: -x to +x)
=== modified file 'ecua_pagos/objects/move_line.py' (properties changed: -x to +x)
=== modified file 'ecua_pagos/objects/partner.py' (properties changed: -x to +x)
=== modified file 'ecua_pagos/objects/payment_line.py' (properties changed: -x to +x)
=== modified file 'ecua_pagos/objects/voucher.py' (properties changed: -x to +x)
=== modified file 'ecua_pagos/report/voucher_report.odt' (properties changed: -x to +x)
=== modified file 'ecua_pagos/report/voucher_report.xml' (properties changed: -x to +x)
=== modified file 'ecua_pagos/security/ir.model.access.csv' (properties changed: -x to +x)
=== modified file 'ecua_pagos/views/journal_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_pagos/views/payment_line_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_pagos/views/payment_mode_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_pagos/views/voucher_view.xml' (properties changed: -x to +x)
=== added directory 'ecua_partner'
=== added file 'ecua_partner/__init__.py'
--- ecua_partner/__init__.py	1970-01-01 00:00:00 +0000
+++ ecua_partner/__init__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+########################################################################
+#                                                                       
+#@authors:TRESCLOUD Cia.Ltda                                                                          
+# Copyright (C) 2013                     
+#                                                                       
+#This program is free software: you can redistribute it and/or modify   
+#it under the terms of the GNU General Public License as published by   
+#the Free Software Foundation, either version 3 of the License, or      
+#(at your option) any later version.                                    
+#
+# This module is GPLv3 or newer and incompatible
+# with OpenERP SA "AGPL + Private Use License"!
+#                                                                       
+#This program is distributed in the hope that it will be useful,        
+#but WITHOUT ANY WARRANTY; without even the implied warranty of         
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          
+#GNU General Public License for more details.                           
+#                                                                       
+#You should have received a copy of the GNU General Public License      
+#along with this program.  If not, see http://www.gnu.org/licenses.
+#ice
+########################################################################
+
+import ecua_partner
\ No newline at end of file

=== added file 'ecua_partner/__openerp__.py'
--- ecua_partner/__openerp__.py	1970-01-01 00:00:00 +0000
+++ ecua_partner/__openerp__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+########################################################################
+#                                                                       
+# @authors:TRESCLOUD Cia.Ltda                                                                           
+# Copyright (C) 2013                                  
+#                                                                       
+#This program is free software: you can redistribute it and/or modify   
+#it under the terms of the GNU General Public License as published by   
+#the Free Software Foundation, either version 3 of the License, or      
+#(at your option) any later version.                                    
+#
+# This module is GPLv3 or newer and incompatible
+# with OpenERP SA "AGPL + Private Use License"!
+#                                                                       
+#This program is distributed in the hope that it will be useful,        
+#but WITHOUT ANY WARRANTY; without even the implied warranty of         
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          
+#GNU General Public License for more details.                           
+#                                                                       
+#You should have received a copy of the GNU General Public License      
+#along with this program.  If not, see http://www.gnu.org/licenses.
+#ice
+########################################################################
+{
+   "name" : "Módulo de mejoras a partners para Ecuador",
+   "author" : "TRESCloud Cia. Ltda.",
+   "maintainer": 'TRESCloud Cia. Ltda.',
+   "website": 'http://www.trescloud.com',
+   'complexity': "easy",
+   "description": """Sistema de mejoras a la vista de creación de PARTNERS
+   
+   Este sistema permite agregar mejoras a la vista de creación de partners, poniendo por defecto valores de Ecuador en el campo de localización, el nombre del vendedor y la fecha de creación.
+     
+   Desarrollador:
+   
+   Carlos Yumbillo
+   
+   """,
+   "category": "Partners",
+   "version" : "1.0",
+   'depends': ['base','account'],
+   'init_xml': [],
+   'update_xml': [],
+   'installable': True,
+}
\ No newline at end of file

=== added file 'ecua_partner/ecua_partner.py'
--- ecua_partner/ecua_partner.py	1970-01-01 00:00:00 +0000
+++ ecua_partner/ecua_partner.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+from osv import osv, fields
+from datetime import datetime
+
+class partner(osv.osv):
+    _inherit='res.partner'
+    _name = 'res.partner'
+    
+    def _get_user_id(self, cr, uid, ids, context={}):
+        user_obj = self.pool.get('res.users')
+        user = user_obj.browse(cr,uid,uid) 
+        return user.id
+    
+    _defaults = {
+         'user_id': _get_user_id,
+         'date': datetime.now()
+         }
+    
+partner()
+
+class partner_address(osv.osv):
+    _inherit='res.partner.address'
+    _name = 'res.partner.address'
+    
+    def _get_user_location_id(self, cr, uid, ids, context={}):
+        user_obj = self.pool.get('res.users')
+        user = user_obj.browse(cr,uid,uid)
+        partner_address = user.company_id.partner_id.address
+
+        for loc in partner_address:
+            loc.location.id
+
+        return loc.location.id
+    
+    _defaults = {
+         'location': _get_user_location_id,
+         }
+    
+partner_address()
\ No newline at end of file

=== modified file 'ecua_posicion_fiscal/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/__openerp__.py' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/documentation/PORCENTAJE DE RETENCIÓN DE IMPUESTO A LA RENTA 2011.xls' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/documentation/Retenciones_IVA.ods' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/object/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/object/fiscal_position.py' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/object/invoice.py' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/object/purchase.py' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/object/sale.py' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/security/ir.model.access.csv' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/view/fiscal_position_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/view/invoice_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/view/purchase_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/view/sale_order_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_posicion_fiscal/wizard/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/__openerp__.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/data/data.xml' (properties changed: -x to +x)
=== modified file 'ecua_remision/i18n/es.po' (properties changed: -x to +x)
=== modified file 'ecua_remision/objects/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/objects/carrier.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/objects/company.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/objects/delivery_note.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/objects/partner.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/objects/sale_order.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/objects/stock_move.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/objects/stock_picking.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/report/delivery_note_report.xml' (properties changed: -x to +x)
=== modified file 'ecua_remision/security/ir.model.access.csv' (properties changed: -x to +x)
=== modified file 'ecua_remision/views/carrier_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_remision/views/company_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_remision/views/delivery_note_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_remision/views/partner_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_remision/views/picking_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_remision/views/sale_order_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_remision/wizard/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/wizard/cancel_delivery_notes_wizard.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/wizard/cancel_delivery_notes_wizard.xml' (properties changed: -x to +x)
=== modified file 'ecua_remision/wizard/create_invoice_remision.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/wizard/create_invoice_remision_wizard.xml' (properties changed: -x to +x)
=== modified file 'ecua_remision/wizard/stock_partial_picking.py' (properties changed: -x to +x)
=== modified file 'ecua_remision/wizard/stock_partial_picking_wizard.xml' (properties changed: -x to +x)
=== modified file 'ecua_remision/workflow/delivery_note_workflow.xml' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/Revision' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/__openerp__.py' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/data/data.xml' (properties changed: -x to +x)
--- ecua_retenciones_manual/data/data.xml	2013-02-16 14:02:25 +0000
+++ ecua_retenciones_manual/data/data.xml	2013-05-03 13:54:27 +0000
@@ -29,6 +29,7 @@
             <!-- field model="account.account" name="default_credit_account_id" ref="l10n_ec_niif_minimal.101050101"/>
             <field model="account.account" name="default_debit_account_id" ref="l10n_ec_niif_minimal.101050101"/-->
             <field name="user_id" ref="base.user_root"/>
+            <field name="update_posted">True</field>
         </record>
         
 		<record id="ir_retention_journal" model="account.journal">
@@ -40,6 +41,7 @@
             <!--field model="account.account" name="default_credit_account_id" ref="l10n_ec_niif_minimal.1010502"/>
             <field model="account.account" name="default_debit_account_id" ref="l10n_ec_niif_minimal.1010502"/-->
             <field name="user_id" ref="base.user_root"/>
+            <field name="update_posted">True</field>
         </record>
         
         <record id="base.main_company" model="res.company">

=== modified file 'ecua_retenciones_manual/i18n/es.po' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/objects/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/objects/company.py' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/objects/invoice.py' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/objects/retencion_line.py' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/objects/retenciones.py' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/objects/voucher.py' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/report/retention_report.odt' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/report/retention_report.xml' (properties changed: -x to +x)
--- ecua_retenciones_manual/report/retention_report.xml	2013-02-16 14:02:25 +0000
+++ ecua_retenciones_manual/report/retention_report.xml	2013-05-03 13:54:27 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data>
+	<!-- no actualizar ya que en multicompania o multidb debe poder personalizarse -->
+	<data noupdate="1">
 		<record id="retention_report" model="ir.actions.report.xml">
 			<field name="name">Retenciones</field>
 			<field name="type">ir.actions.report.xml</field>

=== modified file 'ecua_retenciones_manual/security/ir.model.access.csv' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/views/company_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/views/invoice_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/views/retenciones_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/views/shop.xml' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/views/type_document.xml' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/wizard/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/wizard/cancel_retentions_wizard.py' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/wizard/cancel_retentions_wizard.xml' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/wizard/retention_wizard.py' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/wizard/retention_wizard_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_retenciones_manual/workflow/retention_workflow.xml' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/__init__.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/__openerp__.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/data/calendar.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/data/company_configuration.xml' (properties changed: +x to -x)
--- ecua_seguro_social/data/company_configuration.xml	2013-02-16 14:02:25 +0000
+++ ecua_seguro_social/data/company_configuration.xml	2013-05-03 13:54:27 +0000
@@ -21,6 +21,7 @@
             <field name="view_id" ref="account.account_journal_view"/>
             <field name="sequence_id" ref="sueldos_sequence"/>
             <field name="user_id" ref="base.user_root"/>
+            <field name="update_posted">True</field>
 		</record>
 
 	</data>

=== modified file 'ecua_seguro_social/data/data_init.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/data/education_area.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/data/salary_estructure.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/i18n/es.po' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/objects/__init__.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/objects/account.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/objects/account_move.py' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/objects/advances.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/objects/calendar.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/objects/company.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/objects/contract.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/objects/education_level.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/objects/employee.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/objects/family_burden.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/objects/holidays.py' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/objects/move_line.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/objects/newholidays.py' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/objects/partner.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/objects/payroll.py' (properties changed: +x to -x)
--- ecua_seguro_social/objects/payroll.py	2013-03-21 21:19:42 +0000
+++ ecua_seguro_social/objects/payroll.py	2013-05-03 13:54:27 +0000
@@ -1532,7 +1532,10 @@
         'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Payroll')),
         'total': fields.function(_calculate_total, method=True, type='float', string='Total', digits_compute=dp.get_precision('Payroll'),store=True ),
     }
- 
+    _sql_constraints = [
+                        ('code_unique_salary_rule', '1=1', _('Code can duplicate')),     
+                         ]
+
 hr_payslip_line()
 
 class hr_allounce_deduction_categoty(osv.osv):

=== modified file 'ecua_seguro_social/objects/provision.py' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/objects/vacation.py' (properties changed: -x to +x)
--- ecua_seguro_social/objects/vacation.py	2013-03-21 21:19:42 +0000
+++ ecua_seguro_social/objects/vacation.py	2013-05-03 13:54:27 +0000
@@ -50,7 +50,7 @@
     
     def get_year_start_end(self, cr, uid, last_vacation_id, employee_id, year_vacation, date_start_vacation, date_end_vacation, context=None):
         """
-        Calcula y devuelve desde que ano hasta que ano se va a tomar vacaciones
+        Calcula y devuelve desde que año hasta que ano se va a tomar vacaciones
         Ejm. del 2 al 4 ano se va a tomar vacaciones 
         """
 #        el algoritmo es:

=== modified file 'ecua_seguro_social/objects/voucher.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/__init__.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/ecua_seguro_social_reports.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/nomina_general.ods' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/nomina_general_parser.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/nomina_general_report.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/report_hr_advances.odt' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/report_hr_advances.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/report_hr_employee_need_vacation.odt' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/report/report_hr_employee_need_vacation.xml' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/report/report_hr_provision.odt' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/report/report_hr_vacation.odt' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/report/report_hr_vacation.xml' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/report/report_payslip.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/report_payslip.rml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/report_payslip.sxw' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/report_payslip_details.odt' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/report_payslip_details.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/report_payslip_details.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/report_payslip_details_group.odt' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/report/report_payslip_details_group.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/security/hr_security.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/security/ir.model.access.csv' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/views/advances_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/views/calendar_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/views/company_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/views/contract_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/views/education_level_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/views/employee_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/views/extra_input_output_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/views/family_burden_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/views/holiday_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/views/newholidays_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/views/payroll_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/views/payslip_line_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/views/provision_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/views/vacation_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_seguro_social/views/voucher_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/wizards/__init__.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/wizards/hr_payroll_contribution_register_report.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/wizards/hr_payroll_contribution_register_report.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/wizards/hr_payroll_payslips_by_employees.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/wizards/hr_payroll_payslips_by_employees.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/wizards/multi_advances_wizard.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/wizards/multi_advances_wizard_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/wizards/payment_wizard.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/wizards/payroll_statement.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/wizards/payroll_statement_view.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/wizards/wizard_payslip.py' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/workflows/advances_workflow.xml' (properties changed: +x to -x)
=== modified file 'ecua_seguro_social/workflows/payroll_workflow.xml' (properties changed: +x to -x)
=== modified file 'ecua_sequence/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_sequence/__openerp__.py' (properties changed: -x to +x)
=== modified file 'ecua_sequence/object/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_sequence/object/ir_sequence.py' (properties changed: -x to +x)
=== modified file 'ecua_sequence/security/ir.model.access.csv' (properties changed: -x to +x)
=== modified file 'ecua_states/i18n/es_EC.po' (properties changed: -x to +x)
=== modified file 'ecua_states/objects/states.py'
--- ecua_states/objects/states.py	2013-02-16 14:02:25 +0000
+++ ecua_states/objects/states.py	2013-05-03 13:54:27 +0000
@@ -23,6 +23,26 @@
 
 from osv import osv, fields
 
+class res_parroquia(osv.osv):
+    '''
+    Open ERP Model
+    '''
+    _name = 'res.parroquia'
+    _description = 'Parroquias'
+
+    _columns = {
+            'name':fields.char('Nombre', size=255, required=True, readonly=False),
+            'city_id':fields.many2one('city.city', 'Ciudad', required=True), 
+            'type':fields.selection([
+                ('urbana','Urbana'),
+                ('rural','Rural'),
+                 ],    'Tipo', select=True, readonly=False,required=True),
+            
+        }
+    _defaults = {  
+        'type': 'urbana',  
+        }
+res_parroquia()
 
 class region(osv.osv):
     _name = 'res.region'
@@ -156,28 +176,6 @@
     }
 city()
 
-
-class res_parroquia(osv.osv):
-    '''
-    Open ERP Model
-    '''
-    _name = 'res.parroquia'
-    _description = 'Parroquias'
-
-    _columns = {
-            'name':fields.char('Nombre', size=255, required=True, readonly=False),
-            'city_id':fields.many2one('city.city', 'Ciudad', required=True), 
-            'type':fields.selection([
-                ('urbana','Urbana'),
-                ('rural','Rural'),
-                 ],    'Tipo', select=True, readonly=False,required=True),
-            
-        }
-    _defaults = {  
-        'type': 'urbana',  
-        }
-res_parroquia()
-
 class res_partner_sector(osv.osv):
     _name = 'res.partner.sector'
     _description = 'Parish and Sectors'

=== modified file 'ecua_states/views/menu.xml' (properties changed: -x to +x)
=== modified file 'ecua_states/views/partner_view.xml' (properties changed: -x to +x)
=== modified file 'ecua_verifica_ruc_cedula/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_verifica_ruc_cedula/__openerp__.py' (properties changed: -x to +x)
=== modified file 'ecua_verifica_ruc_cedula/i18n/en_US.po' (properties changed: -x to +x)
=== modified file 'ecua_verifica_ruc_cedula/i18n/es.po' (properties changed: -x to +x)
=== modified file 'ecua_verifica_ruc_cedula/i18n/es_EC.po' (properties changed: -x to +x)
=== modified file 'ecua_verifica_ruc_cedula/installer.py' (properties changed: -x to +x)
=== modified file 'ecua_verifica_ruc_cedula/installer.xml' (properties changed: -x to +x)
=== modified file 'ecua_verifica_ruc_cedula/partner.py' (properties changed: -x to +x)
--- ecua_verifica_ruc_cedula/partner.py	2013-02-16 14:02:25 +0000
+++ ecua_verifica_ruc_cedula/partner.py	2013-05-03 13:54:27 +0000
@@ -200,9 +200,17 @@
     def create(self, cr, uid, values, context=None):
         if not context:
             context = {}
-        if context.get('skip_ruc_validation'):
+        
+        # If foreing is True don't have to verify the CI/RUC
+        foreing = False
+
+        if 'foreing' in values:
+            foreing = values['foreing']
+            
+        if context.get('skip_ruc_validation') or foreing:
             return super(res_partner, self).create(cr, uid, values, context)
         ref = None
+
         try:
             ref = values['ref']
             if not ref:
@@ -258,7 +266,17 @@
     def write(self, cr, uid, ids, values,context=None):
         if not context:
             context = {}
-        if context.get('skip_ruc_validation'):
+
+        # If foreing is True don't have to verify the CI/RUC
+        # First, check if change the value of foreing, else use the stored value
+        foreing = False
+        
+        if 'foreing' in values:
+            foreing = values['foreing']
+        else:
+            foreing = self.pool.get('res.partner').browse(cr, uid, ids[0]).foreing
+            
+        if context.get('skip_ruc_validation') or foreing:
             return super(res_partner, self).write(cr, uid, ids, values, context)
         ref = None
         try:

=== modified file 'ecua_verifica_ruc_cedula/views/verificar_ruc_cedula_view.xml' (properties changed: -x to +x)
--- ecua_verifica_ruc_cedula/views/verificar_ruc_cedula_view.xml	2013-02-16 14:02:25 +0000
+++ ecua_verifica_ruc_cedula/views/verificar_ruc_cedula_view.xml	2013-05-03 13:54:27 +0000
@@ -97,8 +97,8 @@
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<xpath expr="/form/group//field[@name='ref']" position="replace">
-					<field string="CEDULA/RUC" name="ref"
-						attrs="{'readonly':[('foreing','=',True)]}" select="1">
+					<field string="CEDULA/RUC" name="ref" select="1">
+<!-- 						attrs="{'readonly':[('foreing','=',True)]}"  --> 
 					</field>
 					<field string="type" name="type_ref" invisible="1">
 					</field>

=== modified file 'ecua_verifica_ruc_cedula_importacion/__init__.py' (properties changed: -x to +x)
=== modified file 'ecua_verifica_ruc_cedula_importacion/__openerp__.py' (properties changed: -x to +x)
=== modified file 'ecua_verifica_ruc_cedula_importacion/partner.py' (properties changed: -x to +x)
=== modified file 'ecua_verifica_ruc_cedula_importacion/partner_view.xml' (properties changed: -x to +x)
=== modified file 'l10n_ec_niif_minimal/__init__.py' (properties changed: -x to +x)
=== modified file 'l10n_ec_niif_minimal/__openerp__.py' (properties changed: -x to +x)
=== modified file 'l10n_ec_niif_minimal/data/account_chart.xml' (properties changed: -x to +x)
=== modified file 'l10n_ec_niif_minimal/data/account_tax_103.xml' (properties changed: -x to +x)
=== modified file 'l10n_ec_niif_minimal/data/account_tax_104.xml' (properties changed: -x to +x)
=== modified file 'l10n_ec_niif_minimal/data/account_tax_code.xml' (properties changed: -x to +x)
=== modified file 'l10n_ec_niif_minimal/i18n/l10n_ec_niif_minimal.pot' (properties changed: -x to +x)
=== modified file 'l10n_ec_niif_minimal/objects/__init__.py' (properties changed: -x to +x)
=== modified file 'l10n_ec_niif_minimal/objects/account_installer.py' (properties changed: -x to +x)
=== modified file 'l10n_ec_niif_minimal/objects/account_invoice_tax.py' (properties changed: -x to +x)
--- l10n_ec_niif_minimal/objects/account_invoice_tax.py	2013-04-21 14:26:15 +0000
+++ l10n_ec_niif_minimal/objects/account_invoice_tax.py	2013-05-03 13:54:27 +0000
@@ -53,7 +53,7 @@
         company_currency = inv.company_id.currency_id.id
 
         for line in inv.invoice_line:
-            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id, {'skip_round':True})['taxes']:
+            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']:#, {'skip_round':True})['taxes']:
                 tax_browse = tax_obj.browse(cr, uid, tax['id'], context)
                 val={}
                 val['invoice_id'] = inv.id

=== modified file 'l10n_ec_niif_minimal/objects/account_tax.py' (properties changed: -x to +x)
=== modified file 'l10n_ec_niif_minimal/views/account_tax_view.xml' (properties changed: -x to +x)
=== modified file 'l10n_ec_niif_minimal/views/l10n_chart_ec_niif_minimal_wizard.xml' (properties changed: -x to +x)
=== added directory 'trescloud_cheques'
=== added file 'trescloud_cheques/__init__.py'
--- trescloud_cheques/__init__.py	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/__init__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+########################################################################
+#                                                                       
+#@authors:TRESCLOUD Cia.Ltda                                                                          
+# Copyright (C) 2012                     
+#                                                                       
+#This program is free software: you can redistribute it and/or modify   
+#it under the terms of the GNU General Public License as published by   
+#the Free Software Foundation, either version 3 of the License, or      
+#(at your option) any later version.                                    
+#
+# This module is GPLv3 or newer and incompatible
+# with OpenERP SA "AGPL + Private Use License"!
+#                                                                       
+#This program is distributed in the hope that it will be useful,        
+#but WITHOUT ANY WARRANTY; without even the implied warranty of         
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          
+#GNU General Public License for more details.                           
+#                                                                       
+#You should have received a copy of the GNU General Public License      
+#along with this program.  If not, see http://www.gnu.org/licenses.
+#ice
+########################################################################
+
+import account_voucher
+import trescloud_cheques
+import account
+import amount_to_words
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'trescloud_cheques/__openerp__.py'
--- trescloud_cheques/__openerp__.py	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/__openerp__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+########################################################################
+#                                                                       
+# @authors:TRESCLOUD Cia.Ltda                                                                           
+# Copyright (C) 2012                                  
+#                                                                       
+#This program is free software: you can redistribute it and/or modify   
+#it under the terms of the GNU General Public License as published by   
+#the Free Software Foundation, either version 3 of the License, or      
+#(at your option) any later version.                                    
+#
+# This module is GPLv3 or newer and incompatible
+# with OpenERP SA "AGPL + Private Use License"!
+#                                                                       
+#This program is distributed in the hope that it will be useful,        
+#but WITHOUT ANY WARRANTY; without even the implied warranty of         
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          
+#GNU General Public License for more details.                           
+#                                                                       
+#You should have received a copy of the GNU General Public License      
+#along with this program.  If not, see http://www.gnu.org/licenses.
+#ice
+########################################################################
+{
+   "name" : "Módulo de cheques para Ecuador",
+   "author" : "TRESCloud Cia. Ltda.",
+   "maintainer": 'TRESCloud Cia. Ltda.',
+   "website": 'http://www.trescloud.com',
+   'complexity': "easy",
+   "description": """Sistema gestión y control de CHEQUES
+   
+   Este sistema permite la impresión de los cheques y conocer el estado de los mismos.
+     
+   Desarrollador:
+   
+   Carlos Yumbillo
+   
+   """,
+   "category": "Tesoreria",
+   "version" : "1.0",
+   'depends': ['base','account','account_payment'],
+   'init_xml': [],
+   'update_xml': [
+       'security/ir.model.access.csv',        
+       'trescloud_cheques_view.xml',
+       'workflow/check_wkf.xml',
+       'account_voucher_view.xml',
+       'account_view.xml',
+       'report/report_data.xml',
+   ],
+   'installable': True,
+}
\ No newline at end of file

=== added file 'trescloud_cheques/account.py'
--- trescloud_cheques/account.py	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/account.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,105 @@
+from osv import osv, fields
+
+class account_journal(osv.osv):
+    """
+        Add fields Allow Check writing, Use Preprinted Check and Check Sequence on journal
+    """
+    _inherit = "account.journal"
+    _columns = {
+        'allow_check_writing': fields.boolean('Allow Check writing', help='Fill this if the journal is to be used for writing checks.'),
+        'use_preprint_check': fields.boolean('Use Preprinted Check'),
+        'check_sequence': fields.many2one('ir.sequence', 'Check Sequence', 
+                                          help="This field contains the information related to the numbering of the check number."),
+        }
+
+account_journal()
+
+#class check_log(osv.osv):
+#    """
+#        Check Log model
+#    """
+#    _name = 'check.log'
+#    _description = 'Check Log'
+#    _columns = {
+#        'name': fields.many2one('account.voucher', 'Reference payment'),
+#        'status': fields.selection([('active', 'Active'), ('voided', 'Voided'), ('stop_pay', 'Stop Pay Placed'), ('lost', 'Lost'), ('unk', 'Unknown')],
+#                                    "Check Status"),
+#        'check_no': fields.char('Check Number', size=64),
+#        'cleared': fields.boolean('Cleared', help="Check this if the check is cleared (aka Paid) by the Bank")
+#        }
+#    
+#    _defaults = {
+#        'status': 'blank',
+#        }
+#check_log()
+#
+#
+#class account_invoice(osv.osv):
+#    """Update inv_reference field.
+#    This field will update only if the stock_assigned_picker module is installed."""
+#    _inherit = "account.invoice"
+#
+#    def _calc_inv_ref(self, cr, uid, ids, name, args, context=None):
+#        """
+#        @param cr: current row of the database
+#        @param uid: id of user currently logged
+#        @param ids: ids of selected records
+#        @param name: 
+#        @param args: 
+#        @param context: context
+#        @return: 
+#        """
+#        res = {}
+#        picking_obj = self.pool.get('stock.picking')
+#        for inv in self.browse(cr, uid, ids, context=context):
+#            cr.execute("SELECT purchase_id FROM purchase_invoice_rel WHERE invoice_id = %s", (inv.id,))
+#            pur_ids = cr.fetchall() or None
+#            if pur_ids and pur_ids[0]:
+#                pick_ids = picking_obj.search(cr, uid, [('purchase_id', '=', pur_ids[0][0])], context=context)
+#                if pick_ids:
+#                    pici_id = picking_obj.browse(cr, uid, pick_ids[0], context=context)
+#                    if hasattr(pici_id, 'ref_inv_no'):
+#                        res[inv.id] = pici_id.ref_inv_no
+#        return res
+#    
+#    def _get_invoice_pur(self, cr, uid, ids, context=None):
+#        """
+#        @param cr: current row of database
+#        @param uid: id of user currently logged in
+#        @param ids: ids of selected records
+#        @param context: context
+#        @return: list of ids
+#        """
+#        result = {}
+#        for purchase_id in self.pool.get('purchase.order').browse(cr, uid, ids, context=context):
+#            for invoice_id in purchase_id.invoice_ids:
+#                result[invoice_id.id] = True
+#        return result.keys() 
+#    
+#    def _get_invoice_pick(self, cr, uid, ids, context=None):
+#        """
+#        @param cr: current row of database
+#        @param uid: id of user currently logged in
+#        @param ids: ids of selected records
+#        @param context: context
+#        @return: list of ids
+#        """
+#        result = {}
+#        for pick in self.pool.get('stock.picking').browse(cr, uid, ids, context=context):
+#            if pick.purchase_id:
+#                for invoice_id in pick.purchase_id.invoice_ids:
+#                    result[invoice_id.id] = True
+#        return result.keys()
+#
+#    _columns = {
+#        'inv_ref': fields.function(_calc_inv_ref, method=True, string='Reference Invoice', type='char', size=32,
+#            store = {
+#                'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['state'], 10),
+#                'purchase.order': (_get_invoice_pur, ['order_line'], 10),
+#                'stock.picking': (_get_invoice_pick, ['ref_inv_no', 'purchase_id'], 10),
+#                }, multi=False),
+#        }
+#    
+#account_invoice()
+#
+## vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'trescloud_cheques/account_view.xml'
--- trescloud_cheques/account_view.xml	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/account_view.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+
+            <!-- check option in journal -->
+
+		<record id="view_account_journal_form" model="ir.ui.view">
+			<field name="name">account.journal.form</field>
+			<field name="model">account.journal</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="account.view_account_journal_form" />
+			<field name="arch" type="xml">
+			<!--  	<field name="type" on_change="onchange_type(type, currency)" />-->
+				<field name="entry_posted" position="after">
+					<field name="allow_check_writing" attrs="{'readonly':[('type','!=','bank')]}" />
+					<!--  <field name="use_preprint_check" attrs="{'readonly':[('type','!=','bank')]}" />-->
+				</field>
+				<field name="sequence_id" required="0" position="after">
+					<field name="check_sequence"
+						attrs=
+						"{'invisible':[('allow_check_writing','=',False)]}" />
+				</field>
+			</field>
+		</record>
+
+	</data>
+</openerp>

=== added file 'trescloud_cheques/account_voucher.py'
--- trescloud_cheques/account_voucher.py	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/account_voucher.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*-
+from osv import osv, fields
+from tools.amount_to_text_en import amount_to_text
+from tools.translate import _
+
+class account_voucher(osv.osv):
+    _inherit = 'account.voucher'
+    
+    def _get_journal(self, cr, uid, context=None):
+        """
+        Function to initialise the variable journal_id
+        """
+        if context is None:
+            context = {}
+        journal_obj = self.pool.get('account.journal')
+        if 'invoice_id' in context:
+            currency_id = self.pool.get('account.invoice').browse(cr, uid, context['invoice_id'], context=context).currency_id.id
+            journal_id = journal_obj.search(cr, uid, [('currency', '=', currency_id)], limit=1, context=context)
+            return journal_id and journal_id[0] or False
+        if 'journal_id' in context:
+            return context['journal_id']
+        if not 'journal_id' in context and 'search_default_journal_id' in context:
+            return context.get('search_default_journal_id')
+        ttype = context.get('type', 'bank')
+        if ttype in ('payment', 'receipt'):
+            ttype = 'bank'
+        if 'write_check' in context:
+            res = journal_obj.search(cr, uid, [('allow_check_writing', '=', True)], limit=1, context=context)
+        else:
+            res = journal_obj.search(cr, uid, [('type', '=', ttype)], limit=1, context=context)
+        return res and res[0] or False
+    
+    def _check_get(self, cr, uid, context=None):
+        rs={}
+        lista_check=[]
+        if context:
+            rs = {
+                'mount':context['price'],
+                'payee_name':context['partner_id'],
+                'daily':"",
+                'check_number':2,
+                'current_date':context['current_date'],
+                }   
+            lista_check.append(rs)
+        return lista_check
+
+    
+    def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
+        """ Inherited - add amount_in_word in return value dictionary
+            cr: cursor
+            uid: user id
+            ids: ids of account voucher
+            partner_id: partner's id
+            journal_id: journal's id
+            price: price
+            currency_id: id of currency using
+            date: date
+            context: context
+        """
+        rs={}
+        lines={}
+        lista_check=[]
+        tres_check_obj=self.pool.get('check.check')
+        
+        default = super(account_voucher, self).onchange_partner_id(cr, uid, ids, partner_id, journal_id, price,
+                                                                   currency_id, ttype, date, context=context)
+        if 'value' in default:
+            if journal_id:
+               allow_check_writing = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context).allow_check_writing
+               default['value'].update({'allow_check': allow_check_writing})
+               journal_obj = self.pool.get('account.journal')
+               journal = journal_obj.browse(cr, uid, journal_id).type
+               if journal == 'bank' :            
+                  default['value'].update({'reference': "Cheque"})
+               else:
+                  default['value'].update({'reference': "Efectivo"})
+
+        return default    
+    
+    _columns = {
+        'amount_in_word': fields.char("Amount in word", size=128, readonly=True, states={'draft': [('readonly', False)]}),
+        'allow_check': fields.boolean('Allow Check Writing'), # attrs does not support '.' format and fields.relates get the value when v save the record
+        'chk_seq': fields.char("Check Number", size=64, readonly=True),
+        'chk_status': fields.boolean("Check Status"),
+        'check_ids': fields.one2many('check.check','check_id','Check lines',readonly=True, states={'draft':[('readonly',False)]})
+        }
+    
+    _defaults = {
+        'journal_id': _get_journal,
+        'chk_status': False,
+       # 'check_ids':_check_get,
+        }
+    
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        Función que impide la eliminación de vouchers que tengan cheques asociados.
+        """
+        
+        check_obj = self.pool.get('check.check')
+        id_check = check_obj.search(cr,uid,[('check_id','=',ids[0])])
+        if id_check:
+            check = check_obj.browse(cr,uid,id_check[0])       
+            if check.check_id:
+               raise osv.except_osv(_('Invalid action !'), _('Cannot delete Voucher(s) because there is a associated check. !'))
+        return super(account_voucher, self).unlink(cr, uid, ids, context=context)    
+    
+    def action_move_line_create(self, cr, uid, ids, context=None):
+        res=super(account_voucher, self).action_move_line_create( cr, uid, ids, context=context)
+        i=0
+
+        for obj_voucher in self.browse(cr, uid, ids, context=context):
+            if len(obj_voucher.check_ids)>1:
+                raise osv.except_osv(_('Warning'),
+                _("Error while processing 'account.voucher' you can have only one check!"))
+            if obj_voucher.check_ids:
+                if obj_voucher.check_ids[0].state!='printed':
+                   raise osv.except_osv(_('Warning'),
+                   _("Error while processing 'account.voucher' you can only validate check in state printed!"))
+                            
+        return True 
+    
+account_voucher()
\ No newline at end of file

=== added file 'trescloud_cheques/account_voucher_view.xml'
--- trescloud_cheques/account_voucher_view.xml	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/account_voucher_view.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+	
+        <!-- Account Voucher -->
+
+		<record model="ir.ui.view" id="view_vendor_payment_check_form">
+			<field name="name">account.voucher.payment.check.form</field>
+			<field name="model">account.voucher</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="account_voucher.view_vendor_payment_form" />
+			<field name="arch" type="xml">
+				<field name="partner_id" domain="[('supplier','=',True)]" required="1" 
+				       on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" 
+				       context="{'invoice_currency':currency_id}" string="Supplier"/>
+				<field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+				<field name="amount" position="after">
+					<field name="allow_check" invisible="1"/>
+					<!-- <field name="amount_in_word" attrs="{'invisible':[('allow_check','!=',1)]}" nolabel="1" colspan="2"/>-->
+					<!--<field name="chk_seq" attrs="{'invisible':[('allow_check','!=',1)]}" colspan="1"/>-->
+					<!--<field name="chk_status" invisible="1" />-->
+				</field>
+				<field name="journal_id"
+                       domain="[('type','in',['bank', 'cash'])]"
+                       widget="selection" select="1"
+                       on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
+                       string="Payment Method"/>
+				<field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+				<field name="name" colspan="4"/>
+				<field name="type" invisible="True"/>
+				<field name="currency_id" invisible="True"/>
+				<field name="state"/>
+				<separator string="Other Information" colspan="2" position="replace"/>
+  				<field name="line_dr_ids" position="before">
+					<field name="check_ids" attrs="{'invisible':[('allow_check','!=',1)]}" default_get="{'journal_id':journal_id,'amount':amount, 'partner_id':partner_id,'date':date}" colspan="4" nolabel="1" height="140">
+                         <tree string="Checks Lines">
+                          	<field name="check_number"/>
+        					<field name="payee_name"/>
+        					<field name="amount"/>
+        					<field name="journal_id"/>
+        					<field name="current_date"/>
+        					<field name="state"/>
+        					<button name="imprimir" string="Print" states="draft" type="object" icon="gtk-print"/>
+                         </tree>
+                         <form string="Manage checks">
+				           <group col="2" colspan="2">
+				               <separator colspan="2"></separator> 
+				               <field name="supplier" on_change="onchange_partner(supplier)" attrs="{'readonly':[('state','!=','draft')]}" readonly="1"/>
+				               <field name="check_number" attrs="{'readonly':[('state','!=','draft')]}"/> 	               
+				               <field name="amount" on_change="onchange_amount(amount)" attrs="{'readonly':[('state','!=','draft')]}" />	
+				               <field name="payee_name" attrs="{'readonly':[('state','!=','draft')]}" />               	               	                                                                            	               
+				           	   <field name="ver_p" invisible="1"/>
+				           </group>
+				           <group col="2" colspan="2">
+				               <separator colspan="2"></separator> 
+				               <field name="journal_id" on_change="onchange_check_number(journal_id)" attrs="{'readonly':[('state','!=','draft')]}" readonly="1"/>
+				               <field name="current_date" attrs="{'readonly':[('state','!=','draft')]}"/>	
+				               <newline/>
+				               <field name="amount_in_words" nolabel="1" colspan="2"/> 	                                                                                         	               
+				           </group>     
+                         </form>
+                    </field>
+				</field>
+			</field>
+		</record>
+
+	</data>
+</openerp>

=== added file 'trescloud_cheques/amount_to_words.py'
--- trescloud_cheques/amount_to_words.py	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/amount_to_words.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+# can be used for numbers as large as 999 vigintillion
+# (vigintillion --> 10 to the power 60)
+# tested with Python24      vegaseat      07dec2006
+
+# Modificado por Andres Calle - TRESCLOUD Cía Ltda [e-mail] 
+# Basado en el trabajo realizado por Gabriel Umaña [e-mail]
+
+""" 
+Este archivo fue realizado por Gabriel Umana  [e-mail]
+Es para poner los valores de los cheques en castellano
+"""
+import math
+
+UNIDADES = ( '', 'Un ', 'Dos ', 'Tres ', 'Cuatro ', 'Cinco ', 'Seis ', 'Siete ', 'Ocho ', 'Nueve ', 'Diez ', 'Once ', 'Doce ', 'Trece ', 'Catorce ', 'Quince ', 'Dieciseis ', 'Diecisiete ', 'Dieciocho ', 'Diecinueve ', 'Veinte ')
+DECENAS = ('Venti', 'Treinta ', 'Cuarenta ', 'Cincuenta ', 'Sesenta ', 'Setenta ', 'Ochenta ', 'Noventa ', 'Cien ')
+CENTENAS = ('Ciento ', 'Doscientos ', 'Trecientos ', 'Cuatrocientos ', 'Quinientos ', 'Seiscientos ', 'Setecientos ', 'ochocientos ', 'novecientos '  )      
+
+def Numero_a_Texto(number_in):
+    convertido = ''
+    number_str = str(number_in) if (type(number_in) != 'str') else number_in
+    number_str =  number_str.zfill(9)
+    millones, miles, cientos = number_str[:3], number_str[3:6], number_str[6:]
+    if(millones):
+        if(millones == '001'):
+            convertido += 'Un Millon '
+        elif(int(millones) > 0):
+            convertido += '%sMillones ' % __convertNumber(millones)
+    if(miles):
+        if(miles == '001'):
+            convertido += 'Mil '
+        elif(int(miles) > 0):
+            convertido += '%sMil ' % __convertNumber(miles)
+    if(cientos):
+        if(cientos == '001'):
+            convertido += 'Un '
+        elif(int(cientos) > 0):
+            convertido += '%s ' % __convertNumber(cientos)
+    return convertido
+
+def __convertNumber(n):
+    output = ''
+    if(n == '100'):
+        output = "Cien "
+    elif(n[0] != '0'):
+        output = CENTENAS[int(n[0])-1]
+    k = int(n[1:])
+    if(k <= 20):
+        output += UNIDADES[k]
+    else:
+        if((k > 30) & (n[2] != '0')):
+            output += '%sy %s' % (DECENAS[int(n[1])-2], UNIDADES[int(n[2])])
+        else:
+            output += '%s%s' % (DECENAS[int(n[1])-2], UNIDADES[int(n[2])])
+    return output
+
+
+def amount_to_words_es(j):
+    try:   
+        Arreglo1 = str(j).split(',')
+        Arreglo2 = str(j).split('.')
+        if (len(Arreglo1) > len(Arreglo2) or len(Arreglo1) == len(Arreglo2)):
+             Arreglo = Arreglo1
+        else:
+            Arreglo = Arreglo2
+            
+        if (len(Arreglo) == 2):  
+            whole = math.floor(j)  
+            frac = j - whole
+            num = str("{0:.2f}".format(frac))[2:]            
+            return Numero_a_Texto(Arreglo[0]) + 'con ' + num + "/100"
+        elif (len(Arreglo) == 1):
+           return Numero_a_Texto(Arreglo[0]) + 'con ' + '00/100'
+    except ValueError:
+        return "Cero"
\ No newline at end of file

=== added directory 'trescloud_cheques/i18n'
=== added file 'trescloud_cheques/i18n/es.po'
--- trescloud_cheques/i18n/es.po	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/i18n/es.po	2013-05-03 13:54:27 +0000
@@ -0,0 +1,308 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* trescloud_cheques
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.4\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2013-04-25 20:27+0000\n"
+"PO-Revision-Date: 2013-04-25 20:27+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: trescloud_cheques
+#: code:addons/trescloud_cheques/account_voucher.py:114
+#, python-format
+msgid "Error while processing 'account.voucher' you can have only one check!"
+msgstr "Error mientras procesa 'account.voucher', puede tener solo un cheque! "
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/trescloud_cheques.py:158
+#, python-format
+msgid "Cannot delete check(s) that are already printed!"
+msgstr "No se pueden eliminar cheques que ya están impresos!"
+
+#. module: trescloud_cheques
+#: help:check.check,check_number:0
+msgid "check number"
+msgstr "Número de cheque"
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/trescloud_cheques.py:77
+#, python-format
+msgid "Please add \"Check Sequence\" for journal %s.'%str(journal_id.name))\n"
+"                        }\n"
+"            return {'warning':warning}\n"
+"        result=self.get_id(cr, uid, journal_id.check_sequence.id , test='id', context=context)\n"
+"        res['check_number']=result[0]\n"
+"        res['new_no']=result[0]\n"
+"        journal_id = self.pool.get('account.journal"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:account.voucher:0
+#: view:check.check:0
+msgid "Print"
+msgstr "Imprimir"
+
+#. module: trescloud_cheques
+#: field:check.check,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: trescloud_cheques
+#: view:check.check:0
+#: selection:check.check,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: trescloud_cheques
+#: field:check.check,new_no:0
+msgid "Update Check Number"
+msgstr "Actualizar número de cheque"
+
+#. module: trescloud_cheques
+#: field:check.check,check_id:0
+msgid "Check Reference"
+msgstr "Referencia del cheque"
+
+#. module: trescloud_cheques
+#: view:account.voucher:0
+msgid "Supplier"
+msgstr "Proveedor"
+
+#. module: trescloud_cheques
+#: field:account.voucher,check_ids:0
+msgid "Check lines"
+msgstr "Detalle de cheques"
+
+#. module: trescloud_cheques
+#: model:ir.actions.report.xml,name:trescloud_cheques.voucher_report
+msgid "Comprobante Ingreso-Egreso"
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:check.check,check_number:0
+msgid "Check Number"
+msgstr "Número de cheque"
+
+#. module: trescloud_cheques
+#: field:check.check,amount_in_words:0
+msgid " "
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:account.voucher:0
+msgid "Payment Method"
+msgstr "Método de pago"
+
+#. module: trescloud_cheques
+#: model:ir.actions.act_window,name:trescloud_cheques.action_view_check
+#: model:ir.ui.menu,name:trescloud_cheques.submenu_check
+msgid "Cheques"
+msgstr "Cheques"
+
+#. module: trescloud_cheques
+#: help:check.check,payee_name:0
+msgid "Used to indicate the payee name of check."
+msgstr "Usado para indicar el nombre del beneficario del cheque"
+
+#. module: trescloud_cheques
+#: field:check.check,journal_id:0
+#: model:ir.model,name:trescloud_cheques.model_account_journal
+msgid "Journal"
+msgstr "Diario"
+
+#. module: trescloud_cheques
+#: view:check.check:0
+msgid "Vouchers"
+msgstr "Comprobantes"
+
+#. module: trescloud_cheques
+#: view:check.check:0
+#: selection:check.check,state:0
+msgid "Rejected"
+msgstr "Rechazado"
+
+#. module: trescloud_cheques
+#: model:ir.model,name:trescloud_cheques.model_check_check
+msgid "check.check"
+msgstr ""
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/account_voucher.py:118
+#, python-format
+msgid "Error while processing 'account.voucher' you can only validate check in state printed!"
+msgstr "Error mientras procesa 'account.voucher', solo puedes validarla con un cheque en estado impreso! "
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/account_voucher.py:113
+#: code:addons/trescloud_cheques/account_voucher.py:117
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
+
+#. module: trescloud_cheques
+#: view:check.check:0
+#: selection:check.check,state:0
+msgid "Printed"
+msgstr "Impreso"
+
+#. module: trescloud_cheques
+#: model:ir.actions.report.xml,name:trescloud_cheques.report_check
+msgid "Impresion de cheque"
+msgstr "Impresión del cheque"
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/account_voucher.py:104
+#: code:addons/trescloud_cheques/trescloud_cheques.py:158
+#, python-format
+msgid "Invalid action !"
+msgstr "Acción invalida !"
+
+#. module: trescloud_cheques
+#: help:check.check,new_no:0
+msgid "Enter new check number here if you wish to update"
+msgstr "Introduzca el nuevo número de cheque aquí si desea actualizar"
+
+#. module: trescloud_cheques
+#: view:check.check:0
+msgid "Reprint"
+msgstr "Reimprimir"
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/account_voucher.py:104
+#, python-format
+msgid "Cannot delete Voucher(s) because there is a associated check. !"
+msgstr "No puede eliminar comprobante(s) porque hay un cheque asociado. !"
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/trescloud_cheques.py:49
+#: code:addons/trescloud_cheques/trescloud_cheques.py:76
+#, python-format
+msgid "Warning!"
+msgstr "Advertencia!"
+
+#. module: trescloud_cheques
+#: view:check.check:0
+#: selection:check.check,state:0
+msgid "Lost"
+msgstr "Perdido"
+
+#. module: trescloud_cheques
+#: sql_constraint:check.check:0
+msgid "The check number must be unique !"
+msgstr "El número de cheque debe ser único !"
+
+#. module: trescloud_cheques
+#: view:account.voucher:0
+#: view:check.check:0
+msgid "Manage checks"
+msgstr "Gestionar cheques"
+
+#. module: trescloud_cheques
+#: field:check.check,amount:0
+msgid "Amount"
+msgstr "Total"
+
+#. module: trescloud_cheques
+#: field:check.check,ver_p:0
+msgid "Verificacion"
+msgstr "Verificación"
+
+#. module: trescloud_cheques
+#: view:account.voucher:0
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: trescloud_cheques
+#: view:check.check:0
+msgid "Search Check"
+msgstr "Buscar cheque"
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/trescloud_cheques.py:205
+#: constraint:check.check:0
+#, python-format
+msgid "The number of check is incorrect, it must be of six digits XXXXXX, X is a number."
+msgstr "El número de cheque es incorrecto, debe tener 6 digitos XXXXXX, X es un número."
+
+#. module: trescloud_cheques
+#: view:check.check:0
+#: selection:check.check,state:0
+msgid "Charged"
+msgstr "Cobrado"
+
+#. module: trescloud_cheques
+#: view:account.voucher:0
+msgid "Checks Lines"
+msgstr "Detalle de cheques"
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/trescloud_cheques.py:49
+#, python-format
+msgid "Please add \"Check Sequence\" for journal %s.'%str(voucher_id.journal_id.name)))\n"
+"            res = self.get_id(cr, uid, voucher_id.journal_id.check_sequence.id, test='id', context=context)\n"
+"            return res and res[0]\n"
+"        else:\n"
+"            return False\n"
+"        \n"
+"    def _get_new_no(self, cr, uid, context=None):\n"
+"        \"\"\"\n"
+"        Function to get the next number used to generate sequence\n"
+"        \"\"\"\n"
+"        if context is None:\n"
+"            context = {}\n"
+"        res = []\n"
+"        if 'active_id' in context:\n"
+"            voucher_id = self.pool.get('account.voucher"
+msgstr ""
+
+#. module: trescloud_cheques
+#: model:ir.model,name:trescloud_cheques.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Comprobante contable"
+
+#. module: trescloud_cheques
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "El nombre del diario debe ser único por companía !"
+
+#. module: trescloud_cheques
+#: field:check.check,payee_name:0
+msgid "Payee name"
+msgstr "Beneficario"
+
+#. module: trescloud_cheques
+#: view:check.check:0
+#: selection:check.check,state:0
+msgid "Canceled"
+msgstr "Anulado"
+
+#. module: trescloud_cheques
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "El código del diario debe ser único por compañía !"
+
+#. module: trescloud_cheques
+#: field:check.check,current_date:0
+msgid "Current date"
+msgstr "Fecha"
+
+#. module: trescloud_cheques
+#: field:check.check,supplier:0
+msgid "Partner"
+msgstr "Cliente"
+
+#. module: trescloud_cheques
+#: model:ir.actions.act_window,help:trescloud_cheques.action_view_check
+msgid "With this module you can create and print new checks. You can also track the status of the check (like cancelled, charged, lost or rejected).\n"
+"It is related to vendor payments module and must have a journal configured as a check journal."
+msgstr "Con este módulo se puede crear e imprimir nuevos cheques. También puede realizar el seguimiento del estado de los cheques (como anulado, cobrado, perdido o rechazado).\n"
+"Está relacionado con el módulo de pagos a proveedores y debe tener un diario configurado como un diario cheques. "
+

=== added file 'trescloud_cheques/i18n/trescloud_cheques.pot'
--- trescloud_cheques/i18n/trescloud_cheques.pot	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/i18n/trescloud_cheques.pot	2013-05-03 13:54:27 +0000
@@ -0,0 +1,307 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* trescloud_cheques
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.4\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2013-04-25 20:27+0000\n"
+"PO-Revision-Date: 2013-04-25 20:27+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: trescloud_cheques
+#: code:addons/trescloud_cheques/account_voucher.py:114
+#, python-format
+msgid "Error while processing 'account.voucher' you can have only one check!"
+msgstr ""
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/trescloud_cheques.py:158
+#, python-format
+msgid "Cannot delete check(s) that are already printed!"
+msgstr ""
+
+#. module: trescloud_cheques
+#: help:check.check,check_number:0
+msgid "check number"
+msgstr ""
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/trescloud_cheques.py:77
+#, python-format
+msgid "Please add \"Check Sequence\" for journal %s.'%str(journal_id.name))\n"
+"                        }\n"
+"            return {'warning':warning}\n"
+"        result=self.get_id(cr, uid, journal_id.check_sequence.id , test='id', context=context)\n"
+"        res['check_number']=result[0]\n"
+"        res['new_no']=result[0]\n"
+"        journal_id = self.pool.get('account.journal"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:account.voucher:0
+#: view:check.check:0
+msgid "Print"
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:check.check,state:0
+msgid "State"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:check.check:0
+#: selection:check.check,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:check.check,new_no:0
+msgid "Update Check Number"
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:check.check,check_id:0
+msgid "Check Reference"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:account.voucher:0
+msgid "Supplier"
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:account.voucher,check_ids:0
+msgid "Check lines"
+msgstr ""
+
+#. module: trescloud_cheques
+#: model:ir.actions.report.xml,name:trescloud_cheques.voucher_report
+msgid "Comprobante Ingreso-Egreso"
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:check.check,check_number:0
+msgid "Check Number"
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:check.check,amount_in_words:0
+msgid " "
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:account.voucher:0
+msgid "Payment Method"
+msgstr ""
+
+#. module: trescloud_cheques
+#: model:ir.actions.act_window,name:trescloud_cheques.action_view_check
+#: model:ir.ui.menu,name:trescloud_cheques.submenu_check
+msgid "Cheques"
+msgstr ""
+
+#. module: trescloud_cheques
+#: help:check.check,payee_name:0
+msgid "Used to indicate the payee name of check."
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:check.check,journal_id:0
+#: model:ir.model,name:trescloud_cheques.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:check.check:0
+msgid "Vouchers"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:check.check:0
+#: selection:check.check,state:0
+msgid "Rejected"
+msgstr ""
+
+#. module: trescloud_cheques
+#: model:ir.model,name:trescloud_cheques.model_check_check
+msgid "check.check"
+msgstr ""
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/account_voucher.py:118
+#, python-format
+msgid "Error while processing 'account.voucher' you can only validate check in state printed!"
+msgstr ""
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/account_voucher.py:113
+#: code:addons/trescloud_cheques/account_voucher.py:117
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:check.check:0
+#: selection:check.check,state:0
+msgid "Printed"
+msgstr ""
+
+#. module: trescloud_cheques
+#: model:ir.actions.report.xml,name:trescloud_cheques.report_check
+msgid "Impresion de cheque"
+msgstr ""
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/account_voucher.py:104
+#: code:addons/trescloud_cheques/trescloud_cheques.py:158
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: trescloud_cheques
+#: help:check.check,new_no:0
+msgid "Enter new check number here if you wish to update"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:check.check:0
+msgid "Reprint"
+msgstr ""
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/account_voucher.py:104
+#, python-format
+msgid "Cannot delete Voucher(s) because there is a associated check. !"
+msgstr ""
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/trescloud_cheques.py:49
+#: code:addons/trescloud_cheques/trescloud_cheques.py:76
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:check.check:0
+#: selection:check.check,state:0
+msgid "Lost"
+msgstr ""
+
+#. module: trescloud_cheques
+#: sql_constraint:check.check:0
+msgid "The check number must be unique !"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:account.voucher:0
+#: view:check.check:0
+msgid "Manage checks"
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:check.check,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:check.check,ver_p:0
+msgid "Verificacion"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:account.voucher:0
+msgid "Other Information"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:check.check:0
+msgid "Search Check"
+msgstr ""
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/trescloud_cheques.py:205
+#: constraint:check.check:0
+#, python-format
+msgid "The number of check is incorrect, it must be of six digits XXXXXX, X is a number."
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:check.check:0
+#: selection:check.check,state:0
+msgid "Charged"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:account.voucher:0
+msgid "Checks Lines"
+msgstr ""
+
+#. module: trescloud_cheques
+#: code:addons/trescloud_cheques/trescloud_cheques.py:49
+#, python-format
+msgid "Please add \"Check Sequence\" for journal %s.'%str(voucher_id.journal_id.name)))\n"
+"            res = self.get_id(cr, uid, voucher_id.journal_id.check_sequence.id, test='id', context=context)\n"
+"            return res and res[0]\n"
+"        else:\n"
+"            return False\n"
+"        \n"
+"    def _get_new_no(self, cr, uid, context=None):\n"
+"        \"\"\"\n"
+"        Function to get the next number used to generate sequence\n"
+"        \"\"\"\n"
+"        if context is None:\n"
+"            context = {}\n"
+"        res = []\n"
+"        if 'active_id' in context:\n"
+"            voucher_id = self.pool.get('account.voucher"
+msgstr ""
+
+#. module: trescloud_cheques
+#: model:ir.model,name:trescloud_cheques.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: trescloud_cheques
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:check.check,payee_name:0
+msgid "Payee name"
+msgstr ""
+
+#. module: trescloud_cheques
+#: view:check.check:0
+#: selection:check.check,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: trescloud_cheques
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:check.check,current_date:0
+msgid "Current date"
+msgstr ""
+
+#. module: trescloud_cheques
+#: field:check.check,supplier:0
+msgid "Partner"
+msgstr ""
+
+#. module: trescloud_cheques
+#: model:ir.actions.act_window,help:trescloud_cheques.action_view_check
+msgid "With this module you can create and print new checks. You can also track the status of the check (like cancelled, charged, lost or rejected).\n"
+"It is related to vendor payments module and must have a journal configured as a check journal."
+msgstr ""
+

=== added directory 'trescloud_cheques/report'
=== added file 'trescloud_cheques/report/cheque_report.odt'
Binary files trescloud_cheques/report/cheque_report.odt	1970-01-01 00:00:00 +0000 and trescloud_cheques/report/cheque_report.odt	2013-05-03 13:54:27 +0000 differ
=== added file 'trescloud_cheques/report/ingreso_egreso_report.odt'
Binary files trescloud_cheques/report/ingreso_egreso_report.odt	1970-01-01 00:00:00 +0000 and trescloud_cheques/report/ingreso_egreso_report.odt	2013-05-03 13:54:27 +0000 differ
=== added file 'trescloud_cheques/report/report_data.xml'
--- trescloud_cheques/report/report_data.xml	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/report/report_data.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<!-- no actualizar ya que en multicompania o multidb debe poder personalizarse -->
+	<data noupdate="1">
+	
+	<!-- !!!!!!!!!!!!!!!!!!!!!!!!!  REPORTE - CHEQUE  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+	
+		<record id="report_check" model="ir.actions.report.xml">
+			<field name="name">Impresion de cheque</field>
+			<field name="type">ir.actions.report.xml</field>
+			<field name="model">check.check</field>
+			<field name="report_name">check_report</field>
+			<field name="report_type">aeroo</field>
+			<field name="in_format">oo-odt</field>
+			<field name='out_format' eval="ref('report_aeroo_ooo.report_mimetypes_pdf_odt')" />
+			<field name="report_rml">trescloud_cheques/report/cheque_report.odt</field>
+			<field name="parser_state">default</field>
+			<field name="tml_source">file</field>
+		</record>
+	
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!  REPORTE - COMPROBANTE DE INGRESO Y EGRESO  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+	
+		<record id="voucher_report" model="ir.actions.report.xml">
+			<field name="name">Comprobante Ingreso-Egreso</field>
+			<field name="type">ir.actions.report.xml</field>
+			<field name="model">account.voucher</field>
+			<field name="report_name">Comprobante Ingreso-Egreso</field>
+			<field name="report_type">aeroo</field>
+			<field name="in_format">oo-odt</field>
+			<field name='out_format' eval="ref('report_aeroo_ooo.report_mimetypes_pdf_odt')" />
+			<field name="report_rml">trescloud_cheques/report/ingreso_egreso_report.odt</field>
+			<field name="parser_state">default</field>
+			<field name="tml_source">file</field>
+		</record>
+		
+		<ir_set>
+			<field eval="'action'" name="key" />
+			<field eval="'client_print_multi'" name="key2" />
+			<field eval="['account.voucher']" name="models" />
+			<field name="name">voucher</field>
+			<field eval="'ir.actions.report.xml,'+str(voucher_report)" name="value" />
+			<field eval="True" name="isobject" />
+			<field eval="True" name="replace" />
+		</ir_set>   
+
+	</data>
+</openerp>
\ No newline at end of file

=== added directory 'trescloud_cheques/security'
=== added file 'trescloud_cheques/security/ir.model.access.csv'
--- trescloud_cheques/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/security/ir.model.access.csv	2013-05-03 13:54:27 +0000
@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_check_check","check.check","model_check_check","account_payment.group_account_payment",1,1,1,0
\ No newline at end of file

=== added file 'trescloud_cheques/trescloud_cheques.py'
--- trescloud_cheques/trescloud_cheques.py	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/trescloud_cheques.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,299 @@
+# -*- coding: utf-8 -*-
+from osv import osv, fields
+from datetime import datetime
+from amount_to_words import amount_to_words_es
+from tools.translate import _
+import netsvc
+import pooler
+import time
+import re
+
+class check(osv.osv):
+    
+    """ Cheque """
+    _name = 'check.check'
+    
+    def get_id(self, cr, uid, sequence_id, test='id', context=None):
+        """
+        Function to find next sequence number
+        """
+        seq_pool = self.pool.get('ir.sequence')
+        assert test in ('code', 'id')
+        company_id = self.pool.get('res.users').read(cr, uid, uid, ['company_id'], context=context)['company_id'][0] or None
+        cr.execute('''SELECT id, number_next, prefix, suffix, padding
+                      FROM ir_sequence
+                      WHERE %s=%%s
+                      AND active=true
+                      AND (company_id = %%s or company_id is NULL)
+                      ORDER BY company_id, id
+                      FOR UPDATE NOWAIT''' % test,
+                      (sequence_id, company_id))
+        res = cr.dictfetchone()
+        if res:
+            if res['number_next']:
+                return (seq_pool._process(res['prefix']) + '%%0%sd' % res['padding'] % res['number_next'] + seq_pool._process(res['suffix']),
+                        res['number_next'])
+            else:
+                return (seq_pool._process(res['prefix']) + seq_pool._process(res['suffix']), 0)
+        return False
+
+    def _get_nxt_no(self, cr, uid, context=None):
+        """
+        Function to find next sequence number and update sequence
+        """
+        if context is None:
+            context = {}
+        if 'active_id' in context:
+            voucher_id = self.pool.get('account.voucher').browse(cr, uid, context['active_id'], context=context)
+            if not voucher_id.journal_id.check_sequence:
+                raise osv.except_osv(_('Warning!'), _('Please add "Check Sequence" for journal %s.'%str(voucher_id.journal_id.name)))
+            res = self.get_id(cr, uid, voucher_id.journal_id.check_sequence.id, test='id', context=context)
+            return res and res[0]
+        else:
+            return False
+        
+    def _get_new_no(self, cr, uid, context=None):
+        """
+        Function to get the next number used to generate sequence
+        """
+        if context is None:
+            context = {}
+        res = []
+        if 'active_id' in context:
+            voucher_id = self.pool.get('account.voucher').browse(cr, uid, context['active_id'], context=context)
+            res = self.get_id(cr, uid, voucher_id.journal_id.check_sequence.id , test='id', context=context)
+            #print res
+        return res and res[1]
+    
+    def onchange_check_number(self, cr, uid, ids, journal, context=None):
+        journal_id = self.pool.get('account.journal').browse(cr, uid, journal, context=context)
+        result={}
+        res={}
+        context={}
+        warning = {}
+        if not journal_id.check_sequence:
+            warning = {
+                        'title': _('Warning!'),
+                        'message': _('Please add "Check Sequence" for journal %s.'%str(journal_id.name))
+                        }
+            return {'warning':warning}
+        result=self.get_id(cr, uid, journal_id.check_sequence.id , test='id', context=context)
+        res['check_number']=result[0]
+        res['new_no']=result[0]
+        journal_id = self.pool.get('account.journal').browse(cr, uid, journal, context=context)
+        context.update({'journal_id':journal})
+        return {'value': res}
+    
+    def default_get(self, cr, uid, fields_list, context=None):
+        """
+        Returns default values for fields
+        @param fields_list: list of fields, for which default values are required to be read
+        @param context: context arguments, like lang, time zone
+
+        @return: Returns a dict that contains default values for fields
+        """
+        if context is None:
+            context = {}
+        journal_id=context.get('journal_id', False)
+        values={}
+        if journal_id:
+            partner_obj = self.pool.get('res.partner')
+            partner = partner_obj.browse(cr, uid, context['partner_id'])
+            values = super(check, self).default_get(cr, uid, fields_list, context=context)  
+            values.update({
+                'amount':context['amount'],
+                'journal_id':context['journal_id'],
+                'supplier':context['partner_id'],
+                'payee_name':partner.name,
+                'amount_in_words':amount_to_words_es(context['amount']),
+                'check_number':self._get_nxt_no(cr, uid, context),
+                'new_no': self._get_new_no(cr, uid, context),
+                'state':'draft',
+                'ver_p':True,
+                
+            })
+        else:
+            #journalo_id = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+            #nxt_no = self.pool.get('ir.sequence').read(cr, uid, journalo_id.check_sequence.id, ['number_next'], context=context)['number_next']
+            #new_no=nxt_no+1
+            #self.pool.get('ir.sequence').write(cr, uid, [journalo_id.check_sequence.id], {'number_next': new_no}, context=context)
+            values.update({
+                'amount_in_words': 'Cero con 00/100',
+                'current_date': datetime.now(),
+                'state': 'draft',
+                'ver_p':False,
+           #     'new_no':nxt_no,
+                
+            })           
+        return values
+    
+    def onchange_partner(self,cr,uid,ids,partner_id,context=None):
+        result={}
+        partner_obj = self.pool.get('res.partner')
+        partner = partner_obj.browse(cr, uid, partner_id)
+        result['payee_name'] = partner.name
+        return {'value': result}
+    
+    def onchange_amount(self, cr, uid, ids, amount, context=None):
+        """
+        Function to convert amount to words
+        """
+        result = {}
+        
+        amount_in_words = amount_to_words_es(amount)
+
+        result['amount_in_words'] = amount_in_words
+        
+        return {'value': result}
+    
+    def unlink(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        checks = self.read(cr, uid, ids, ['state'], context=context)
+        unlink_ids = []
+        for t in checks:
+            if t['state'] in ('draft'):
+                unlink_ids.append(t['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete check(s) that are already printed!'))
+        osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+        return True
+    
+    _columns = {
+        'supplier':fields.many2one('res.partner', 'Partner', change_default=1, required=True ),
+        'journal_id': fields.many2one('account.journal', 'Journal',required=True),
+        'check_number': fields.char('Check Number', size=32, help='check number',required=True),
+        'payee_name': fields.char('Payee name', size=45, help='Used to indicate the payee name of check.', required=True),
+        'current_date': fields.date('Current date', required=True),
+        'amount': fields.float('Amount', digits=(2,2), required=True),
+        'amount_in_words': fields.char(' ', size=70),
+        'check_id': fields.many2one('account.voucher', 'Check Reference'),
+        'state': fields.selection([
+            ('draft', 'Draft'),
+            ('printed', 'Printed'),
+            ('canceled', 'Canceled'),
+            ('charged', 'Charged'),
+            ('lost', 'Lost'),
+            ('rejected', 'Rejected'),
+            ],"State", readonly=True,),
+        'new_no': fields.integer('Update Check Number', help= 'Enter new check number here if you wish to update'),
+        'ver_p':fields.boolean('Verificacion'),
+    }
+    _sql_constraints = [
+        ('check_number_uniq', 'unique (check_number)','The check number must be unique !'),
+    ]
+    _defaults = {
+        'amount_in_words': 'Cero con 00/100',
+        'current_date': datetime.now(),
+        'state': 'draft',
+        'check_number':_get_nxt_no,
+        'new_no': _get_new_no,
+     }
+    
+    def _check_number_check(self,cr,uid,ids):
+        res = True
+        for check in self.browse(cr, uid, ids):
+            cadena='(\d{6})'
+            ref = check.check_number
+            if check.check_number:
+                if re.match(cadena,ref):
+                    res = True
+                else:
+                    res = False
+            return res
+    
+    _constraints = [(_check_number_check,_('The number of check is incorrect, it must be of six digits XXXXXX, X is a number.'),['check_number',])]    
+   
+    def action_canceled(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if not len(ids):
+            return False
+        self.write(cr, uid, ids, {'state': 'canceled'})
+        wf_service = netsvc.LocalService("workflow")
+        for i in ids:     
+            wf_service.trg_write(uid,'check.check', i, cr)
+        return True
+    
+    def action_charged(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if not len(ids):
+            return False
+        self.write(cr, uid, ids, {'state': 'charged'})
+        wf_service = netsvc.LocalService("workflow")
+        for i in ids:     
+            wf_service.trg_write(uid,'check.check', i, cr)
+        return True
+    
+    def action_lost(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if not len(ids):
+            return False
+        self.write(cr, uid, ids, {'state': 'lost'})
+        wf_service = netsvc.LocalService("workflow")
+        for i in ids:     
+            wf_service.trg_write(uid,'check.check', i, cr)
+        return True
+    
+    def action_rejected(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        if not len(ids):
+            return False
+        self.write(cr, uid, ids, {'state': 'rejected'})
+        wf_service = netsvc.LocalService("workflow")
+        for i in ids:     
+            wf_service.trg_write(uid,'check.check', i, cr)
+        return True
+    
+    def action_printed(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        self.write(cr, uid, ids, {'state': 'printed', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+#        self.write(cr, uid, ids, {})
+#        self.write(cr, uid, ids, { 'state' : 'printed' })
+#######################################################################################################       
+        #funciona cuando es sobre modulos base.
+#######################################################################################################
+        
+#        for obj_inv in self.browse(cr, uid, ids, context=context):
+#            if obj_inv.ver_p == False:
+#                nxt_no = self.pool.get('ir.sequence').read(cr, uid,  obj_inv.journal_id.check_sequence.id, ['number_next'], context=context)['number_next']
+#                new_no=nxt_no+1
+#                self.pool.get('ir.sequence').write(cr, uid, [ obj_inv.journal_id.check_sequence.id], {'number_next': new_no}, context=context)
+
+########################################################################################################       
+        ## funcion especifica para ecua_account
+########################################################################################################        
+        for obj_inv in self.browse(cr, uid, ids, context=context):
+            nxt_no = self.pool.get('ir.sequence').read(cr, uid,  obj_inv.journal_id.check_sequence.id, ['number_next'], context=context)['number_next']
+            new_no=nxt_no+1
+            self.pool.get('ir.sequence').write(cr, uid, [ obj_inv.journal_id.check_sequence.id], {'number_next': new_no}, context=context)
+        
+        return True
+        
+    def imprimir(self, cr, uid, ids, context=None):
+        self.action_printed(cr, uid, ids, context=context)
+        return {
+             'type': 'ir.actions.report.xml',
+             'report_name': 'check_report',    # the 'Service Name' from the report
+             'datas' : {
+             'model' : 'check.check',    # Report Model
+             'res_ids' : ids
+             }
+         }
+    
+    def reprint(self, cr, uid, ids, context=None):
+
+        return {
+             'type': 'ir.actions.report.xml',
+             'report_name': 'check_report',    # the 'Service Name' from the report
+             'datas' : {
+             'model' : 'check.check',    # Report Model
+             'res_ids' : ids
+             }
+         }    
+
+check()

=== added file 'trescloud_cheques/trescloud_cheques_view.xml'
--- trescloud_cheques/trescloud_cheques_view.xml	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/trescloud_cheques_view.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+	<data>
+		
+	<!-- VISTA -->
+	<record model="ir.ui.view" id="view_ckeck_form">
+	    <field name="name">view.check.form</field>
+	    <field name="model">check.check</field>
+	    <field name="type">form</field>
+	    <field name="arch" type="xml">
+	        <form string="Manage checks">
+	           <group col="2" colspan="2">
+	               <separator colspan="2"></separator> 
+	               <field name="supplier" on_change="onchange_partner(supplier)" attrs="{'readonly':[('state','!=','draft')]}"/>
+	               <field name="check_number" attrs="{'readonly':[('state','!=','draft')]}"/> 	               
+	               <field name="amount" on_change="onchange_amount(amount)" attrs="{'readonly':[('state','!=','draft')]}"/>	
+	               <field name="payee_name" attrs="{'readonly':[('state','!=','draft')]}"/>               	               	                                                                            	               
+	           </group>
+	           <group col="2" colspan="2">
+	               <separator colspan="2"></separator> 
+	               <field name="journal_id" on_change="onchange_check_number(journal_id)" attrs="{'readonly':[('state','!=','draft')]}"/>
+	               <field name="current_date" attrs="{'readonly':[('state','!=','draft')]}"/>	
+	               <newline/>
+	               <field name="amount_in_words" nolabel="1" colspan="2"/> 	                                                                                         	               
+	           </group>     
+               <group col="8" colspan="8">                   
+                   <separator colspan="7"></separator>
+                   <field name="state"/>
+                   <button name="check_draft_to_printed" string="Print" type="workflow" states="draft" icon="gtk-print"/>  
+                   <button name="reprint" string="Reprint" type="object" states="printed" icon="gtk-print"/>         	  
+				   <button name="action_charged" string="Charged" type="object" states="printed" icon="terp-dolar"/>	               
+	               <button name="action_rejected" string="Rejected" type="object" states="printed" icon="terp-dolar_ok!"/>
+	               <button name="action_canceled" string="Canceled" states="printed" icon="gtk-cancel" type="object"/> 
+	               <button name="action_lost" string="Lost" type="object" states="printed" icon="terp-gtk-media-pause"/>
+               </group>    
+	        </form>
+		</field>
+	</record>
+	
+    <record id="check_check_view_filter" model="ir.ui.view">
+       <field name="name">check.check.select</field>
+       <field name="model">check.check</field>
+       <field name="type">search</field>
+       <field name="arch" type="xml">
+           <search string="Search Check">
+              <group col="10" colspan="4">
+                   <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Checks"/>
+                   <filter name="printed" icon="gtk-print" string="Printed" domain="[('state','=','printed')]" help="Printed Checks"/>
+                   <filter name="charged" icon="terp-dolar" string="Charged" domain="[('state','=','charged')]" help="Charged Checks"/>
+                   <filter name="rejected" icon="terp-dolar_ok!" string="Rejected" domain="[('state','=','rejected')]" help="Reject Checks"/>
+                   <filter name="canceled" icon="gtk-cancel" string="Canceled" domain="[('state','=','canceled')]" help="Canceled Checks"/>
+                   <filter name="lost" icon="terp-gtk-media-pause" string="Lost" domain="[('state','=','lost')]" help="Lost Checks"/>
+                   <separator orientation="vertical"/>                            
+                   <field name="supplier"/>
+                   <field name="check_number"/>
+               </group>
+          </search>
+        </field>
+    </record>
+	
+	<record model="ir.ui.view" id="view_check_tree">
+	    <field name="name">view.check.tree</field>
+	    <field name="model">check.check</field>
+	    <field name="type">tree</field>
+	    <field name="arch" type="xml">
+	        <tree string="Vouchers">
+	            <field name="current_date"/>
+	            <field name="supplier"/>
+                <field name="journal_id"/>
+	            <field name="check_number"/>				
+	            <field name="amount"/>
+	            <field name="state"/>	            
+	        </tree>
+		</field>
+	</record>
+	
+	<!-- ACCION -->
+	<record model="ir.actions.act_window" id="action_view_check">
+        <field name="name">Cheques</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">check.check</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_check_tree"/>
+        <field name="search_view_id" ref="check_check_view_filter"/>
+        <field name="help">With this module you can create and print new checks. You can also track the status of the check (like cancelled, charged, lost or rejected).
+It is related to vendor payments module and must have a journal configured as a check journal.</field>
+    </record>
+	
+	<!-- MENU -->
+	<menuitem id="submenu_check" name="Cheques" action="action_view_check" parent="account.menu_finance_payables"/>
+	
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'trescloud_cheques/workflow'
=== added file 'trescloud_cheques/workflow/check_wkf.xml'
--- trescloud_cheques/workflow/check_wkf.xml	1970-01-01 00:00:00 +0000
+++ trescloud_cheques/workflow/check_wkf.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,105 @@
+<?xml version="1.0" ?>
+<openerp>
+	<data>
+		<record id="workflow_workflowchecks0" model="workflow">
+			<field eval="1" name="on_create"/>
+			<field name="name">workflow_checks</field>
+			<field name="osv">check.check</field>
+		</record>
+		
+		<record id="workflow_activity_draft0" model="workflow.activity">
+			<field name="kind">function</field>
+			<field name="name">Draft</field>
+			<field name="join_mode">XOR</field>
+			<field model="workflow" name="wkf_id" search="[('name', '=', u'workflow_checks')]"/>
+			<field eval="0" name="flow_stop"/>
+			<field name="split_mode">XOR</field>
+			<field name="action">write({'state':'draft'})</field>		
+			<field eval="1" name="flow_start"/>
+		</record>
+ 		<record id="workflow_activity_printed0" model="workflow.activity">
+			<field name="kind">function</field>
+			<field name="name">Printed</field>
+			<field name="join_mode">XOR</field>
+			<field model="workflow" name="wkf_id" search="[('name', '=', u'workflow_checks')]"/>
+			<field eval="0" name="flow_stop"/>
+			<field name="split_mode">XOR</field>
+			<!--  <field name="action">write({'state':'printed'})</field>-->
+			<field name="action">action_printed()</field>
+			<field eval="0" name="flow_start"/>
+		</record> 
+		<record id="workflow_activity_canceled0" model="workflow.activity">
+			<field name="kind">function</field>
+			<field name="name">Canceled</field>
+			<field name="join_mode">XOR</field>
+			<field model="workflow" name="wkf_id" search="[('name', '=', u'workflow_checks')]"/>
+			<field eval="1" name="flow_stop"/>
+			<field name="split_mode">XOR</field>
+			<field name="action">action_canceled()</field>
+			<field eval="0" name="flow_start"/>
+		</record>						
+		<record id="workflow_activity_charged0" model="workflow.activity">
+			<field name="kind">function</field>
+			<field name="name">Charged</field>
+			<field name="join_mode">XOR</field>
+			<field model="workflow" name="wkf_id" search="[('name', '=', u'workflow_checks')]"/>
+			<field eval="1" name="flow_stop"/>
+			<field name="split_mode">XOR</field>
+			<field name="action">write({'state':'charged'})</field>
+			<field eval="0" name="flow_start"/>
+		</record>
+		<record id="workflow_activity_lost0" model="workflow.activity">
+			<field name="kind">function</field>
+			<field name="name">Lost</field>
+			<field name="join_mode">XOR</field>
+			<field model="workflow" name="wkf_id" search="[('name', '=', u'workflow_checks')]"/>
+			<field eval="1" name="flow_stop"/>
+			<field name="split_mode">XOR</field>
+			<field name="action">write({'state':'lost'})</field>
+			<field eval="0" name="flow_start"/>
+		</record>
+		<record id="workflow_activity_rejected0" model="workflow.activity">
+			<field name="kind">function</field>
+			<field name="name">Rejected</field>
+			<field name="join_mode">XOR</field>
+			<field model="workflow" name="wkf_id" search="[('name', '=', u'workflow_checks')]"/>
+			<field eval="1" name="flow_stop"/>
+			<field name="split_mode">XOR</field>
+			<field name="action">write({'state':'rejected'})</field>
+			<field eval="0" name="flow_start"/>
+		</record>		
+	</data>
+
+	<data>
+		<record id="workflow_transition_2" model="workflow.transition">
+			<field name="signal">check_draft_to_printed</field>
+			<field model="workflow.activity" name="act_from" search="[('name', '=', u'Draft')]"/>
+			<field model="workflow.activity" name="act_to" search="[('name', '=', u'Printed')]"/>
+			<field name="condition">True</field>
+		</record>
+		<record id="workflow_transition_0" model="workflow.transition">
+			<field name="signal">check_printed_to_canceled</field>
+			<field model="workflow.activity" name="act_from" search="[('name', '=', u'Printed')]"/>
+			<field model="workflow.activity" name="act_to" search="[('name', '=', u'Canceled')]"/>
+			<field name="condition">True</field>
+		</record>
+		<record id="workflow_transition_1" model="workflow.transition">
+			<field name="signal">check_printed_to_charged</field>
+			<field model="workflow.activity" name="act_from" search="[('name', '=', u'Printed')]"/>
+			<field model="workflow.activity" name="act_to" search="[('name', '=', u'Charged')]"/>
+			<field name="condition">True</field>
+		</record>
+		<record id="workflow_transition_3" model="workflow.transition">
+			<field name="signal">check_printed_to_lost</field>
+			<field model="workflow.activity" name="act_from" search="[('name', '=', u'Printed')]"/>
+			<field model="workflow.activity" name="act_to" search="[('name', '=', u'Lost')]"/>
+			<field name="condition">True</field>
+		</record>
+		<record id="workflow_transition_6" model="workflow.transition">
+			<field name="signal">check_printed_to_rejected</field>
+			<field model="workflow.activity" name="act_from" search="[('name', '=', u'Printed')]"/>
+			<field model="workflow.activity" name="act_to" search="[('name', '=', u'Rejected')]"/>
+			<field name="condition">True</field>
+		</record>		
+	</data>
+</openerp>
\ No newline at end of file

=== added directory 'trescloud_voucher_lote'
=== added file 'trescloud_voucher_lote/__init__.py'
--- trescloud_voucher_lote/__init__.py	1970-01-01 00:00:00 +0000
+++ trescloud_voucher_lote/__init__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,26 @@
+
+# -*- encoding: utf-8 -*-
+########################################################################
+#                                                                       
+# @authors: Patricio Rangles                                                                           
+# Copyright (C) 2012 TRESCLOUD CIA. LTDA.                                  
+#                                                                       
+#This program is free software: you can redistribute it and/or modify   
+#it under the terms of the GNU General Public License as published by   
+#the Free Software Foundation, either version 3 of the License, or      
+#(at your option) any later version.                                    
+#
+# This module is GPLv3 or newer and incompatible
+# with OpenERP SA "AGPL + Private Use License"!
+#                                                                       
+#This program is distributed in the hope that it will be useful,        
+#but WITHOUT ANY WARRANTY; without even the implied warranty of         
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          
+#GNU General Public License for more details.                           
+#                                                                       
+#You should have received a copy of the GNU General Public License      
+#along with this program.  If not, see http://www.gnu.org/licenses.
+########################################################################
+import trescloud_voucher_lote
+
+

=== added file 'trescloud_voucher_lote/__openerp__.py'
--- trescloud_voucher_lote/__openerp__.py	1970-01-01 00:00:00 +0000
+++ trescloud_voucher_lote/__openerp__.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+########################################################################
+#                                                                       
+# @authors: Patricio Rangles                                                                          
+# Copyright (C) 2012  TRESCloud Cia. Ltda.                                 
+#                                                                       
+#This program is free software: you can redistribute it and/or modify   
+#it under the terms of the GNU General Public License as published by   
+#the Free Software Foundation, either version 3 of the License, or      
+#(at your option) any later version.                                    
+#
+# This module is GPLv3 or newer and incompatible
+# with OpenERP SA "AGPL + Private Use License"!
+#                                                                       
+#This program is distributed in the hope that it will be useful,        
+#but WITHOUT ANY WARRANTY; without even the implied warranty of         
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          
+#GNU General Public License for more details.                           
+#                                                                       
+#You should have received a copy of the GNU General Public License      
+#along with this program.  If not, see http://www.gnu.org/licenses.
+########################################################################
+{
+    "name" : "Registro del Numero de Lote de Vouchers",
+    "version" : "1.0",
+    "author" : "Patricio Rangles",
+    "website": "http://www.trescloud.com",
+    "category" : "Lote de Vouchers",
+    "description": """Ingreso del numero de lote para los vouchers que son cobrados a los clientes
+    Debe configurarse un diario (Journal) para cada institucion que emite la tarjeta con la cual se 
+    efectua el pago""",
+    "depends": ['base','account_voucher'],
+    "init_xml": [],
+    "update_xml": [
+        'views/trescloud_voucher_lote_view.xml',
+    ],
+    "installable": True,
+    "active": False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+

=== added file 'trescloud_voucher_lote/trescloud_voucher_lote.py'
--- trescloud_voucher_lote/trescloud_voucher_lote.py	1970-01-01 00:00:00 +0000
+++ trescloud_voucher_lote/trescloud_voucher_lote.py	2013-05-03 13:54:27 +0000
@@ -0,0 +1,63 @@
+
+# -*- encoding: utf-8 -*-
+########################################################################
+#                                                                       
+# @authors: Patricio Rangles                                                                           
+# Copyright (C) 2012  TRESCLOUD Cia Ltda.                                 
+#                                                                       
+#This program is free software: you can redistribute it and/or modify   
+#it under the terms of the GNU General Public License as published by   
+#the Free Software Foundation, either version 3 of the License, or      
+#(at your option) any later version.                                    
+#
+# This module is GPLv3 or newer and incompatible
+# with OpenERP SA "AGPL + Private Use License"!
+#                                                                       
+#This program is distributed in the hope that it will be useful,        
+#but WITHOUT ANY WARRANTY; without even the implied warranty of         
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          
+#GNU General Public License for more details.                           
+#                                                                       
+#You should have received a copy of the GNU General Public License      
+#along with this program.  If not, see http://www.gnu.org/licenses.
+########################################################################
+
+from osv import osv
+from osv import fields
+#from tools.translate import _
+
+class account_voucher(osv.osv):
+    
+    _inherit = 'account.voucher'
+    _name = 'account.voucher'
+    
+    _columns = {
+        'reference': fields.char('No. Referencia', size=64, required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Puede anotarse la siguiente informacion: No. de Deposito, No. de Voucher, otras referencias"),
+                }
+    
+    _defaults = {  
+        'reference': 'Efectivo',
+        }
+    
+account_voucher()
+
+
+#class account_journal(osv.osv):
+#    
+#    _inherit = 'account.journal'
+#    _name = 'account.journal'
+#    
+#    _columns = {
+#        'imprimir_cheque': fields.boolean('Habilitar para generar la impresion de cheques desde egresos (Pagos)'),
+#        'ingresar_voucher': fields.boolean('Habilitar para ingresar la informacion de vouchers desde ingresos (Cobros)'),
+#                }
+#    
+#    _defaults = {  
+#        'imprimir_cheque': False,
+#        'ingresar_voucher': False,
+#        }
+#    
+#account_journal()
+
+ 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added directory 'trescloud_voucher_lote/views'
=== added file 'trescloud_voucher_lote/views/trescloud_voucher_lote_view.xml'
--- trescloud_voucher_lote/views/trescloud_voucher_lote_view.xml	1970-01-01 00:00:00 +0000
+++ trescloud_voucher_lote/views/trescloud_voucher_lote_view.xml	2013-05-03 13:54:27 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+	<data>
+
+		<record model="ir.ui.view" id="account_voucher_receipt_form_view">
+			<field name="name">account.voucher.form</field>
+			<field name="model">account.voucher</field>
+			<field name="type">form</field>
+			<field name="inherit_id" ref="account_voucher.view_vendor_receipt_form"/>
+			<field name="arch" type="xml">
+			 <field name="reference" position="replace">
+			     <field name="reference" string="No. Referencia"/>
+			 </field>
+			</field>
+		</record>
+
+		<record id="account_voucher_receipt_search_view" model="ir.ui.view">
+			<field name="name">account.voucher.customer_pay.search</field>
+			<field name="model">account.voucher</field>
+			<field name="type">search</field>
+			<field name="inherit_id" ref="account_voucher.view_voucher_filter_customer_pay"/>
+			<field name="arch" type="xml">
+				<field name="reference" position="replace">
+					<field name="reference" string="No. Referencia" />
+				</field>
+			</field>
+		</record>
+
+	</data>
+</openerp>
\ No newline at end of file