Merge lp:~altegra/altegra/altegra_dev_carlos_2 into lp:~altegra/+junk/altegra

[Carlos Blanco - http://www.grupoaltegra.com]

[REF] Purchase_order has product's price in Dollars

[lp:~altegra/altegra/altegra_dev_carlos_2]

102. By Eric Hernández - http://www.grupoaltegra.com on 2013-07-05

[MERGE] Carlos

=== modified file 'account_altegra/__openerp__.py'
--- account_altegra/__openerp__.py	2013-02-19 00:22:16 +0000
+++ account_altegra/__openerp__.py	2013-07-03 23:03:28 +0000
@@ -38,6 +38,7 @@
 	"description": "Account customization altegra",
     "data" :[
         #~ "account_invoice_view.xml",
+        "account_invoice_view.xml",
         ],
 	'demo': [],
 	'test': [],

=== added file 'account_altegra/account_invoice_view.xml'
--- account_altegra/account_invoice_view.xml	1970-01-01 00:00:00 +0000
+++ account_altegra/account_invoice_view.xml	2013-07-03 23:03:28 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_invoice_line_form_inherit">
+            <field name="name">view.invoice.line.form.inherit</field>
+            <field name="type">form</field>
+            <field name="model">account.invoice.line</field>
+            <field name="inherit_id" ref="account.view_invoice_line_form" />
+            <field name="arch" type="xml">
+                <field name="uos_id" position="replace">
+                    <field name="uos_id" nolabel="1"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added directory 'crm_altegra'
=== added file 'crm_altegra/__init__.py'
--- crm_altegra/__init__.py	1970-01-01 00:00:00 +0000
+++ crm_altegra/__init__.py	2013-07-03 23:03:28 +0000
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+#############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    CopyLeft 2012 - http://www.grupoaltegra.com
+#    You are free to share, copy, distribute, transmit, adapt and use for commercial purpose
+#    More information about license: http://www.gnu.org/licenses/agpl.html
+#    info Grupo Altegra ([e-mail])
+#
+#############################################################################
+#
+#    Coded by: Carlos Blanco ([e-mail])
+#
+#############################################################################
+#
+#    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 crm_project

=== added file 'crm_altegra/__openerp__.py'
--- crm_altegra/__openerp__.py	1970-01-01 00:00:00 +0000
+++ crm_altegra/__openerp__.py	2013-07-03 23:03:28 +0000
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+#############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    CopyLeft 2012 - http://www.grupoaltegra.com
+#    You are free to share, copy, distribute, transmit, adapt and use for commercial purpose
+#    More information about license: http://www.gnu.org/licenses/agpl.html
+#    info Grupo Altegra ([e-mail])
+#
+#############################################################################
+#
+#    Coded by: Carlos Blanco ([e-mail])
+#
+#############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################
+
+{
+
+    "name": "CRM Altegra",
+    "version": "0.1",
+    "depends": ["base","sale_altegra"],
+    "author": "Grupo Altegra",
+    "description": """
+       This module allows you to manage projects that are entered
+    """,
+    "website" : "http://www.grupoaltegra.com",
+    "category": "Custom Modules",
+
+    "data" :[
+            'security/ir.model.access.csv',
+            'security/groups.xml',
+            'security/sequence.xml',
+            'crm_project_view.xml',
+            ],
+
+    'demo': [
+            ],
+
+    "active": False,
+    "images": [],
+    "installable": True,
+}

=== added file 'crm_altegra/crm_project.py'
--- crm_altegra/crm_project.py	1970-01-01 00:00:00 +0000
+++ crm_altegra/crm_project.py	2013-07-03 23:03:28 +0000
@@ -0,0 +1,586 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+#############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    CopyLeft 2012 - http://www.grupoaltegra.com
+#    You are free to share, copy, distribute, transmit, adapt and use for commercial purpose
+#    More information about license: http://www.gnu.org/licenses/agpl.html
+#    info Grupo Altegra ([e-mail])
+#
+#############################################################################
+#
+#    Coded by: Carlos Blanco ([e-mail])
+#
+#############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################
+
+from osv import osv, fields
+import datetime
+import time
+from tools.translate import _
+
+class crm_project(osv.Model):
+    _name = "crm.project"
+    
+    def _get_task_date(self, cr, uid, ids, field_names=None, arg=False, context=None):
+        """
+        Metodo para obtener la fecha menor de todas las tareas agregadas al proyecto
+        """
+        res = {}
+        # Para cada projecto buscamos la fecha menor de todas sus tareas
+        for project_row in self.browse(cr, uid, ids, context):
+            # Si es el campo "task_warning_date" buscamos el campo "warning_date"
+            if field_names == 'task_warning_date':
+                field = "warning_date"
+            else:
+                field = "date_limit"
+            # Query donde obtenemos la fehca menor
+            query = "SELECT "+str(field)+" FROM crm_task WHERE state = 'open' AND type = '"+str(project_row.type)+"' AND project_id = '"+str(project_row.id)+"' order by date_limit ASC limit 1 "
+            cr.execute(query)
+            date_min = cr.fetchall()
+            # Si se tiene una fecha
+            if date_min:
+                # Obtenemos la fecha
+                date_min = date_min[0][0]
+                # Separams la fecha y la hora
+                date_min = date_min.split(' ')
+                # Obtenemos solo la fecha
+                date2 = date_min[0]
+                # Se la asiganamos al campo
+                res[project_row.id] = str(date2)
+            else:
+                res[project_row.id] = False
+        return res
+    
+    _columns = {
+        'name': fields.char('Nombre',size= 64, help="Nombre del proyecto", required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'reference': fields.char('Referencia',size=64, readonly=True,states={'draft': [('readonly', False)]}),
+        'user_id': fields.many2one('res.users','Responsable', required=True, readonly=True, states={'draft': [('readonly', False)]}, help = "Usuario que debe estar encargado del proyecto"),
+        'estimated_amount': fields.float('Ingreso estimado', states={'done': [('readonly', True)],'cancel': [('readonly', True)]}, help = "Ingreso que podria dar este proyecto si se gana"),
+        'date':fields.datetime('Fecha de creación', readonly=True, states={'draft': [('readonly', False)]}, help = "Fecha en que se creo el proyecto "),
+        'customer_id': fields.many2one('res.partner','Cliente', readonly=True, states={'draft': [('readonly', False)]}, help = "Cliente que se esta trabajando si es que existe en la base"),
+        'company': fields.char('Empresa', size= 64, readonly=True, required=True, states={'draft': [('readonly', False)]}, help = " Nombre de la empresa que tiene el proyecto"),
+        'contact_name': fields.char('Nombre de contacto', states={'done': [('readonly', True)],'cancel': [('readonly', True)]}, size=64, help="Nombre con quien se debe contactar para información del proyecto"),
+        'phone': fields.char('Teléfono', size= 64, states={'done': [('readonly', True)],'cancel': [('readonly', True)]}),
+        'mail': fields.char('e-mail',size= 64, states={'done': [('readonly', True)],'cancel': [('readonly', True)]}),
+        'type': fields.selection([
+            ('opportunity', 'Oportunidad'),
+            ('implementation', 'Implementación')
+            ], 'Tipo', help="Tipo del proyecto.", readonly=True, states={'draft': [('readonly', False)]}),
+        'state': fields.selection([
+            ('draft', 'Borrador'),
+            ('opportunity', 'Oportunidad'),
+            ('implementation', 'Implementación'),
+            ('done', 'Finalizado'),
+            ('cancel', 'Cancelada')
+            ], 'Estado', readonly=True, help="Estado en el que se encuentra el proyecto.", select=True),
+        #~ 'task_ids': fields.one2many('crm.task','project_id', 'Tareas', states={'done': [('readonly', True)],'draft': [('readonly', True)],'cancel': [('readonly', True)]}, help="Tareas que deben realizarse para el proyecto"),
+        'task_opportunity_ids': fields.one2many('crm.task','project_id', 'Tareas Oportunidades',  domain=[('type','=','opportunity')], readonly=True,states={'opportunity': [('readonly', False)]}, help="Tareas que deben realizarse para el proyecto"),
+        'task_implementation_ids': fields.one2many('crm.task','project_id', 'Tareas Implementaciones',  domain=[('type','=','implementation')], readonly=True,states={'implementation': [('readonly', False)]}, help="Tareas que deben realizarse para el proyecto"),
+        'activity_ids': fields.one2many('crm.activities','project_id', 'Actividades', states={'done': [('readonly', True)],'draft': [('readonly', True)],'cancel': [('readonly', True)]}, help="Actividades que deben realizarse para el proyecto"),
+        'task_min_date':fields.function(_get_task_date,type='date',string="Fecha menor", help="Fecha menor de todos las tareas agregadas al proyecto"),
+        'task_warning_date':fields.function(_get_task_date,type='date',string="Fecha menor", help="Fecha menor de todos las tareas agregadas al proyecto"),
+        'change_date':fields.boolean('Cambio Fecha', help ="Indica que se cambio la fecha de alguna tarea"),
+        'pending_project': fields.boolean('Proyecto Pendiente', states={'done': [('readonly', True)],'draft': [('readonly', True)],'cancel': [('readonly', True)]}, help="Se marca esta opcion para indicar que éste proyecto tendra un seguimiento a largo plazo."),
+        'UEE': fields.many2one('account.analytic.account', 'UEE', required=True, help="Unidad de negocios a las que pertenece el usuario."),
+    }
+    
+    _defaults = {
+        'state': 'draft',
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'user_id': lambda obj, cr, uid, context: uid,
+        'type': 'opportunity',
+        'pending_project': False,
+        'reference': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'crm.project'),
+    }
+    
+    def acction_done(self, cr, uid, ids, context=None):
+        """
+        Función para finalizar el proyecto y cambiarlos a estado Done
+        """
+        for project_row in self.browse(cr, uid ,ids, context):
+            # Validamos que se hayan realizado todas las tareas 
+            #~ self.validate_task_done(cr, uid, project_row.task_ids, context)
+            self.validate_task_done(cr, uid, project_row.task_implementation_ids, context)
+        self.write(cr, uid, ids, {'state':'done'})
+        return True
+    
+    def review_task_change_date(self, cr, uid, ids, context=None):
+        """
+        función para revisar si a otra tarea se le han cambiado la fecha
+        """
+        for projetc_row in self.browse(cr, uid, ids, context):
+            change_date = False
+            if projetc_row.type == 'opportunity':
+                for task_row in projetc_row.task_opportunity_ids:
+                    if task_row.change_date and task_row.state == 'open':
+                        change_date = True
+                        break
+                self.write(cr, uid, ids, {'change_date':change_date})
+            elif projetc_row.type == 'implementation':
+                for task_row in projetc_row.task_implementation_ids:
+                    if task_row.change_date and task_row.state == 'open':
+                        change_date = True
+                        break
+            self.write(cr, uid, [projetc_row.id], {'change_date':change_date})
+        return True
+    
+    def acction_cancel(self, cr, uid, ids, context=None):
+        """  
+        Función para cancelar los projectos y cambiarlas a estado Cancelodo
+        """
+        for project_row in self.browse(cr, uid, ids, context):
+            task_opportunity_ids = [task_row.id for task_row in project_row.task_opportunity_ids]
+            task_implementation_ids = [task_row.id for task_row in project_row.task_implementation_ids]
+            activities_ids = [activity_row.id for activity_row in project_row.activity_ids]
+            if task_opportunity_ids:
+                self.pool.get('crm.task').acction_cancel(cr, uid, task_opportunity_ids, context)
+            if task_implementation_ids:
+                self.pool.get('crm.task').acction_cancel(cr, uid, task_implementation_ids, context)
+            #~ task_ids = [task_row.id for task_row in project_row.task_ids]
+            #~ if task_ids:
+                #~ self.pool.get('crm.task').acction_cancel(cr, uid, task_ids, context)
+        self.write(cr, uid, ids, {'state':'cancel'})
+        return True
+    
+    def on_change_customer_id(self, cr, uid, ids, partner_id, context = None):
+        """
+        Método para obtener todos los datos del cliente que se esta seleccionando
+        """
+        val = {}
+        if partner_id:
+            partner_row = self.pool.get('res.partner').browse(cr, uid, partner_id)
+            val.update({'company':partner_row.name})
+            if partner_row.address:
+                address_row = partner_row.address[0]
+                val.update({'contact_name':address_row.name, 'phone':address_row.phone, 'mail':address_row.email})
+        return { 'value' : val}
+        
+    def validate_task_done(self, cr, uid, task_rows, context=None):
+        """
+        Función que evalua si todas las tareas ya fueron terminadas
+        """
+        done = False
+        if not task_rows:
+            raise osv.except_osv(_('Error !'),_('No tienes asignada ninguna tarea al proyecto.'))
+        for task_row in task_rows:
+            if task_row.state in ('draft','open'):
+                raise osv.except_osv(_('Error !'),_('Aun falta terminar la tarea '+str(task_row.name)+'.'))
+            if task_row.state == 'done':
+                done = True
+        if not done:
+            raise osv.except_osv(_('Error !'),_('No se realizo ninguna tarea.'))
+        return True
+        
+    def acction_confirm(self, cr, uid, ids, context=None):
+        """
+        Función para confirmar el proyecto y pasarlo a estado oportunidad
+        """
+        self.write(cr, uid, ids, {'state': 'opportunity','type':'opportunity'})
+        return True
+        
+    def acction_implementation(self, cr, uid, ids, context=None):
+        """
+        Función para confirmar el proyecto y pasarlo a estado implementación
+        """
+        for project_row in self.browse(cr, uid, ids, context):
+            if not project_row.type == 'implementation':
+                self.validate_task_done(cr, uid, project_row.task_opportunity_ids, context)
+                #~ self.validate_task_done(cr, uid, project_row.task_ids, context)
+        self.write(cr, uid, ids, {'state': 'implementation', 'type':'implementation'})
+        return True
+    
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        Función que redefine la función unlink para evitar que eliminen proyectos que no esten en estado draft
+        """
+        for project_row in self.browse(cr, uid, ids, context):
+            task_ids = []
+            if project_row.state != 'draft':
+                raise osv.except_osv(_('Error !'),_('Solo puedes eliminar proyectos en estao Borrador.'))
+            task_opportunity_ids = [task_row.id for task_row in project_row.task_opportunity_ids]
+            task_implementation_ids = [task_row.id for task_row in project_row.task_implementation_ids]
+            if task_opportunity_ids:
+                self.pool.get('crm.task').unlink(cr, uid, task_opportunity_ids)
+            if task_implementation_ids:
+                self.pool.get('crm.task').unlink(cr, uid, task_implementation_ids)
+            #~ task_ids = [task_row.id for task_row in project_row.task_ids]
+            #~ if task_ids:
+                #~ self.pool.get('crm.task').unlink(cr, uid, task_ids)
+        return super(crm_project, self).unlink(cr, uid, ids, context)
+    
+    def search_task_expired(self, cr, uid, ids=None, context=None):
+        if not context:
+            context = {}
+        self.pool.get('crm.task').search_task_expired(cr, uid, ids=None, context=None)
+        return True
+    
+class crm_task(osv.Model):
+    _name = "crm.task"
+    
+    _columns = {
+        'name': fields.char('Nombre Tarea', size=64, required=True,readonly=True, states={'draft': [('readonly', False)]}),
+        'date_limit': fields.datetime('Fecha Limite', required=True, states={'cancel': [('readonly', True)]}, help="Fecha limite en la cual debe realizarse la tarea"),
+        'user_id': fields.many2one('res.users','Responsable', required=True, select=True,readonly=True, states={'draft': [('readonly', False)]}),
+        'note': fields.text('Notas',states={'cancel': [('readonly', True)]}),
+        'project_id': fields.many2one('crm.project', 'Proyecto', domain="[('state','in',('opportunity','implementation'))]", required = True, select=True,readonly=True, states={'draft': [('readonly', False)]}),
+        'type': fields.selection([
+            ('opportunity', 'Oportunidad'),
+            ('implementation', 'Implementación')
+            ], 'Tipo', help="Tipo de la tarea.", readonly=True, states={'draft': [('readonly', False)]},select=True),
+        'state': fields.selection([
+            ('draft', 'Borrador'),
+            ('open', 'Abierta'),
+            ('done', 'Finalizado'),
+            ('cancel', 'Cancelada')
+            ], 'Estado', readonly=True, help="Estado en el que se encuentra la tarea.", select=True),
+        'warning_date': fields.date('Fecha para aviso', help="Fecha en que se avisara que la tarea esta por vencerse"),
+        'change_date':fields.boolean('Cambio Fecha', readonly=True, help ="Indica que se cambio la fecha de la tarea"),
+        'activity_id': fields.many2one('crm.activities','Actividad', required=True, readonly=True, states={'draft': [('readonly', False)]}, help="Actividad a la que pertenece esta tarea"),
+    }
+    
+    _defaults = {
+        'state': 'draft',
+        'change_date': False,
+        'user_id': lambda obj, cr, uid, context: uid,
+        'type': 'opportunity',
+    }
+    
+    def onchange_activity(self, cr, uid, ids, activity_id,context=None):
+        """Función para ontener el proyecto al que pertenece el sprint seleccionado"""
+        val = {}
+        if not activity_id:
+            val['project_id'] = False
+            return {'value': val}
+        # Obtenemos el registro de la actividad
+        activity_row = self.pool.get('crm.activities').browse(cr, uid, activity_id)
+        # Asignamos al proyecto que tiene asigando
+        val['project_id'] = activity_row.project_id.id
+        return {'value': val}
+    
+    def get_email_vals(self, cr, uid, task_ids, subject, message, context=None):
+        """
+        Funcion para obtener los datos para crear el correo
+        """
+        list_vals = []
+        notifications_obj = self.pool.get('email.notifications')
+        user_obj = self.pool.get('res.users')
+        # Buscamos las notificaciones
+        notifications_ids = notifications_obj.search(cr, uid, [], limit = 1)
+        if not notifications_ids:
+            raise osv.except_osv(_('Error'), _("No existen correos de destinatario en las notificaciones!"))
+        notifications_row = notifications_obj.browse(cr,uid, notifications_ids, context)[0]
+        # Validamos si existen correos para productos recibidos
+        if not notifications_row.authorization_discount:
+            raise osv.except_osv(_('Error'), _("No existen correos de destinatario !"))
+        for task_row in self.browse(cr, uid, task_ids, context):
+            # Validamos que el usuario tenga correo
+            if not task_row.user_id.user_email:
+                raise osv.except_osv(_('Error'), _("No tiene correo el usuario "+str(task_row.user_id.name)+" !"))
+            date = str(task_row.date_limit)
+            task_name = task_row.name.encode('utf-8')
+            project_name = task_row.project_id.name.encode('utf-8')
+            # concatenamos el asunto y el mensaje con los datos de la tarea
+            subject_new = subject % (str(task_name), date)
+            message_new = message % (str(task_name),str(project_name),date,task_row.user_id.name.encode('utf-8'))
+            # Obtenemos los destinatarios que es el del responsable de la tarea y al director
+            email_to = notifications_row.authorization_discount.encode('utf-8') +","+task_row.user_id.user_email.encode('utf-8')
+            # Obtenemos todos los valores para crear el correo
+            vals = {
+                'email_from': "[e-mail]",
+                'email_to': email_to,
+                'subject': subject_new,
+                'body_text' :message_new,
+            }
+            list_vals.append(vals)
+        return list_vals
+    
+    def search_task_expired(self, cr, uid, ids=None, context=None):
+        if not context:
+            context = {}
+        # Obtenemos la fecha de hoy
+        today = datetime.date.today()
+        # Obtenemos las tareas que esten abiertas y que su fecha de expiracion es 
+        expiring_task_ids = self.search(cr, uid, [('state','=','open'),('warning_date','=',today)])
+        # Obtenemos las tareas que estan abiertas pero la fecha limite de realizacion esta pasada
+        expired_task_ids = self.search(cr, uid, [('state','=','open'),('date_limit','<',str(today))])
+        # Creamos los correos para las tareas que apenas expiraran 
+        if expiring_task_ids:
+            # Creamos el asunto y el mensaje
+            subject = "La tarea '%s' esta por expirar el dia %s "
+            msj = "La tarea '%s' del proyecto '%s' tiene fecha limite de realizacion el dia %s \n Responsable: %s"
+            # Obtenemos los diccionarios para las tareas que van a expirar
+            vals_expiring_task_ids = self.get_email_vals(cr, uid, expiring_task_ids, subject, msj.encode('utf-8'), context)
+            # Enviamos los correos de las tareas que apenas van a expirar
+            self.send_email(cr, uid, ids, vals_expiring_task_ids, context)
+        # Creamos los correos para las tareas que ya estan expiradass
+        if expired_task_ids:
+            # Creamos el asunto y mensaje
+            subject = "La tarea '%s' ya expiro el dia %s"
+            msj = "La tarea '%s' del proyecto '%s' tiene fecha limite de realizacion el dia %s \n Responsable: %s"
+            # Obtenemos los diccionarios para las tareas que van a expirar
+            vals_expired_task_ids = self.get_email_vals(cr, uid, expired_task_ids, subject, msj.encode('utf-8'), context)
+            # Enviamos correos con las tareas ya expiradas
+            self.send_email(cr, uid, ids, vals_expired_task_ids, context)
+        return True
+        
+    def send_email(self, cr, uid, ids, list_vals, context=None):
+        """
+        Método que envia correo por el picking que se recibio
+        ids: ids de task_row
+        vals: diccionario con todos los elementos que se necesitan para crear el correo "email_from, email_to, subject, body_text"
+        """
+        if not context:
+            context = {}
+        # Objetos
+        mail_message_obj = self.pool.get('mail.message')
+        for vals in list_vals:
+            # Creamos el correo
+            msg_id = mail_message_obj.schedule_with_attach(cr, uid, vals['email_from'], [vals['email_to']], vals['subject'], vals['body_text'],
+            model='mail.campaign', email_cc=False, email_bcc=False, reply_to=False,
+            attachments={}, references=False, res_id=1,
+            subtype='html', headers=False, context=context)
+            # Enviamos el Correo
+            mail_message_obj.send(cr,uid,[msg_id],context)
+        return True
+    
+    def acction_confirm(self, cr, uid, ids, context=None):
+        """  
+        Funcion para aprobar las tareas y cambiarlas a estado aprobada
+        """
+        self.write(cr, uid, ids, {'state':'open'})
+        activities_ids = [task_row.activity_id.id for task_row in self.browse(cr, uid, ids, context)]
+        if activities_ids:
+            self.pool.get('crm.activities').update_state_activities(cr, uid, activities_ids, context)
+        return True
+    
+    def acction_done(self, cr, uid, ids, context=None):
+        """  
+        Funcion para Terminar las tareas y cambiarlas a estado Finalizado
+        """
+        activities_ids = []
+        # Para cada tarea que se quiere finalizar se obtiene su actividad y se revisa si no tiene revisiones pendientes
+        for task_row in self.browse(cr, uid, ids, context):
+            activities_ids.append(task_row.activity_id.id)
+            # Si aun no se revisa esa tarea se marca un error
+            if task_row.change_date:
+                raise osv.except_osv(_('Error !'),_('No se puede finalizar una tarea que no se ha revisado.'))
+        # Se actualiza el estado de las tareas a realizado si todas estan bien
+        self.write(cr, uid, ids, {'state':'done'})
+        # Se actualizan las actividades de las tareas que se acaban de finalizar
+        if activities_ids:
+            self.pool.get('crm.activities').update_state_activities(cr, uid, activities_ids, context)
+        return True
+        
+    def acction_cancel(self, cr, uid, ids, context=None):
+        """  
+        Funcion para cancelar las tareas y cambiarlas a estado Finalizado
+        """
+        project_ids = []
+        activities_ids = []
+        # Se obtienen los proyectos relacionados a las tareas a cancelar
+        for task_row in self.browse(cr, uid, ids, context):
+            if task_row.change_date:
+                project_ids.append(task_row.project_id.id)
+            activities_ids.append(task_row.activity_id.id)
+        # Se actualiza el proyecto a revisado puesto que se cancelo la tarea que se cambio la fecha
+        if project_ids:
+            # Se actualiza el proyecto indicando que ya se reviso la tarea con fecha cambiada
+            self.pool.get('crm.project').review_task_change_date(cr, uid, project_ids, context)
+        self.write(cr, uid, ids, {'state':'cancel'})
+        if activities_ids:
+            self.pool.get('crm.activities').update_state_activities(cr, uid, activities_ids, context)
+        return True
+        
+    def action_review(self, cr, uid, ids, context=None):
+        """  
+        Funcion para indicar que esta tarea ya fue revisada
+        """
+        project_ids = []
+        # Se buscan los proyectos relacionados con la tarea
+        for task_row in self.browse(cr, uid, ids, context):
+            project_ids.append(task_row.project_id.id)
+        # Se actualiza la tarea indicando que ya se reviso
+        self.write(cr, uid, ids, {'change_date':False})
+        if project_ids:
+            # Se actualiza el proyecto indicando que ya se reviso
+            self.pool.get('crm.project').review_task_change_date(cr, uid, project_ids, context)
+        return True
+    
+    def get_warning_date(self, cr, uid, vals, context=None):
+        """
+        Función que obtiene la fecha para aviso si es que se agrega la fecha limite
+        """
+        if vals.get('date_limit'):
+            # Obtenemos solo la fecha sin tiempo
+            date = vals.get('date_limit').split(' ')
+            # La convertimos a datetime
+            date =  datetime.datetime.strptime(date[0] ,'%Y-%m-%d')
+            warning_date = date - datetime.timedelta(days = 1)
+            # Actualizamos la fecha para aviso
+            vals.update({'warning_date':warning_date})
+            if context.get('write'):
+                vals.update({'change_date': True})
+        return vals
+    
+    def create(self, cr, uid, vals, context=None):
+        """
+        Función que redefine el metodo create para obtener la fecha limite y las fechas para dar avisos
+        """
+        vals = self.get_warning_date(cr, uid, vals, context)
+        if vals.get('activity_id'):
+            # Obtenemos el registro del spint
+            activity_row = self.pool.get('crm.activities').browse(cr, uid, vals.get('activity_id'))
+            # Asignamos al proyecto que tiene asigando
+            vals.update({'project_id':activity_row.project_id.id,'type':activity_row.project_id.type})
+        vals.update({'change_date': False})
+        # Creamos la nueva tarea
+        task_id = super(crm_task, self).create(cr, uid, vals, context)
+        return task_id
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        Función que redefine el metodo write para saber si se esta modificando la fecha limite
+        """
+        if context is None:
+            context = {}
+        # Actualizamos el context por si se actualiza la fech alimite se actualize tambien el campo change_date
+        context.update({'write':True})
+        # Obtenemos la fecha de aviso
+        vals = self.get_warning_date(cr, uid, vals, context)
+        # Realizamos el write de la funcion original
+        res = super(crm_task, self).write(cr, uid, ids, vals, context)
+        project_ids = []
+        task_ids = []
+        # Obtenemos los ids de los projectos
+        for task_row in self.browse(cr, uid, ids):
+            if task_row.state == 'draft' and task_row.change_date:
+                task_ids.append(task_row.id)
+            elif task_row.change_date:
+                project_ids.append(task_row.project_id.id)
+        # se actualiza el proyecto indicando que se cambio la fecha
+        if project_ids:
+            self.pool.get('crm.project').write(cr, uid, project_ids, {'change_date':True})
+        if task_ids:
+            self.write(cr, uid, task_ids, {'change_date':False})
+        return res
+    
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        Función que redefine la función unlink para evitar que eliminen tarea que no esten en estado draft
+        """
+        activities_ids = []
+        for task_row in self.browse(cr, uid, ids, context):
+            if task_row.state != 'draft':
+                raise osv.except_osv(_('Error !'),_('Solo puedes eliminar tareas en estao Borrador.'))
+            activities_ids.append(task_row.activity_id.id)
+        res = super(crm_task, self).unlink(cr, uid, ids, context)
+        if activities_ids:
+            self.pool.get('crm.activities').update_state_activities(cr, uid, activities_ids, context)
+        return res 
+        
+    
+class crm_activities(osv.Model):
+    
+    _name = "crm.activities"
+    
+    _columns = {
+        'name': fields.char('Nombre', size=64, required=True,readonly=True, states={'draft': [('readonly', False)]}),
+        'task_ids': fields.one2many('crm.task', 'activity_id', 'Tareas', readonly=True, states={'open': [('readonly', False)]}, help="Tareas de la actividad"),
+        'project_id': fields.many2one('crm.project', 'Proyecto', required=True, readonly=True, states={'draft': [('readonly', False)]}, domain="[('state','in',('opportunity','implementation'))]", help="Proyecto al que pertenece la actividad"),
+        'user_id': fields.many2one('res.users','Responsable', required=True, readonly=True, states={'draft': [('readonly', False)]}, help = "Usuario que debe estar encargado de la actividad"),
+        'type': fields.selection([
+            ('opportunity', 'Oportunidad'),
+            ('implementation', 'Implementación')
+            ], 'Tipo', help="Tipo de la actividad.", readonly=True),
+        'state': fields.selection([
+            ('draft', 'Borrador'),
+            ('open', 'Abierta'),
+            ('done', 'Finalizado'),
+            ('cancel', 'Cancelada')
+            ], 'Estado', readonly=True, help="Estado en el que se encuentra la actividad.", select=True),
+        'date_limit': fields.date('Fecha limite', readonly=True, states={'draft': [('readonly', False)]}, help=" Fecha limite en que se debe cumplir la actividad"),
+    }
+    
+    _defaults = {
+        'state': 'draft',
+        'user_id': lambda obj, cr, uid, context: uid,
+    }
+    
+    def create(self, cr, uid, vals, context=None):
+        """
+        Función para actualizar el tipo de la actividad segun el tipo del proyecto seleccionado
+        """
+        if vals.get('project_id'):
+            project_row = self.pool.get('crm.project').browse(cr, uid, vals.get('project_id'))
+            vals.update({'type':project_row.type})
+        return super(crm_activities, self).create(cr, uid, vals, context)
+    
+    def action_confirm_activity(self, cr, uid, ids, context=None):
+        """
+        Función para cambiar el estado de la actividd a confirmada
+        """
+        self.write(cr, uid, ids, {'state':'open'})
+        return True
+    
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        Se redefine el método unlink para no permitir eliminar actividades que no esten en estado draft
+        """
+        for activity_row in self.browse(cr, uid, ids):
+            if activity_row.state != 'draft':
+                raise osv.except_osv(_('Error !'),_('No se puede eliminar una actividad que no esta en estado draft.'))
+        super(crm_activities, self).unlink(cr, uid, ids, context)
+        return True
+    
+    def update_state_activities(self, cr, uid, ids, context=None):
+        """
+        Funcion para cambiar el estado de la actividad en base a sus tareas
+        """
+        # Se recorren todas las actividades
+        for activity_row in self.browse(cr, uid, ids, context):
+            done = 0
+            cancel = 0
+            state =False
+            # Se recorren todas las tareas de la actividad para revisar sus estados si tienen tareas
+            if activity_row.task_ids:
+                for task_row in activity_row.task_ids:
+                    # Si tiene alguntatarea en estado draft u open se marca la actividad como abierta
+                    if task_row.state == 'draft' or task_row.state == 'open':
+                        state = 'open'
+                        break
+                    # Si tiene tareas en estado done se aumenta el contador
+                    elif task_row.state == 'done':
+                        done += 1
+                    # Si tiene tareas en estado cancel se aumenta el contador
+                    elif task_row.state == 'cancel':
+                        cancel += 1
+                # Si no se tiene estado aun comparamos los contadores de done y cancel
+                if not state:
+                    # si existen cantidades en done y cancel o si el contador done es igual al total de actividades se pone en estado done
+                    if (done and cancel) or done == len(activity_row.task_ids):
+                        state = 'done'
+                    # Si el contador de cancel es igual al total de tareas el estado es cancel
+                    elif cancel == len(activity_row.task_ids):
+                        state = 'cancel'
+            else:
+                state='draft'
+            self.write(cr, uid, [activity_row.id], {'state':state})
+        return True
+    
+    

=== added file 'crm_altegra/crm_project_view.xml'
--- crm_altegra/crm_project_view.xml	1970-01-01 00:00:00 +0000
+++ crm_altegra/crm_project_view.xml	2013-07-03 23:03:28 +0000
@@ -0,0 +1,442 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+         <!-- crm_project_main_menu -->
+        <menuitem icon="terp-stock" id="crm_project_main_menu" name="CRM" sequence="0" groups="crm_altegra.group_crm_user"
+                web_icon="images/icon.png"
+                web_icon_hover="images/icon.png"/>
+
+        <!-- crm_project_menu -->
+        <menuitem id="crm_project_menu" name="CRM" parent="crm_project_main_menu" sequence="1"/>
+        
+        <!-- crm_task_menu -->
+        <menuitem id="crm_activities_menu" name="Actividades" parent="crm_project_main_menu" sequence="1"/>
+        
+        <!-- crm_task_menu -->
+        <menuitem id="crm_task_menu" name="Tareas" parent="crm_project_main_menu" sequence="2"/>
+        
+        <record id="view_crm_project_filter" model="ir.ui.view">
+            <field name="name">view.crm.project.filter</field>
+            <field name="model">crm.project</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Buscar">
+                    <group>
+                        <filter icon="terp-check" name="pending_project_false" string="Proyectos Actuales" domain="[('pending_project','=',False),('state','in',('opportunity','implementation','draft'))]" help="Proyectos que estan marcados como pendientes"/>
+                        <filter icon="terp-gtk-media-pause" name="pending_project_true" string="Proyectos Pendientes" domain="[('pending_project','=',True),('state','in',('opportunity','implementation','draft'))]" help="Proyectos que estan marcados como pendientes"/>
+                    </group>
+                    <field name="name" filter_domain="[('name','ilike',self)]" string="Proyecto"/>
+                    <field name="company" filter_domain="[('company','ilike',self)]"/>
+                    <field name="user_id">
+                        <filter domain="[('user_id','=',uid)]" help="Encargado" icon="terp-personal"/>
+                    </field>
+                    <field name="state"/>
+                    <field name="UEE"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." groups="base.group_extended">
+                        <filter string="Responsable" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Cliente" icon="terp-personal" domain="[]" context="{'group_by':'company'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+        
+        <!-- view_crm_project_tree -->
+        <record id="view_crm_project_tree" model="ir.ui.view">
+            <field name="name">view.crm.project.tree</field>
+            <field name="model">crm.project</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="17"/>
+            <field name="arch" type="xml">
+                <tree string="Proyectos" colors="black: state == 'done';grey: state == 'cancel';blue: change_date == True;red: task_min_date &lt; current_date and state in ('implementation','opportunity');orange: task_warning_date &lt;= current_date and state in ('implementation','opportunity')">
+                    <field name="reference"/>
+                    <field name="name"/>
+                    <field name="company"/>
+                    <field name="user_id"/>
+                    <field name="estimated_amount" sum="Sum amount"/>
+                    <field name="state"/>
+                    <field name="task_min_date" invisible="1"/>
+                    <field name="task_warning_date" invisible="1"/>
+                    <field name="change_date" invisible="1"/>
+                    <field name="pending_project" invisible="1"/>
+                    <field name="UEE" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- view_crm_project_form -->
+        <record id="view_crm_project_form" model="ir.ui.view">
+            <field name="name">view.crm.project.form</field>
+            <field name="model">crm.project</field>
+            <field name="type">form</field>
+            <field name="priority" eval="17"/>
+            <field name="arch" type="xml">
+                <form string="Proyecto" >
+                    <group colspan="4" col = "8">
+                        <field name="name" colspan="6"/>
+                        <field name="reference" invisible="1"/>
+                        <field name="pending_project" colspan="2"/>
+                        <field name="user_id" colspan="2"/>
+                        <field name="UEE" colspan="4"/>
+                        <field name="date" colspan="2"/>
+                        <field name="estimated_amount" colspan="2"/>
+                        <field name="type" invisible="1"/>
+                    </group>
+                    <group string ="Cliente" colspan="4">
+                        <field name="customer_id" on_change="on_change_customer_id(customer_id)"/>
+                        <field name="company"/>
+                        <field name="contact_name"/>
+                        <field name="phone"/>
+                        <field name="mail"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Actividades">
+                            <field name="activity_ids" nolabel="1">
+                                <form string="Actividad" >
+                                    <group colspan="4" col = "6">
+                                        <field name="name" />
+                                        <field name="date_limit"/>
+                                    </group>
+                                    <group string="Tareas" colspan="4">
+                                        <field name="task_ids" nolabel="1"/>
+                                    </group>
+                                    <group>
+                                        <field name="state" widget="statusbar"/>
+                                    </group>
+                                    <group>
+                                        <button name="action_confirm_activity" type="object" states="draft" string="Aprobar" icon="gtk-go-forward" />
+                                    </group>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Tareas Oportunidad">
+                            <group colspan="4">
+                                <field name="task_opportunity_ids" nolabel="1">
+                                    <form string="Tarea" >
+                                        <group colspan="4" col = "6">
+                                            <field name="name" colspan="6"/>
+                                            <field name="user_id"/>
+                                            <field name="date_limit"/>
+                                            <field name="change_date" invisible="1"/>
+                                            <field name="activity_id" domain="[('project_id','=',parent.id),('state','=','open')]"/>
+                                        </group>
+                                        <group string ="Notas" colspan="4">
+                                            <field name="note" nolabel="1"/>
+                                        </group>
+                                        <group>
+                                            <field name="state" widget="statusbar"/>
+                                        </group>
+                                        <group>
+                                            <button name="action_review" type="object" string="Revisado" icon="terp-stock_zoom" attrs="{'invisible':['|',('change_date','=',False),('state','in',('draft','cancel','done'))]}" groups="crm_altegra.group_crm_admin"/>
+                                            <button name="acction_confirm" type="object" states="draft" string="Aprobar" icon="STOCK_NEW" />
+                                            <button name="acction_done" type="object" states="open" string="Finalizada" icon="terp-camera_test" />
+                                            <button name="acction_cancel" type="object" string="Cancelar" icon="gtk-cancel" attrs="{'invisible':['|',('state','in',('cancel','done'))]}" groups="crm_altegra.group_crm_admin"/>
+                                        </group>
+                                    </form>
+                                </field>
+                            </group>
+                        </page>
+                        <page string="Tareas implementacion">
+                            <group colspan="4">
+                                <field name="task_implementation_ids" nolabel="1">
+                                    <form string="Tarea" >
+                                        <group colspan="4" col = "6">
+                                            <field name="name" colspan="6"/>
+                                            <field name="user_id"/>
+                                            <field name="date_limit"/>
+                                            <field name="change_date" invisible="1"/>
+                                            <field name="activity_id" domain="[('project_id','=',parent.id),('state','=','open')]"/>
+                                        </group>
+                                        <group string ="Notas" colspan="4">
+                                            <field name="note" nolabel="1"/>
+                                        </group>
+                                        <group>
+                                            <field name="state" widget="statusbar"/>
+                                        </group>
+                                        <group>
+                                            <button name="action_review" type="object" string="Revisado" icon="terp-stock_zoom" attrs="{'invisible':['|',('change_date','=',False),('state','in',('draft','cancel','done'))]}" groups="crm_altegra.group_crm_admin"/>
+                                            <button name="acction_confirm" type="object" states="draft" string="Aprobar" icon="STOCK_NEW" />
+                                            <button name="acction_done" type="object" states="open" string="Finalizada" icon="terp-camera_test" />
+                                            <button name="acction_cancel" type="object" string="Cancelar" icon="gtk-cancel" attrs="{'invisible':['|',('state','in',('cancel','done'))]}" groups="crm_altegra.group_crm_admin"/>
+                                        </group>
+                                    </form>
+                                </field>
+                            </group>
+                        </page>
+                    </notebook>
+                    <group col="16">
+                        <group>
+                            <field name="state" widget="statusbar"/>
+                        </group>
+                        <group col="10">
+<!--
+                            <button name="search_task_expired" type="object" string="Correos" icon="gtk-go-forward" groups="crm_altegra.group_crm_admin"/>
+-->
+                            <button name="acction_confirm" type="object" string="Oportunidad" icon="gtk-go-forward" attrs="{'invisible':['|',('state','!=','draft'),('type','=','implementation')]}"/>
+                            <button name="acction_implementation" type="object" string="Implementación" icon="gtk-go-forward" attrs="{'invisible':['|',('state','!=','draft'),('type','=','opportunity')]}"/>
+                            <button name="acction_implementation" states ="opportunity" type="object" string="Implementación" icon="gtk-go-forward" />
+                            <button name="acction_done" states ="implementation" type="object" string="Finalizar" icon="gtk-go-forward" />
+                            <button name="acction_cancel" type="object" string="Cancelar" icon="gtk-cancel" groups="crm_altegra.group_crm_admin" attrs="{'invisible':[('state','in',('cancel','done'))]}"/>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+         <!-- crm_project_opportunity_action -->
+        <record id="crm_project_opportunity_action" model="ir.actions.act_window">
+            <field name="name">Proyectos Oportunidades</field>
+            <field name="res_model">crm.project</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'default_type': 'opportunity',"search_default_pending_project_false":1}</field>
+            <field name="domain">[('type','=','opportunity')]</field>
+            <field name="view_id" ref="view_crm_project_tree"/>
+        </record>
+        
+        <record id="crm_project_implementation_action" model="ir.actions.act_window">
+            <field name="name">Proyectos Implementación</field>
+            <field name="res_model">crm.project</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'default_type': 'implementation',"search_default_pending_project_false":1}</field>
+            <field name="domain">[('type','=','implementation')]</field>
+            <field name="search_view_id" ref="view_crm_project_filter"/>
+            <field name="view_id" ref="view_crm_project_tree"/>
+        </record>
+        
+        <!-- crm_project_menu_action -->
+        <menuitem id="crm_project_opportunity_menu_action"
+                    parent="crm_project_menu"
+                    name="Oportunidades"
+                    action="crm_project_opportunity_action"
+                    sequence="1"/>
+        
+        <menuitem id="crm_project_implementation_menu_action"
+                    parent="crm_project_menu"
+                    name="Implementación"
+                    action="crm_project_implementation_action"
+                    sequence="1"/>
+        
+        <record id="view_crm_task_filter" model="ir.ui.view">
+            <field name="name">view.crm.task.filter</field>
+            <field name="model">crm.task</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Buscar">
+                    <field name="name" filter_domain="[('name','ilike',self)]" string="Tarea"/>
+                    <field name="project_id"/>
+                    <field name="user_id">
+                        <filter domain="[('user_id','=',uid)]" help="Encargado" icon="terp-personal"/>
+                    </field>
+                    <field name="type"/>
+                    <field name="state"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." groups="base.group_extended">
+                        <filter string="Proyecto" icon="gtk-open" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Actividad" icon="gtk-find-and-replace" domain="[]" context="{'group_by':'activity_id'}"/>
+                        <filter string="Responsable" icon="terp-personal+" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+        
+        <!-- view_crm_task_tree -->
+        <record id="view_crm_task_tree" model="ir.ui.view">
+            <field name="name">view.crm.task.tree</field>
+            <field name="model">crm.task</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="17"/>
+            <field name="arch" type="xml">
+                <tree string="Tareas" colors="black: state == 'done';grey: state == 'cancel';blue: change_date == True;red: date_limit &lt;= current_date and state == 'open';orange: warning_date &lt;= current_date and state == 'open';green: date_limit &gt; current_date  and state == 'open'" >
+                    <field name="name"/>
+                    <field name="project_id"/>
+                    <field name="activity_id"/>
+                    <field name="user_id"/>
+                    <field name="date_limit"/>
+                    <field name="type" invisible="1"/>
+                    <field name="warning_date" invisible="1"/>
+                    <field name="change_date" invisible="1"/>
+                    <field name="state"/>
+                    <field name="type" invisible="1"/>
+                    <button name="acction_confirm" type="object" states="draft" string="Aprobar" icon="STOCK_NEW" />
+                    <button name="acction_done" type="object" states="open" string="Finalizada" icon="terp-camera_test" />
+                </tree>
+            </field>
+        </record>
+        
+        
+        <!-- view_crm_task_form -->
+        <record id="view_crm_task_form" model="ir.ui.view">
+            <field name="name">view.crm.task.form</field>
+            <field name="model">crm.task</field>
+            <field name="type">form</field>
+            <field name="priority" eval="17"/>
+            <field name="arch" type="xml">
+                <form string="Tarea" >
+                    <group colspan="4" col = "6">
+                        <field name="name" colspan="6"/>
+                        <field name="user_id"/>
+                        <field name="date_limit"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string ="Notas">
+                            <group colspan="4">
+                                <field name="note" nolabel="1"/>
+                            </group>
+                        </page>
+                        <page string="Otra información">
+                            <field name="project_id" />
+                            <field name="activity_id" domain="[('project_id','=',project_id),('state','=','open')]"/>
+                            <field name="type" readonly="1"/>
+                            <field name="change_date" readonly="1"/>
+                        </page>
+                    </notebook>
+                    <group>
+                        <field name="state" widget="statusbar"/>
+                    </group>
+                    <group>
+                        <button name="action_review" type="object" string="Revisado" icon="terp-stock_zoom" attrs="{'invisible':['|',('change_date','=',False),('state','in',('draft','cancel','done'))]}" groups="crm_altegra.group_crm_admin"/>
+                        <button name="acction_confirm" type="object" states="draft" string="Aprobar" icon="STOCK_NEW" />
+                        <button name="acction_done" type="object" states="open" string="Finalizada" icon="terp-camera_test" />
+                        <button name="acction_cancel" type="object" string="Cancelar" icon="gtk-cancel" attrs="{'invisible':['|',('state','in',('cancel','done'))]}" groups="crm_altegra.group_crm_admin"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <record id="crm_task_action" model="ir.actions.act_window">
+            <field name="name">Tareas</field>
+            <field name="res_model">crm.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_crm_task_filter"/>
+            <field name="view_id" ref="view_crm_task_tree"/>
+        </record>
+        
+        <!-- crm_project_menu_action -->
+        <menuitem id="crm_task_menu_action"
+                    parent="crm_task_menu"
+                    name="Tareas"
+                    action="crm_task_action"
+                    groups="crm_altegra.group_crm_admin"
+                    sequence="1"/>
+                    
+        
+        <record id="view_crm_activities_filter" model="ir.ui.view">
+            <field name="name">view.crm.activities.filter</field>
+            <field name="model">crm.activities</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Buscar">
+                    <field name="name" filter_domain="[('name','ilike',self)]" string="Actividad"/>
+                    <field name="project_id"/>
+                    <field name="user_id">
+                        <filter domain="[('user_id','=',uid)]" help="Encargado" icon="terp-personal"/>
+                    </field>
+                    <field name="state"/>
+                    <newline/>
+                    <group expand="0" string="Group By..." groups="base.group_extended">
+                        <filter string="Proyecto" icon="gtk-open" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Responsable" icon="terp-personal+" domain="[]" context="{'group_by':'user_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
+               </search>
+            </field>
+        </record>
+        
+        
+        <!-- view_crm_activities_tree -->
+        <record id="view_crm_activities_tree" model="ir.ui.view">
+            <field name="name">view.crm.activities.tree</field>
+            <field name="model">crm.activities</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="17"/>
+            <field name="arch" type="xml">
+                <tree string="Actividades">
+                    <field name="name"/>
+                    <field name="project_id"/>
+                    <field name="user_id"/>
+                    <field name="type"/>
+                    <field name="state"/>
+                    <button name="action_confirm_activity" type="object" states="draft" string="Aprobar" icon="gtk-go-forward" />
+                </tree>
+            </field>
+        </record>
+        
+         <!-- view_crm_activities_form -->
+        <record id="view_crm_activities_form" model="ir.ui.view">
+            <field name="name">view.crm.activities.form</field>
+            <field name="model">crm.activities</field>
+            <field name="type">form</field>
+            <field name="priority" eval="17"/>
+            <field name="arch" type="xml">
+                <form string="Actividad" >
+                    <group colspan="4" >
+                        <field name="name" />
+                        <field name="project_id"/>
+                        <field name="user_id"/>
+                        <field name="date_limit"/>
+                    </group>
+                    <group string="Tareas" colspan="4">
+                        <field name="task_ids" nolabel="1">
+                            <form string="Tarea" >
+                                <group colspan="4" col = "6">
+                                    <field name="name" colspan="6"/>
+                                    <field name="user_id"/>
+                                    <field name="date_limit"/>
+                                    <field name="change_date" invisible="1"/>
+                                </group>
+                                    <group string ="Notas" colspan="4">
+                                        <field name="note" nolabel="1"/>
+                                    </group>
+                                <group>
+                                    <field name="state" widget="statusbar"/>
+                                </group>
+                                <group>
+                                    <button name="action_review" type="object" string="Revisado" icon="terp-stock_zoom" attrs="{'invisible':['|',('change_date','=',False),('state','in',('draft','cancel','done'))]}" groups="crm_altegra.group_crm_admin"/>
+                                    <button name="acction_confirm" type="object" states="draft" string="Aprobar" icon="STOCK_NEW" />
+                                    <button name="acction_done" type="object" states="open" string="Finalizada" icon="terp-camera_test" />
+                                    <button name="acction_cancel" type="object" string="Cancelar" icon="gtk-cancel" attrs="{'invisible':['|',('state','in',('cancel','done'))]}" groups="crm_altegra.group_crm_admin"/>
+                                </group>
+                            </form>
+                        </field>
+                    </group>
+                    <group>
+                        <field name="state" widget="statusbar"/>
+                    </group>
+                    <group>
+                        <button name="action_confirm_activity" type="object" states="draft" string="Aprobar" icon="gtk-go-forward" />
+<!--
+                        <button name="update_state_activities" type="object" string="UPDATE" icon="gtk-go-forward" />
+-->
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <record id="crm_activities_action" model="ir.actions.act_window">
+            <field name="name">Actividades</field>
+            <field name="res_model">crm.activities</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_crm_activities_filter"/>
+            <field name="view_id" ref="view_crm_activities_tree"/>
+        </record>
+        
+        <!-- crm_project_menu_action -->
+        <menuitem id="crm_activities_menu_action"
+                    parent="crm_activities_menu"
+                    name="Actividades"
+                    action="crm_activities_action"
+                    groups="crm_altegra.group_crm_admin"
+                    sequence="1"/>
+
+        
+    </data>
+</openerp>

=== added directory 'crm_altegra/images'
=== added file 'crm_altegra/images/icon.png'
Binary files crm_altegra/images/icon.png	1970-01-01 00:00:00 +0000 and crm_altegra/images/icon.png	2013-07-03 23:03:28 +0000 differ
=== added directory 'crm_altegra/security'
=== added file 'crm_altegra/security/groups.xml'
--- crm_altegra/security/groups.xml	1970-01-01 00:00:00 +0000
+++ crm_altegra/security/groups.xml	2013-07-03 23:03:28 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="res.groups" id="group_crm_admin">
+            <field name="name">Administrador de CRM</field>
+            <field  name="category_id" ref="base.module_category_usability"/>
+        </record>
+        
+        <record model="res.groups" id="group_crm_user">
+            <field name="name">Usuario de CRM</field>
+            <field  name="category_id" ref="base.module_category_usability"/>
+        </record>
+
+    </data>
+</openerp>

=== added file 'crm_altegra/security/ir.model.access.csv'
--- crm_altegra/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ crm_altegra/security/ir.model.access.csv	2013-07-03 23:03:28 +0000
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_crm_project,crm.project,model_crm_project,,1,1,1,1
+access_crm_task,crm.task,model_crm_task,,1,1,1,1
+access_crm_activities,crm.activities,model_crm_activities,,1,1,1,1

=== added file 'crm_altegra/security/sequence.xml'
--- crm_altegra/security/sequence.xml	1970-01-01 00:00:00 +0000
+++ crm_altegra/security/sequence.xml	2013-07-03 23:03:28 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.sequence.type" id="sequence_crm_project">
+             <field name="code">crm.project</field>
+             <field name="name">Seguimiento</field>
+        </record>
+        
+        <record model="ir.sequence" id="sequence_tracing">
+            <field name="code">crm.project</field>
+            <field name="name">Seguimiento</field>
+            <field name="number_next">1</field>
+            <field name="implementation">standard</field>
+            <field name="padding">4</field>
+            <field name="number_increment">1</field>
+            <field name="prefix">SEG</field>
+            <field name="active">True</field>
+        </record>
+        
+    </data>
+</openerp>

=== added directory 'crm_altegra/static'
=== added directory 'crm_altegra/static/src'
=== added directory 'crm_altegra/static/src/img'
=== added file 'crm_altegra/static/src/img/icon.png'
Binary files crm_altegra/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and crm_altegra/static/src/img/icon.png	2013-07-03 23:03:28 +0000 differ
=== modified file 'dollars_altegra/__init__.py'
--- dollars_altegra/__init__.py	2013-03-28 22:40:30 +0000
+++ dollars_altegra/__init__.py	2013-07-03 23:03:28 +0000
@@ -34,3 +34,7 @@
 import account_invoice
 import account_change_currency
 import account_voucher
+import internal_order
+import purchase
+import wizard
+import stock

=== modified file 'dollars_altegra/__openerp__.py'
--- dollars_altegra/__openerp__.py	2013-04-15 22:22:45 +0000
+++ dollars_altegra/__openerp__.py	2013-07-03 23:03:28 +0000
@@ -40,6 +40,8 @@
         "sale_view.xml",
         "account_invoice_view.xml",
         "account_voucher_view.xml",
+        "internal_order_view.xml",
+        "purchase_view.xml",
         ],
 	'demo': [],
 	'test': [],

