Merge lp:~cpueyo/eficent-openerp-project-management/nerviaconsultores-openerp-7.0 into lp:eficent-openerp-project-management

[Carlos Pueyo]

Adaptados los módulos a la versión 7.0

[lp:~cpueyo/eficent-openerp-project-management/nerviaconsultores-openerp-7.0]

2. By Carlos Pueyo on 2013-02-14

Update

3. By Carlos Pueyo on 2013-02-14

Test

4. By Carlos Pueyo on 2013-02-15

Arreglados ciertos problemas

5. By Carlos Pueyo on 2013-02-19

Actualizados.

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Carlos,

there seems to be something wrong with your branch. I took the liberty of rebasing your changes to the trunk series of this project, so that we can review the changes. See here: https://code.launchpad.net/~openerp-community/eficent-openerp-project-management/nerviaconsultores-openerp-7.0/+merge/150892

Thanks for your work!

Cheers,
Stefan.

review: Disapprove

Unmerged revisions

5. By Carlos Pueyo on 2013-02-19

Actualizados.

4. By Carlos Pueyo on 2013-02-15

Arreglados ciertos problemas

3. By Carlos Pueyo on 2013-02-14

Test

2. By Carlos Pueyo on 2013-02-14

Update

1. By Carlos Pueyo on 2013-01-22

Adaptados modulos Eficent a la 7.0

=== added directory 'account_analytic_lob'
=== renamed directory 'account_analytic_lob' => 'account_analytic_lob.moved'
=== added file 'account_analytic_lob/__init__.py'
--- account_analytic_lob/__init__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_lob/__init__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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 account_analytic_lob
+import project
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_analytic_lob/__openerp__.py'
--- account_analytic_lob/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_lob/__openerp__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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": "Project Management",
+    "version": "1.0",
+    "author": "Eficent, Nervia Consultores",
+    "website": "",
+    "category": "Generic Modules/Projects & Services",
+    "depends": ["account","analytic","project"],
+    "description": """Introduce business segments in analytic accounts.
+        Provides the possibility to perform economic analysis by business segment.
+    """,
+    "init_xml": [],
+    "update_xml": [    
+        "security/ir.model.access.csv",
+        "account_analytic_lob_view.xml",
+        "project_view.xml",        
+    ],
+    'demo_xml': [
+
+    ],
+    'test':[
+    ],
+    'installable': True,
+    'active': False,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'account_analytic_lob/account_analytic_lob.py'
--- account_analytic_lob/account_analytic_lob.py	1970-01-01 00:00:00 +0000
+++ account_analytic_lob/account_analytic_lob.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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 tools
+from osv import fields, osv
+from tools.translate import _
+
+    
+class account_analytic_lob(osv.osv):
+    
+    _name = "account.analytic.lob"
+    _description = 'Line of Business'
+    _order = 'name'
+    
+    _columns = {        
+        'code': fields.char('Code', size=4, required=True, translate=True),
+        'name': fields.char('Name', size=32, required=True, translate=True),
+    }
+
+account_analytic_lob()
+

=== added file 'account_analytic_lob/account_analytic_lob_view.xml'
--- account_analytic_lob/account_analytic_lob_view.xml	1970-01-01 00:00:00 +0000
+++ account_analytic_lob/account_analytic_lob_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Analytic Account Line of Business -->
+        
+        <record id="view_account_analytic_lob_search" model="ir.ui.view">
+            <field name="name">account.analytic.lob.search</field>
+            <field name="model">account.analytic.lob</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Line of Business">                    
+                    <field name="code"/>
+                    <field name="name"/>
+                </search>
+            </field>
+        </record>        
+        
+        <record id="view_account_analytic_lob_edit" model="ir.ui.view">
+            <field name="name">account.analytic.lob.form</field>
+            <field name="model">account.analytic.lob</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Line of Business">
+                    <field name="code" select="1"/>
+                    <field name="name" select="1"/>                    
+                </form>
+            </field>
+        </record>
+
+        <record id="view_account_analytic_lob_tree" model="ir.ui.view">
+            <field name="name">account.analytic.lob.tree</field>
+            <field name="model">account.analytic.lob</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Line of Business">   
+					<field name="code"/>                	                 
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_account_analytic_lob_tree" model="ir.actions.act_window">
+            <field name="name">Line of Business</field>
+            <field name="res_model">account.analytic.lob</field>
+            <field name="view_id" ref="view_account_analytic_lob_tree"/>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_analytic_lob_search"/>     
+            <field name="help">Define the Lines of Business.</field>
+        </record>
+
+        <menuitem id="menu_account_analytic_lob_config" 
+        	name="Line of Business" 
+        	parent="account.menu_analytic_accounting" 
+        	sequence="1"
+        	/>
+        	
+        <menuitem 
+        	action="action_account_analytic_lob_tree" 
+        	id="menu_account_analytic_lob_view" 
+        	parent="menu_account_analytic_lob_config" 
+        	sequence="1"
+        	groups="analytic.group_analytic_accounting"
+        	/>                  	                    
+    </data>
+</openerp>

=== added directory 'account_analytic_lob/i18n'
=== added file 'account_analytic_lob/i18n/account_analytic_lob.pot'
--- account_analytic_lob/i18n/account_analytic_lob.pot	1970-01-01 00:00:00 +0000
+++ account_analytic_lob/i18n/account_analytic_lob.pot	2013-02-19 14:36:22 +0000
@@ -0,0 +1,57 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_analytic_lob
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-12-18 08:17+0000\n"
+"PO-Revision-Date: 2011-12-18 08:17+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_analytic_lob
+#: field:account.analytic.account,lob:0
+#: view:account.analytic.lob:0
+#: model:ir.actions.act_window,name:account_analytic_lob.action_account_analytic_lob_tree
+#: model:ir.model,name:account_analytic_lob.model_account_analytic_lob
+#: model:ir.ui.menu,name:account_analytic_lob.menu_account_analytic_lob_config
+#: model:ir.ui.menu,name:account_analytic_lob.menu_account_analytic_lob_view
+msgid "Line of Business"
+msgstr ""
+
+#. module: account_analytic_lob
+#: field:account.analytic.lob,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_analytic_lob
+#: field:account.analytic.lob,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_analytic_lob
+#: model:ir.actions.act_window,help:account_analytic_lob.action_account_analytic_lob_tree
+msgid "Define the Lines of Business."
+msgstr ""
+
+#. module: account_analytic_lob
+#: model:ir.model,name:account_analytic_lob.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_lob
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
+#. module: account_analytic_lob
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+

=== added file 'account_analytic_lob/i18n/es.po'
--- account_analytic_lob/i18n/es.po	1970-01-01 00:00:00 +0000
+++ account_analytic_lob/i18n/es.po	2013-02-19 14:36:22 +0000
@@ -0,0 +1,57 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_analytic_lob
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-12-18 08:17+0000\n"
+"PO-Revision-Date: 2011-12-18 09:18+0100\n"
+"Last-Translator: Jordi Ballester <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: account_analytic_lob
+#: field:account.analytic.account,lob:0
+#: view:account.analytic.lob:0
+#: model:ir.actions.act_window,name:account_analytic_lob.action_account_analytic_lob_tree
+#: model:ir.model,name:account_analytic_lob.model_account_analytic_lob
+#: model:ir.ui.menu,name:account_analytic_lob.menu_account_analytic_lob_config
+#: model:ir.ui.menu,name:account_analytic_lob.menu_account_analytic_lob_view
+msgid "Line of Business"
+msgstr "Línea de Negocio"
+
+#. module: account_analytic_lob
+#: field:account.analytic.lob,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_analytic_lob
+#: field:account.analytic.lob,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_analytic_lob
+#: model:ir.actions.act_window,help:account_analytic_lob.action_account_analytic_lob_tree
+msgid "Define the Lines of Business."
+msgstr "Define las Líneas de Negocio."
+
+#. module: account_analytic_lob
+#: model:ir.model,name:account_analytic_lob.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: account_analytic_lob
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr "¡Error! La divisa tiene que ser la misma que la establecida en la compañía seleccionada"
+
+#. module: account_analytic_lob
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+

=== added file 'account_analytic_lob/project.py'
--- account_analytic_lob/project.py	1970-01-01 00:00:00 +0000
+++ account_analytic_lob/project.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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 fields, osv
+
+
+class account_analytic_account(osv.osv):
+
+    _inherit = 'account.analytic.account'
+
+
+    _columns = {
+        'lob': fields.many2one('account.analytic.lob','Line of Business'),                
+     }
+    
+account_analytic_account()

=== added file 'account_analytic_lob/project_view.xml'
--- account_analytic_lob/project_view.xml	1970-01-01 00:00:00 +0000
+++ account_analytic_lob/project_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+
+
+#---------------------------------------------------------------------------------------------------------
+#   Extend the project
+#---------------------------------------------------------------------------------------------------------
+       <record id="edit_project" model="ir.ui.view">
+            <field name="name">project.project.form</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+            	<xpath expr="//form/sheet/notebook/page[@string='Other Info']/group/group[@string='Miscellaneous']/field[@name='parent_id']" position="after">	
+            		<field name="lob"/>          				            		
+            	</xpath>
+            </field>            	        
+        </record>  
+
+        
+
+#---------------------------------------------------------------------------------------------------------
+#   Extend the analytic account
+#---------------------------------------------------------------------------------------------------------
+       
+           	
+        <record id="view_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+				<xpath expr="//form/sheet/notebook/page[@string='Contract Information']/field[@name='description']" position="after">
+            		<field name="lob"/>
+            	</xpath>      				            		            	              
+            </field>
+        </record>         
+         
+    </data>
+</openerp>        

=== added directory 'account_analytic_lob/security'
=== added file 'account_analytic_lob/security/ir.model.access.csv'
--- account_analytic_lob/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ account_analytic_lob/security/ir.model.access.csv	2013-02-19 14:36:22 +0000
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_account_analytic_lob_project_user","account.analytic.lob project user","model_account_analytic_lob","project.group_project_user",1,0,0,0
+"access_account_analytic_lob_account_user","account.analytic.lob account user","model_account_analytic_lob","account.group_account_user",1,0,0,0
+"access_account_analytic_lob_project_manager","account.analytic.lob project manager","model_account_analytic_lob","project.group_project_manager",1,1,1,1
+"access_account_analytic_lob_account_manager","account.analytic.lob account manager","model_account_analytic_lob","account.group_account_manager",1,1,1,1
\ No newline at end of file

