diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index 46a0ebd95d2..d185e7d19f1 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -98,6 +98,55 @@ action="action_hr_analytic_timesheet_tree_invoiced"/> + + Open analytic accounts + account.analytic.account + form + tree,form + [('state','<>','close'),('type','<>','view')] + + + + + Unclosed invoiced accounts + account.analytic.account + form + tree,form + [('state','<>','close'),('type','<>','view'),('pricelist_id','<>',False)] + + + + + + Draft analytic accounts + account.analytic.account + form + tree,form + [('state','=','draft'),('type','<>','view')] + + + + + + Pending analytic accounts + account.analytic.account + form + tree,form + [('state','=','pending'),('type','<>','view')] + + + + + + hr_timesheet_invoice.factor.form hr_timesheet_invoice.factor diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__terp__.py index b6d7ca8d8aa..a4fe9e451ca 100644 --- a/addons/l10n_be/__terp__.py +++ b/addons/l10n_be/__terp__.py @@ -3,7 +3,7 @@ "version" : "1.0", "author" : "Tiny", "category" : "Localisation/Account charts", - "depends" : ["base", "account", "account_report"], + "depends" : ["base", "account", "account_report", "l10n_euro"], "init_xml" : [], "demo_xml" : ["account_demo.xml","account.report.report.csv"], "update_xml" : ["account_pcmn_belgium.xml"], diff --git a/addons/l10n_euro/__init__.py b/addons/l10n_euro/__init__.py new file mode 100644 index 00000000000..766503a2996 --- /dev/null +++ b/addons/l10n_euro/__init__.py @@ -0,0 +1,29 @@ +############################################################################## +# +# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved. +# Fabien Pinckaers +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + +import base_bank diff --git a/addons/l10n_euro/__terp__.py b/addons/l10n_euro/__terp__.py new file mode 100644 index 00000000000..23342996580 --- /dev/null +++ b/addons/l10n_euro/__terp__.py @@ -0,0 +1,10 @@ +{ + "name" : "EURO - Localisation", + "version" : "1.0", + "author" : "Tiny", + "category" : "Localisation/Account charts", + "depends" : ["base"], + "init_xml" : ["base_data.xml"], + "active": False, + "installable": True +} diff --git a/addons/l10n_euro/base_bank.py b/addons/l10n_euro/base_bank.py new file mode 100644 index 00000000000..ede0d7c11e2 --- /dev/null +++ b/addons/l10n_euro/base_bank.py @@ -0,0 +1,41 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $ +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + +import netsvc +from osv import fields, osv + +class res_partner_bank(osv.osv): + _inherit = "res.partner.bank" + _columns = { + 'iban': fields.char('IBAN Nbr', size=32, readonly=True), + 'swift': fields.char('BIC/Swift', size=12, readonly=True), + } +res_partner_bank() + diff --git a/addons/l10n_euro/base_data.xml b/addons/l10n_euro/base_data.xml new file mode 100644 index 00000000000..fdb41c7ac39 --- /dev/null +++ b/addons/l10n_euro/base_data.xml @@ -0,0 +1,52 @@ + + + + + + res.partner.bank.form.iban.inherit + res.partner.bank + + form + + + + + + + + + + + # -------------------------------------------------------------- + # Default bank account description + # -------------------------------------------------------------- + + IBAN Account + iban + + + iban + + + + + + swift + + + + + + country_id + + + + + + zip + + + + + + diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml index 5edc7f392ff..fadc61ad081 100644 --- a/addons/report_task/report_task_view.xml +++ b/addons/report_task/report_task_view.xml @@ -11,7 +11,7 @@ report.task.user.pipeline.open form -
+ @@ -27,9 +27,9 @@ report.task.user.pipeline.open graph - + - + @@ -39,7 +39,7 @@ report.task.user.pipeline.open tree - + @@ -56,29 +56,29 @@ tree,graph [] - + - Closed task by company + Closed task by user report.task.user.pipeline.open form tree,graph [('task_state','=','done')] - Opened task by projects + Opened task by user report.task.user.pipeline.open form tree,graph [('task_state','=','open')]