=== modified file 'dollars_altegra/account_invoice_view.xml'
--- dollars_altegra/account_invoice_view.xml	2013-05-07 06:18:54 +0000
+++ dollars_altegra/account_invoice_view.xml	2013-07-03 23:03:28 +0000
@@ -3,6 +3,43 @@
     <data>
 
         <!-- account_invoice_form_inh -->
+        <record model="ir.ui.view" id="invoice_supplier_form_inh">
+            <field name="name">invoice.supplier.form.inh</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form" />
+            <field name="type">form</field>
+            <field name="arch" type="xml" >
+                
+                <field name="currency_id" position="replace"/>
+                <field name="period_id" position="replace">
+                    <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection" invisible="1"/>
+                </field>
+                <field name="reference_type" position="replace">
+                    <field name="reference_type" nolabel="1" size="0" invisible="1"/>
+                </field>
+                <field name="fiscal_position" position="replace">
+                    <field name="fiscal_position" groups="base.group_extended" widget="selection" invisible="1"/>
+                </field>
+                <button name="239" string="Change" position="replace">
+                    <button name="239" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" colspan="2" invisible="1"/>
+                </button>
+                <field name="date_due" position="after">
+                    <newline/>
+                    <group string="Dolares" colspan="4" col="10">
+                        <field name="currency_id" width="50" colspan="2"/>
+                        <button name="239" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" colspan="2"/>
+                        <field name="exchange_rate" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
+                        <field name="system_rate" colspan="2"/>
+                        <field name="dollar_invoice" readonly="1" colspan="2"/>
+                    </group>
+                </field>
+                <button name="invoice_open" position="replace">
+                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test" attrs="{'readonly':[('exchange_rate','=', False),('dollar_invoice','=', True)]}"/>
+                </button>
+            </field>
+        </record>
+        
+        <!-- account_invoice_form_inh -->
         <record model="ir.ui.view" id="account_invoice_form_inh">
             <field name="name">account.invoice.form.inh</field>
             <field name="model">account.invoice</field>
