diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index e3232286a80..03056b8d204 100755 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -489,7 +489,7 @@ msgstr "Date de création" #. module: account #: selection:account.journal,type:0 msgid "Purchase Refund" -msgstr "Remboursement d'achat" +msgstr "Avoir fournisseur" #. module: account #: selection:account.journal,type:0 @@ -1632,7 +1632,7 @@ msgstr "Compte fournisseurs débiteurs" #: field:account.tax,account_paid_id:0 #: field:account.tax.template,account_paid_id:0 msgid "Refund Tax Account" -msgstr "Compte de taxe à payer" +msgstr "Compte de taxe pour avoirs" #. module: account #: view:account.bank.statement:0 @@ -9899,7 +9899,7 @@ msgstr "Rechercher une facture" #: view:account.invoice.report:0 #: model:ir.actions.act_window,name:account.action_account_invoice_refund msgid "Refund" -msgstr "Rembourser" +msgstr "Créer un avoir" #. module: account #: field:wizard.multi.charts.accounts,bank_accounts_id:0 diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index 5f429270e29..39ed61cc253 100755 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -16,98 +16,98 @@ Account Entry - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Entry lines - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Journal Period - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Journal multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Analytic journal multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Analytic journal multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Period multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Fiscal year multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Account multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Tax multi-company - ['|',('company_id','=',False),('company_id','=',user.company_id.id)] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Tax code multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Invoice multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Account fiscal Mapping company rule - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Account model company rule - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py index 47f9ac9c2c8..d915a1cd34b 100755 --- a/addons/account/wizard/account_change_currency.py +++ b/addons/account/wizard/account_change_currency.py @@ -72,7 +72,7 @@ class account_change_currency(osv.osv_memory): new_price = (line.price_unit / old_rate ) * rate obj_inv_line.write(cr, uid, [line.id], {'price_unit': new_price}) obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} account_change_currency() diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index 42383341828..6190f792c7f 100755 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -215,7 +215,7 @@ class account_fiscalyear_close(osv.osv_memory): cr.execute('UPDATE account_fiscalyear ' \ 'SET end_journal_period_id = %s ' \ 'WHERE id = %s', (ids[0], old_fyear.id)) - return {} + return {'type': 'ir.actions.act_window_close'} account_fiscalyear_close() diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py index 9a559d039da..abf054746ce 100755 --- a/addons/account/wizard/account_fiscalyear_close_state.py +++ b/addons/account/wizard/account_fiscalyear_close_state.py @@ -57,7 +57,7 @@ class account_fiscalyear_close_state(osv.osv_memory): fy_pool = self.pool.get('account.fiscalyear') fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code)) - return {} + return {'type': 'ir.actions.act_window_close'} account_fiscalyear_close_state() diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py index 2e7a519aa34..7adcb908a34 100755 --- a/addons/account/wizard/account_invoice_state.py +++ b/addons/account/wizard/account_invoice_state.py @@ -43,7 +43,7 @@ class account_invoice_confirm(osv.osv_memory): if record['state'] not in ('draft','proforma','proforma2'): raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!")) wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_open', cr) - return {} + return {'type': 'ir.actions.act_window_close'} account_invoice_confirm() @@ -67,7 +67,7 @@ class account_invoice_cancel(osv.osv_memory): if record['state'] in ('cancel','paid'): raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!")) wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_cancel', cr) - return {} + return {'type': 'ir.actions.act_window_close'} account_invoice_cancel() diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py index 582bbc36619..541e7b2cbdb 100755 --- a/addons/account/wizard/account_open_closed_fiscalyear.py +++ b/addons/account/wizard/account_open_closed_fiscalyear.py @@ -42,7 +42,7 @@ class account_open_closed_fiscalyear(osv.osv_memory): ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)]) if ids_move: cr.execute('delete from account_move where id IN %s', (tuple(ids_move),)) - return {} + return {'type': 'ir.actions.act_window_close'} account_open_closed_fiscalyear() diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py index 3b3acecc389..5b7589d7830 100755 --- a/addons/account/wizard/account_period_close.py +++ b/addons/account/wizard/account_period_close.py @@ -50,7 +50,7 @@ class account_period_close(osv.osv_memory): # Log message for Period for period_id, name in period_pool.name_get(cr, uid, [id]): period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name)) - return {} + return {'type': 'ir.actions.act_window_close'} account_period_close() diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py index f89ffb47a76..8131f6a9668 100755 --- a/addons/account/wizard/account_reconcile.py +++ b/addons/account/wizard/account_reconcile.py @@ -101,7 +101,7 @@ class account_move_line_reconcile(osv.osv_memory): context.update({'stop_reconcile': True}) account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id, period_id, journal_id, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} account_move_line_reconcile() @@ -145,7 +145,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory): if context is None: context = {} account_move_line_obj.reconcile_partial(cr, uid, context['active_ids'], 'manual', context=context) - return {} + return {'type': 'ir.actions.act_window_close'} def trans_rec_reconcile(self, cr, uid, ids, context=None): account_move_line_obj = self.pool.get('account.move.line') @@ -169,7 +169,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory): context.update({'stop_reconcile': True}) account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id, period_id, journal_id, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} account_move_line_reconcile_writeoff() diff --git a/addons/account/wizard/account_reconcile_partner_process.py b/addons/account/wizard/account_reconcile_partner_process.py index 9f91d1ec2d2..7cfeff70891 100755 --- a/addons/account/wizard/account_reconcile_partner_process.py +++ b/addons/account/wizard/account_reconcile_partner_process.py @@ -83,7 +83,7 @@ class account_partner_reconcile_process(osv.osv_memory): res_partner_obj.write(cr, uid, partner_id[0], {'last_reconciliation_date': time.strftime('%Y-%m-%d')}, context) #TODO: we have to find a way to update the context of the current tab (we could open a new tab with the context but it's not really handy) #TODO: remove that comments when the client side dev is done - return {} + return {'type': 'ir.actions.act_window_close'} _columns = { 'to_reconcile': fields.float('Remaining Partners', readonly=True, help='This is the remaining partners for who you should check if there is something to reconcile or not. This figure already count the current partner as reconciled.'), diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py index 1c3743bf3c7..a72d58dd904 100755 --- a/addons/account/wizard/account_report_account_balance.py +++ b/addons/account/wizard/account_report_account_balance.py @@ -19,8 +19,6 @@ # ############################################################################## -from lxml import etree - from osv import osv class account_balance_report(osv.osv_memory): @@ -38,4 +36,4 @@ class account_balance_report(osv.osv_memory): account_balance_report() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py index 5cb5d52c413..59784e6e15d 100755 --- a/addons/account/wizard/account_report_aged_partner_balance.py +++ b/addons/account/wizard/account_report_aged_partner_balance.py @@ -22,8 +22,6 @@ import time from datetime import datetime from dateutil.relativedelta import relativedelta -from lxml import etree - from osv import osv, fields from tools.translate import _ diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py index 174c172fdaa..b69c6d65d71 100755 --- a/addons/account/wizard/account_report_balance_sheet.py +++ b/addons/account/wizard/account_report_balance_sheet.py @@ -19,8 +19,6 @@ # ############################################################################## -from lxml import etree - from osv import osv, fields from tools.translate import _ @@ -86,4 +84,4 @@ class account_bs_report(osv.osv_memory): account_bs_report() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py index 444d91fa8fd..c526550e789 100755 --- a/addons/account/wizard/account_report_profit_loss.py +++ b/addons/account/wizard/account_report_profit_loss.py @@ -19,8 +19,6 @@ # ############################################################################## -from lxml import etree - from osv import osv, fields class account_pl_report(osv.osv_memory): @@ -60,4 +58,4 @@ class account_pl_report(osv.osv_memory): account_pl_report() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py index 2a03a80aefa..81705771d67 100755 --- a/addons/account/wizard/account_state_open.py +++ b/addons/account/wizard/account_state_open.py @@ -37,7 +37,7 @@ class account_state_open(osv.osv_memory): raise osv.except_osv(_('Warning'), _('Invoice is already reconciled')) wf_service = netsvc.LocalService("workflow") res = wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr) - return {} + return {'type': 'ir.actions.act_window_close'} account_state_open() diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py index 3a067b4a598..0e6c38f9d7c 100755 --- a/addons/account/wizard/account_unreconcile.py +++ b/addons/account/wizard/account_unreconcile.py @@ -31,7 +31,7 @@ class account_unreconcile(osv.osv_memory): context = {} if context.get('active_ids', False): obj_move_line._remove_move_reconcile(cr, uid, context['active_ids'], context=context) - return {} + return {'type': 'ir.actions.act_window_close'} account_unreconcile() @@ -46,7 +46,7 @@ class account_unreconcile_reconcile(osv.osv_memory): rec_ids = context['active_ids'] if rec_ids: obj_move_reconcile.unlink(cr, uid, rec_ids, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} account_unreconcile_reconcile() diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py index f840d2b5532..ddcfa2c5353 100755 --- a/addons/account/wizard/account_validate_account_move.py +++ b/addons/account/wizard/account_validate_account_move.py @@ -38,7 +38,7 @@ class validate_account_move(osv.osv_memory): if not ids_move: raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period')) obj_move.button_validate(cr, uid, ids_move, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} validate_account_move() @@ -60,7 +60,7 @@ class validate_account_move_lines(osv.osv_memory): if not move_ids: raise osv.except_osv(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state')) obj_move.button_validate(cr, uid, move_ids, context) - return {} + return {'type': 'ir.actions.act_window_close'} validate_account_move_lines() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py index 0581197aaca..1cd3022f60b 100755 --- a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py +++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py @@ -53,7 +53,7 @@ class analytic_plan_create_model(osv.osv_memory): 'target': 'new', } else: - return {} + return {'type': 'ir.actions.act_window_close'} analytic_plan_create_model() diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py index 784dd9367c7..c37a93b4be4 100755 --- a/addons/account_anglo_saxon/invoice.py +++ b/addons/account_anglo_saxon/invoice.py @@ -21,7 +21,7 @@ # ############################################################################## -from osv import fields, osv +from osv import osv class account_invoice_line(osv.osv): _inherit = "account.invoice.line" diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml index 1fbcd82e86c..1d737d5ddd8 100755 --- a/addons/account_budget/security/account_budget_security.xml +++ b/addons/account_budget/security/account_budget_security.xml @@ -6,21 +6,21 @@ Budget post multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Budget multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Budget lines multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] diff --git a/addons/account_coda/security/account_security.xml b/addons/account_coda/security/account_security.xml index b8fdd32ebe6..3035c8e608b 100755 --- a/addons/account_coda/security/account_security.xml +++ b/addons/account_coda/security/account_security.xml @@ -5,7 +5,7 @@ Account Coda model company rule - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml index 5977ea36365..dcd2826a65f 100755 --- a/addons/account_payment/security/account_payment_security.xml +++ b/addons/account_payment/security/account_payment_security.xml @@ -10,7 +10,7 @@ Payment Mode company rule - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py index b8328aee333..eb0d8b21926 100755 --- a/addons/account_payment/wizard/account_payment_order.py +++ b/addons/account_payment/wizard/account_payment_order.py @@ -65,7 +65,7 @@ class payment_order_create(osv.osv_memory): data = self.read(cr, uid, ids, [], context=context)[0] line_ids = data['entries'] if not line_ids: - return {} + return {'type': 'ir.actions.act_window_close'} payment = order_obj.browse(cr, uid, context['active_id'], context=context) t = None @@ -90,7 +90,7 @@ class payment_order_create(osv.osv_memory): 'date': date_to_pay, 'currency': line.invoice and line.invoice.currency_id.id or False, }, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} def search_entries(self, cr, uid, ids, context=None): line_obj = self.pool.get('account.move.line') diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py index 6627ffaa614..ca9311b1f88 100755 --- a/addons/account_payment/wizard/account_payment_pay.py +++ b/addons/account_payment/wizard/account_payment_pay.py @@ -37,7 +37,7 @@ class account_payment_make_payment(osv.osv_memory): # obj_act = self.pool.get('ir.actions.act_window') # order = obj_payment_order.browse(cr, uid, context['active_id'], context) obj_payment_order.set_done(cr, uid, [context['active_id']], context) - return {} + return {'type': 'ir.actions.act_window_close'} # t = order.mode and order.mode.type.code or 'manual' # if t == 'manual': # obj_payment_order.set_done(cr,uid,context['active_id'],context) diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py index f99189a8444..340ab4bcb03 100755 --- a/addons/account_payment/wizard/account_payment_populate_statement.py +++ b/addons/account_payment/wizard/account_payment_populate_statement.py @@ -65,7 +65,7 @@ class account_payment_populate_statement(osv.osv_memory): data = self.read(cr, uid, ids, [], context=context)[0] line_ids = data['lines'] if not line_ids: - return {} + return {'type': 'ir.actions.act_window_close'} statement = statement_obj.browse(cr, uid, context['active_id'], context=context) diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py index cef854aa953..06511c9a118 100755 --- a/addons/account_voucher/report/account_voucher_sales_receipt.py +++ b/addons/account_voucher/report/account_voucher_sales_receipt.py @@ -17,11 +17,8 @@ # along with this program. If not, see . # ############################################################################## -import time from osv import fields, osv -import pooler -from tools import config import tools class sale_receipt_report(osv.osv): diff --git a/addons/account_voucher/security/account_voucher_security.xml b/addons/account_voucher/security/account_voucher_security.xml index df4e58484b5..d368ab858ed 100755 --- a/addons/account_voucher/security/account_voucher_security.xml +++ b/addons/account_voucher/security/account_voucher_security.xml @@ -5,13 +5,13 @@ Voucher multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Voucher Line multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py index a75513b02fc..f3ce59f7b0b 100755 --- a/addons/account_voucher/wizard/account_statement_from_invoice.py +++ b/addons/account_voucher/wizard/account_statement_from_invoice.py @@ -39,11 +39,11 @@ class account_statement_from_invoice_lines(osv.osv_memory): context = {} statement_id = context.get('statement_id', False) if not statement_id: - return {} + return {'type': 'ir.actions.act_window_close'} data = self.read(cr, uid, ids, context=context)[0] line_ids = data['line_ids'] if not line_ids: - return {} + return {'type': 'ir.actions.act_window_close'} line_obj = self.pool.get('account.move.line') statement_obj = self.pool.get('account.bank.statement') @@ -115,7 +115,7 @@ class account_statement_from_invoice_lines(osv.osv_memory): 'voucher_id': voucher_id, 'date': time.strftime('%Y-%m-%d'), #time.strftime('%Y-%m-%d'), #line.date_maturity or, }, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} account_statement_from_invoice_lines() diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py index 2bfdfd1ecf8..42a9e1c5ec2 100755 --- a/addons/account_voucher/wizard/account_voucher_unreconcile.py +++ b/addons/account_voucher/wizard/account_voucher_unreconcile.py @@ -55,7 +55,7 @@ class account_voucher_unreconcile(osv.osv_memory): # wf_service = netsvc.LocalService("workflow") # wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr) - return {} + return {'type': 'ir.actions.act_window_close'} account_voucher_unreconcile() diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml index dfa8c840bb6..58a687fee1b 100755 --- a/addons/analytic/security/analytic_security.xml +++ b/addons/analytic/security/analytic_security.xml @@ -5,7 +5,7 @@ Analytic multi company rule - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Useability / Analytic Accounting diff --git a/addons/auction/wizard/auction_aie_send.py b/addons/auction/wizard/auction_aie_send.py index 7c904cf850b..1caec13b852 100755 --- a/addons/auction/wizard/auction_aie_send.py +++ b/addons/auction/wizard/auction_aie_send.py @@ -220,7 +220,7 @@ class auction_lots_send_aie(osv.osv_memory): def send_pdf(self, cr, uid, ids, context=None): threaded_calculation = threading.Thread(target=self._send, args=(cr, uid, ids, context)) threaded_calculation.start() - return {} + return {'type': 'ir.actions.act_window_close'} auction_lots_send_aie() diff --git a/addons/auction/wizard/auction_aie_send_result.py b/addons/auction/wizard/auction_aie_send_result.py index 5b2b4eca7fd..d6102dd0522 100755 --- a/addons/auction/wizard/auction_aie_send_result.py +++ b/addons/auction/wizard/auction_aie_send_result.py @@ -137,7 +137,7 @@ class auction_lots_pay(osv.osv_memory): lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context['active_ids'], ['obj_num','obj_price']) args = pickle.dumps(lots) self._catalog_send(datas['uname'], datas['password'], datas['dates'], args) - return {} + return {'type': 'ir.actions.act_window_close'} auction_lots_pay() diff --git a/addons/auction/wizard/auction_lots_able.py b/addons/auction/wizard/auction_lots_able.py index 369d762727a..8604d691456 100755 --- a/addons/auction/wizard/auction_lots_able.py +++ b/addons/auction/wizard/auction_lots_able.py @@ -41,6 +41,6 @@ class auction_lots_able(osv.osv_memory): if context is None: context = {} self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'ach_emp':True}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_lots_able() diff --git a/addons/auction/wizard/auction_lots_auction_move.py b/addons/auction/wizard/auction_lots_auction_move.py index 97330f922fe..cc698887afd 100755 --- a/addons/auction/wizard/auction_lots_auction_move.py +++ b/addons/auction/wizard/auction_lots_auction_move.py @@ -52,7 +52,7 @@ class auction_lots_auction_move(osv.osv_memory): rec_ids = auction_lots_obj.browse(cr, uid, context.get('active_ids', [])) for current in self.browse(cr, uid, ids, context=context): if not (current.auction_id and len(context.get('active_ids', []))): - return {} + return {'type': 'ir.actions.act_window_close'} for rec in rec_ids: new_id = auction_lot_history_obj.create(cr, uid, { @@ -70,7 +70,7 @@ class auction_lots_auction_move(osv.osv_memory): 'sel_inv_id': None, 'obj_num': None, 'state': 'draft'}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_lots_auction_move() diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py index e50f11fd1ec..436d51a66c7 100755 --- a/addons/auction/wizard/auction_lots_buyer_map.py +++ b/addons/auction/wizard/auction_lots_buyer_map.py @@ -90,7 +90,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory): for lots in lots_obj.browse(cr, uid, rec_ids, context=context): if lots.ach_login == current.ach_login: lots_obj.write(cr, uid, [lots.id], {'ach_uid': current.ach_uid.id}, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): diff --git a/addons/auction/wizard/auction_lots_cancel.py b/addons/auction/wizard/auction_lots_cancel.py index 62313315bd9..3974241a071 100755 --- a/addons/auction/wizard/auction_lots_cancel.py +++ b/addons/auction/wizard/auction_lots_cancel.py @@ -49,7 +49,7 @@ class auction_lots_cancel(osv.osv): supplier_refund_inv_id = invoice_obj.refund(cr, uid, [lot.ach_inv_id.id]) if lot.sel_inv_id: customer_refund_inv_id = invoice_obj.refund(cr, uid, [lot.sel_inv_id.id]) - return {} + return {'type': 'ir.actions.act_window_close'} _columns = { } diff --git a/addons/auction/wizard/auction_lots_enable.py b/addons/auction/wizard/auction_lots_enable.py index ed6b8950d2e..290664ba697 100755 --- a/addons/auction/wizard/auction_lots_enable.py +++ b/addons/auction/wizard/auction_lots_enable.py @@ -38,6 +38,6 @@ class auction_lots_enable(osv.osv_memory): if context is None: context = {} self.pool.get('auction.lots').write(cr, uid, context.get('active_id',False), {'ach_emp':False}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_lots_enable() diff --git a/addons/auction/wizard/auction_lots_numerotate.py b/addons/auction/wizard/auction_lots_numerotate.py index 0712e21565e..22bdac5a67f 100755 --- a/addons/auction/wizard/auction_lots_numerotate.py +++ b/addons/auction/wizard/auction_lots_numerotate.py @@ -178,7 +178,7 @@ class auction_lots_numerotate(osv.osv_memory): for rec_id in rec_ids: lots_obj.write(cr, uid, [rec_id.id], {'obj_num':nbr}) nbr+=1 - return {} + return {'type': 'ir.actions.act_window_close'} auction_lots_numerotate() diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py index dfad93dc759..b914dd1c643 100755 --- a/addons/auction/wizard/auction_pay_buy.py +++ b/addons/auction/wizard/auction_pay_buy.py @@ -100,7 +100,7 @@ class auction_pay_buy(osv.osv_memory): }) for lot in lots: lot_obj.write(cr, uid, [lot.id], {'statement_id':[(4, new_id)]}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_pay_buy() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py index 7265a4e7f98..77484bbe988 100755 --- a/addons/auction/wizard/auction_pay_sel.py +++ b/addons/auction/wizard/auction_pay_sel.py @@ -52,6 +52,6 @@ class auction_pay_sel(osv.osv_memory): journal_id = datas.get('journal_id', False) if lot.sel_inv_id: p = invoice_obj.pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context) - return {} + return {'type': 'ir.actions.act_window_close'} auction_pay_sel() diff --git a/addons/auction/wizard/auction_payer_sel.py b/addons/auction/wizard/auction_payer_sel.py index 808826cfc23..8ad2f5ca019 100755 --- a/addons/auction/wizard/auction_payer_sel.py +++ b/addons/auction/wizard/auction_payer_sel.py @@ -29,7 +29,7 @@ class auction_payer(osv.osv_memory): if context is None: context = {} self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'is_ok':True, 'state':'paid'}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_payer() @@ -50,7 +50,7 @@ class auction_payer_sel(osv.osv_memory): if context is None: context = {} self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'paid_vnd':True}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_payer_sel() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auction/wizard/auction_transfer_unsold_object.py b/addons/auction/wizard/auction_transfer_unsold_object.py index 8bc0cb8cb5b..f593a36de2e 100755 --- a/addons/auction/wizard/auction_transfer_unsold_object.py +++ b/addons/auction/wizard/auction_transfer_unsold_object.py @@ -82,6 +82,6 @@ class auction_transfer_unsold_object(osv.osv): 'ach_inv_id':None, 'sel_inv_id':None, 'state':'draft'}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_transfer_unsold_object() \ No newline at end of file diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py index b744a10b3d9..2f769246bcf 100755 --- a/addons/audittrail/audittrail.py +++ b/addons/audittrail/audittrail.py @@ -20,7 +20,7 @@ ############################################################################## from osv import fields, osv -from osv.osv import osv_pool +from osv.osv import osv_pool, object_proxy from tools.translate import _ import ir import pooler @@ -184,7 +184,7 @@ class audittrail_log_line(osv.osv): audittrail_log_line() -class audittrail_objects_proxy(osv_pool): +class audittrail_objects_proxy(object_proxy): """ Uses Object proxy for auditing changes on object of subscribed Rules""" def get_value_text(self, cr, uid, field_name, values, model, context=None): diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 0e57c7cfb66..301780282e7 100755 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1150,8 +1150,9 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ ('weekly', 'Weeks'), ('monthly', 'Months'), ('yearly', 'Years'), ], 'Frequency'), - - 'interval': fields.integer('Interval', help="Repeat every (Days/Week/Month/Year)"), + + 'end_type' : fields.selection([('forever', 'Forever'), ('count', 'Fix amout of times'), ('end_date','End date')], 'Way to end reccurency'), + 'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"), 'count': fields.integer('Repeat', help="Repeat x times"), 'mo': fields.boolean('Mon'), 'tu': fields.boolean('Tue'), @@ -1189,6 +1190,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ return res _defaults = { + 'end_type' : 'forever', 'state': 'tentative', 'class': 'public', 'show_as': 'busy', diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index d7e949b6d06..6fcb8f72f82 100755 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -1,8 +1,7 @@ - - + calendar.attendee.form @@ -348,18 +347,21 @@ - @@ -379,13 +381,13 @@ - + + attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')], + 'invisible' : ['|', ('select1','=','day'), ('rrule_type','!=','monthly')]}" /> + attrs="{'invisible' : ['|', ('select1','=','date'), ('rrule_type','!=','monthly')]}"> ','Not Equals')) - return {} + return {'type': 'ir.actions.act_window_close'} class set_filter_fields(wizard.interface): states = { diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py index 9d39bba8a61..88f4d9d5a81 100755 --- a/addons/base_report_designer/__openerp__.py +++ b/addons/base_report_designer/__openerp__.py @@ -36,8 +36,7 @@ upload the report using the same wizard. 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base'], - 'init_xml': ['security/base_report_security.xml', - 'wizard/base_report_design_view.xml'], + 'init_xml': ['wizard/base_report_design_view.xml'], 'update_xml': ['base_report_designer_installer.xml'], 'demo_xml': [], 'installable': True, diff --git a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py index 77314929269..4819007f1d0 100755 --- a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py +++ b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py @@ -344,7 +344,6 @@ if __name__ == "__main__": parser.error("incorrect number of arguments") import sys - import StringIO fname = sys.argv[1] f = fname diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/plugin/openerp_report_designer.zip index 50524b2e60d..47ca560e47d 100755 Binary files a/addons/base_report_designer/plugin/openerp_report_designer.zip and b/addons/base_report_designer/plugin/openerp_report_designer.zip differ diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py index 123be9b9bc2..3cf759e7ada 100755 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py @@ -140,28 +140,16 @@ class ServerParameter( unohelper.Base, XJobExecutor ): ErrorDialog("Connection Refuse...","Please enter valid Login/Password") self.win.endExecute() try: - - ids = self.sock.execute(sDatabase,UID,sPassword, 'res.groups' , 'search', [('name','=','OpenOfficeReportDesigner')]) ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')]) - dict_groups =self.sock.execute(sDatabase, UID,sPassword, 'res.groups' , 'read',ids,['users']) except : import traceback,sys info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback)) self.logobj.log_write('ServerParameter', LOG_ERROR, info) - if not len(ids) : - ErrorDialog("Group Not Found!!! Create a group named \n\n"'"OpenOfficeReportDesigner"'" \n\n ","","Group Name Error") - self.logobj.log_write('Group Error',LOG_WARNING, ':Create a group OpenOfficeReportDesigner using database %s' % (sDatabase)) - self.win.endExecute() if not len(ids_module): ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error") self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in database %s' % (sDatabase)) self.win.endExecute() - - if UID not in dict_groups[0]['users']: - ErrorDialog("Connection Refuse...","You have not access these Report Designer") - self.logobj.log_write('Connection Refuse',LOG_WARNING, " Not Access Report Designer ") - self.win.endExecute() else: desktop=getDesktop() doc = desktop.getCurrentComponent() diff --git a/addons/base_report_designer/security/base_report_security.xml b/addons/base_report_designer/security/base_report_security.xml deleted file mode 100755 index bd3854ebdba..00000000000 --- a/addons/base_report_designer/security/base_report_security.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py index c7478801598..f5c8c8d09a6 100755 --- a/addons/base_setup/todo.py +++ b/addons/base_setup/todo.py @@ -171,7 +171,7 @@ class res_currency(osv.osv): if isinstance(ids, (int, long)): ids = [ids] reads = self.read(cr, uid, ids, ['name','symbol'], context, load='_classic_write') - return [(x['id'], tools.ustr(x['name']) + ' (' + tools.ustr(x['symbol']) + ')') for x in reads] + return [(x['id'], tools.ustr(x['name']) + (x['symbol'] and (' (' + tools.ustr(x['symbol']) + ')') or '')) for x in reads] res_currency() diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv index 1b0abd337c7..1909601eb00 100755 --- a/addons/board/security/ir.model.access.csv +++ b/addons/board/security/ir.model.access.csv @@ -4,5 +4,6 @@ "access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1 "access_board_note","board.note","model_board_note","base.group_user",1,1,1,1 "access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1 +"access_res_log_report","res.log.report","model_res_log_report","base.group_user",1,1,1,1 "access_res_log_report_system","res.log.report system","model_res_log_report",base.group_system,1,0,0,0 "access_res_log_report_erp_manager","res.log.report erp_manager","model_res_log_report",base.group_erp_manager,1,0,0,0 diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py index 2b688962265..10d4d80a7f3 100755 --- a/addons/board/wizard/board_menu_create.py +++ b/addons/board/wizard/board_menu_create.py @@ -78,7 +78,7 @@ class board_menu_create(osv.osv_memory): 'action': 'ir.actions.act_window,' + str(action_id) }, context=context) #End Loop - return {} + return {'type': 'ir.actions.act_window_close'} _name = "board.menu.create" _description = "Menu Create" diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index fc2b38dcfb1..f8cf6b39930 100755 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -125,7 +125,7 @@ class crm_lead(crm_case, osv.osv): 'channel_id': fields.many2one('res.partner.canal', 'Channel'), 'contact_name': fields.char('Contact Name', size=64), - 'partner_name': fields.char("Customer Name", size=64), + 'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the into opportunity'), 'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."), 'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."), 'type':fields.selection([ diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 20d8bbfbe31..f5e960dc0d4 100755 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -57,8 +57,8 @@ help="Convert to Opportunity" icon="gtk-go-forward" type="object"/> - +