From 9e20a7f2990132321549a62fbade423a02ca8b4c Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 18 Jun 2012 18:44:33 +0200
Subject: [ADD] analytic_contract_expense_project: a new module to manage the
 modularity of analytic_contract_hr_expense and project modules

bzr revid: qdp-launchpad@openerp.com-20120618164433-tvnfdw1zz6pj5kcr
---
 .../analytic_contract_expense_project/__init__.py  | 24 +++++++++++
 .../__openerp__.py                                 | 47 ++++++++++++++++++++++
 .../analytic_contract_expense_project.py           | 37 +++++++++++++++++
 .../analytic_contract_expense_project_view.xml     | 34 ++++++++++++++++
 4 files changed, 142 insertions(+)
 create mode 100644 addons/analytic_contract_expense_project/__init__.py
 create mode 100644 addons/analytic_contract_expense_project/__openerp__.py
 create mode 100644 addons/analytic_contract_expense_project/analytic_contract_expense_project.py
 create mode 100644 addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml

(limited to 'addons/analytic_contract_expense_project')

diff --git a/addons/analytic_contract_expense_project/__init__.py b/addons/analytic_contract_expense_project/__init__.py
new file mode 100644
index 00000000000..05c84916922
--- /dev/null
+++ b/addons/analytic_contract_expense_project/__init__.py
@@ -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_contract_expense_project
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py
new file mode 100644
index 00000000000..fc9c2bc4307
--- /dev/null
+++ b/addons/analytic_contract_expense_project/__openerp__.py
@@ -0,0 +1,47 @@
+# -*- 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/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Contracts Management',
+    'version': '1.1',
+    'category': 'Sales Management',
+    'description': """
+This module is for modifying project view to show some data related to the hr_expense module.
+======================================================================================================
+
+""",
+    "author": "OpenERP S.A.",
+    "website": "http://www.openerp.com/",
+    "depends": ["analytic_contract_hr_expense","project"],
+    "init_xml": [],
+    "update_xml": [
+                    "analytic_contract_expense_project_view.xml",
+                    ],
+    'demo_xml': [],
+    "css" : [
+             ],
+    'installable': True,
+    'auto_install': True,
+    'certificate': '',
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project.py b/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
new file mode 100644
index 00000000000..efbb8b75a9e
--- /dev/null
+++ b/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
@@ -0,0 +1,37 @@
+# -*- 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/>.
+#
+##############################################################################
+
+from osv import osv
+
+class project_project(osv.osv):
+    _inherit = "project.project"
+
+    def open_hr_expense(self, cr, uid, ids, context=None):
+        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
+        return self.pool.get('account.analytic.account').open_hr_expense(cr, uid, account_ids, context=context)
+
+    def hr_to_invoice_expense(self, cr, uid, ids, context=None):
+        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
+        return self.pool.get('account.analytic.account').hr_to_invoice_expense(cr, uid, account_ids, context=context)
+
+project_project()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
new file mode 100644
index 00000000000..d4350c7325f
--- /dev/null
+++ b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="project_form_expense_form" model="ir.ui.view">
+            <field name="name">project.project.form.expense.inherit</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="analytic_contract_project.project_account_analytic_account_form"/>
+            <field eval="20" name="priority"/>
+            <field name="arch" type="xml">
+                <xpath expr='//tr[@name="total"]' position='before'>
+                    <tr>
+                        <td>
+                            <label for="charge_expenses"/>
+                        </td><td>
+                            <field name="charge_expenses"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td><td>
+                            <button name="open_hr_expense" string="All Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                            <button name="hr_to_invoice_expense" string="Expenses to Invoice" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
+                        </td>
+                    </tr>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
-- 
cgit v1.2.3


From c2b6c35dd9d22caeccf46b4f28b7b1bb9a2919b0 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 25 Jun 2012 11:54:48 +0200
Subject: [IMP] Clean Modules name: there are 3 modules named Contracts
 Management.

bzr revid: qdp-launchpad@openerp.com-20120625095448-hzpekh2x5gls0t8o
---
 addons/analytic_contract_expense_project/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/analytic_contract_expense_project')

diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py
index fc9c2bc4307..514f0bfbbf5 100644
--- a/addons/analytic_contract_expense_project/__openerp__.py
+++ b/addons/analytic_contract_expense_project/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': 'Contracts Management',
+    'name': 'Projects Management: hr_expense link',
     'version': '1.1',
     'category': 'Sales Management',
     'description': """
-- 
cgit v1.2.3


From 3b8573f7ce273948826cffbffd7f2cfa91665e3c Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Wed, 27 Jun 2012 11:25:35 +0200
Subject: [FIX] analytic_contract_expense_project: removed empty certificate
 entry from descriptor file (which cause the unique constraint to be
 impossible to add).

bzr revid: vmt@openerp.com-20120627092535-va6fuhc3o65te8u9
---
 addons/analytic_contract_expense_project/__openerp__.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/analytic_contract_expense_project')

diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py
index 514f0bfbbf5..41e0bbd084a 100644
--- a/addons/analytic_contract_expense_project/__openerp__.py
+++ b/addons/analytic_contract_expense_project/__openerp__.py
@@ -41,7 +41,6 @@ This module is for modifying project view to show some data related to the hr_ex
              ],
     'installable': True,
     'auto_install': True,
-    'certificate': '',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-- 
cgit v1.2.3