@@ -17,15 +54,20 @@
                         <button name="%(account.action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                     </group>
                     <group colspan="2" col="6">
-                        <field name="exchange_rate" attrs="{'readonly':[('state','!=','draft')]}"/>
-                        <field name="system_rate"/>
-                        <field name="dollar_invoice" readonly="1"/>
+                        <field name="exchange_rate" attrs="{'readonly':[('state','!=','draft')]}" />
+                        <field name="system_rate" />
+                        <field name="dollar_invoice" readonly="1" />
                     </group>
                 </field>
+                <button string="Validate" position="replace">
+                    <button name="invoice_open" string="Validate" icon="gtk-go-forward" attrs="{'invisible':['|',('state','not in',('draft')),'|',('origin','=','')], 'readonly':[('exchange_rate','=', '0'),('dollar_invoice','=', True)]}"/>
+                </button>
+<!--
                 <button string="Validate" position="replace"/>
                 <button string="IMPRIMIR REMISION" position="after">
                     <button name="invoice_open" string="Validate" icon="gtk-go-forward" attrs="{'invisible':['|',('state','not in',('draft')),'|',('origin','=','')], 'readonly':[('exchange_rate','=', '0'),('dollar_invoice','=', True)]}"/>
                 </button>
+-->
                 <field name="origin" position="replace">
                     <field name="origin" attrs="{'readonly':[('manual_invoice','!=',True)]}"/>
                     <field name="manual_invoice" groups="base.group_system"/>

