diff --git a/addons/account/account.py b/addons/account/account.py index 6e96ce73962..caf1d68c45d 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -24,11 +24,12 @@ from datetime import datetime from dateutil.relativedelta import relativedelta from operator import itemgetter -import netsvc +import logging import pooler from osv import fields, osv import decimal_precision as dp from tools.translate import _ +_logger = logging.getLogger(__name__) def check_cycle(self, cr, uid, ids, context=None): """ climbs the ``self._table.parent_id`` chains for 100 levels or @@ -212,7 +213,6 @@ class account_account(osv.osv): _name = "account.account" _description = "Account" _parent_store = True - logger = netsvc.Logger() def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): @@ -295,8 +295,7 @@ class account_account(osv.osv): if aml_query.strip(): wheres.append(aml_query.strip()) filters = " AND ".join(wheres) - self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG, - 'Filters: %s'%filters) + _logger.debug('Filters: %s',(filters)) # IN might not work ideally in case there are too many # children_and_consolidated, in that case join on a # values() e.g.: @@ -312,8 +311,7 @@ class account_account(osv.osv): " GROUP BY l.account_id") params = (tuple(children_and_consolidated),) + query_params cr.execute(request, params) - self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG, - 'Status: %s'%cr.statusmessage) + _logger.debug('Status: %s',(cr.statusmessage)) for res in cr.dictfetchall(): accounts[res['id']] = res @@ -2095,9 +2093,7 @@ class account_tax(osv.osv): } def compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None): - logger = netsvc.Logger() - logger.notifyChannel("warning", netsvc.LOG_WARNING, - "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included") + _logger.warning("Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included") return self._compute(cr, uid, taxes, price_unit, quantity, product, partner) def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None): diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 68a723aa4a0..a10cba705e4 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -39,7 +39,7 @@ - + @@ -61,8 +61,8 @@ on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/> - - + + @@ -98,7 +98,7 @@ - + @@ -148,7 +148,8 @@
- - + account.invoice.customer.pay + account.invoice + form + + + + + +
- - - - - - - - - - - - - - - - - - - - - Configure Sales - ir.actions.act_window - sale.config.settings - - form - inline - - diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po index 92290c2dd95..8bf029ddbdb 100644 --- a/addons/base_setup/i18n/ja.po +++ b/addons/base_setup/i18n/ja.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-25 05:14+0000\n" +"X-Launchpad-Export-Date: 2012-06-26 05:22+0000\n" "X-Generator: Launchpad (build 15482)\n" #. module: base_setup diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index 92914f8f7a3..f6fdcefe8fe 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -28,13 +28,44 @@ class base_config_settings(osv.osv_memory): 'module_multi_company': fields.boolean('Multi Company', help="""Work in multi-company environments, with appropriate security access between companies. This installs the module multi_company."""), - 'module_portal': fields.boolean('Portal', - help="""Define a portal for your customers or suppliers. The portal is a group of - external users that has specific access rights and rules. - This installs the module portal."""), - 'module_share': fields.boolean('Share', - help="""Share OpenERP documents (records) with external users. - This installs the module share."""), + 'module_portal': fields.boolean('Activate Customer Portal', + help="""The portal will give access to a series of documents for your customers; his quotations, his invoices, his projects, etc."""), + 'module_share': fields.boolean('Allow Sharing Resources to External Users', + help="""As an example, you will be able to share a project or some tasks to your customers, or quotes/sales to several persons at your customer company, or your agenda availabilities to your contacts."""), + } + + def open_company(self, cr, uid, ids, context=None): + user = self.pool.get('res.users').browse(cr, uid, uid, context) + return { + 'type': 'ir.actions.act_window', + 'name': 'Your Company', + 'view_type': 'form', + 'view_mode': 'form', + 'res_model': 'res.company', + 'res_id': user.company_id.id, + } + +# Preferences wizard for Sales & CRM. +# It is defined here because it is inherited independently in modules sale, crm, +# plugin_outlook and plugin_thunderbird. +class sale_config_settings(osv.osv_memory): + _name = 'sale.config.settings' + _inherit = 'res.config.settings' + _columns = { + 'module_crm': fields.boolean('CRM'), + 'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin', + help="""The plugin allows you archive email and its attachments to the selected + OpenERP objects. You can select a partner, or a lead and + attach the selected mail as a .eml file in + the attachment of a selected record. You can create documents for CRM Lead, + Partner from the selected emails. + This installs the module plugin_thunderbird."""), + 'module_plugin_outlook': fields.boolean('Outlook Plugin', + help="""The Outlook plugin allows you to select an object that you would like to add + to your email and its attachments from MS Outlook. You can select a partner, + or a lead object and archive a selected + email into an OpenERP mail message with attachments. + This installs the module plugin_outlook."""), } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 0b85e13a08f..93523f06746 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -8,24 +8,32 @@
-
- + - - - - -