=== added directory 'project_category'
=== renamed directory 'project_category' => 'project_category.moved'
=== added file 'project_category/__init__.py'
--- project_category/__init__.py	1970-01-01 00:00:00 +0000
+++ project_category/__init__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import analytic_account_category
+import account_analytic_account
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project_category/__openerp__.py'
--- project_category/__openerp__.py	1970-01-01 00:00:00 +0000
+++ project_category/__openerp__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              <[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": "Project Management",
+    "version": "1.0",
+    "author": "Eficent, Nervia Consultores",
+    "website": "",
+    "category": "Generic Modules/Projects & Services",
+    "depends": [
+                "base",
+                "account",
+                "analytic",
+                "project",                       
+                ],
+    "description": """ This module intrododuces the possibility to associate categories to analytic accounts and projects.
+        Manage the analytic account categories in order to better classify them for tracking and analysis purposes. 
+        An analytic account may belong to several categories and categories have a hierarchy structure: an analytic account belonging to a category also belong to her parent category.
+    """,
+    "init_xml": [
+                ],
+    "update_xml": [    
+        "analytic_account_category.xml",
+        "analytic_account_view.xml",
+        "project_view.xml",
+        "security/ir.model.access.csv",
+    ],
+    'demo_xml': [
+
+    ],
+    'test':[
+    ],
+    'installable': True,
+    'active': False,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project_category/account_analytic_account.py'
--- project_category/account_analytic_account.py	1970-01-01 00:00:00 +0000
+++ project_category/account_analytic_account.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              <[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 lxml import etree
+import time
+from datetime import datetime, date, timedelta
+import decimal_precision as dp
+from tools.translate import _
+from osv import fields, osv
+import netsvc
+import tools
+
+class account_analytic_account(osv.osv):
+    
+    def _categories_name_calc(self, cr, uid, ids, name, args, context=None):
+        
+        if not ids:
+            return []
+        res = []            
+            
+        accounts_br = self.browse(cr, uid, ids, context=context)   
+                
+        for account in accounts_br:
+            data =[]
+            categories_br = account.category_id
+            if categories_br:                    
+                for category_br in categories_br:
+                    cat_name = category_br.complete_name or ''
+                    data.insert(0, cat_name)
+                data.sort(cmp=None, key=None, reverse=False)
+                data_str = ', '.join(map(tools.ustr,data))     
+                
+            else:
+                data_str = ''
+                                
+
+            res.append((account.id, data_str))
+                                   
+        return dict(res)     
+    
+    _inherit = 'account.analytic.account'
+    _columns = {   
+            
+        'category_id': fields.many2many('analytic.account.category', 'analytic_account_category_rel', 'account_id', 'category_id', 'Categories'),
+        'categories_name_str': fields.function(_categories_name_calc, method=True, type='text', string='Categories', help='Analytic account categories'), 
+                                               
+     }
+                
+account_analytic_account()
\ No newline at end of file

=== added file 'project_category/analytic_account_category.py'
--- project_category/analytic_account_category.py	1970-01-01 00:00:00 +0000
+++ project_category/analytic_account_category.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              <[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 tools
+from osv import fields, osv
+from tools.translate import _
+
+    
+class analytic_account_category(osv.osv):
+    def name_get(self, cr, uid, ids, context=None):
+        if not len(ids):
+            return []
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
+        res = []
+        for record in reads:
+            name = record['name']
+            if record['parent_id']:
+                name = record['parent_id'][1]+' / '+name
+            res.append((record['id'], name))
+        return res
+
+    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
+        if not args:
+            args=[]
+        if context is None:
+            context={}
+        if name:
+            # Be sure name_search is symetric to name_get
+            name = name.split(' / ')[-1]
+            ids = self.search(cr, uid, [('name', operator, name)] + args, limit=limit, context=context)
+        else:
+            ids = self.search(cr, uid, args, limit=limit, context=context)
+        return self.name_get(cr, uid, ids, context)
+
+
+    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = self.name_get(cr, uid, ids, context=context)
+        return dict(res)
+
+    _description='Analytic account & project Categories'
+    _name = 'analytic.account.category'
+    _columns = {
+        'name': fields.char('Category Name', required=True, size=64, translate=True),
+        'parent_id': fields.many2one('analytic.account.category', 'Parent Category', select=True, ondelete='cascade'),
+        'complete_name': fields.function(_name_get_fnc, method=True, type="char", string='Full Name'),
+        'child_ids': fields.one2many('analytic.account.category', 'parent_id', 'Child Categories'),
+        'active' : fields.boolean('Active', help="The active field allows you to hide the category without removing it."),
+        'parent_left' : fields.integer('Left parent', select=True),
+        'parent_right' : fields.integer('Right parent', select=True),
+        'account_ids': fields.many2many('account.analytic.account', 'analytic_account_category_rel', 'category_id', 'account_id', 'Categories'),
+    }
+    _constraints = [
+        (osv.osv._check_recursion, 'Error ! You can not create recursive categories.', ['parent_id'])
+    ]
+    _defaults = {
+        'active' : lambda *a: 1,
+    }
+    _parent_store = True
+    _parent_order = 'name'
+    _order = 'parent_left'
+    
+analytic_account_category()
\ No newline at end of file

=== added file 'project_category/analytic_account_category.xml'
--- project_category/analytic_account_category.xml	1970-01-01 00:00:00 +0000
+++ project_category/analytic_account_category.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!--
+          ======================
+          Categories
+          ======================
+        -->
+        <record id="view_analytic_account_category_form" model="ir.ui.view">
+            <field name="name">Analytic Account Categories</field>
+            <field name="model">analytic.account.category</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Account Category">
+                    <field name="name" select="1"/>
+                    <field name="active" groups="base.group_erp_manager"/>
+                    <field name="parent_id"/>
+                    <separator colspan="4" string="Analytic Accounts"/>
+                    <field colspan="4" name="account_ids" nolabel="1"/>
+                </form>
+            </field>
+        </record>
+        <record id="view_analytic_account_category_list" model="ir.ui.view">
+            <field name="name">Analytic Account Categories</field>
+            <field name="model">analytic.account.category</field>
+            <field name="type">tree</field>
+            <field eval="6" name="priority"/>
+            <field name="arch" type="xml">
+                <tree string="Analytic Account Categories">
+                    <field name="complete_name"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_analytic_account_category_tree" model="ir.ui.view">
+            <field name="name">analytic.account.category.tree</field>
+            <field name="model">analytic.account.category</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">
+                <tree toolbar="1" string="Analytic Account Categories">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+
+
+        <record id="action_analytic_account_by_category" model="ir.actions.act_window">
+            <field name="name">Analytic Account Categories</field>
+            <field name="res_model">account.analytic.account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('category_id','child_of', [active_id])]</field>
+            <field name="context">{'category_id':active_id}</field>
+            <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
+        </record>
+        
+
+        <record id="ir_action_analytic_account_by_category" model="ir.values">
+            <field eval="'tree_but_open'" name="key2"/>
+            <field eval="'analytic.account.category'" name="model"/>
+            <field name="name">Open analytic accounts</field>
+            <field eval="'ir.actions.act_window,%d'%action_analytic_account_by_category" name="value"/>
+            <field eval="True" name="object"/>
+        </record>
+
+        <record id="action_analytic_account_category_form" model="ir.actions.act_window">
+            <field name="name">Analytic Account Categories</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">analytic.account.category</field>
+            <field name="view_type">form</field>
+            <field name="help">Manage the analytic account categories in order to better classify them for tracking and analysis purposes. An analytic account may belong to several categories and categories have a hierarchy structure: an analytic account belonging to a category also belong to her parent category.</field>
+        </record>
+
+        <menuitem action="action_analytic_account_category_form" id="menu_analytic_account_category_form" name="Analytic Account Categories" sequence="4" parent="account.menu_analytic_accounting"/>
+        <menuitem action="action_analytic_account_category_form" id="menu_project_category_form" name="Project Categories" sequence="4" parent="base.menu_definitions"/>
+
+
+    </data>
+</openerp>

=== added file 'project_category/analytic_account_view.xml'
--- project_category/analytic_account_view.xml	1970-01-01 00:00:00 +0000
+++ project_category/analytic_account_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+
+#---------------------------------------------------------------------------------------------------------
+#   Extend the analytic account
+#---------------------------------------------------------------------------------------------------------
+        <record id="view_account_analytic_account_list" model="ir.ui.view">
+            <field name="name">account.analytic.account.list</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">tree</field>
+            <field eval="8" name="priority"/>
+            <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
+            <field name="arch" type="xml">
+                <field name="code" position="after">            		
+            		<field name="category_id"/>   
+            	</field>                     	
+            </field>
+        </record>              
+        
+        <record id="view_account_analytic_account_search" model="ir.ui.view">
+            <field name="name">account.analytic.account.search</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_search"/>
+            <field name="arch" type="xml">
+            	<field name="name" position="after">  
+            		<field name="category_id" select="1"/>  
+            	</field>               	   
+            </field>
+        </record>           
+        
+		<record id="view_account_analytic_account_tree" model="ir.ui.view">
+            <field name="name">account.analytic.account.tree</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_complete_ids</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_tree"/>
+            <field name="arch" type="xml">         	    
+            	<field name="name" position="after"> 
+            		<field name="categories_name_str"/> 	
+            	</field>  	  
+            </field>
+        </record>         
+           	
+        <record id="view_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+				<form string="Analytic Account" version="7.0">
+                    <sheet string="Analytic Account">
+						<notebook>
+							<page string="Account Data" position="after">
+								<page string="Categories">	                        
+									<field  colspan="4" name="category_id" nolabel="1"/>
+								</page>
+							</page>
+						</notebook>
+					</sheet>
+				</form>
+            </field>
+        </record>         
+        
+    </data>
+</openerp>        

=== added directory 'project_category/i18n'
=== added file 'project_category/i18n/es.po'
--- project_category/i18n/es.po	1970-01-01 00:00:00 +0000
+++ project_category/i18n/es.po	2013-02-19 14:36:22 +0000
@@ -0,0 +1,134 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_category
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2012-10-18 22:49+0000\n"
+"PO-Revision-Date: 2012-10-19 01:04+0100\n"
+"Last-Translator: Jordi Ballester <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: project_category
+#: field:analytic.account.category,parent_left:0
+msgid "Left parent"
+msgstr "Padre izquierdo"
+
+#. module: project_category
+#: view:project.project:0
+msgid "Administration"
+msgstr "Administración"
+
+#. module: project_category
+#: field:analytic.account.category,child_ids:0
+msgid "Child Categories"
+msgstr "Categorías hijas"
+
+#. module: project_category
+#: view:analytic.account.category:0
+msgid "Analytic Account Category"
+msgstr "Categoría Cuenta Analítica"
+
+#. module: project_category
+#: field:analytic.account.category,name:0
+msgid "Category Name"
+msgstr "Nombre Categoría"
+
+#. module: project_category
+#: model:ir.actions.act_window,help:project_category.action_analytic_account_category_form
+msgid "Manage the analytic account categories in order to better classify them for tracking and analysis purposes. An analytic account may belong to several categories and categories have a hierarchy structure: an analytic account belonging to a category also belong to her parent category."
+msgstr "Gestione las categorías de cuentas analíticas para clasificarlas mejor con el objetivo de realizar su seguimiento y análisis. Una cuenta analítica puede pertenecer a varias categorías. Éstas conforman una estructura jerárquica, de modo que si una cuenta analítica o proyecto pertenece a una categoría también pertenecerá a la categoría padre."
+
+#. module: project_category
+#: model:ir.ui.menu,name:project_category.menu_project_category_form
+msgid "Project Categories"
+msgstr "Categorías de Proyecto"
+
+#. module: project_category
+#: model:ir.model,name:project_category.model_analytic_account_category
+msgid "Analytic account & project Categories"
+msgstr "Categorías de cuenta analítica y proyecto"
+
+#. module: project_category
+#: view:analytic.account.category:0
+#: model:ir.actions.act_window,name:project_category.action_analytic_account_by_category
+#: model:ir.actions.act_window,name:project_category.action_analytic_account_category_form
+#: model:ir.ui.menu,name:project_category.menu_analytic_account_category_form
+msgid "Analytic Account Categories"
+msgstr "Categorías Cuenta Analítica"
+
+#. module: project_category
+#: field:analytic.account.category,active:0
+msgid "Active"
+msgstr "Activa"
+
+#. module: project_category
+#: view:account.analytic.account:0
+#: field:account.analytic.account,categories_name_str:0
+#: field:account.analytic.account,category_id:0
+#: field:analytic.account.category,account_ids:0
+#: view:project.project:0
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: project_category
+#: view:analytic.account.category:0
+msgid "Analytic Accounts"
+msgstr "Cuentas Analíticas"
+
+#. module: project_category
+#: field:analytic.account.category,parent_id:0
+msgid "Parent Category"
+msgstr "Categoría Padre"
+
+#. module: project_category
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr "¡Error! La divisa tiene que ser la misma que la establecida en la compañía seleccionada"
+
+#. module: project_category
+#: field:analytic.account.category,complete_name:0
+msgid "Full Name"
+msgstr "Nombre Completo"
+
+#. module: project_category
+#: view:account.analytic.account:0
+msgid "Account Data"
+msgstr "Datos de la cuenta"
+
+#. module: project_category
+#: constraint:analytic.account.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "¡Error! No puede crear categorías recursivas."
+
+#. module: project_category
+#: help:account.analytic.account,categories_name_str:0
+msgid "Analytic account categories"
+msgstr "Categorías de cuenta analítica"
+
+#. module: project_category
+#: model:ir.model,name:project_category.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: project_category
+#: help:analytic.account.category,active:0
+msgid "The active field allows you to hide the category without removing it."
+msgstr "El campo activo le permite ocultar la categoría sin tener que eliminarla."
+
+#. module: project_category
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: project_category
+#: field:analytic.account.category,parent_right:0
+msgid "Right parent"
+msgstr "Padre derecho"
+

=== added file 'project_category/i18n/project_category.pot'
--- project_category/i18n/project_category.pot	1970-01-01 00:00:00 +0000
+++ project_category/i18n/project_category.pot	2013-02-19 14:36:22 +0000
@@ -0,0 +1,134 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_category
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2012-10-18 22:49+0000\n"
+"PO-Revision-Date: 2012-10-18 22:49+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_category
+#: field:analytic.account.category,parent_left:0
+msgid "Left parent"
+msgstr ""
+
+#. module: project_category
+#: view:project.project:0
+msgid "Administration"
+msgstr ""
+
+#. module: project_category
+#: field:analytic.account.category,child_ids:0
+msgid "Child Categories"
+msgstr ""
+
+#. module: project_category
+#: view:analytic.account.category:0
+msgid "Analytic Account Category"
+msgstr ""
+
+#. module: project_category
+#: field:analytic.account.category,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: project_category
+#: model:ir.actions.act_window,help:project_category.action_analytic_account_category_form
+msgid "Manage the analytic account categories in order to better classify them for tracking and analysis purposes. An analytic account may belong to several categories and categories have a hierarchy structure: an analytic account belonging to a category also belong to her parent category."
+msgstr ""
+
+#. module: project_category
+#: model:ir.ui.menu,name:project_category.menu_project_category_form
+msgid "Project Categories"
+msgstr ""
+
+#. module: project_category
+#: model:ir.model,name:project_category.model_analytic_account_category
+msgid "Analytic account & project Categories"
+msgstr ""
+
+#. module: project_category
+#: view:analytic.account.category:0
+#: model:ir.actions.act_window,name:project_category.action_analytic_account_by_category
+#: model:ir.actions.act_window,name:project_category.action_analytic_account_category_form
+#: model:ir.ui.menu,name:project_category.menu_analytic_account_category_form
+msgid "Analytic Account Categories"
+msgstr ""
+
+#. module: project_category
+#: field:analytic.account.category,active:0
+msgid "Active"
+msgstr ""
+
+#. module: project_category
+#: view:account.analytic.account:0
+#: field:account.analytic.account,categories_name_str:0
+#: field:account.analytic.account,category_id:0
+#: field:analytic.account.category,account_ids:0
+#: view:project.project:0
+msgid "Categories"
+msgstr ""
+
+#. module: project_category
+#: view:analytic.account.category:0
+msgid "Analytic Accounts"
+msgstr ""
+
+#. module: project_category
+#: field:analytic.account.category,parent_id:0
+msgid "Parent Category"
+msgstr ""
+
+#. module: project_category
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
+#. module: project_category
+#: field:analytic.account.category,complete_name:0
+msgid "Full Name"
+msgstr ""
+
+#. module: project_category
+#: view:account.analytic.account:0
+msgid "Account Data"
+msgstr ""
+
+#. module: project_category
+#: constraint:analytic.account.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: project_category
+#: help:account.analytic.account,categories_name_str:0
+msgid "Analytic account categories"
+msgstr ""
+
+#. module: project_category
+#: model:ir.model,name:project_category.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_category
+#: help:analytic.account.category,active:0
+msgid "The active field allows you to hide the category without removing it."
+msgstr ""
+
+#. module: project_category
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: project_category
+#: field:analytic.account.category,parent_right:0
+msgid "Right parent"
+msgstr ""
+

=== added file 'project_category/project_view.xml'
--- project_category/project_view.xml	1970-01-01 00:00:00 +0000
+++ project_category/project_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+
+
+#---------------------------------------------------------------------------------------------------------
+#   Extend the project
+#---------------------------------------------------------------------------------------------------------
+        
+       <record id="view_project_project_filter" model="ir.ui.view">
+            <field name="name">project.project.select</field>
+            <field name="model">project.project</field>
+            <field name="type">search</field>
+            <field name="inherit_id" ref="project.view_project_project_filter"/>
+            <field name="arch" type="xml">            	 	
+            	<field name="name" position="after">
+            			<field name="category_id" select="1"/>    
+            	</field>
+            </field>
+        </record>
+ 	
+        
+        <record id="view_project" model="ir.ui.view">
+            <field name="name">project.project.tree</field>
+            <field name="model">project.project</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="project.view_project"/>
+            <field name="field_parent">child_ids</field>
+            <field name="arch" type="xml">                
+                <field name="name" position="after">            		   
+            		<field name="categories_name_str"/>     			            			            				            		
+            	</field>            	                                         
+            </field>
+        </record>        
+ 
+        
+        <record id="edit_project" model="ir.ui.view">
+            <field name="name">project.project.form</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+            	<page string="Other Info" position="after">	
+	                <page string="Categories">	                        
+	                	<field  colspan="4" name="category_id" nolabel="1"/>
+	                </page>       		            				            	
+            	</page>
+            </field>            	        
+        </record>  
+
+    </data>
+</openerp>

=== added directory 'project_category/security'
=== added file 'project_category/security/ir.model.access.csv'
--- project_category/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ project_category/security/ir.model.access.csv	2013-02-19 14:36:22 +0000
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_analytic_account_category_project_user","analytic_account_category project user","model_analytic_account_category","project.group_project_user",1,0,0,0
+"access_analytic_account_category_project_manager","analytic_account_category project manager","model_analytic_account_category","project.group_project_manager",1,1,1,1
+"access_analytic_account_category_account_user","analytic_account_category account user","model_analytic_account_category","account.group_account_user",1,0,0,0
+"access_analytic_account_category_account_manager","analytic_account_category account manager","model_analytic_account_category","account.group_account_manager",1,1,1,1

=== added directory 'project_communications_mailgate'
=== renamed directory 'project_communications_mailgate' => 'project_communications_mailgate.moved'
=== added file 'project_communications_mailgate/__init__.py'
--- project_communications_mailgate/__init__.py	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate/__init__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import project_communications_mailgate
+import project
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project_communications_mailgate/__openerp__.py'
--- project_communications_mailgate/__openerp__.py	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate/__openerp__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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": "Project MailGateWay for Projects",
+    "version": "1.0",
+    "author": "Eficent, Nervia Consultores",
+    "website": "",
+    "category": "Generic Modules/Projects & Services",
+    "depends": ["project", "mail"],
+    "description": """This module is an interface that synchronises mails with OpenERP Project.
+
+It allows updating projects as soon as a new mail arrives in our configured mail server.
+Moreover, it keeps track of all further communications and project states.
+    """,
+    "init_xml": [],
+    "update_xml": [
+        "project_communications_mailgate_view.xml",
+    ],
+    'demo_xml': [
+    ],
+    'installable': True,
+    'active': False,
+    'certificate': '',
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'project_communications_mailgate/i18n'
=== added file 'project_communications_mailgate/i18n/es.po'
--- project_communications_mailgate/i18n/es.po	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate/i18n/es.po	2013-02-19 14:36:22 +0000
@@ -0,0 +1,102 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_communications_mailgate
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2012-01-26 13:31+0000\n"
+"PO-Revision-Date: 2012-01-26 14:34+0100\n"
+"Last-Translator: Jordi Ballester <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: project_communications_mailgate
+#: view:project.project:0
+msgid "History Information"
+msgstr "Información histórica"
+
+#. module: project_communications_mailgate
+#: model:ir.module.module,description:project_communications_mailgate.module_meta_information
+msgid ""
+"This module is an interface that synchronises mails with OpenERP Project.\n"
+"\n"
+"It allows updating projects as soon as a new mail arrives in our configured mail server.\n"
+"Moreover, it keeps track of all further communications and project states.\n"
+"    "
+msgstr "Este módulo es una interfaz que sincroniza los correos con un proyecto en OpenERP.Permite la actualización de los proyectos al llegar un nuevo correo en nuestro servidor de correo configurado.Además, realiza un seguimiento de todas las comunicaciones y los estados del proyecto."
+
+#. module: project_communications_mailgate
+#: view:project.project:0
+msgid "Attachments"
+msgstr "Archivos adjuntos"
+
+#. module: project_communications_mailgate
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: project_communications_mailgate
+#: model:ir.model,name:project_communications_mailgate.model_project_project
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_communications_mailgate
+#: code:addons/project_communications_mailgate/project.py:46
+#, python-format
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_communications_mailgate
+#: model:ir.module.module,shortdesc:project_communications_mailgate.module_meta_information
+msgid "Project MailGateWay for Projects"
+msgstr "Pasarela de correos para proyectos"
+
+#. module: project_communications_mailgate
+#: code:addons/project_communications_mailgate/project.py:34
+#, python-format
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_communications_mailgate
+#: view:project.project:0
+msgid "Details"
+msgstr "Detalles"
+
+#. module: project_communications_mailgate
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
+
+#. module: project_communications_mailgate
+#: code:addons/project_communications_mailgate/project.py:58
+#, python-format
+msgid "Cancel"
+msgstr "Cancelado"
+
+#. module: project_communications_mailgate
+#: code:addons/project_communications_mailgate/project.py:52
+#, python-format
+msgid "Done"
+msgstr "Realizado"
+
+#. module: project_communications_mailgate
+#: code:addons/project_communications_mailgate/project.py:40
+#, python-format
+msgid "Open"
+msgstr "Abierto"
+
+#. module: project_communications_mailgate
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final del proyecto."
+
+#. module: project_communications_mailgate
+#: view:project.project:0
+msgid "History"
+msgstr "Historial"
+

=== added file 'project_communications_mailgate/i18n/project_communications_mailgate.pot'
--- project_communications_mailgate/i18n/project_communications_mailgate.pot	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate/i18n/project_communications_mailgate.pot	2013-02-19 14:36:22 +0000
@@ -0,0 +1,101 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_communications_mailgate
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2012-01-26 13:31+0000\n"
+"PO-Revision-Date: 2012-01-26 13:31+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_communications_mailgate
+#: view:project.project:0
+msgid "History Information"
+msgstr ""
+
+#. module: project_communications_mailgate
+#: model:ir.module.module,description:project_communications_mailgate.module_meta_information
+msgid "This module is an interface that synchronises mails with OpenERP Project.\n"
+"\n"
+"It allows updating projects as soon as a new mail arrives in our configured mail server.\n"
+"Moreover, it keeps track of all further communications and project states.\n"
+"    "
+msgstr ""
+
+#. module: project_communications_mailgate
+#: view:project.project:0
+msgid "Attachments"
+msgstr ""
+
+#. module: project_communications_mailgate
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: project_communications_mailgate
+#: model:ir.model,name:project_communications_mailgate.model_project_project
+msgid "Project"
+msgstr ""
+
+#. module: project_communications_mailgate
+#: code:addons/project_communications_mailgate/project.py:46
+#, python-format
+msgid "Pending"
+msgstr ""
+
+#. module: project_communications_mailgate
+#: model:ir.module.module,shortdesc:project_communications_mailgate.module_meta_information
+msgid "Project MailGateWay for Projects"
+msgstr ""
+
+#. module: project_communications_mailgate
+#: code:addons/project_communications_mailgate/project.py:34
+#, python-format
+msgid "Draft"
+msgstr ""
+
+#. module: project_communications_mailgate
+#: view:project.project:0
+msgid "Details"
+msgstr ""
+
+#. module: project_communications_mailgate
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_communications_mailgate
+#: code:addons/project_communications_mailgate/project.py:58
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: project_communications_mailgate
+#: code:addons/project_communications_mailgate/project.py:52
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: project_communications_mailgate
+#: code:addons/project_communications_mailgate/project.py:40
+#, python-format
+msgid "Open"
+msgstr ""
+
+#. module: project_communications_mailgate
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+
+#. module: project_communications_mailgate
+#: view:project.project:0
+msgid "History"
+msgstr ""
+

=== added file 'project_communications_mailgate/project.py'
--- project_communications_mailgate/project.py	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate/project.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,223 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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 openerp.osv import orm
+from openerp.tools.translate import _
+
+import base64
+import datetime
+import dateutil
+import email
+import logging
+import pytz
+import re
+import time
+import xmlrpclib
+
+    
+class project(orm.Model):
+   
+    _inherit = "project.project"
+ 
+    def set_draft(self, cr, uid, ids, context=None):
+        res = super(project, self).set_draft(cr, uid, ids, context=context)
+        projects = self.browse(cr, uid, ids, context=context)
+        self.message_append(cr, uid, projects, _('Draft'), context=context)
+        return res
+    
+    def set_open(self, cr, uid, ids, context=None):
+        res = super(project, self).set_open(cr, uid, ids, context=context)
+        projects = self.browse(cr, uid, ids, context=context)
+        self.message_append(cr, uid, projects, _('Open'), context=context)
+        return res
+
+    def set_pending(self, cr, uid, ids, context=None):
+        res = super(project, self).set_pending(cr, uid, ids, context=context)
+        projects = self.browse(cr, uid, ids, context=context)
+        self.message_append(cr, uid, projects, _('Pending'), context=context)
+        return res
+
+    def set_done(self, cr, uid, ids, context=None):
+        res = super(project, self).set_done(cr, uid, ids, context=context)
+        projects = self.browse(cr, uid, ids, context=context)
+        self.message_append(cr, uid, projects, _('Done'), context=context)
+        return res
+
+    def set_cancel(self, cr, uid, ids, context=None):
+        res = super(project, self).set_cancel(cr, uid, ids, context=context)
+        projects = self.browse(cr, uid, ids, context=context)
+        self.message_append(cr, uid, projects, _('Cancel'), context=context)
+        return res
+		
+    def message_append(self, cr, uid, threads, subject, body_text=None, email_to=False,
+                email_from=False, email_cc=None, email_bcc=None, reply_to=None,
+                email_date=None, message_id=False, references=None,
+                attachments=None, body_html=None, subtype=None, headers=None,
+                original=None, context=None):
+        """Creates a new mail.message attached to the current mail.thread,
+           containing all the details passed as parameters.  All attachments
+           will be attached to the thread record as well as to the actual
+           message.
+           If only the ``threads`` and ``subject`` parameters are provided,
+           a *event log* message is created, without the usual envelope
+           attributes (sender, recipients, etc.). 
+
+        :param threads: list of thread ids, or list of browse_records representing
+                        threads to which a new message should be attached
+        :param subject: subject of the message, or description of the event if this
+                        is an *event log* entry.
+        :param email_to: Email-To / Recipient address
+        :param email_from: Email From / Sender address if any
+        :param email_cc: Comma-Separated list of Carbon Copy Emails To addresse if any
+        :param email_bcc: Comma-Separated list of Blind Carbon Copy Emails To addresses if any
+        :param reply_to: reply_to header
+        :param email_date: email date string if different from now, in server timezone
+        :param message_id: optional email identifier
+        :param references: optional email references
+        :param body_text: plaintext contents of the mail or log message
+        :param body_html: html contents of the mail or log message
+        :param subtype: optional type of message: 'plain' or 'html', corresponding to the main
+                        body contents (body_text or body_html).
+        :param headers: mail headers to store
+        :param dict attachments: map of attachment filenames to binary contents, if any.
+        :param str original: optional full source of the RFC2822 email, for reference
+        :param dict context: if a ``thread_model`` value is present
+                             in the context, its value will be used
+                             to determine the model of the thread to
+                             update (instead of the current model).
+        """
+        if context is None:
+            context = {}
+        if attachments is None:
+            attachments = {}
+
+        if email_date:
+            edate = parsedate(email_date)
+            if edate is not None:
+                email_date = time.strftime('%Y-%m-%d %H:%M:%S', edate)
+
+        if all(isinstance(thread_id, (int, long)) for thread_id in threads):
+            model = context.get('thread_model') or self._name
+            model_pool = self.pool.get(model)
+            threads = model_pool.browse(cr, uid, threads, context=context)
+
+        ir_attachment = self.pool.get('ir.attachment')
+        mail_message = self.pool.get('mail.message')
+
+        for thread in threads:
+            to_attach = []
+            for attachment in attachments:
+                fname, fcontent = attachment
+                if isinstance(fcontent, unicode):
+                    fcontent = fcontent.encode('utf-8')
+                data_attach = {
+                    'name': fname,
+                    'datas': base64.b64encode(str(fcontent)),
+                    'datas_fname': fname,
+                    'description': _('Mail attachment'),
+                    'res_model': thread._name,
+                    'res_id': thread.id,
+                }
+                to_attach.append(ir_attachment.create(cr, uid, data_attach, context=context))
+
+            partner_id = hasattr(thread, 'partner_id') and (thread.partner_id and thread.partner_id.id or False) or False
+            if not partner_id and thread._name == 'res.partner':
+                partner_id = thread.id
+            data = {
+                'subject': subject,
+                'user_id': uid,
+                'model' : thread._name,
+                'partner_id': partner_id,
+                'res_id': thread.id,
+                'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'message_id': message_id,
+                'body_text': body_text or (hasattr(thread, 'description') and thread.description or False),
+                'attachment_ids': [(6, 0, to_attach)],
+                'state' : 'received',
+            }
+
+            if email_from:
+                for param in (email_to, email_cc, email_bcc):
+                    if isinstance(param, list):
+                        param = ", ".join(param)
+                data = {
+                    'subject': subject or _('History'),
+                    'user_id': uid,
+                    'model' : thread._name,
+                    'res_id': thread.id,
+                    'date': email_date or time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'body_text': body_text,
+                    'email_to': email_to,
+                    'email_from': email_from or \
+                        (hasattr(thread, 'user_id') and thread.user_id and thread.user_id.user_email),
+                    'email_cc': email_cc,
+                    'email_bcc': email_bcc,
+                    'partner_id': partner_id,
+                    'references': references,
+                    'message_id': message_id,
+                    'attachment_ids': [(6, 0, to_attach)],
+                    'state' : 'received',
+                    'body_html': body_html,
+                    'subtype': subtype,
+                    'headers': headers,
+                    'reply_to': reply_to,
+                    'original': original,
+                }
+            mail_message.create(cr, uid, data, context=context)
+        return True
+
+    def message_append_dict(self, cr, uid, ids, msg_dict, context=None):
+        """Creates a new mail.message attached to the given threads (``ids``),
+           with the contents of ``msg_dict``, by calling ``message_append``
+           with the mail details. All attachments in msg_dict will be
+           attached to the object record as well as to the actual
+           mail message.
+
+           :param dict msg_dict: a map containing the email details and
+                                 attachments. See ``message_process()`` and
+                                ``mail.message.parse()`` for details on
+                                the dict structure.
+           :param dict context: if a ``thread_model`` value is present
+                                in the context, its value will be used
+                                to determine the model of the thread to
+                                update (instead of the current model).
+        """
+        return self.message_append(cr, uid, ids,
+                            subject = msg_dict.get('subject'),
+                            body_text = msg_dict.get('body_text'),
+                            email_to = msg_dict.get('to'),
+                            email_from = msg_dict.get('from'),
+                            email_cc = msg_dict.get('cc'),
+                            email_bcc = msg_dict.get('bcc'),
+                            reply_to = msg_dict.get('reply'),
+                            email_date = msg_dict.get('date'),
+                            message_id = msg_dict.get('message-id'),
+                            references = msg_dict.get('references')\
+                                      or msg_dict.get('in-reply-to'),
+                            attachments = msg_dict.get('attachments'),
+                            body_html= msg_dict.get('body_html'),
+                            subtype = msg_dict.get('subtype'),
+                            headers = msg_dict.get('headers'),
+                            original = msg_dict.get('original'),
+                            context = context)
+
+#project()
+

=== added file 'project_communications_mailgate/project_communications_mailgate.py'
--- project_communications_mailgate/project_communications_mailgate.py	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate/project_communications_mailgate.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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 openerp.osv import fields, orm
+
+
+class project_communications_mail(orm.Model):
+    _name = "project.project"
+    _inherit = ['mail.thread','project.project']
+    
+    _columns= {
+		'message_ids': fields.one2many(
+			'mail.message', 'res_id', 'Messages',
+			domain=[('model','=',_name)], readonly=True
+		),
+	}
+
+    def message_thread_followers(self, cr, uid, ids, context=None):
+        if not ids:
+            return {}
+        if isinstance(ids, (int, long)):
+            ids= [ids]
+
+        res = {}
+
+        for project in self.browse(cr, uid, select, context=context):
+            user_email = (project.user_id and project.user_id.address_id
+                          and project.user_id.address_id.email) or False
+            if user_email:
+                res.setdefault(project.id, []).append(user_email)
+        
+        return res
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project_communications_mailgate/project_communications_mailgate_view.xml'
--- project_communications_mailgate/project_communications_mailgate_view.xml	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate/project_communications_mailgate_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+	<openerp>
+		<data>		       
+			<record id="edit_project" model="ir.ui.view">
+		            <field name="name">project.project.form</field>
+		            <field name="model">project.project</field>
+		            <field name="type">form</field>
+		            <field name="inherit_id" ref="project.edit_project"/>
+		            <field name="arch" type="xml">
+		                <!-- #Repetido en project_communications_mailgate_note_view 25/01/2013 -->
+						<xpath expr="/form/sheet/notebook/page[@string='Other Info']" position="after">
+		                    <page string="History">
+	                        	<field name="message_ids" colspan="4" nolabel="1" mode="tree">
+									<tree string="History">
+										<field name="email_from" invisible="1"/>
+									</tree>
+	                    		</field>
+	                        </page>
+		                </xpath>
+		                <xpath expr="/form/header/button[@name='set_cancel']" position="after">
+			                <!--  attrs="{'invisible': [('email_from', '=', False)]}" -->
+			                <button
+								string="Reply"
+								name="%(mail.action_email_compose_message_wizard)d"
+								context="{'mail.compose.message.mode':'reply', 'message_id':active_id}"
+								icon="terp-mail-replied" type="action" />
+		                </xpath>
+		            </field>
+		       </record>	       
+	 	</data>
+</openerp> 
\ No newline at end of file

=== added directory 'project_communications_mailgate/security'
=== added file 'project_communications_mailgate/security/ir.model.access.csv'
=== added directory 'project_communications_mailgate_note'
=== renamed directory 'project_communications_mailgate_note' => 'project_communications_mailgate_note.moved'
=== added file 'project_communications_mailgate_note/__init__.py'
--- project_communications_mailgate_note/__init__.py	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate_note/__init__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    project_mailgate_note module for OpenERP, Add buttons to add notes and send mail into history tab
+#    Copyright (C) 2011 SYLEAM Info Services (<http://www.Syleam.fr/>)
+#              Sylvain Garancher <[e-mail]>
+#
+#    This file is a part of project_mailgate_note
+#
+#    project_mailgate_note 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.
+#
+#    project_mailgate_note 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 wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project_communications_mailgate_note/__openerp__.py'
--- project_communications_mailgate_note/__openerp__.py	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate_note/__openerp__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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': 'Project Mailgate Note for Projects',
+    'version': '1.0',
+    'category': 'Generic Modules/Projects & Services',
+    'description': """This module allows to add a note or send an email from the history tab in the project form view.""",
+    "author": "Eficent, Nervia Consultores",
+    "website": "",
+    'depends': [
+        'base',
+        'crm',
+        'project_communications_mailgate',
+    ],
+    'init_xml': [],
+    'images': [
+        'images/accueil.png',
+        'images/send_mail.png',
+        'images/history.png',
+    ],
+    'update_xml': [
+        #'security/ir.model.access.csv',
+        #'wizard/wizard.xml',
+        'wizard/project_communications_add_note_view.xml',
+        'wizard/project_communications_send_email_view.xml',
+        'project_communications_mailgate_note_view.xml',
+    ],
+    'demo_xml': [],
+    'test': [],
+    #'external_dependancies': {'python': ['kombu'], 'bin': ['which']},
+    #SIN ADAPTAR
+    'installable': False,
+    'active': False,
+    'license': 'AGPL-3',
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'project_communications_mailgate_note/i18n'
=== added file 'project_communications_mailgate_note/i18n/es.po'
--- project_communications_mailgate_note/i18n/es.po	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate_note/i18n/es.po	2013-02-19 14:36:22 +0000
@@ -0,0 +1,286 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_communications_mailgate_note
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-09-03 11:48+0000\n"
+"PO-Revision-Date: 2011-09-03 20:03+0100\n"
+"Last-Translator: Jordi Ballester Alomar (Avangard Enterprise Information Systems) <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: project_communications_mailgate_note
+#: selection:project.add.note,state:0
+#: selection:project.send.mail,state:0
+msgid "In Progress"
+msgstr "En curso"
+
+#. module: project_communications_mailgate_note
+#: help:project.send.mail,email_cc:0
+msgid "These addresses will receive a copy of this email. To modify the permanent CC list, edit the global CC field of this case"
+msgstr "Estas direcciones recibirán una copia de este correo electrónico. Para modificar la lista de CC permanente, edite el campo CC global de este caso"
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: project_communications_mailgate_note
+#: view:project.project:0
+msgid "History Information"
+msgstr "Información de la Historia"
+
+#. module: project_communications_mailgate_note
+#: help:project.send.mail,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr "Seleccione esta opción si desea enviar correo electrónico con formato HTML."
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail.attachment,wizard_id:0
+msgid "Wizard"
+msgstr "Asistente"
+
+#. module: project_communications_mailgate_note
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_add_note.py:38
+#: view:project.add.note:0
+#, python-format
+msgid "Note"
+msgstr "Nota"
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,email_to:0
+msgid "To"
+msgstr "Para"
+
+#. module: project_communications_mailgate_note
+#: view:project.project:0
+msgid "Send New Email"
+msgstr "Enviar nuevo mensaje"
+
+#. module: project_communications_mailgate_note
+#: model:ir.actions.act_window,name:project_communications_mailgate_note.action_project_add_note
+#: view:project.add.note:0
+msgid "Add Note"
+msgstr "Añadir nota"
+
+#. module: project_communications_mailgate_note
+#: selection:project.add.note,state:0
+#: selection:project.send.mail,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_communications_mailgate_note
+#: view:project.add.note:0
+#: view:project.send.mail:0
+#: field:project.send.mail.attachment,binary:0
+msgid "Attachment"
+msgstr "Fichero adjunto"
+
+#. module: project_communications_mailgate_note
+#: view:project.project:0
+msgid "Reply"
+msgstr "Respuesta"
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,html:0
+msgid "HTML formatting?"
+msgstr "Formato HTML?"
+
+#. module: project_communications_mailgate_note
+#: selection:project.add.note,state:0
+#: selection:project.send.mail,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_communications_mailgate_note
+#: view:project.send.mail:0
+msgid " "
+msgstr " "
+
+#. module: project_communications_mailgate_note
+#: field:project.add.note,attachment_ids:0
+#: field:project.send.mail,attachment_ids:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: project_communications_mailgate_note
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_add_note.py:24
+#, python-format
+msgid "Can not add note!"
+msgstr "No se puede agregar la nota!"
+
+#. module: project_communications_mailgate_note
+#: model:ir.actions.act_window,name:project_communications_mailgate_note.action_project_reply_mail
+#: view:project.send.mail:0
+msgid "Reply to last Mail"
+msgstr "Responder al último e-mail"
+
+#. module: project_communications_mailgate_note
+#: model:ir.module.module,description:project_communications_mailgate_note.module_meta_information
+msgid "This module allows to add a note or send an email from the history tab in the task form view."
+msgstr "Este módulo permite agregar una nota o enviar un correo electrónico de la ficha de la historia en la vista Formulario de tareas."
+
+#. module: project_communications_mailgate_note
+#: help:project.send.mail,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr "Responder al equipo de ventas que se define en este caso"
+
+#. module: project_communications_mailgate_note
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:143
+#, python-format
+msgid "Unable to send mail. Please check SMTP is configured properly."
+msgstr "No se puede enviar por correo. Por favor, compruebe que el SMTP está configurado correctamente."
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,subject:0
+msgid "Subject"
+msgstr "Asunto"
+
+#. module: project_communications_mailgate_note
+#: model:ir.model,name:project_communications_mailgate_note.model_project_add_note
+#: view:project.project:0
+msgid "Add Internal Note"
+msgstr "Añadir nota interna"
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail.attachment,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,email_cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: project_communications_mailgate_note
+#: model:ir.actions.act_window,name:project_communications_mailgate_note.action_project_send_mail
+#: view:project.send.mail:0
+msgid "Send Mail"
+msgstr "Enviar correo"
+
+#. module: project_communications_mailgate_note
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:143
+#, python-format
+msgid "Error!"
+msgstr "Error!"
+
+#. module: project_communications_mailgate_note
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_add_note.py:24
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:74
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:169
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:288
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: project_communications_mailgate_note
+#: selection:project.add.note,state:0
+#: selection:project.send.mail,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project_communications_mailgate_note
+#: field:project.add.note,body:0
+msgid "Note Body"
+msgstr "Cuerpo de la Nota"
+
+#. module: project_communications_mailgate_note
+#: view:project.send.mail:0
+msgid "_Send Reply"
+msgstr "_Enviar Respuesta"
+
+#. module: project_communications_mailgate_note
+#: model:ir.module.module,shortdesc:project_communications_mailgate_note.module_meta_information
+msgid "Project Mailgate Note for Projects"
+msgstr "Project Mailgate Note for Projects"
+
+#. module: project_communications_mailgate_note
+#: view:project.project:0
+msgid "History"
+msgstr "Historia"
+
+#. module: project_communications_mailgate_note
+#: view:project.add.note:0
+#: view:project.project:0
+#: view:project.send.mail:0
+msgid "Attachments"
+msgstr "Ficheros Adjuntos"
+
+#. module: project_communications_mailgate_note
+#: model:ir.model,name:project_communications_mailgate_note.model_project_send_mail_attachment
+msgid "project.send.mail.attachment"
+msgstr "project.send.mail.attachment"
+
+#. module: project_communications_mailgate_note
+#: view:project.send.mail:0
+msgid "_Send"
+msgstr "_Enviar"
+
+#. module: project_communications_mailgate_note
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:74
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:169
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:288
+#, python-format
+msgid "Can not send mail!"
+msgstr "No se puede enviar el correo!"
+
+#. module: project_communications_mailgate_note
+#: selection:project.add.note,state:0
+#: selection:project.send.mail,state:0
+msgid "Unchanged"
+msgstr "Sin cambios"
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,body:0
+msgid "Message Body"
+msgstr "Cuerpo del Mensaje"
+
+#. module: project_communications_mailgate_note
+#: model:ir.model,name:project_communications_mailgate_note.model_project_send_mail
+msgid "Send new email"
+msgstr "Enviar nuevo email"
+
+#. module: project_communications_mailgate_note
+#: view:project.add.note:0
+msgid "_Add"
+msgstr "_Añadir"
+
+#. module: project_communications_mailgate_note
+#: field:project.add.note,state:0
+#: field:project.send.mail,state:0
+msgid "Set New State To"
+msgstr "Fijar Nuevo Estado A"
+
+#. module: project_communications_mailgate_note
+#: view:project.add.note:0
+#: view:project.send.mail:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: project_communications_mailgate_note
+#: selection:project.add.note,state:0
+#: selection:project.send.mail,state:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: project_communications_mailgate_note
+#: view:project.send.mail:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,reply_to:0
+msgid "Reply To"
+msgstr "Responder A"
+
+#. module: project_communications_mailgate_note
+#: view:project.project:0
+msgid "Details"
+msgstr "Detalles"
+

=== added file 'project_communications_mailgate_note/i18n/project_communications_mailgate_note.pot'
--- project_communications_mailgate_note/i18n/project_communications_mailgate_note.pot	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate_note/i18n/project_communications_mailgate_note.pot	2013-02-19 14:36:22 +0000
@@ -0,0 +1,286 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_communications_mailgate_note
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-09-03 11:48+0000\n"
+"PO-Revision-Date: 2011-09-03 11:48+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_communications_mailgate_note
+#: selection:project.add.note,state:0
+#: selection:project.send.mail,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: help:project.send.mail,email_cc:0
+msgid "These addresses will receive a copy of this email. To modify the permanent CC list, edit the global CC field of this case"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.project:0
+msgid "History Information"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: help:project.send.mail,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail.attachment,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_add_note.py:38
+#: view:project.add.note:0
+#, python-format
+msgid "Note"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.project:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: model:ir.actions.act_window,name:project_communications_mailgate_note.action_project_add_note
+#: view:project.add.note:0
+msgid "Add Note"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: selection:project.add.note,state:0
+#: selection:project.send.mail,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.add.note:0
+#: view:project.send.mail:0
+#: field:project.send.mail.attachment,binary:0
+msgid "Attachment"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.project:0
+msgid "Reply"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,html:0
+msgid "HTML formatting?"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: selection:project.add.note,state:0
+#: selection:project.send.mail,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.send.mail:0
+msgid " "
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: field:project.add.note,attachment_ids:0
+#: field:project.send.mail,attachment_ids:0
+msgid "unknown"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_add_note.py:24
+#, python-format
+msgid "Can not add note!"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: model:ir.actions.act_window,name:project_communications_mailgate_note.action_project_reply_mail
+#: view:project.send.mail:0
+msgid "Reply to last Mail"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: model:ir.module.module,description:project_communications_mailgate_note.module_meta_information
+msgid "This module allows to add a note or send an email from the history tab in the task form view."
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: help:project.send.mail,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:143
+#, python-format
+msgid "Unable to send mail. Please check SMTP is configured properly."
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,subject:0
+msgid "Subject"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: model:ir.model,name:project_communications_mailgate_note.model_project_add_note
+#: view:project.project:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail.attachment,name:0
+msgid "Name"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,email_cc:0
+msgid "CC"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: model:ir.actions.act_window,name:project_communications_mailgate_note.action_project_send_mail
+#: view:project.send.mail:0
+msgid "Send Mail"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:143
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_add_note.py:24
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:74
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:169
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:288
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: selection:project.add.note,state:0
+#: selection:project.send.mail,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: field:project.add.note,body:0
+msgid "Note Body"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.send.mail:0
+msgid "_Send Reply"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: model:ir.module.module,shortdesc:project_communications_mailgate_note.module_meta_information
+msgid "Project Mailgate Note for Projects"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.project:0
+msgid "History"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.add.note:0
+#: view:project.project:0
+#: view:project.send.mail:0
+msgid "Attachments"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: model:ir.model,name:project_communications_mailgate_note.model_project_send_mail_attachment
+msgid "project.send.mail.attachment"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.send.mail:0
+msgid "_Send"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:74
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:169
+#: code:addons/project_communications_mailgate_note/wizard/project_communications_send_email.py:288
+#, python-format
+msgid "Can not send mail!"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: selection:project.add.note,state:0
+#: selection:project.send.mail,state:0
+msgid "Unchanged"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,body:0
+msgid "Message Body"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: model:ir.model,name:project_communications_mailgate_note.model_project_send_mail
+msgid "Send new email"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.add.note:0
+msgid "_Add"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: field:project.add.note,state:0
+#: field:project.send.mail,state:0
+msgid "Set New State To"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.add.note:0
+#: view:project.send.mail:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: selection:project.add.note,state:0
+#: selection:project.send.mail,state:0
+msgid "Close"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.send.mail:0
+msgid "Message"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: field:project.send.mail,reply_to:0
+msgid "Reply To"
+msgstr ""
+
+#. module: project_communications_mailgate_note
+#: view:project.project:0
+msgid "Details"
+msgstr ""
+

=== added directory 'project_communications_mailgate_note/images'
=== added file 'project_communications_mailgate_note/images/accueil.png'
Binary files project_communications_mailgate_note/images/accueil.png	1970-01-01 00:00:00 +0000 and project_communications_mailgate_note/images/accueil.png	2013-02-19 14:36:22 +0000 differ
=== added file 'project_communications_mailgate_note/images/history.png'
Binary files project_communications_mailgate_note/images/history.png	1970-01-01 00:00:00 +0000 and project_communications_mailgate_note/images/history.png	2013-02-19 14:36:22 +0000 differ
=== added file 'project_communications_mailgate_note/images/send_mail.png'
Binary files project_communications_mailgate_note/images/send_mail.png	1970-01-01 00:00:00 +0000 and project_communications_mailgate_note/images/send_mail.png	2013-02-19 14:36:22 +0000 differ
=== added file 'project_communications_mailgate_note/project_communications_mailgate_note_view.xml'
--- project_communications_mailgate_note/project_communications_mailgate_note_view.xml	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate_note/project_communications_mailgate_note_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+  
+        <record id="view_project_mailgate_form2" model="ir.ui.view">
+            <field name="name">project.mailgate.form</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field eval="40" name="priority"/>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/sheet/notebook/page[@string='Other Info']" position="replace">
+                    <page string="History">
+                       	<field name="message_ids" colspan="4" nolabel="1" mode="tree">
+							<tree string="History">
+								<field name="email_from" invisible="1"/>
+								<field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/>
+							</tree>
+                   		</field>
+                    </page>
+                </xpath>
+                <xpath expr="/form/header/button[@name='set_cancel']" position="after">
+                       	<button string="Add Internal Note"
+                           	name="%(action_project_add_note)d"
+                           	context="{'model': 'project.project' }"
+                           	icon="terp-document-new" type="action" />
+						<button string="Send New Email"
+								name="%(mail.action_email_compose_message_wizard)d"
+                                context="{'default_composition_mode':'new', 'default_parent_id': active_id}"
+								states='received,sent,exception,cancel'
+								type="action" icon="terp-mail-replied"/>
+                </xpath>
+            </field>
+        </record>        
+
+    </data>
+</openerp>

=== added directory 'project_communications_mailgate_note/security'
=== added file 'project_communications_mailgate_note/security/ir.model.access.csv'
--- project_communications_mailgate_note/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate_note/security/ir.model.access.csv	2013-02-19 14:36:22 +0000
@@ -0,0 +1,1 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"

=== added directory 'project_communications_mailgate_note/wizard'
=== added file 'project_communications_mailgate_note/wizard/__init__.py'
--- project_communications_mailgate_note/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate_note/wizard/__init__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    project_mailgate_note module for OpenERP, Add buttons to add notes and send mail into history tab
+#    Copyright (C) 2011 SYLEAM Info Services (<http://www.Syleam.fr/>)
+#              Sylvain Garancher <[e-mail]>
+#
+#    This file is a part of project_mailgate_note
+#
+#    project_mailgate_note 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.
+#
+#    project_mailgate_note 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 project_communications_add_note
+import project_communications_send_email
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project_communications_mailgate_note/wizard/project_communications_add_note.py'
--- project_communications_mailgate_note/wizard/project_communications_add_note.py	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate_note/wizard/project_communications_add_note.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,59 @@
+from osv import fields, osv
+from tools.translate import _
+import base64
+
+AVAILABLE_STATES = [('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('close', 'Close'), ('unchanged', 'Unchanged')]
+
+class project_add_note(osv.osv_memory):
+    """Adds a new note to the case."""
+    _name = 'project.add.note'
+    _description = "Add Internal Note"
+
+    _columns = {
+        'body': fields.text('Note Body', required=True),
+        'state': fields.selection(AVAILABLE_STATES, string='Set New State To',
+                                  required=True), 
+        'attachment_ids' : fields.one2many('project.send.mail.attachment', 'wizard_id'),
+    }
+
+    def action_add(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
+        if not context.get('active_model'):
+            raise osv.except_osv(_('Error'), _('Can not add note!'))
+
+        model = context.get('active_model')
+        case_pool = self.pool.get(model)
+
+        for obj in self.browse(cr, uid, ids, context=context):
+            case_list = case_pool.browse(cr, uid, context['active_ids'],
+                                         context=context)
+            case = case_list[0]
+            user_obj = self.pool.get('res.users')
+            user_name = user_obj.browse(cr, uid, [uid], context=context)[0].name
+            attach = [
+                (x.name, base64.decodestring(x.binary)) for x in obj.attachment_ids
+            ]
+#            case_pool.history(cr, uid, [case], _("Note"), history=False,
+#                              details=obj.body, email_from=user_name, attach=attach)
+
+            if obj.state == 'unchanged':
+                pass
+            elif obj.state == 'close':
+                case_pool.do_close(cr, uid, [case.id])
+            elif obj.state in ['draft', 'cancel', 'open', 'pending']:
+                act = 'do_' + obj.state
+                getattr(case_pool, act)(cr, uid, [case.id])
+
+        return {'type': 'ir.actions.act_window_close'}
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        """
+        return {'state': u'unchanged'}
+
+
+project_add_note()
+

=== added file 'project_communications_mailgate_note/wizard/project_communications_add_note_view.xml'
--- project_communications_mailgate_note/wizard/project_communications_add_note_view.xml	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate_note/wizard/project_communications_add_note_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+<!-- Add New Note view -->
+
+        <record model="ir.ui.view" id="project_add_new_note_view">
+            <field name="name">project.new.add.note.form</field>
+            <field name="model">project.add.note</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Add Note" col="4">
+                    <separator string="Add Note" colspan="6"/>
+                    <notebook colspan="6">
+                        <page string="Note">
+                            <field name="body" nolabel="1" colspan="4" default_focus="1"/>
+                        </page>
+                        <page string="Attachments">
+                            <field name="attachment_ids" colspan="4" nolabel="1">
+                                <form string="Attachment">
+                                    <field name="binary" filename="name" />
+                                    <field name="name" />
+                                </form>
+                                <tree string="Attachments">
+                                    <field name="name" />
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                    <separator string="" colspan="6"/>
+                    <group colspan="6" col="4" >
+                        <field name="state" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_add" type="object" string="_Add" icon="gtk-ok" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+<!-- Add New Note action -->
+
+        <record model="ir.actions.act_window" id="action_project_add_note">
+            <field name="name">Add Note</field>
+            <field name="res_model">project.add.note</field>
+            <field name="domain">[('state','=','unchanged')]</field> 
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="project_add_new_note_view"/>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>
+

=== added file 'project_communications_mailgate_note/wizard/project_communications_send_email.py'
--- project_communications_mailgate_note/wizard/project_communications_send_email.py	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate_note/wizard/project_communications_send_email.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,292 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    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 _
+import base64
+import itertools
+import tools
+import re
+
+
+AVAILABLE_STATES = [('unchanged', 'Unchanged'),('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('close', 'Close')]
+
+
+class project_send_new_email_attachment(osv.osv_memory):
+    _name = 'project.send.mail.attachment'
+
+    _columns = {
+        'binary' : fields.binary('Attachment', required=True),
+        'name' : fields.char('Name', size=128, required=True),
+        'wizard_id' : fields.many2one('project.send.mail', 'Wizard', required=True),
+    }
+    
+    
+
+project_send_new_email_attachment()
+
+class project_send_new_email(osv.osv_memory):
+    """ Sends new email for the case"""
+    _name = "project.send.mail"
+    _description = "Send new email"
+
+    _columns = {
+        'email_to' : fields.char('To', size=512, required=True),
+        'email_from' : fields.char('From', size=128, required=True),
+        'reply_to' : fields.char('Reply To', size=128, required=True, help="Reply-to of the Sales team defined on this case"),
+        'email_cc' : fields.char('CC', size=512, help="These addresses will receive a copy of this email. To modify the permanent CC list, edit the global CC field of this case"),
+        'subject': fields.char('Subject', size=512, required=True),
+        'body': fields.text('Message Body', required=True),
+        'state': fields.selection(AVAILABLE_STATES, string='Set New State To', required=True),
+        'attachment_ids' : fields.one2many('project.send.mail.attachment', 'wizard_id'),
+        'html': fields.boolean('HTML formatting?', help="Select this if you want to send email with HTML formatting."),
+    }
+
+
+    def action_send(self, cr, uid, ids, context=None):
+        """ This sends an email to ALL the addresses of the selected partners.
+        """
+        hist_obj = self.pool.get('mailgate.message')
+
+        if context is None:
+            context = {}
+
+        if not context.get('active_model'):
+            raise osv.except_osv(_('Error'), _('Can not send mail!'))
+
+        model = context.get('active_model')
+        case_pool = self.pool.get(model)
+        res_id = context and context.get('active_id', False) or False
+
+        for obj in self.browse(cr, uid, ids, context=context):
+            attach = [
+                (x.name, base64.decodestring(x.binary)) for x in obj.attachment_ids
+            ]
+
+            subtype = 'plain'
+            message_id = None
+            ref_id = None
+
+            case = case_pool.browse(cr, uid, res_id, context=context)
+            if context.get('mail', 'new') == 'new':
+                if case.message_ids:
+                    message_id = case.message_ids[0].message_id
+            elif context.get('mail') == 'forward':
+                # extract attachements from case and emails according to mode
+                attachments = []
+                attach_pool = self.pool.get('ir.attachment')
+                direct_attachments = attach_pool.search(cr, uid, [('res_model', '=', 'crm.lead'), ('res_id', '=', res_id)], context=context)
+                attachments += attach_pool.browse(cr, uid, direct_attachments, context=context)
+                if obj.history in ['latest', 'whole'] and case.message_ids:
+                    msgs = case.message_ids
+                    if obj.history == 'latest':
+                        msgs = msgs[:1]
+                    attachments.extend(itertools.chain(*[m.attachment_ids for m in msgs]))
+                attach_all = [(a.datas_fname or a.name, base64.decodestring(a.datas)) for a in attachments if a.datas]
+                attach += attach_all
+
+            else:
+                hist = hist_obj.browse(cr, uid, res_id, context=context)
+                message_id = hist.message_id
+                model = hist.model
+                case_pool = self.pool.get(model)
+                res_id = hist.res_id
+                ref_id = hist.ref_id
+                case = case_pool.browse(cr, uid, res_id, context=context)
+            emails = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_to or '')
+            email_cc = re.findall(r'([^ ,<@]+@[^> ,]+)', obj.email_cc or '')
+            emails = filter(None, emails)
+            body = obj.body
+
+            body = body and tools.ustr(body) or ''
+            email_from = getattr(obj, 'email_from', False)
+            x_headers = {}
+            if message_id:
+                x_headers['References'] = "%s" % (message_id)
+
+            if obj.html:
+                subtype = 'html'
+
+            flag = tools.email_send(
+                email_from,
+                emails,
+                obj.subject,
+                body,
+                email_cc=email_cc,
+                attach=attach,
+                subtype=subtype,
+                reply_to=obj.reply_to,
+                openobject_id=str(case.id),
+                x_headers=x_headers
+            )
+
+            if not flag:
+                raise osv.except_osv(_('Error!'), _('Unable to send mail. Please check SMTP is configured properly.'))
+
+            msg_dict = {'new': 'Send', 'reply': 'Reply', 'forward': 'Forward'}
+            case_pool.history(cr, uid, [case], _(msg_dict[context.get('mail', 'new')]), history=True, \
+                            email=obj.email_to, details=body, \
+                            subject=obj.subject, email_from=email_from, \
+                            email_cc=', '.join(email_cc), message_id=message_id, \
+                            references=ref_id or message_id, attach=attach)
+            if obj.state == 'unchanged':
+                pass
+            elif obj.state == 'done':
+                case_pool.do_close(cr, uid, [case.id])
+            elif obj.state in ['draft', 'cancel', 'open', 'pending']:
+                act = 'do_' + obj.state
+                getattr(case_pool, act)(cr, uid, [case.id])
+
+        return {'type': 'ir.actions.act_window_close'}
+
+    def default_get(self, cr, uid, fields, context=None):
+        """
+        This function gets default values
+        """
+        if context is None:
+            context = {}
+
+        if not context.get('active_model'):
+            raise osv.except_osv(_('Error'), _('Can not send mail!'))
+
+        res = super(project_send_new_email, self).default_get(cr, uid, fields, context=context)
+
+        if context.get('mail') == 'reply':
+            res.update(self.get_reply_defaults(cr, uid, fields, context=context))
+            return res
+
+        model = context.get('active_model')
+        mod_obj = self.pool.get(model)
+        res_id = context and context.get('active_ids', []) or []
+
+        user_obj = self.pool.get('res.users')
+        user_mail_from = user_obj._get_email_from(cr, uid, [uid], context=context)[uid]
+
+
+        for case in mod_obj.browse(cr, uid, res_id, context=context):
+            if 'email_to' in fields:
+                user_mail_to = ''
+                if case.members:
+                    for member in case.members:
+                        if not user_mail_to :
+                            user_mail_to = user_obj._get_email_from(cr, uid, [member.id], context=context)[member.id]
+                        else:
+                            user_mail_to += ', ' + user_obj._get_email_from(cr, uid, [member.id], context=context)[member.id]
+                res.update({'email_to': user_mail_to and tools.ustr(user_mail_to) or ''})
+            if 'email_from' in fields:
+                res.update({'email_from': user_mail_from and tools.ustr(user_mail_from) or ''})
+            if 'subject' in fields:
+                if case:
+                    subject = '[' + case.complete_name + '] '
+                else:
+                    subject = case.name
+                res.update({'subject': tools.ustr(context.get('subject', subject) or '')})
+            if 'email_cc' in fields:
+                user_mail_cc = ''
+                if case:
+                    user_mail_cc = user_obj._get_email_from(cr, uid, [case.user_id.id], context=context)[case.user_id.id]
+                res.update({'email_cc':  user_mail_cc and tools.ustr(user_mail_cc) or ''})
+            if 'body' in fields:
+                res.update({'body': u'\n'+(tools.ustr(case.user_id.signature or ''))})
+            if 'state' in fields:
+                res.update({'state': u'pending'})
+
+        return res
+
+    def get_reply_defaults(self, cr, uid, fields, context=None):
+        """
+        This function gets default values for reply mail
+        """
+        hist_obj = self.pool.get('mailgate.message')
+        res_ids = context and context.get('active_ids', []) or []
+
+        user_obj = self.pool.get('res.users')
+        user_mail_from = user_obj._get_email_from(cr, uid, [uid], context=context)[uid]
+
+        include_original = context and context.get('include_original', False) or False
+        res = {}
+        for hist in hist_obj.browse(cr, uid, res_ids, context=context):
+            model = hist.model
+
+            # In the case where the project does not exist in the database
+            if not model:
+                return {'type': 'ir.actions.act_window_close'}
+
+            model_pool = self.pool.get(model)
+            res_id = hist.res_id
+            case = model_pool.browse(cr, uid, res_id)
+            if 'email_to' in fields:
+                user_mail_to = ''
+                if case and case.members:
+                    for member in case.members:
+                        if not user_mail_to :
+                            user_mail_to = user_obj._get_email_from(cr, uid, [member.id], context=context)[member.id]
+                        else:
+                            user_mail_to += ', ' + user_obj._get_email_from(cr, uid, [member.id], context=context)[member.id]
+                res.update({'email_to': user_mail_to and tools.ustr(user_mail_to) or ''})
+            if 'email_from' in fields:
+                res.update({'email_from': user_mail_from and tools.ustr(user_mail_from) or False})
+
+            signature = u'\n' + (tools.ustr(case.user_id.signature or '')) + u'\n'
+            original = [signature]
+
+            if include_original == True and 'body' in fields:
+                header = u'-------- Original Message --------'
+                sender = u'From: %s' %(tools.ustr(hist.email_from or ''))
+                to = u'To: %s' % (tools.ustr(hist.email_to or ''))
+                sentdate = u'Date: %s' % (tools.ustr(hist.date))
+                desc = u'\n%s'%(tools.ustr(hist.description))
+
+                original = [signature, header, sender, to, sentdate, desc]
+
+            res['body']= u'\n' + u'\n'.join(original)
+
+            if 'subject' in fields:
+                res.update({u'subject': u'Re: %s' %(tools.ustr(hist.name or ''))})
+            if 'email_cc' in fields:
+                user_mail_cc = ''
+                if case:
+                    user_mail_cc = user_obj._get_email_from(cr, uid, [case.user_id.id], context=context)[case.user_id.id]
+                res.update({'email_cc':  user_mail_cc and tools.ustr(user_mail_cc) or ''})
+            if 'state' in fields:
+                res['state'] = u'pending'
+        return res
+
+    def view_init(self, cr, uid, fields_list, context=None):
+        """
+        This function checks for precondition before wizard executes
+        @param self: The object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param fields: List of fields for default value
+        @param context: A standard dictionary for contextual values
+
+        """
+        if context is None:
+            context = {}
+
+        if not context.get('active_model'):
+            raise osv.except_osv(_('Error'), _('Can not send mail!'))
+        return True
+
+project_send_new_email()
+

=== added file 'project_communications_mailgate_note/wizard/project_communications_send_email_view.xml'
--- project_communications_mailgate_note/wizard/project_communications_send_email_view.xml	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate_note/wizard/project_communications_send_email_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+<!-- Send New Mail view -->
+
+        <record model="ir.ui.view" id="project_send_new_mail_view">
+            <field name="name">project.new.send.mail.form</field>
+            <field name="model">project.send.mail</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Send Mail" col="4">
+                    <group colspan="4" col="2">
+                    <field name="email_from"/>
+                    <field name="reply_to"/>
+                    <field name="email_to" />
+                    <field name="email_cc"/>
+                    <field name="subject"/>
+                    <field name="html"/>
+                    </group>
+                    <notebook colspan="6">
+                        <page string="Message">
+                            <field name="body" nolabel="1" colspan="4" default_focus="1"/>
+                        </page>
+                        <page string="Attachments">
+                            <field name="attachment_ids" colspan="4" nolabel="1">
+                                <form string="Attachment">
+                                    <field name="binary" filename="name" />
+                                    <field name="name" />
+                                </form>
+                                <tree string="Attachments">
+                                    <field name="name" />
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                    <separator string="" colspan="6"/>
+                    <group colspan="6" col="4" >                    	
+                        <field name="state" />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_send" type="object" string="_Send" icon="gtk-go-forward" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+<!-- Send New Mail action -->
+
+        <record model="ir.actions.act_window" id="action_project_send_mail">
+            <field name="name">Send Mail</field>
+            <field name="res_model">project.send.mail</field>
+            <field name="domain">[('state','=','unchanged')]</field> 
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="project_send_new_mail_view"/>
+            <field name="target">new</field>
+        </record>
+
+
+    <!-- Reply to Mail view -->
+
+        <record model="ir.ui.view" id="project_reply_mail_view">
+            <field name="name">project.mail.reply.form</field>
+            <field name="model">project.send.mail</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Reply to last Mail" col="2">
+                    <field name="email_from" />
+                    <field name="email_to" />
+                    <field name="email_cc" />
+                    <field name="subject" />
+                    <field name="attachment_ids" colspan="4" nolabel="1">
+                        <form string="Attachment">
+                            <field name="binary" filename="name" />
+                            <field name="name" />
+                        </form>
+                        <tree string="Attachments">
+                            <field name="name" />
+                        </tree>
+                    </field>
+                    <separator string="" colspan="4"/>
+                    <field name="body" nolabel="1" colspan="4"/>
+                    <separator string=" " colspan="4"/>
+                    <group colspan="4" col="3" >
+                        <label string=" " />
+                        <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+                        <button name="action_send" type="object" string="_Send Reply" icon="gtk-go-forward" />
+                    </group>
+                </form>
+            </field>
+        </record>
+
+<!-- Reply to Mail action -->
+
+        <record model="ir.actions.act_window" id="action_project_reply_mail">
+            <field name="name">Reply to last Mail</field>
+            <field name="res_model">project.send.mail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="project_reply_mail_view"/>
+            <field name="target">new</field>
+        </record>
+
+    </data>
+</openerp>

=== added file 'project_communications_mailgate_note/wizard/wizard.xml'
--- project_communications_mailgate_note/wizard/wizard.xml	1970-01-01 00:00:00 +0000
+++ project_communications_mailgate_note/wizard/wizard.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+##############################################################################
+#
+#    project_mailgate_note module for OpenERP, Add buttons to add notes and send mail into history tab
+#    Copyright (C) 2011 SYLEAM Info Services ([http://www.Syleam.fr/]) 
+#              Sylvain Garancher [[e-mail]]
+#
+#    This file is a part of project_mailgate_note
+#
+#    project_mailgate_note 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.
+#
+#    project_mailgate_note 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/].
+#
+##############################################################################
+
+
+    </data>
+</openerp>
\ No newline at end of file

=== added directory 'project_communications_meetings'
=== renamed directory 'project_communications_meetings' => 'project_communications_meetings.moved'
=== added file 'project_communications_meetings/__init__.py'
--- project_communications_meetings/__init__.py	1970-01-01 00:00:00 +0000
+++ project_communications_meetings/__init__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import project_communications_meetings
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project_communications_meetings/__openerp__.py'
--- project_communications_meetings/__openerp__.py	1970-01-01 00:00:00 +0000
+++ project_communications_meetings/__openerp__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Avangard Enterprise Information Systems (<http://www.avangard-eis.com/>)
+#              Jordi Ballester <[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": "Project Management",
+    "version": "1.0",
+    "author": "Eficent, Nervia Consultores",
+    "website": "http://www.eficent.com",
+    "category": "Generic Modules/Projects & Services",
+    "depends": ["project","crm", "google_calendar"],
+    "description": """
+        - This module helps you better manage the meetings related to your projects.         
+        - The 'Meetings' tab in the project  form, and a link to meetings view helps you to create new meetings from the project, and 
+        to better track the status of existing meetings.
+         
+    """,
+    "init_xml": [
+                ],
+    "update_xml": [
+        "security/ir.model.access.csv",
+        "security/project_communications_meetings_security.xml",
+        "project_communications_meetings_view.xml",     
+        "project_view.xml",   
+
+    ],
+    'demo_xml': [
+
+    ],
+    'test':[
+    ],
+    #SIN ADAPTAR
+    'installable': False,
+    'active': False,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'project_communications_meetings/i18n'
=== added file 'project_communications_meetings/i18n/es.mo'
Binary files project_communications_meetings/i18n/es.mo	1970-01-01 00:00:00 +0000 and project_communications_meetings/i18n/es.mo	2013-02-19 14:36:22 +0000 differ
=== added file 'project_communications_meetings/i18n/es.po'
--- project_communications_meetings/i18n/es.po	1970-01-01 00:00:00 +0000
+++ project_communications_meetings/i18n/es.po	2013-02-19 14:36:22 +0000
@@ -0,0 +1,74 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_communications_meetings
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-09-30 00:39+0000\n"
+"PO-Revision-Date: 2011-09-30 02:40+0100\n"
+"Last-Translator: Jordi Ballester Alomar (Avangard Enterprise Information Systems) <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: project_communications_meetings
+#: model:ir.ui.menu,name:project_communications_meetings.menu_project_meeting_categories_def_act
+msgid "Meeting Categories"
+msgstr "Categorías de reuniones"
+
+#. module: project_communications_meetings
+#: model:ir.actions.act_window,name:project_communications_meetings.act_project_2_meeting
+#: model:ir.ui.menu,name:project_communications_meetings.menu_project_meeting
+#: model:ir.ui.menu,name:project_communications_meetings.menu_project_meeting_categories_act
+#: view:project.project:0
+#: field:project.project,crm_meetings:0
+msgid "Meetings"
+msgstr "Reuniones"
+
+#. module: project_communications_meetings
+#: field:crm.meeting,project_id:0
+#: model:ir.model,name:project_communications_meetings.model_project_project
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_communications_meetings
+#: model:ir.ui.menu,name:project_communications_meetings.menu_project_attendee_invitations_act
+msgid "Meeting Invitations"
+msgstr "Invitaciones a reunión"
+
+#. module: project_communications_meetings
+#: model:ir.module.module,description:project_communications_meetings.module_meta_information
+msgid ""
+"Extensions for the Project management module.     \n"
+"    "
+msgstr "Extensiones para el módulo de gestión de proyectos."
+
+#. module: project_communications_meetings
+#: view:project.project:0
+msgid "Members"
+msgstr "Miembros"
+
+#. module: project_communications_meetings
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
+
+#. module: project_communications_meetings
+#: model:ir.model,name:project_communications_meetings.model_crm_meeting
+msgid "Meeting"
+msgstr "Reunión"
+
+#. module: project_communications_meetings
+#: model:ir.module.module,shortdesc:project_communications_meetings.module_meta_information
+msgid "Project Management"
+msgstr "Proyectos"
+
+#. module: project_communications_meetings
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final del proyecto."
+

=== added file 'project_communications_meetings/i18n/project_communications_meetings.pot'
--- project_communications_meetings/i18n/project_communications_meetings.pot	1970-01-01 00:00:00 +0000
+++ project_communications_meetings/i18n/project_communications_meetings.pot	2013-02-19 14:36:22 +0000
@@ -0,0 +1,73 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* project_communications_meetings
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.3\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-09-30 00:39+0000\n"
+"PO-Revision-Date: 2011-09-30 00:39+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: project_communications_meetings
+#: model:ir.ui.menu,name:project_communications_meetings.menu_project_meeting_categories_def_act
+msgid "Meeting Categories"
+msgstr ""
+
+#. module: project_communications_meetings
+#: model:ir.actions.act_window,name:project_communications_meetings.act_project_2_meeting
+#: model:ir.ui.menu,name:project_communications_meetings.menu_project_meeting
+#: model:ir.ui.menu,name:project_communications_meetings.menu_project_meeting_categories_act
+#: view:project.project:0
+#: field:project.project,crm_meetings:0
+msgid "Meetings"
+msgstr ""
+
+#. module: project_communications_meetings
+#: field:crm.meeting,project_id:0
+#: model:ir.model,name:project_communications_meetings.model_project_project
+msgid "Project"
+msgstr ""
+
+#. module: project_communications_meetings
+#: model:ir.ui.menu,name:project_communications_meetings.menu_project_attendee_invitations_act
+msgid "Meeting Invitations"
+msgstr ""
+
+#. module: project_communications_meetings
+#: model:ir.module.module,description:project_communications_meetings.module_meta_information
+msgid "Extensions for the Project management module.     \n"
+"    "
+msgstr ""
+
+#. module: project_communications_meetings
+#: view:project.project:0
+msgid "Members"
+msgstr ""
+
+#. module: project_communications_meetings
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr ""
+
+#. module: project_communications_meetings
+#: model:ir.model,name:project_communications_meetings.model_crm_meeting
+msgid "Meeting"
+msgstr ""
+
+#. module: project_communications_meetings
+#: model:ir.module.module,shortdesc:project_communications_meetings.module_meta_information
+msgid "Project Management"
+msgstr ""
+
+#. module: project_communications_meetings
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+

=== added file 'project_communications_meetings/project_communications_meetings.py'
--- project_communications_meetings/project_communications_meetings.py	1970-01-01 00:00:00 +0000
+++ project_communications_meetings/project_communications_meetings.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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 fields, osv
+
+
+    
+class project(osv.osv):
+    
+    _inherit = "project.project"
+ 
+    _columns = {                                       
+            'crm_meetings': fields.one2many('crm.meeting','project_id','Meetings'),                        
+    }
+
+    
+project()
+
+class crm_meeting(osv.osv):
+    """ CRM Meeting Cases """
+
+    _inherit = 'crm.meeting'
+
+    _columns = {    
+        'project_id':fields.many2one('project.project', 'Project'),
+    }
+
+crm_meeting()    

=== added file 'project_communications_meetings/project_communications_meetings_view.xml'
--- project_communications_meetings/project_communications_meetings_view.xml	1970-01-01 00:00:00 +0000
+++ project_communications_meetings/project_communications_meetings_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	
+
+#---------------------------------------------------------------------------------------------------------
+#   Add meetings from project
+#---------------------------------------------------------------------------------------------------------            
+	<act_window			            
+            domain="[('project_id', '=', active_id)]"
+            id="act_project_2_meeting"
+            name="Meetings"
+            res_model="crm.meeting"
+            src_model="project.project"
+            groups="project.group_project_manager,project.group_project_user" />    
+
+    <!-- CRM Meetings Form View -->
+
+    <record model="ir.ui.view" id="crm_case_form_view_meet_avg">
+        <field name="name">CRM - Meetings Form</field>
+        <field name="model">crm.meeting</field>
+		<field name="inherit_id" ref="crm.crm_case_form_view_meet" />        
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+        	<field name="categ_id" position="after">
+        		<field name="project_id"/>
+        	</field>
+        </field>
+    </record>               
+
+    <!-- CRM Meeting Search View  -->
+
+    <record id="view_crm_case_meetings_filter_avg" model="ir.ui.view">
+        <field name="name">CRM - Meetings Search</field>
+        <field name="model">crm.meeting</field>
+        <field name="type">search</field>
+        <field name="inherit_id" ref="crm.view_crm_case_meetings_filter" />
+        <field name="arch" type="xml">
+        	<field name="categ_id" position="after">
+        		<field name="project_id" select="2"/>
+        	</field>
+        </field>
+    </record>               	                     
+
+
+    </data>
+</openerp>

=== added file 'project_communications_meetings/project_view.xml'
--- project_communications_meetings/project_view.xml	1970-01-01 00:00:00 +0000
+++ project_communications_meetings/project_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+#---------------------------------------------------------------------------------------------------------
+#   Extend the menus
+#---------------------------------------------------------------------------------------------------------
+
+    <menuitem name="Meetings" id="menu_project_meeting"
+        parent="project.menu_project_management" sequence="3"/>
+                    
+    <menuitem id="menu_project_meeting_categories_act"
+    	name="Meetings" 
+        parent="menu_project_meeting"
+        sequence="10" action="crm.crm_case_categ_meet"
+        groups="project.group_project_manager,project.group_project_user"/>
+
+            
+    <menuitem id="menu_project_attendee_invitations_act"
+            name="Meeting Invitations" parent="menu_project_meeting"
+            sequence="20" action="crm.action_view_attendee_form"
+            groups="project.group_project_manager,project.group_project_user" />
+            
+            
+
+    <menuitem id="menu_project_meeting_categories_def_act"
+            name="Meeting Categories" parent="base.menu_definitions"
+            sequence="10" action="crm.crm_meeting_categ_action"
+            groups="project.group_project_manager" />
+
+
+		<menuitem id="project_menu_google" 
+			name="Google Import-Export" 
+			parent="project.menu_project_management"/>
+		
+		<menuitem name="Synchronize Events" 
+			id="project_menu_tools_google_calendar_synch" 
+			parent="project_menu_google" 
+			action="google_calendar.wizard_google_calendar_synch"
+			type="wizard"/>
+    	
+
+
+#---------------------------------------------------------------------------------------------------------
+#   Extend the project
+#---------------------------------------------------------------------------------------------------------
+		<record id="edit_project" model="ir.ui.view">
+            <field name="name">project.project.form</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+            	<page string='Other Info' position="after">
+	            	<page string="Meetings">
+	                        <field colspan="4" name="crm_meetings" nolabel="1"  mode="tree,form" context="{'default_project_id': active_id}"/>
+	                </page>  
+				</page>	 
+				
+				                            	                        
+            </field>            	        
+        </record>   	
+
+            
+    </data>
+</openerp>

=== added directory 'project_communications_meetings/security'
=== added file 'project_communications_meetings/security/ir.model.access.csv'
--- project_communications_meetings/security/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ project_communications_meetings/security/ir.model.access.csv	2013-02-19 14:36:22 +0000
@@ -0,0 +1,9 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_crm_meetings_project_manager","crm.meeting.manager","crm.model_crm_meeting","project.group_project_manager",1,1,1,1
+"access_crm_meetings_project_user","crm.meeting.user","crm.model_crm_meeting","project.group_project_user",1,1,1,1
+"access_calendar_attendee_crm_project_user","calendar.attendee.crm.user","crm.model_calendar_attendee","project.group_project_user",1,1,1,1
+"access_calendar_attendee_crm_project_manager","calendar.attendee.crm.manager","crm.model_calendar_attendee","project.group_project_manager",1,1,1,1
+"access_res_partner_project_user","res.partner.crm.user","base.model_res_partner","project.group_project_user",1,1,1,1
+"access_res_partner_address_project_user","res.partner.address.crm.user","base.model_res_partner_address","project.group_project_user",1,1,1,1
+"access_res_partner_category_project_user","res.partner.category.crm.user","base.model_res_partner_category","project.group_project_user",1,1,1,1
+

=== added file 'project_communications_meetings/security/project_communications_meetings_security.xml'
--- project_communications_meetings/security/project_communications_meetings_security.xml	1970-01-01 00:00:00 +0000
+++ project_communications_meetings/security/project_communications_meetings_security.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<openerp>
+<data>
+
+<!--
+	<record model="ir.rule" id="project_meeting_visibility_rule_project_user">
+        <field name="name" >Project Meetings According to User</field>
+        <field name="model_id" ref="crm.model_crm_meeting"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|','|','|',('user_id','=',False),('project_id.members','in', [user.id]),('user_id','=',user.id),('project_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('project.group_project_user'))]"/>
+    </record>    
+-->
+         
+</data>
+</openerp>

=== added directory 'project_cost'
=== renamed directory 'project_cost' => 'project_cost.moved'
=== added file 'project_cost/__init__.py'
--- project_cost/__init__.py	1970-01-01 00:00:00 +0000
+++ project_cost/__init__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_analytic_account
+import account_analytic_journal_plan
+import account_analytic_journal_commit
+import account_analytic_line
+import account_analytic_line_plan
+import account_analytic_line_commit
+import report
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project_cost/__openerp__.py'
--- project_cost/__openerp__.py	1970-01-01 00:00:00 +0000
+++ project_cost/__openerp__.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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": "Project Management",
+    "version": "1.0",
+    "author": "Eficent, Nervia Consultores",
+    "website": "",
+    "category": "Generic Modules/Projects & Services",
+    "depends": ["account","product", "analytic", "board", "project", "purchase","hr_timesheet", "sale"],
+    "description": """Eficent Project Management. Project Cost Planning
+        - A planning analytic journal object is created. It is similar to the analytic journal, but used for planning purposes
+        - The planning analytic journals can be configured
+        - A planning analytic journal lines object is created, with the exceptions of referencing 
+        to the planning analytic journal instead of the analytic journal, and considering 
+        that the general account is not a required entry.
+        - The new object is visible as a separate entity, accesible from the Accounting area, with the corresponding search, tree, form views.
+        - New analytic account attributes: cumulated planned costs, cummulated planned earnings and cumulated balance.
+        The attributes are calculated based on the planning analytic journal lines. 
+        The new attributes are visible on the following views:
+            − Analytic account forms: cumulated planned costs, cumulated planned earnings and cumulated balance
+            − Budget positions: cumulated planned costs
+ 
+    """,
+    "init_xml": [],
+    "update_xml": [
+        "account_analytic_journal_plan_view.xml",
+        "account_analytic_journal_commit_view.xml",
+        "account_analytic_journal_plan_report.xml", 
+        "account_analytic_journal_commit_report.xml",                                  
+        "account_analytic_line_view.xml",        
+        "account_analytic_line_plan_view.xml",
+        "account_analytic_line_commit_view.xml",           
+        "account_analytic_account_view.xml",             
+        "wizard/account_analytic_journal_plan_report_view.xml", 
+        "wizard/account_analytic_journal_commit_report_view.xml",       
+        "project_view.xml",       
+        "security/ir.model.access.csv",
+        "security/project_cost_security.xml",
+        "account_analytic_journal_plan_data.xml",
+        "account_analytic_journal_commit_data.xml",
+    ],
+    'demo_xml': [
+
+    ],
+    'test':[
+    ],
+    'installable': True,
+    'active': False,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project_cost/account_analytic_account.py'
--- project_cost/account_analytic_account.py	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_account.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,220 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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 lxml import etree
+import time
+from datetime import datetime, date, timedelta
+import decimal_precision as dp
+from tools.translate import _
+from osv import fields, osv
+import netsvc
+import tools
+
+class account_analytic_account(osv.osv):
+    
+    _inherit = 'account.analytic.account'
+    
+    def _compute_level_tree_plan(self, cr, uid, ids, child_ids, res, field_names, context=None):
+        osv.logging.log(100, "36:project_cost/account_analytic_account:_compute_level_tree_plan")
+        def recursive_computation(account_id, res, repeated_account_ids=None):
+            if repeated_account_ids is None:
+                repeated_account_ids = []
+            currency_obj = self.pool.get('res.currency')
+            account = self.browse(cr, uid, account_id)
+            for son in account.child_ids:
+                if son.id in repeated_account_ids:
+                    continue
+                res = recursive_computation(son.id, res)
+                repeated_account_ids.append(son.id)
+                for field in field_names:
+                    if account.currency_id.id == son.currency_id.id or field=='quantity_plan':
+                        res[account.id][field] += res[son.id][field]
+                    else:
+                        res[account.id][field] += currency_obj.compute(cr, uid, son.currency_id.id, account.currency_id.id, res[son.id][field], context=context)
+            return res
+        for account in self.browse(cr, uid, ids, context=context):
+            if account.id not in child_ids:
+                continue
+            res = recursive_computation(account.id, res)
+        return res    
+    
+    def _compute_level_tree_commit(self, cr, uid, ids, child_ids, res, field_names, context=None):
+        osv.logging.log(100, "60:project_cost/account_analytic_account:_compute_level_tree_commit")
+        def recursive_computation(account_id, res, repeated_account_ids=[]):
+            currency_obj = self.pool.get('res.currency')
+            account = self.browse(cr, uid, account_id)
+            for son in account.child_ids:
+                if son.id in repeated_account_ids:
+                    continue
+                res = recursive_computation(son.id, res)
+                repeated_account_ids.append(son.id)
+                for field in field_names:
+                    if account.currency_id.id == son.currency_id.id or field=='quantity_commit':
+                        res[account.id][field] += res[son.id][field]
+                    else:
+                        res[account.id][field] += currency_obj.compute(cr, uid, son.currency_id.id, account.currency_id.id, res[son.id][field], context=context)
+            return res
+        for account in self.browse(cr, uid, ids, context=context):
+            if account.id not in child_ids:
+                continue
+            res = recursive_computation(account.id, res)
+        return res    
+    
+    def _debit_credit_bal_qtty_plan(self, cr, uid, ids, name, arg, context=None):
+        osv.logging.log(100, "82:project_cost/account_analytic_account:_debit_credit_bal_qtty_plan")
+        res = {}
+        if context is None:
+            context = {}
+        child_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
+        for i in child_ids:
+            res[i] =  {}
+            for n in name:
+                res[i][n] = 0.0
+
+        if not child_ids:
+            return res
+
+        where_date = ''
+        where_clause_args = [tuple(child_ids)]
+        if context.get('from_date', False):
+            where_date += " AND l.date >= %s"
+            where_clause_args  += [context['from_date']]
+        if context.get('to_date', False):
+            where_date += " AND l.date <= %s"
+            where_clause_args += [context['to_date']]
+        cr.execute("""
+              SELECT a.id,
+                     sum(
+                         CASE WHEN l.amount > 0
+                         THEN l.amount
+                         ELSE 0.0
+                         END
+                          ) as debit,
+                     sum(
+                         CASE WHEN l.amount < 0
+                         THEN -l.amount
+                         ELSE 0.0
+                         END
+                          ) as credit,
+                     COALESCE(SUM(l.amount),0) AS balance,
+                     COALESCE(SUM(l.unit_amount),0) AS quantity
+              FROM account_analytic_account a
+                  LEFT JOIN account_analytic_line_plan l ON (a.id = l.account_id)
+              WHERE a.id IN %s
+              """ + where_date + """
+              GROUP BY a.id""", where_clause_args)
+        for ac_id, debit, credit, balance, quantity in cr.fetchall():
+            res[ac_id] = {'debit_plan': debit, 'credit_plan': credit, 'balance_plan': balance, 'quantity_plan': quantity}
+        return self._compute_level_tree_plan(cr, uid, ids, child_ids, res, ['debit_plan', 'credit_plan', 'balance_plan', 'quantity_plan'], context)
+
+    def _debit_credit_bal_qtty_commit(self, cr, uid, ids, name, arg, context=None):
+        osv.logging.log(100, "129:project_cost/account_analytic_account:_debit_credit_bal_qtty_commit")
+        res = {}
+        if context is None:
+            context = {}
+        child_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
+        for i in child_ids:
+            res[i] =  {}
+            for n in name:
+                res[i][n] = 0.0
+
+        if not child_ids:
+            return res
+
+        where_date = ''
+        where_clause_args = [tuple(child_ids)]
+        if context.get('from_date', False):
+            where_date += " AND l.date >= %s"
+            where_clause_args  += [context['from_date']]
+        if context.get('to_date', False):
+            where_date += " AND l.date <= %s"
+            where_clause_args += [context['to_date']]
+        cr.execute("""
+              SELECT a.id,
+                     sum(
+                         CASE WHEN l.amount > 0
+                         THEN l.amount
+                         ELSE 0.0
+                         END
+                          ) as debit,
+                     sum(
+                         CASE WHEN l.amount < 0
+                         THEN -l.amount
+                         ELSE 0.0
+                         END
+                          ) as credit,
+                     COALESCE(SUM(l.amount),0) AS balance,
+                     COALESCE(SUM(l.unit_amount),0) AS quantity
+              FROM account_analytic_account a
+                  LEFT JOIN account_analytic_line_commit l ON (a.id = l.account_id)
+              WHERE a.id IN %s
+              """ + where_date + """
+              GROUP BY a.id""", where_clause_args)
+        for ac_id, debit, credit, balance, quantity in cr.fetchall():
+            res[ac_id] = {'debit_commit': debit, 'credit_commit': credit, 'balance_commit': balance, 'quantity_commit': quantity}
+        return self._compute_level_tree_commit(cr, uid, ids, child_ids, res, ['debit_commit', 'credit_commit', 'balance_commit', 'quantity_commit'], context)
+
+    
+    _columns = {   
+        
+        #In case that the parent is deleted, we also delete this entity
+        'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2, ondelete='cascade'),
+                         
+        'balance_plan': fields.function(_debit_credit_bal_qtty_plan, method=True, type='float', string='Planned Balance', multi='debit_credit_bal_qtty_plan', digits_compute=dp.get_precision('Account')),
+        'balance_commit': fields.function(_debit_credit_bal_qtty_commit, method=True, type='float', string='Commitment Balance', multi='debit_credit_bal_qtty_commit', digits_compute=dp.get_precision('Account')),
+        'debit_plan': fields.function(_debit_credit_bal_qtty_plan, method=True, type='float', string='Planned Debit', multi='debit_credit_bal_qtty_plan', digits_compute=dp.get_precision('Account')),
+        'debit_commit': fields.function(_debit_credit_bal_qtty_commit, method=True, type='float', string='Planned Commitments', multi='debit_credit_bal_qtty_commit', digits_compute=dp.get_precision('Account')),
+        'credit_plan': fields.function(_debit_credit_bal_qtty_plan, method=True, type='float', string='Planned Credit', multi='debit_credit_bal_qtty_plan', digits_compute=dp.get_precision('Account')),
+        'credit_commit': fields.function(_debit_credit_bal_qtty_commit, method=True, type='float', string='Commitments Credit', multi='debit_credit_bal_qtty_commit', digits_compute=dp.get_precision('Account')),
+        'quantity_plan': fields.function(_debit_credit_bal_qtty_plan, method=True, type='float', string='Quantity Debit', multi='debit_credit_bal_qtty_plan', digits_compute=dp.get_precision('Account')),
+        'quantity_commit': fields.function(_debit_credit_bal_qtty_commit, method=True, type='float', string='Quantity Commitments', multi='debit_credit_bal_qtty_commit', digits_compute=dp.get_precision('Account')),
+        'state': fields.selection([('draft','Draft'),('ready','Ready'),('open','Open'), ('pending','Pending'),('cancelled', 'Cancelled'),('close','Closed'),('template', 'Template')], 'State', required=True,
+                                  help='* When an account is created its in \'Draft\' state.\
+                                  \n* When is ready to be used, it can be in \'Ready\' state.\
+                                  \n* If any associated partner is there, it can be in \'Open\' state.\
+                                  \n* If any pending balance is there it can be in \'Pending\'. \
+                                  \n* And finally when all the transactions are over, it can be in \'Close\' state. \
+                                  \n* The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
+                                 \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'),
+        'plan_line_ids': fields.one2many('account.analytic.line.plan', 'account_id', 'Analytic Entries'),
+        'commit_line_ids': fields.one2many('account.analytic.line.commit', 'account_id', 'Commitment Analytic Entries'),
+                      
+     }
+    
+    _defaults = {
+        'state': 'draft',
+    }
+    
+    def set_ready(self, cr, uid, ids, context=None):
+        osv.logging.log(100, "205:project_cost/account_analytic_account:set_ready")
+        self.write(cr, uid, ids, {'state':'ready'}, context=context)
+        return True
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        osv.logging.log(100, "210:project_cost/account_analytic_account:copy")
+        if default is None:
+            default = {}        
+        default['plan_line_ids'] = []
+        default['commit_line_ids'] = []
+        return super(account_analytic_account, self).copy(cr, uid, id, default, context=context)
+    
+                
+account_analytic_account()
\ No newline at end of file

=== added file 'project_cost/account_analytic_account_view.xml'
--- project_cost/account_analytic_account_view.xml	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_account_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+#---------------------------------------------------------------------------------------------------------
+#   Extend the menus
+#---------------------------------------------------------------------------------------------------------
+		<menuitem id="project_cost_analytic_account_menu" 
+			name="Analytic Accounting" 
+			parent="project.menu_project_management" 
+			sequence="2"
+			groups="analytic.group_analytic_accounting"/>
+		
+		<menuitem action="account.action_account_analytic_account_form" id="account_analytic_def_account"
+            parent="project_cost_analytic_account_menu"
+            groups="analytic.group_analytic_accounting"/>
+
+		<menuitem groups="analytic.group_analytic_accounting"
+            action="action_account_analytic_journal_plan_open_form"
+            id="account_analytic_journal_plan_entries_2"
+            parent="project_cost_analytic_account_menu"/>   
+			
+---------------------------------------------------------------------------------------------------------
+#   Extend the analytic account
+#---------------------------------------------------------------------------------------------------------
+          
+
+		<record id="view_account_analytic_account_tree_inh" model="ir.ui.view">
+            <field name="name">account.analytic.account.tree</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_complete_ids</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_tree"/>
+            <field name="arch" type="xml">         	    
+            	<field name="balance" position="after">
+            	    <field name="debit_plan"/>
+                    <field name="credit_plan"/>
+                    <field name="balance_plan"/>
+                    <field name="debit_commit"/>
+                    <field name="credit_commit"/>
+                    <field name="balance_commit"/>
+            	</field>            	
+            </field>
+        </record>            	
+
+        <record id="view_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+				<form string="Analytic Account" version="7.0">
+                    <sheet string="Analytic Account">
+						<notebook>
+							<page string="Description" position="after">
+								<page string="Costs">
+										<field colspan="4" name="line_ids" nolabel="1" context="{'default_account_id': active_id}"/>
+										<field colspan="4" name="plan_line_ids" nolabel="1" context="{'default_account_id': active_id}">
+											<tree string="Planned analytic lines">	                            	
+												<field name="date"/>
+												<field name="period_id"/>
+												<field name="ref" />
+												<field name="name"/>
+												<field name="journal_id" invisible="False"/>
+												<field name="amount" sum="Total" />
+												<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" />
+												<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity" />
+												<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+												<field name="general_account_id" />
+												<field name="user_id" invisible="True"/>
+											</tree>
+											<form string="Planned analytic lines">	                            	
+												<group colspan="4" col="6">
+													<field name="name"/>
+													<field name="ref"/>
+													<field name="account_id" invisible="True"/>
+													<field name="journal_id"/>
+													<field name="date"/>
+													<field name="period_id"/>
+													<field name="company_id" groups="base.group_multi_company"/>
+												</group>
+												<group colspan="2" col="4">
+													<separator string="Amount" colspan="4"/>
+													<field name="amount" colspan="4"/>
+													<field name="amount_currency" colspan="2"/>
+													<field name="currency_id" colspan="2" nolabel="1"/>
+												</group>
+												<group colspan="2" col="4">
+													<separator string="Product Information" colspan="4"/>
+													<field name="product_id" colspan="4" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
+													<field name="unit_amount" colspan="2" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
+													<field name="product_uom_id" colspan="2" nolabel="1" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
+												</group>
+												<group colspan="2" col="2" groups="base.group_erp_manager">
+													<separator string="General Accounting" colspan="2"/>
+													<field name="general_account_id"/>
+													<field name="move_id" readonly="1"/>
+												</group>
+											</form>
+										</field>
+										<field colspan="4" name="commit_line_ids" nolabel="1" context="{'default_account_id': active_id}">
+											<tree string="Commitment analytic lines">	                            	
+												<field name="date"/>
+												<field name="period_id"/>
+												<field name="ref" />
+												<field name="name"/>
+												<field name="journal_id" invisible="False"/>
+												<field name="amount" sum="Total" />
+												<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" />
+												<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity" />
+												<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+												<field name="general_account_id" />
+												<field name="user_id" invisible="True"/>
+											</tree>
+											<form string="Commitment analytic lines">	                            	
+												<group colspan="4" col="6">
+													<field name="name"/>
+													<field name="ref"/>
+													<field name="account_id" invisible="True"/>
+													<field name="journal_id"/>
+													<field name="date"/>
+													<field name="period_id"/>
+													<field name="company_id" groups="base.group_multi_company"/>
+												</group>
+												<group colspan="2" col="4">
+													<separator string="Amount" colspan="4"/>
+													<field name="amount" colspan="4"/>
+													<field name="amount_currency" colspan="2"/>
+													<field name="currency_id" colspan="2" nolabel="1"/>
+												</group>
+												<group colspan="2" col="4">
+													<separator string="Product Information" colspan="4"/>
+													<field name="product_id" colspan="4" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
+													<field name="unit_amount" colspan="2" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
+													<field name="product_uom_id" colspan="2" nolabel="1" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
+												</group>
+												<group colspan="2" col="2" groups="base.group_erp_manager">
+													<separator string="General Accounting" colspan="2"/>
+													<field name="general_account_id"/>
+													<field name="move_id" readonly="1"/>
+												</group>
+											</form>
+										</field>	                         
+								 </page>  
+							</page>
+						</notebook>
+					</sheet>
+				</form>
+            </field>            	        
+        </record>   						        	            	        
+         	                    
+    </data>
+</openerp>

=== added file 'project_cost/account_analytic_journal_commit.py'
--- project_cost/account_analytic_journal_commit.py	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_journal_commit.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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 lxml import etree
+import time
+from datetime import datetime, date, timedelta
+import decimal_precision as dp
+from tools.translate import _
+from osv import fields, osv
+import netsvc
+import tools
+
+
+    
+class account_analytic_journal_commit(osv.osv):
+    
+    _name = 'account.analytic.journal.commit'
+    _description = 'Analytic Journal Commitments'
+    _columns = {
+        'name': fields.char('Commitments Journal Name', size=64, required=True),
+        'code': fields.char('Commitments Journal Code', size=8),
+        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the analytic journal without removing it."),
+        'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."),
+        'line_ids': fields.one2many('account.analytic.line.commit', 'journal_id', 'Lines'),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'analytic_journal': fields.many2one('account.analytic.journal', 'Actual Analytic journal', required=False),
+    }
+    _defaults = {
+        'active': True,
+        'type': 'general',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+    }
+
+
+account_analytic_journal_commit()

=== added file 'project_cost/account_analytic_journal_commit_data.xml'
--- project_cost/account_analytic_journal_commit_data.xml	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_journal_commit_data.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="analytic_journal_commit_sale" model="account.analytic.journal.commit">
+            <field name="code">SAL</field>
+            <field name="name">Sales</field>
+            <field name="type">sale</field>
+        </record>
+        <record id="analytic_journal_commit_purchase" model="account.analytic.journal.commit">
+            <field name="code">PUR</field>
+            <field name="name">Purchases</field>
+            <field name="type">purchase</field>
+        </record>
+        <record id="analytic_journal_commit_time" model="account.analytic.journal.commit">
+            <field name="code">TS</field>
+            <field name="name">Timesheet</field>
+            <field name="type">general</field>
+        </record>        
+
+    </data>
+</openerp>

=== added file 'project_cost/account_analytic_journal_commit_report.xml'
--- project_cost/account_analytic_journal_commit_report.xml	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_journal_commit_report.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <report auto="False" id="account_analytic_journal_commit_print1" menu="False"
+            model="account.analytic.journal.commit" name="account.analytic.account.journal.commit"
+            rml="project_cost/report/account_analytic_journal_commit.rml" string="Commitments Analytic Journal"/>
+    </data>
+</openerp>
\ No newline at end of file

=== added file 'project_cost/account_analytic_journal_commit_view.xml'
--- project_cost/account_analytic_journal_commit_view.xml	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_journal_commit_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+#---------------------------------------------------------------------------------------------------------
+#   Analytic Journal
+#---------------------------------------------------------------------------------------------------------
+        <record id="view_account_analytic_journal_commit_tree" model="ir.ui.view">
+            <field name="name">account.analytic.journal.commit.tree</field>
+            <field name="model">account.analytic.journal.commit</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Analytic Journal">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="type"/>
+                    <field name="analytic_journal"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_account_analytic_journal_commit_search" model="ir.ui.view">
+            <field name="name">account.analytic.journal.commit.search</field>
+            <field name="model">account.analytic.journal.commit</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Analytic Journals">
+                  <group>
+                      <field name="code"/>
+                      <field name="name"/>
+                      <field name="type"/>
+                      <field name="analytic_journal"/>
+                  </group>
+                  <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_account_analytic_journal_commit_form" model="ir.ui.view">
+            <field name="name">account.analytic.journal.commit.form</field>
+            <field name="model">account.analytic.journal.commit</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Journal">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="type" select="2"/>
+                    <field name="active" select="2"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="analytic_journal"/>
+                </form>
+            </field>
+        </record>
+        <record id="action_account_analytic_journal_commit_form" model="ir.actions.act_window">
+            <field name="name">Commitment Analytic Journals</field>
+            <field name="res_model">account.analytic.journal.commit</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_analytic_journal_commit_search" />            
+        </record>
+        <menuitem groups="analytic.group_analytic_accounting" 
+        	action="action_account_analytic_journal_commit_form" 
+        	id="account_def_analytic_journal_commit" 
+        	parent="account.menu_analytic_accounting" sequence="6"/>
+
+
+#---------------------------------------------------------------------------------------------------------
+#   Reporting
+#---------------------------------------------------------------------------------------------------------
+        
+        <record id="action_account_analytic_journal_commit_tree" model="ir.actions.act_window">
+            <field name="name">Print Commitment Analytic Journals</field>
+            <field name="res_model">account.analytic.journal.commit</field>
+            <field name="view_type">tree</field>
+            <field name="help">To print a commitments analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
+        </record>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="action_account_analytic_journal_commit_tree" 
+            id="account_analytic_journal_commit_print" parent="account.next_id_40"/>
+        	            	        
+         	                    
+    </data>
+</openerp>

=== added file 'project_cost/account_analytic_journal_plan.py'
--- project_cost/account_analytic_journal_plan.py	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_journal_plan.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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 lxml import etree
+import time
+from datetime import datetime, date, timedelta
+import decimal_precision as dp
+from tools.translate import _
+from osv import fields, osv
+import netsvc
+import tools
+
+
+    
+class account_analytic_journal_plan(osv.osv):
+    
+    _name = 'account.analytic.journal.plan'
+    _description = 'Analytic Journal Plan'
+    _columns = {
+        'name': fields.char('Planning Journal Name', size=64, required=True),
+        'code': fields.char('Planning Journal Code', size=8),
+        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the analytic journal without removing it."),
+        'type': fields.selection([('sale','Sale'), ('purchase','Purchase'), ('cash','Cash'), ('general','General'), ('situation','Situation')], 'Type', size=32, required=True, help="Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."),
+        'line_ids': fields.one2many('account.analytic.line.plan', 'journal_id', 'Lines'),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'analytic_journal': fields.many2one('account.analytic.journal', 'Actual Analytic journal', required=False),
+        
+    }
+    _defaults = {
+        'active': True,
+        'type': 'general',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,        
+    }
+
+
+account_analytic_journal_plan()
+

=== added file 'project_cost/account_analytic_journal_plan_data.xml'
--- project_cost/account_analytic_journal_plan_data.xml	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_journal_plan_data.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="analytic_journal_plan_sale" model="account.analytic.journal.plan">
+            <field name="code">SAL</field>
+            <field name="name">Sales</field>
+            <field name="type">sale</field>            
+        </record>
+        <record id="analytic_journal_plan_purchase" model="account.analytic.journal.plan">
+            <field name="code">PUR</field>
+            <field name="name">Purchases</field>
+            <field name="type">purchase</field>
+        </record>
+        <record id="analytic_journal_plan_time" model="account.analytic.journal.plan">
+            <field name="code">TS</field>
+            <field name="name">Timesheet</field>
+            <field name="type">general</field>
+        </record>        
+
+    </data>
+</openerp>

=== added file 'project_cost/account_analytic_journal_plan_report.xml'
--- project_cost/account_analytic_journal_plan_report.xml	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_journal_plan_report.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <report auto="False" id="account_analytic_journal_plan_print1" menu="False"
+            model="account.analytic.journal.plan" name="account.analytic.account.journal.plan"
+            rml="project_cost/report/account_analytic_journal_plan.rml" string="Planning Analytic Journal"/>
+    </data>
+</openerp>
\ No newline at end of file

=== added file 'project_cost/account_analytic_journal_plan_view.xml'
--- project_cost/account_analytic_journal_plan_view.xml	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_journal_plan_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+#---------------------------------------------------------------------------------------------------------
+#   Analytic Journal
+#---------------------------------------------------------------------------------------------------------
+        <record id="view_account_analytic_journal_plan_tree" model="ir.ui.view">
+            <field name="name">account.analytic.journal.plan.tree</field>
+            <field name="model">account.analytic.journal.plan</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Analytic Journal">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="type"/>
+                    <field name="analytic_journal"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_account_analytic_journal_plan_search" model="ir.ui.view">
+            <field name="name">account.analytic.journal.plan.search</field>
+            <field name="model">account.analytic.journal.plan</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Analytic Journals">
+                  <group>
+                      <field name="code"/>
+                      <field name="name"/>
+                      <field name="type"/>
+                      <field name="analytic_journal"/>
+                  </group>
+                  <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_account_analytic_journal_plan_form" model="ir.ui.view">
+            <field name="name">account.analytic.journal.plan.form</field>
+            <field name="model">account.analytic.journal.plan</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Journal">
+                    <field name="name" select="1"/>
+                    <field name="code" select="1"/>
+                    <field name="type" select="2"/>
+                    <field name="active" select="2"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="analytic_journal"/>
+                </form>
+            </field>
+        </record>
+        <record id="action_account_analytic_journal_plan_form" model="ir.actions.act_window">
+            <field name="name">Planning Analytic Journals</field>
+            <field name="res_model">account.analytic.journal.plan</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_analytic_journal_plan_search" />            
+        </record>
+        <menuitem groups="analytic.group_analytic_accounting" 
+        	action="action_account_analytic_journal_plan_form" 
+        	id="account_def_analytic_journal_plan" 
+        	parent="account.menu_analytic_accounting" sequence="6"/>
+
+
+#---------------------------------------------------------------------------------------------------------
+#   Reporting
+#---------------------------------------------------------------------------------------------------------
+        
+        <record id="action_account_analytic_journal_plan_tree" model="ir.actions.act_window">
+            <field name="name">Print Planning Analytic Journals</field>
+            <field name="res_model">account.analytic.journal.plan</field>
+            <field name="view_type">tree</field>
+            <field name="help">To print a planning analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
+        </record>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="action_account_analytic_journal_plan_tree" 
+            id="account_analytic_journal_plan_print" parent="account.next_id_40"/>
+        	            	        
+         	                    
+    </data>
+</openerp>

=== added file 'project_cost/account_analytic_line.py'
--- project_cost/account_analytic_line.py	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_line.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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 time
+
+from osv import fields
+from osv import osv
+from tools.translate import _
+
+
+
+class account_analytic_line(osv.osv):
+
+    _inherit = 'account.analytic.line'
+    
+    def _get_period(self, cr, uid, context=None):
+        periods = self.pool.get('account.period').find(cr, uid)
+        if periods:
+            return periods[0]
+        return False
+    
+    _columns = {        
+        'period_id': fields.many2one('account.period', 'Period', required=True, select=2),        
+    }
+
+    _defaults = {
+        'period_id': _get_period, 
+    }
+
+
+account_analytic_line()
\ No newline at end of file

=== added file 'project_cost/account_analytic_line_commit.py'
--- project_cost/account_analytic_line_commit.py	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_line_commit.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,184 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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 lxml import etree
+import time
+from datetime import datetime, date, timedelta
+import decimal_precision as dp
+from tools.translate import _
+from osv import fields, osv
+import netsvc
+import tools
+
+class account_analytic_line_commit(osv.osv):
+    _name = 'account.analytic.line.commit'
+    _description = 'Analytic Line Commitment'
+    
+    
+    
+    def _get_period(self, cr, uid, context=None):
+        periods = self.pool.get('account.period').find(cr, uid)
+        if periods:
+            return periods[0]
+        return False
+
+    _columns = {
+        'name': fields.char('Description', size=256, required=True),
+        'date': fields.date('Date', required=True, select=True),
+        'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
+        'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True, domain=[('type','<>','view')]),
+        'user_id': fields.many2one('res.users', 'User'),
+        'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),                
+        'product_uom_id': fields.many2one('product.uom', 'UoM'),
+        'product_id': fields.many2one('product.product', 'Product'),            
+        'general_account_id': fields.many2one('account.account', 'General Account', required=False, ondelete='restrict'),
+        'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='restrict', select=True),
+        'journal_id': fields.many2one('account.analytic.journal.commit', 'Commitment Analytic Journal', required=True, ondelete='restrict', select=True),
+        'code': fields.char('Code', size=8),
+        'ref': fields.char('Ref.', size=64),
+        'currency_id': fields.many2one('res.currency', 'Currency'),
+        'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')),
+        'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
+                        
+    }
+
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
+        'amount': 0.00,
+        'period_id': _get_period, 
+    }
+    _order = 'date desc'
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
+        if context.get('from_date',False):
+            args.append(['date', '>=', context['from_date']])
+        if context.get('to_date',False):
+            args.append(['date','<=', context['to_date']])
+        return super(account_analytic_line_commit, self).search(cr, uid, args, offset, limit,
+                order, context=context, count=count)
+
+    def _check_company(self, cr, uid, ids, context=None):
+        lines = self.browse(cr, uid, ids, context=context)
+        for l in lines:
+            if l.move_id and not l.account_id.company_id.id == l.move_id.account_id.company_id.id:
+                return False
+        return True
+
+    # Compute the cost based on the price type define into company
+    # property_valuation_price_type property
+    def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id,
+            unit=False, journal_id=False, context=None):
+        
+        res={}
+        
+        if context==None:
+            context={}
+            
+        product_obj = self.pool.get('product.product')
+        
+        if prod_id:
+            prod = product_obj.browse(cr, uid, prod_id, context=context)
+            res['value']={ }
+#                          'product_uom_id': prod.uom_id.id,
+#                          'unit_amount': quantity or 1.0
+#                          }
+                                
+        if not journal_id:
+            j_ids = self.pool.get('account.analytic.journal.commit').search(cr, uid, [('type','=','purchase')])
+            journal_id = j_ids and j_ids[0] or False
+        if not journal_id or not prod_id:
+            return res
+        
+        analytic_journal_obj =self.pool.get('account.analytic.journal.commit')
+        product_price_type_obj = self.pool.get('product.price.type')
+        j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
+        
+        result = 0.0
+
+        if j_id.type <> 'sale':
+            a = prod.product_tmpl_id.property_account_expense.id
+            if not a:
+                a = prod.categ_id.property_account_expense_categ.id
+            if not a:
+                raise osv.except_osv(_('Error !'),
+                        _('There is no expense account defined ' \
+                                'for this product: "%s" (id:%d)') % \
+                                (prod.name, prod.id,))
+        else:
+            a = prod.product_tmpl_id.property_account_income.id
+            if not a:
+                a = prod.categ_id.property_account_income_categ.id
+            if not a:
+                raise osv.except_osv(_('Error !'),
+                        _('There is no income account defined ' \
+                                'for this product: "%s" (id:%d)') % \
+                                (prod.name, prod_id,))
+
+        flag = False
+        # Compute based on pricetype
+        product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context=context)
+        pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
+        if journal_id:
+            journal = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
+            if journal.type == 'sale':
+                product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context)
+                if product_price_type_ids:
+                    pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
+        # Take the company currency as the reference one
+        if pricetype.field == 'list_price':
+            flag = True
+        ctx = context.copy()
+        if unit:
+            # price_get() will respect a 'uom' in its context, in order
+            # to return a default price for those units
+            ctx['uom'] = unit
+        amount_unit = prod.price_get(pricetype.field, context=ctx)[prod.id]
+        prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+        amount = amount_unit * quantity or 1.0
+        result = round(amount, prec)
+            
+        if not flag:
+            result *= -1
+        
+        res['value'].update({
+            'amount': result,
+            'general_account_id': a,
+            })
+        
+        return res
+
+    def view_header_get(self, cr, user, view_id, view_type, context=None):
+        if context is None:
+            context = {}
+        if context.get('account_id', False):
+            # account_id in context may also be pointing to an account.account.id
+            cr.execute('select name from account_analytic_account where id=%s', (context['account_id'],))
+            res = cr.fetchone()
+            if res:
+                res = _('Entries: ')+ (res[0] or '')
+            return res
+        return False
+
+account_analytic_line_commit()
\ No newline at end of file

=== added file 'project_cost/account_analytic_line_commit_view.xml'
--- project_cost/account_analytic_line_commit_view.xml	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_line_commit_view.xml	2013-02-19 14:36:22 +0000
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	
+                 	
+#---------------------------------------------------------------------------------------------------------
+#   Add Commitment analytic account lines
+#---------------------------------------------------------------------------------------------------------
+       <record id="view_account_analytic_line_commit_form" model="ir.ui.view">
+            <field name="name">account.analytic.line.commit.form</field>
+            <field name="model">account.analytic.line.commit</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Analytic Entry">
+                    <group colspan="4" col="6">
+                        <field name="name"/>
+                        <field name="ref"/>
+                        <field name="account_id"/>
+                        <field name="journal_id"/>
+                        <field name="date"/>
+                        <field name="period_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                    </group>
+                    <group colspan="2" col="4">
+                        <separator string="Amount" colspan="4"/>
+                        <field name="amount" colspan="4"/>
+                        <field name="amount_currency" colspan="2"/>
+                        <field name="currency_id" colspan="2" nolabel="1"/>
+                    </group>
+                    <group colspan="2" col="4">
+                        <separator string="Product Information" colspan="4"/>
+                        <field name="product_id" colspan="4"/>
+                        <field name="unit_amount" colspan="2"/>
+                        <field name="product_uom_id" colspan="2" nolabel="1"/>
+                        <field name="user_id" colspan="2"/>
+                    </group>                    
+                </form>
+            </field>
+        </record>
+        <record id="view_account_analytic_line_commit_tree" model="ir.ui.view">
+            <field name="name">account.analytic.line.commit.tree</field>
+            <field name="model">account.analytic.line.commit</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree editable="top" string="Analytic Entries">
+                    <field name="date"/>
+                    <field name="ref" invisible="False"/>
+                    <field name="name"/>
+                    <field name="journal_id" invisible="False"/>
+                    <field name="amount" sum="Total" invisible="False"/>
+                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)" invisible="False"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total Quantity" invisible="False"/>
+                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" invisible="False"/>
+                    <field domain="[('type','=','normal')]" name="account_id"/>
+                    <field name="user_id" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+        <record id="view_account_analytic_line_commit_filter" model="ir.ui.view">
+            <field name="name">account.analytic.line.commit.select</field>
+            <field name="model">account.analytic.line.commit</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Analytic Lines">
+                    <group col='6' colspan='4'>
+                        <field name="date"/>
+                        <field name="name"/>
+                        <field name="account_id"/>
+                        <field name="user_id"/>                                                   
+                    </group>
+					<newline/>
+                    <group expand="0" string="Extended Filters...">
+                        <field name="journal_id" widget="selection"/>
+                        <field name="product_id" widget="selection"/>
+                        <field name="amount" select="1"/>
+                    </group>
+                    <newline/>
+                </search>
+            </field>
+        </record>
+        <record id="action_account_analytic_line_commit_form" model="ir.actions.act_window">
+            <field name="name">Commitment Analytic Entries</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.analytic.line.commit</field>
+            <field name="view_type">form</field>
+            <field name="context">{"search_default_user_id":uid}</field>
+            <field name="view_id" ref="view_account_analytic_line_commit_tree"/>
+        </record>
+        
+
+#---------------------------------------------------------------------------------------------------------
+#   Open journal entries
+#---------------------------------------------------------------------------------------------------------
+
+        <record id="action_account_analytic_journal_commit_open_form" model="ir.actions.act_window">
+            <field name="name">Analytic Journal Commitment Items</field>
+            <field name="res_model">account.analytic.line.commit</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_analytic_line_commit_filter" />
+        </record>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="action_account_analytic_journal_commit_open_form"
+            id="account_analytic_journal_commit_entries"
+            parent="account.menu_finance_entries" 
+            sequence="7"/>         
+
+
+    </data>
+</openerp>

=== added file 'project_cost/account_analytic_line_plan.py'
--- project_cost/account_analytic_line_plan.py	1970-01-01 00:00:00 +0000
+++ project_cost/account_analytic_line_plan.py	2013-02-19 14:36:22 +0000
@@ -0,0 +1,191 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2011 Eficent (<http://www.eficent.com/>)
+#              Jordi Ballester Alomar <[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 lxml import etree
+import time
+from datetime import datetime, date, timedelta
+import decimal_precision as dp
+from tools.translate import _
+from osv import fields, osv
+import netsvc
+import tools
+
+class account_analytic_line_plan(osv.osv):
+    _name = 'account.analytic.line.plan'
+    _description = 'Analytic Line Plan'
+    
+    
+    
+    def _get_period(self, cr, uid, context=None):
+        osv.logging.log(100, "[Alca]: 38:project_cost/account_analytic_line_plan:_get_period")
+        periods = self.pool.get('account.period').find(cr, uid)
+        if periods:
+            return periods[0]
+        return False
+
+    _columns = {
+        'name': fields.char('Description', size=256, required=True),
+        'date': fields.date('Date', required=True, select=True),
+        'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
+        'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True, domain=[('type','<>','view')]),
+        'user_id': fields.many2one('res.users', 'User'),
+        'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),                
+        'product_uom_id': fields.many2one('product.uom', 'UoM'),
+        'product_id': fields.many2one('product.product', 'Product'),
+        'general_account_id': fields.many2one('account.account', 'General Account', required=False, ondelete='restrict'),
+        'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='restrict', select=True),
+        'journal_id': fields.many2one('account.analytic.journal.plan', 'Planning Analytic Journal', required=True, ondelete='restrict', select=True),
+        'code': fields.char('Code', size=8),
+        'ref': fields.char('Ref.', size=64),
+        'currency_id': fields.related('move_id', 'currency_id', type='many2one', relation='res.currency', string='Account currency', store=True, help="The related account currency if not equal to the company one.", readonly=True),
+        'amount_currency': fields.related('move_id', 'amount_currency', type='float', string='Amount currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
+        'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
+        'notes': fields.text('Notes'),
+    }
+
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
+        'amount': 0.00,
+        'period_id': _get_period, 
+        'journal_id': lambda self, cr, uid, context : context['journal_id'] if context and 'journal_id' in context else None,
+    }
+    _order = 'date desc'
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        osv.logging.log(100, "[Alca]: 75:project_cost/account_analytic_line_plan:search")
+        if context is None:
+            context = {}
+        if context.get('from_date',False):
+            args.append(['date', '>=', context['from_date']])
+        if context.get('to_date',False):
+            args.append(['date','<=', context['to_date']])
+        return super(account_analytic_line_plan, self).search(cr, uid, args, offset, limit,
+                order, context=context, count=count)
+
+    def _check_company(self, cr, uid, ids, context=None):
+        osv.logging.log(100, "[Alca]: 86:project_cost/account_analytic_line_plan:_check_company")
+        lines = self.browse(cr, uid, ids, context=context)
+        for l in lines:
+            if l.move_id and not l.account_id.company_id.id == l.move_id.account_id.company_id.id:
+                return False
+        return True
+
+    # Compute the cost based on the price type define into company
+    # property_valuation_price_type property
+    def on_change_unit_amount(self, cr, uid, id, prod_id, quantity, company_id,
+            unit=False, journal_id=False, context=None):
+        osv.logging.log(100, "[Alca]: 97:project_cost/account_analytic_line_plan:on_change_unit_amount")
+        
+        res={}
+        
+        if context==None:
+            context={}
+            
+        product_obj = self.pool.get('product.product')
+        
+        if prod_id:
+            prod = product_obj.browse(cr, uid, prod_id, context=context)
+            res['value']={ }
+#                          'product_uom_id': prod.uom_id.id,
+#                          'unit_amount': quantity or 1.0
+#                          }
+                                
+        if not journal_id:
+            j_ids = self.pool.get('account.analytic.journal.plan').search(cr, uid, [('type','=','purchase')])
+            journal_id = j_ids and j_ids[0] or False
+        if not journal_id or not prod_id:
+            return res
+        
+        analytic_journal_obj =self.pool.get('account.analytic.journal.plan')
+        product_price_type_obj = self.pool.get('product.price.type')
+        j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
+        
+        result = 0.0
+
+        if j_id.type <> 'sale':
+            a = prod.product_tmpl_id.property_account_expense.id
+            if not a:
+                a = prod.categ_id.property_account_expense_categ.id
+            if not a:
+                raise osv.except_osv(_('Error !'),
+                        _('There is no expense account defined ' \
+                                'for this product: "%s" (id:%d)') % \
+                                (prod.name, prod.id,))
+        else:
+            a = prod.product_tmpl_id.property_account_income.id
+            if not a:
+                a = prod.categ_id.property_account_income_categ.id
+            if not a:
+                raise osv.except_osv(_('Error !'),
+                        _('There is no income account defined ' \
+                                'for this product: "%s" (id:%d)') % \
+                                (prod.name, prod_id,))
+
+        flag = False
+        # Compute based on pricetype
+        product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context=context)
+        pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
+        if journal_id:
+            journal = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
+            if journal.type == 'sale':
+                product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context)
+                if product_price_type_ids:
+                    pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
+        # Take the company currency as the reference one
+        if pricetype.field == 'list_price':
+            flag = True
+        ctx = context.copy()
+        if unit:
+            # price_get() will respect a 'uom' in its context, in order