=== modified file 'dollars_altegra/account_voucher_view.xml'
--- dollars_altegra/account_voucher_view.xml	2013-04-15 20:39:28 +0000
+++ dollars_altegra/account_voucher_view.xml	2013-07-03 23:03:28 +0000
@@ -24,6 +24,22 @@
                     <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)" 
                     attrs="{'readonly':[('payment_rate_currency_id','=','2'),('validate_rate','=', False)]}"/>
                 </button>
+                <xpath expr="//field[@name='line_cr_ids']/tree//field[@name='date_due']" position="after">
+                    <field name="currency_id" string="Divisa"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <!-- view_vendor_payment_form_inherit -->
+        <record model="ir.ui.view" id="view_vendor_payment_form_inherit">
+            <field name="name">view.vendor.payment.form.inherit</field>
+            <field name="model">account.voucher</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='line_dr_ids']/tree//field[@name='date_due']" position="after">
+                    <field name="currency_id" string="Divisa"/>
+                </xpath>
             </field>
         </record>
 

=== added file 'dollars_altegra/internal_order.py'
--- dollars_altegra/internal_order.py	1970-01-01 00:00:00 +0000
+++ dollars_altegra/internal_order.py	2013-07-03 23:03:28 +0000
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+#############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    CopyLeft 2012 - http://www.grupoaltegra.com
+#    You are free to share, copy, distribute, transmit, adapt and use for commercial purpose
+#    More information about license: http://www.gnu.org/licenses/agpl.html
+#    info Grupo Altegra ([e-mail])
+#
+#############################################################################
+#
+#    Coded by: Carlos Blanco ([e-mail])
+#    Coded by: Edgar Romero ([e-mail])
+#
+#############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################
+
+from osv import osv, fields
+
+class internal_order(osv.Model):
+    _inherit = "internal.order"
+    
+    _columns = {
+        'currency_id': fields.many2one('res.currency', 'Moneda', help="Tipo de moneda en que se realizo la cotización"),
+    }
+    
+    _defaults = {
+        'currency_id': 34,
+    }

