diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po index 230ad4b3a09..9b001d87758 100644 --- a/bin/addons/base/i18n/hr.po +++ b/bin/addons/base/i18n/hr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-05-12 04:54+0000\n" +"PO-Revision-Date: 2010-05-13 04:54+0000\n" "Last-Translator: goranc \n" "Language-Team: openerp-translators\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n" +"X-Launchpad-Export-Date: 2010-05-14 04:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: hr\n" diff --git a/bin/addons/base/i18n/it.po b/bin/addons/base/i18n/it.po index a07603c3142..c0690f4e60f 100644 --- a/bin/addons/base/i18n/it.po +++ b/bin/addons/base/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-04-29 04:41+0000\n" -"Last-Translator: eLBati - albatos.com \n" +"PO-Revision-Date: 2010-05-13 09:24+0000\n" +"Last-Translator: Carlo - didotech.com \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-30 03:50+0000\n" +"X-Launchpad-Export-Date: 2010-05-14 04:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base @@ -2150,10 +2150,7 @@ msgstr "Crea Menu" msgid "" "Value Added Tax number. Check the box if the partner is subjected to the " "VAT. Used by the VAT legal statement." -msgstr "" -"numero di Partita IVA (Imposta sul valore Aggiunto - VAT). Seleziona la " -"casella se il partner è soggetto IVA. Usato dalla dichiarazione legale " -"sull'IVA." +msgstr "Seleziona la casella se il partner è soggetto IVA." #. module: base #: model:ir.actions.act_window,name:base.action_module_category_tree @@ -2204,7 +2201,7 @@ msgstr "Registra Regole" #. module: base #: field:res.partner,vat:0 msgid "VAT" -msgstr "IVA" +msgstr "Partita IVA" #. module: base #: view:res.lang:0 @@ -7682,7 +7679,7 @@ msgstr "" #. module: base #: constraint:res.partner:0 msgid "The VAT doesn't seem to be correct." -msgstr "L'IVA non sembra essere corretta" +msgstr "La P.IVA non sembra essere corretta" #. module: base #: selection:ir.report.custom.fields,operation:0 diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po index 49438d5c6b2..03acea74107 100644 --- a/bin/addons/base/i18n/ja.po +++ b/bin/addons/base/i18n/ja.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-05-12 04:56+0000\n" +"PO-Revision-Date: 2010-05-13 04:56+0000\n" "Last-Translator: Harry (Open ERP) \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n" +"X-Launchpad-Export-Date: 2010-05-14 04:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/sv.po b/bin/addons/base/i18n/sv.po index 751d7fcbf62..b9ec038f5c3 100644 --- a/bin/addons/base/i18n/sv.po +++ b/bin/addons/base/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-05-12 04:58+0000\n" +"PO-Revision-Date: 2010-05-13 04:57+0000\n" "Last-Translator: Anders Wallenquist \n" "Language-Team: <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n" +"X-Launchpad-Export-Date: 2010-05-14 04:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po index b1f62e2ff8a..14a1b5e4b75 100644 --- a/bin/addons/base/i18n/uk.po +++ b/bin/addons/base/i18n/uk.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-05-12 04:54+0000\n" +"PO-Revision-Date: 2010-05-13 04:57+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n" +"X-Launchpad-Export-Date: 2010-05-14 04:54+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/i18n/zh_CN.po b/bin/addons/base/i18n/zh_CN.po index 0276b2cc004..567df5d18e4 100644 --- a/bin/addons/base/i18n/zh_CN.po +++ b/bin/addons/base/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-12-18 08:39+0000\n" -"PO-Revision-Date: 2010-05-12 04:58+0000\n" +"PO-Revision-Date: 2010-05-13 04:57+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-13 04:36+0000\n" +"X-Launchpad-Export-Date: 2010-05-14 04:55+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base diff --git a/bin/addons/base/ir/__init__.py b/bin/addons/base/ir/__init__.py index a3f3e7e16c4..01e33494717 100644 --- a/bin/addons/base/ir/__init__.py +++ b/bin/addons/base/ir/__init__.py @@ -28,6 +28,7 @@ import ir_actions import ir_report_custom import ir_attachment import ir_cron +import ir_filters import ir_values import ir_translation import ir_exports diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml index c23a2f689a3..1169798fe8e 100644 --- a/bin/addons/base/ir/ir.xml +++ b/bin/addons/base/ir/ir.xml @@ -230,8 +230,59 @@ + + - + + ir.filters.form + ir.filters + form + +
+ + + + + + + + +
+ + + + + ir.filters.tree + ir.filters + tree + + + + + + + + + + + + + + + Filters + ir.actions.act_window + ir.filters + form + + + + + + + + + ir.actions.report.custom ir.actions.report.custom form diff --git a/bin/addons/base/ir/ir_filters.py b/bin/addons/base/ir/ir_filters.py new file mode 100644 index 00000000000..44dd335f34d --- /dev/null +++ b/bin/addons/base/ir/ir_filters.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# 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 . +# +############################################################################## + +from osv import osv, fields + +class ir_filters(osv.osv): + ''' + Filters + ''' + _name = 'ir.filters' + _description = 'Filters' + + def _list_all_models(self, cr, uid, context=None): + cr.execute("SELECT model, name from ir_model") + return cr.fetchall() + + _columns = { + 'name': fields.char('Action Name', size=64, translate=True, required=True), + 'user_id':fields.many2one('res.users', 'User', help='False means for every user'), + 'domain': fields.char('Domain Value', size=250, required=True), + 'context': fields.char('Context Value', size=250, required=True), + 'model_id': fields.selection(_list_all_models, 'Model', required=True), + } + +ir_filters() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py index a72b5b17bb3..953c9b56ef1 100644 --- a/bin/addons/base/ir/ir_ui_menu.py +++ b/bin/addons/base/ir/ir_ui_menu.py @@ -84,6 +84,9 @@ class ir_ui_menu(osv.osv): if count: return 0 return [] + + if count and ids: + return ids modelaccess = self.pool.get('ir.model.access') user_groups = set(self.pool.get('res.users').read(cr, 1, uid, ['groups_id'])['groups_id']) diff --git a/bin/addons/base/res/res_company.py b/bin/addons/base/res/res_company.py index 6a64d5700b7..011e6f87a42 100644 --- a/bin/addons/base/res/res_company.py +++ b/bin/addons/base/res/res_company.py @@ -24,7 +24,7 @@ from osv import fields import os import tools from tools.translate import _ - +import base64 class multi_company_default(osv.osv): """ @@ -85,7 +85,8 @@ class res_company(osv.osv): 'logo' : fields.binary('Logo'), 'currency_id': fields.many2one('res.currency', 'Currency', required=True), 'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'), - 'user_ids': fields.many2many('res.users', 'res_company_users_rel', 'cid', 'user_id', 'Accepted Users') + 'user_ids': fields.many2many('res.users', 'res_company_users_rel', 'cid', 'user_id', 'Accepted Users'), + 'account_no':fields.char('Account No.', size=64), } def search(self, cr, uid, args, offset=0, limit=None, order=None, @@ -179,6 +180,11 @@ class res_company(osv.osv): level -= 1 return True + def _get_logo(self, cr, uid, ids): + file_data = open('../pixmaps/openerp-header.png','rb').read() + return base64.encodestring(file_data) + + def _get_header2(self,cr,uid,ids): return """
@@ -240,7 +246,8 @@ class res_company(osv.osv): _defaults = { 'currency_id': _get_euro, 'rml_header':_get_header, - 'rml_header2': _get_header2 + 'rml_header2': _get_header2, + 'logo':_get_logo } _constraints = [