From be21d83942867eb922defde59cbd66763b7d904e Mon Sep 17 00:00:00 2001 From: "ksa (Open ERP)" Date: Wed, 25 Aug 2010 17:06:24 +0530 Subject: [PATCH] [IMP]: convert in osv memory wizard bzr revid: ksa@tinyerp.co.in-20100825113624-6ah0xc54mjr5e10n --- bin/addons/base/__openerp__.py | 6 +- .../base/res/partner/partner_wizard.xml | 7 -- .../base/res/partner/wizard/__init__.py | 6 +- ...zard_clear_ids.py => partner_clear_ids.py} | 46 +++++---- .../partner/wizard/partner_clear_ids_view.xml | 32 ++++++ .../wizard/partner_wizard_ean_check.py | 77 +++++++++++++++ .../wizard/partner_wizard_ean_check_view.xml | 32 ++++++ .../res/partner/wizard/partner_wizard_spam.py | 72 ++++++++++++++ .../wizard/partner_wizard_spam_view.xml | 34 +++++++ .../res/partner/wizard/wizard_ean_check.py | 98 ------------------- .../base/res/partner/wizard/wizard_spam.py | 75 -------------- 11 files changed, 283 insertions(+), 202 deletions(-) delete mode 100644 bin/addons/base/res/partner/partner_wizard.xml rename bin/addons/base/res/partner/wizard/{wizard_clear_ids.py => partner_clear_ids.py} (52%) create mode 100644 bin/addons/base/res/partner/wizard/partner_clear_ids_view.xml create mode 100644 bin/addons/base/res/partner/wizard/partner_wizard_ean_check.py create mode 100644 bin/addons/base/res/partner/wizard/partner_wizard_ean_check_view.xml create mode 100644 bin/addons/base/res/partner/wizard/partner_wizard_spam.py create mode 100644 bin/addons/base/res/partner/wizard/partner_wizard_spam_view.xml delete mode 100644 bin/addons/base/res/partner/wizard/wizard_ean_check.py delete mode 100644 bin/addons/base/res/partner/wizard/wizard_spam.py diff --git a/bin/addons/base/__openerp__.py b/bin/addons/base/__openerp__.py index c56bf67a90c..446461323aa 100644 --- a/bin/addons/base/__openerp__.py +++ b/bin/addons/base/__openerp__.py @@ -53,12 +53,14 @@ 'res/res_log_view.xml', 'res/partner/partner_report.xml', 'res/partner/partner_view.xml', - 'res/partner/partner_wizard.xml', 'res/bank_view.xml', 'res/country_view.xml', - 'res/res_currency_view.xml', + 'res/res_currency_view.xml', 'res/partner/crm_view.xml', 'res/partner/wizard/partner_sms_send_view.xml', + 'res/partner/wizard/partner_wizard_spam_view.xml', + 'res/partner/wizard/partner_clear_ids_view.xml', +# 'res/partner/wizard/partner_wizard_ean_check_view.xml', 'res/partner/partner_data.xml', 'res/ir_property_view.xml', 'security/base_security.xml', diff --git a/bin/addons/base/res/partner/partner_wizard.xml b/bin/addons/base/res/partner/partner_wizard.xml deleted file mode 100644 index cc62aa9c7bc..00000000000 --- a/bin/addons/base/res/partner/partner_wizard.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bin/addons/base/res/partner/wizard/__init__.py b/bin/addons/base/res/partner/wizard/__init__.py index f1a85740bf4..65869c366c4 100644 --- a/bin/addons/base/res/partner/wizard/__init__.py +++ b/bin/addons/base/res/partner/wizard/__init__.py @@ -19,10 +19,10 @@ # ############################################################################## -import wizard_spam -import wizard_clear_ids -import wizard_ean_check import partner_sms_send +import partner_wizard_spam +import partner_clear_ids +import partner_wizard_ean_check # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/bin/addons/base/res/partner/wizard/wizard_clear_ids.py b/bin/addons/base/res/partner/wizard/partner_clear_ids.py similarity index 52% rename from bin/addons/base/res/partner/wizard/wizard_clear_ids.py rename to bin/addons/base/res/partner/wizard/partner_clear_ids.py index 083380905f9..880dbaed040 100644 --- a/bin/addons/base/res/partner/wizard/wizard_clear_ids.py +++ b/bin/addons/base/res/partner/wizard/partner_clear_ids.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). +# 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 @@ -15,26 +15,38 @@ # 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 . # ############################################################################## -import wizard import netsvc +from osv import fields, osv -class wizard_clear_ids(wizard.interface): - def _clear_ids(self, cr, uid, data, context): - service = netsvc.LocalService("object_proxy") - service.execute(cr.dbname, uid, 'res.partner', 'write', data['ids'], {'ref': False}) - return {} - - states = { - 'init': { - 'actions': [_clear_ids], - 'result': {'type':'state', 'state':'end'} - } - } -wizard_clear_ids('res.partner.clear_ids') +class partner_clear_ids(osv.osv_memory): + """ Clear IDs """ + + _name = "partner.clear.ids" + _description = "Clear IDs" + + def clear_ids(self, cr, uid, ids, context): + """ + Clear Ids + + @param cr: the current row, from the database cursor. + @param uid: the current user’s ID for security checks. + @param ids: the ID or list of IDs + @param context: A standard dictionary + """ + + partner_pool = self.pool.get('res.partner') + active_ids = context and context.get('active_ids', []) + res = {} + for partner in partner_pool.browse(cr, uid, active_ids, context=context): + if active_ids in partner: + res.update({'ref': False}) + return res + +partner_clear_ids() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/bin/addons/base/res/partner/wizard/partner_clear_ids_view.xml b/bin/addons/base/res/partner/wizard/partner_clear_ids_view.xml new file mode 100644 index 00000000000..5bc5d747de2 --- /dev/null +++ b/bin/addons/base/res/partner/wizard/partner_clear_ids_view.xml @@ -0,0 +1,32 @@ + + + + + + Clear IDs + partner.clear.ids + form + +
+