=== added file 'dollars_altegra/internal_order_view.xml'
--- dollars_altegra/internal_order_view.xml	1970-01-01 00:00:00 +0000
+++ dollars_altegra/internal_order_view.xml	2013-07-03 23:03:28 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- sale_view_order_form_dollars_inh -->
+        <record model="ir.ui.view" id="view_internal_order_tree_inherit">
+            <field name="name">view.internal.order.tree.inherit</field>
+            <field name="model">internal.order</field>
+            <field name="inherit_id" ref="internal_order_altegra.view_internal_order_tree" />
+            <field name="type">tree</field>
+            <field name="arch" type="xml" >
+                <field name="part_number" position="replace">
+                    <field name="currency_id" />
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== added file 'dollars_altegra/purchase.py'
--- dollars_altegra/purchase.py	1970-01-01 00:00:00 +0000
+++ dollars_altegra/purchase.py	2013-07-03 23:03:28 +0000
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+#############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    CopyLeft 2012 - http://www.grupoaltegra.com
+#    You are free to share, copy, distribute, transmit, adapt and use for commercial purpose
+#    More information about license: http://www.gnu.org/licenses/agpl.html
+#    info Grupo Altegra ([e-mail])
+#
+#############################################################################
+#
+#    Coded by: Carlos Blanco ([e-mail])
+#
+#############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################
+
+from osv import osv, fields
+
+class purchase_order(osv.Model):
+    _inherit = 'purchase.order'
+    
+    _columns = {
+        'dollar_purchase': fields.boolean('Compra en dólares', readonly=True, states={'draft': [('readonly', False)]},help = "Selecciona esta opción si la compra será en dólares"),
+        'exchange_rate': fields.float('Tipo de cambio', readonly=True, states={'draft': [('readonly', False)]}, help = "Ingresa el tipo de cambio del dólar a pesos"),
+    }
+    
+    _defaults = {
+        'dollar_purchase': False,
+    }
+    
+    def action_invoice_create(self, cr, uid, ids, context=None):
+        invoice_id = super(purchase_order, self).action_invoice_create(cr, uid, ids, context)
+        purchase_row = self.browse(cr, uid, ids, context)[0]
+        if purchase_row.dollar_purchase:
+            self.pool.get('account.invoice').write(cr, uid, [invoice_id], {'dollar_invoice': True, 'exchange_rate':purchase_row.exchange_rate, 'currency_id':2})
+        return invoice_id
+    

