diff --git a/addons/hr_expense/__init__.py b/addons/hr_expense/__init__.py index 06f78648101..55a87f95400 100644 --- a/addons/hr_expense/__init__.py +++ b/addons/hr_expense/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # 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 . +# along with this program. If not, see . # ############################################################################## diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py index 95d2b60300b..a648bea92bc 100644 --- a/addons/hr_expense/__openerp__.py +++ b/addons/hr_expense/__openerp__.py @@ -54,7 +54,9 @@ re-invoice your customer's expenses if your work by project. 'security/ir_rule.xml', 'report/hr_expense_report_view.xml', 'board_hr_expense_view.xml', - 'board_hr_expense_manager_view.xml' + 'board_hr_expense_manager_view.xml', + 'installer_view.xml', + 'hr_expense_data.xml' ], 'demo_xml': [ 'hr_expense_demo.xml', diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 1fdbb56f40b..995b5950019 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -229,6 +229,12 @@ class product_product(osv.osv): 'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."), } + def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok): + if not hr_expense_ok: + return {} + res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy','purchase_ok':True,'sale_ok' :False,'categ_id':19 }} + return res + product_product() class hr_expense_line(osv.osv): diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml new file mode 100644 index 00000000000..33a7ec7604c --- /dev/null +++ b/addons/hr_expense/hr_expense_data.xml @@ -0,0 +1,13 @@ + + + + + + + Expenses + + + + \ No newline at end of file diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 5aa2fe5c38e..750404c40d9 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -189,7 +189,7 @@ form - + diff --git a/addons/hr_expense/installer_view.xml b/addons/hr_expense/installer_view.xml new file mode 100644 index 00000000000..7b194caa2c5 --- /dev/null +++ b/addons/hr_expense/installer_view.xml @@ -0,0 +1,20 @@ + + + + + Expences Product + ir.actions.act_window + product.product + form + tree,form + {'default_type':'service','default_procure_method':'make_to_stock','default_supply_method':'buy','default_purchase_ok':True,'default_sale_ok':False,'default_hr_expense_ok':True,'default_categ_id':19} + + + + + + 3 + always + + +