=== added file 'dollars_altegra/purchase_view.xml'
--- dollars_altegra/purchase_view.xml	1970-01-01 00:00:00 +0000
+++ dollars_altegra/purchase_view.xml	2013-07-03 23:03:28 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- sale_view_order_form_dollars_inh -->
+        <record model="ir.ui.view" id="purchase_order_form_inh">
+            <field name="name">purchase.order.form.inh</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form" />
+            <field name="type">form</field>
+            <field name="arch" type="xml" >
+                <field name="shipped" position="after">
+                    <field name="dollar_purchase" />
+                </field>
+                <field name="origin" position="after">
+                    <field name="exchange_rate" attrs="{'invisible': [('dollar_purchase','!=',True)], 'required': [('dollar_purchase','=',True)]}"/>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>

=== modified file 'dollars_altegra/sale.py'
--- dollars_altegra/sale.py	2013-03-28 22:40:30 +0000
+++ dollars_altegra/sale.py	2013-07-03 23:03:28 +0000
@@ -44,6 +44,16 @@
     _defaults = {
         'dollar_sale': False,
     }
+    
+    def get_internal_order_vals(self, cr, uid, ids, line,  context=None):
+        internal_order_line = super(sale_order, self).get_internal_order_vals(cr, uid, ids, line,  context)
+        # Si es venta en dólares
+        if line.order_id.dollar_sale:
+            if line.order_id.exchange_rate <= 0:
+                raise osv.except_osv(_('¡Tu cotización es en dólares'),_('Ingresa un tipo de cambio mayor a cero'))
+            else:
+                internal_order_line.update({'currency_id':2})
+        return internal_order_line
 
     def action_wait(self, cr, uid, ids, context=None):
         """

=== added file 'dollars_altegra/stock.py'
--- dollars_altegra/stock.py	1970-01-01 00:00:00 +0000
+++ dollars_altegra/stock.py	2013-07-03 23:03:28 +0000
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+#############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    CopyLeft 2012 - http://www.grupoaltegra.com
+#    You are free to share, copy, distribute, transmit, adapt and use for commercial purpose
+#    More information about license: http://www.gnu.org/licenses/agpl.html
+#    info Grupo Altegra ([e-mail])
+#
+#############################################################################
+#
+#    Coded by: Carlos Blanco ([e-mail])
+#
+#############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################
+
+from osv import osv, fields
+
+class stock_picking(osv.Model):
+    
+    _inherit = "stock.picking"
+    
+    def _prepare_invoice(self, cr, uid, picking, partner, inv_type, journal_id, context=None):
+        """ Se redefine el método para sabes si la compra se cotizo en dolares """
+        invoice_vals = super(stock_picking, self)._prepare_invoice(cr, uid, picking, partner, inv_type, journal_id, context)
+        # Validamos si el picking tiene compra
+        if picking.purchase_id:
+            # Validamos si la compra fue cotizada en Dolares
+            if picking.purchase_id.dollar_purchase:
+                # Si fue cotizada en dolares actualizamos el diccionario para agregarle la moneda y ponerle el tipo de cambio de la compra
+                invoice_vals.update({'dollar_invoice': True, 'exchange_rate':picking.purchase_id.exchange_rate, 'currency_id':2})
+        return invoice_vals

=== added directory 'dollars_altegra/wizard'
=== added file 'dollars_altegra/wizard/__init__.py'
--- dollars_altegra/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ dollars_altegra/wizard/__init__.py	2013-07-03 23:03:28 +0000
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+#############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    CopyLeft 2012 - http://www.grupoaltegra.com
+#    You are free to share, copy, distribute, transmit, adapt and use for commercial purpose
+#    More information about license: http://www.gnu.org/licenses/agpl.html
+#    info Grupo Altegra ([e-mail])
+#
+#############################################################################
+#
+#    Coded by: Carlos Blanco ([e-mail])
+#
+#############################################################################
+#
+#    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 create_purchase

=== added file 'dollars_altegra/wizard/create_purchase.py'
--- dollars_altegra/wizard/create_purchase.py	1970-01-01 00:00:00 +0000
+++ dollars_altegra/wizard/create_purchase.py	2013-07-03 23:03:28 +0000
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+#############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    CopyLeft 2012 - http://www.grupoaltegra.com
+#    You are free to share, copy, distribute, transmit, adapt and use for commercial purpose
+#    More information about license: http://www.gnu.org/licenses/agpl.html
+#    info Grupo Altegra ([e-mail])
+#
+#############################################################################
+#
+#    Coded by: Carlos Blanco ([e-mail])
+#
+#############################################################################
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################
+
+from osv import osv ,fields
+from tools.translate import _
+
+class create_purchase(osv.TransientModel):
+    _inherit = 'create.purchase'
+    
+    def get_io_by_supplier(self, cr, uid, ids, supplier_ids, internal_order_rows, context=None):
+        """ Método que crea un diccionario con las internal orders por proveedor """
+        vals = {}
+        # Clasificamos las lineas por proveedor
+        for supplier_id in supplier_ids:
+            aux = []
+            currency_id = False
+            for index in range(len(internal_order_rows)):
+                # Si es del proveedor se agrega a una lista auxiliar
+                if supplier_id == internal_order_rows[index].supplier_id.id:
+                    if not currency_id:
+                        currency_id = internal_order_rows[index].currency_id.id
+                    elif currency_id != internal_order_rows[index].currency_id.id:
+                        raise osv.except_osv(_('¡Error!'),_('No puedes seleccionar compras con diferentes monedas y el mismo proveedor'))
+                    aux.append(internal_order_rows[index])
+            # Se agrega las lineas por proveedor
+            vals.update({supplier_id:aux})
+        return vals
+        
+    def get_purchase_vals(self, cr, uid, ids, supplier_id, internal_row, context=None):
+        """ Método para obtener el diccionario para crear la compra """
+        purchase_vals = super(create_purchase, self).get_purchase_vals(cr, uid, ids, supplier_id, internal_row, context)
+        if internal_row.currency_id.id == 2:
+            purchase_vals.update({'dollar_purchase':True})
+        return purchase_vals

=== modified file 'internal_order_altegra/purchase.py'
--- internal_order_altegra/purchase.py	2013-04-23 00:23:24 +0000
+++ internal_order_altegra/purchase.py	2013-07-03 23:03:28 +0000
@@ -120,14 +120,17 @@
         - Se redefine la función para agregar la fecha de entrega y la paquetería al picking de entrada
         proveniente de purchase_order.
         """
+        customer_id = False
         picking_id = super(purchase_order, self)._create_pickings(cr, uid, order, order_lines, picking_id=False, context=None)
         if picking_id:
             # Actualizamos fecha de llegada y paqueteria en orden de entrada
             self.pool.get('stock.picking').write(cr, uid, picking_id, {'date_arrival': order.date_arrival or False, 'package_id': order.package_id.id or False,'min_date':order.date_arrival})
             picking_row = self.pool.get('stock.picking').browse(cr,uid,picking_id)[0]
             for stock_move_row in picking_row.move_lines:
+                if stock_move_row.purchase_line_id.internal_order_id:
+                    customer_id = stock_move_row.purchase_line_id.internal_order_id.customer_id and stock_move_row.purchase_line_id.internal_order_id.customer_id.id or False
                 # Actualizamos fecha de llegada y cliente del movimiento
-                self.pool.get('stock.move').write(cr, uid, [stock_move_row.id], {'date_arrival':order.date_arrival, 'customer_id': stock_move_row.purchase_line_id.internal_order_id.customer_id.id or False})
+                self.pool.get('stock.move').write(cr, uid, [stock_move_row.id], {'date_arrival':order.date_arrival, 'customer_id': customer_id})
         return picking_id
 
 class purchase_order_line(osv.Model):

=== modified file 'internal_order_altegra/sale.py'
--- internal_order_altegra/sale.py	2013-04-22 23:17:45 +0000
+++ internal_order_altegra/sale.py	2013-07-03 23:03:28 +0000
@@ -62,6 +62,26 @@
             'name': self.pool.get('ir.sequence').get(cr, uid, 'sale.order'),
         })
         return super(sale_order, self).copy(cr, uid, id, default, context=context)
+    
+    def get_internal_order_vals(self, cr, uid, ids, line,  context=None):
+        """ Método que genera el diccionario para crear las lineas internas """
+        internal_order_line = {
+            'sale_id' : ids[0],
+            'special_price' : line.special_price,
+            'qty_order' : line.product_uom_qty,
+            'qty_buy': line.product_uom_qty,
+            'product_id' : line.product_id.id,
+            'part_number' : line.product_id.default_code,
+            'price_unit' : line.price_unit,
+            'customer_id': line.order_id.partner_id.id, 
+            'user_id': line.order_id.user_id.id,
+            'brand_id' : line.product_id.categ_id.id,
+            'delivery_date' : line.order_id.delivery or False,
+            'supplier_id' : line.supplier_id.id,
+            'price_buy': line.supplier_price,
+            'note': line.order_id.note,
+        }
+        return internal_order_line
         
     def create_internal_lines(self, cr, uid, ids, context=None):
         """
@@ -70,7 +90,7 @@
         """
         # Sale order row
         sale_order_row = self.browse(cr, uid, ids, context=None)[0]
-        
+        internal_order_ids = []
         # Verificamos que haya sido ingresada la fecha de entrega
         if sale_order_row.delivery:
             if sale_order_row:
@@ -87,40 +107,15 @@
                         # Si todas las líneas son servicio se cambia el método de facturación
                         if types[0][0] == 'service':
                             self.pool.get('sale.order').write(cr, uid, ids, {'order_policy': 'manual'}, context=None)
-
-                    # Si es venta en dólares
-                    if sale_order_row.dollar_sale:
-                        if sale_order_row.exchange_rate <= 0:
-                            raise osv.except_osv(_('¡Tu cotización es en dólares'),_('Ingresa un tipo de cambio mayor a cero'))
-                        else:
-                            conversion_factor = float(round(sale_order_row.exchange_rate, 2))
-                    else:
-                        conversion_factor = 1
-                
                     # Recorremos líneas de sale_order
                     for line in self.pool.get('sale.order.line').browse(cr, uid, sale_order_lines, context=None):
                         # Se crean líneas de pedido interno únicamente de productos que no son servicios
                         if line.product_id.type != 'service':
-                            # Creamos líneas de pedido interno
-                            internal_order_line = {
-                                'sale_id' : ids[0],
-                                'special_price' : line.special_price,
-                                'qty_order' : line.product_uom_qty,
-                                'qty_buy': line.product_uom_qty,
-                                'product_id' : line.product_id.id,
-                                'part_number' : line.product_id.default_code,
-                                'price_unit' : line.price_unit * conversion_factor,
-                                'customer_id': sale_order_row.partner_id.id, 
-                                'user_id': sale_order_row.user_id.id,
-                                'brand_id' : line.product_id.categ_id.id,
-                                'delivery_date' : sale_order_row.delivery or False,
-                                'supplier_id' : line.supplier_id.id,
-                                'price_buy': line.supplier_price * conversion_factor,
-                                'note': sale_order_row.note,
-                            }
+                            internal_order_line = self.get_internal_order_vals(cr, uid, ids, line, context)
                             # Creamos línea
                             internal_order_line_id = self.pool.get('internal.order').create(cr, uid, internal_order_line, context=None)
+                            internal_order_ids.append(internal_order_line_id)
         else:
             raise osv.except_osv(_('¡Verifica los datos!'),_('Debes ingresar Tiempo de entrega'))
 
-        return True
+        return internal_order_ids

=== modified file 'internal_order_altegra/wizard/create_purchase.py'
--- internal_order_altegra/wizard/create_purchase.py	2013-04-23 00:23:24 +0000
+++ internal_order_altegra/wizard/create_purchase.py	2013-07-03 23:03:28 +0000
@@ -35,6 +35,33 @@
 class create_purchase(osv.TransientModel):
     _name = 'create.purchase'
     
+    
+    def get_io_by_supplier(self, cr, uid, ids, supplier_ids, internal_order_rows, context=None):
+        """ Método que crea un diccionario con las internal orders por proveedor """
+        vals = {}
+        # Clasificamos las lineas por proveedor
+        for supplier_id in supplier_ids:
+            aux = []
+            for index in range(len(internal_order_rows)):
+                # Si es del proveedor se agrega a una lista auxiliar
+                if supplier_id == internal_order_rows[index].supplier_id.id:
+                    aux.append(internal_order_rows[index])
+            # Se agrega las lineas por proveedor
+            vals.update({supplier_id:aux})
+        return vals
+    
+    def get_purchase_vals(self, cr, uid, ids, supplier_id, internal_row, context=None):
+        """ Método para obtener el diccionario para crear la compra """
+        purchase_vals = {
+            'partner_id':supplier_id,
+            'partner_address_id': self.pool.get('res.partner').address_get(cr, uid, [supplier_id], ['default'])['default'],
+            'pricelist_id': self.pool.get('res.partner').browse(cr, uid, supplier_id).property_product_pricelist_purchase.id,
+            'company_id': internal_row.sale_id.company_id.id,
+            'warehouse_id':internal_row.sale_id.shop_id.warehouse_id.id,
+            'location_id':internal_row.sale_id.shop_id.warehouse_id.lot_stock_id.id,
+        }
+        return purchase_vals
+    
     def action_create_purchase(self,cr,uid,ids,context=None):
         """ Crea las ordenes de compra de los internal orders seleccionadas  """
         # Objetos
@@ -57,28 +84,14 @@
                 if not internal_order_row.supplier_id.id in supplier_ids:
                      supplier_ids.append(internal_order_row.supplier_id.id)
             # Clasificamos las lineas por proveedor
-            for supplier_id in supplier_ids:
-                aux = []
-                for index in range(len(internal_order_rows)):
-                    # Si es del proveedor se agrega a una lista auxiliar
-                    if supplier_id == internal_order_rows[index].supplier_id.id:
-                        aux.append(internal_order_rows[index])
-                # Se agrega las lineas por proveedor
-                vals.update({supplier_id:aux})
+            vals = self.get_io_by_supplier(cr, uid, ids, supplier_ids, internal_order_rows, context)
             # Creamos las compras
             for supplier_id in supplier_ids:
                 # Obtenemos el primer registro del proveedor
                 internal_row = vals[supplier_id][0]
                 origin = internal_row.sale_id.name
                 # Obtenemos los valores para crear la compra
-                purchase_vals = {
-                        'partner_id':supplier_id,
-                        'partner_address_id': self.pool.get('res.partner').address_get(cr, uid, [supplier_id], ['default'])['default'],
-                        'pricelist_id': self.pool.get('res.partner').browse(cr, uid, supplier_id).property_product_pricelist_purchase.id,
-                        'company_id': internal_row.sale_id.company_id.id,
-                        'warehouse_id':internal_row.sale_id.shop_id.warehouse_id.id,
-                        'location_id':internal_row.sale_id.shop_id.warehouse_id.lot_stock_id.id,
-                }
+                purchase_vals = self.get_purchase_vals(cr, uid, ids, supplier_id, internal_row, context)
                 # Creamos la compra
                 fiscal_position_id = False
                 purchase_id = purchase_obj.create(cr,uid,purchase_vals)

=== modified file 'product_altegra/product.py'
--- product_altegra/product.py	2013-04-23 17:36:34 +0000
+++ product_altegra/product.py	2013-07-03 23:03:28 +0000
@@ -76,7 +76,7 @@
         return res
 
     _columns = {
-        'model' : fields.char('Modelo', size=20),
+        'model' : fields.char('Modelo', size=64),
         'government_description': fields.text('Descripción Gobierno', help="Descripción utilizada en cotizaciones y facturas de la UEE Gobierno", translate=True),
         'qty_zero_stock': fields.function(_get_qty_stock, type='float', string='Costo Cero', store=False, multi='all', digits_compute=dp.get_precision('Product UoM')),
     }