From 8233a57725615846c87cc11ecc4eaaca3a8e0eff Mon Sep 17 00:00:00 2001 From: "ATP (Open ERP)" <> Date: Wed, 10 Mar 2010 19:11:56 +0530 Subject: [PATCH] [IMP]: auction: Converted wizards to osv_memory wizards bzr revid: rpa@tinyerp.com-20100310134156-965ifa1c3qo9i0a9 --- addons/auction/__terp__.py | 10 ++ addons/auction/auction.py | 8 +- addons/auction/auction_view.xml | 9 +- addons/auction/auction_wizard.xml | 88 +--------- addons/auction/wizard/__init__.py | 41 ++--- addons/auction/wizard/auction_lots_able.py | 44 +++++ .../auction/wizard/auction_lots_able_view.xml | 43 +++++ .../wizard/auction_lots_auction_move.py | 84 ++++++++++ .../wizard/auction_lots_auction_move_view.xml | 45 ++++++ addons/auction/wizard/auction_lots_enable.py | 47 ++++++ .../wizard/auction_lots_enable_view.xml | 45 ++++++ .../wizard/auction_lots_make_invoice.py | 93 +++++++++++ .../wizard/auction_lots_make_invoice_buyer.py | 109 +++++++++++++ .../auction_lots_make_invoice_buyer_view.xml | 49 ++++++ .../wizard/auction_lots_make_invoice_view.xml | 45 ++++++ .../auction/wizard/auction_lots_sms_send.py | 67 ++++++++ .../wizard/auction_lots_sms_send_view.xml | 49 ++++++ addons/auction/wizard/auction_pay_buy.py | 105 ++++++++++++ .../auction/wizard/auction_pay_buy_view.xml | 51 ++++++ addons/auction/wizard/auction_pay_sel.py | 51 ++++++ .../auction/wizard/auction_pay_sel_view.xml | 35 ++++ ...ard_able_taken.py => auction_payer_sel.py} | 65 ++++---- .../auction/wizard/auction_payer_sel_view.xml | 55 +++++++ addons/auction/wizard/auction_taken.py | 57 +++++++ addons/auction/wizard/auction_taken_view.xml | 42 +++++ .../wizard/auction_wizard_enable_taken.py | 61 ------- .../wizard/wizard_auction_invoice_buyer.py | 111 ------------- .../auction/wizard/wizard_auction_journal.py | 105 ------------ addons/auction/wizard/wizard_emporte.py | 73 --------- addons/auction/wizard/wizard_lot_date_move.py | 96 ----------- addons/auction/wizard/wizard_lots_pay.py | 103 ------------ addons/auction/wizard/wizard_lots_sms.py | 150 ------------------ addons/auction/wizard/wizard_pay.py | 109 ------------- addons/auction/wizard/wizard_payer.py | 79 --------- 34 files changed, 1192 insertions(+), 1032 deletions(-) create mode 100644 addons/auction/wizard/auction_lots_able.py create mode 100644 addons/auction/wizard/auction_lots_able_view.xml create mode 100644 addons/auction/wizard/auction_lots_auction_move.py create mode 100644 addons/auction/wizard/auction_lots_auction_move_view.xml create mode 100644 addons/auction/wizard/auction_lots_enable.py create mode 100644 addons/auction/wizard/auction_lots_enable_view.xml create mode 100644 addons/auction/wizard/auction_lots_make_invoice.py create mode 100644 addons/auction/wizard/auction_lots_make_invoice_buyer.py create mode 100644 addons/auction/wizard/auction_lots_make_invoice_buyer_view.xml create mode 100644 addons/auction/wizard/auction_lots_make_invoice_view.xml create mode 100644 addons/auction/wizard/auction_lots_sms_send.py create mode 100644 addons/auction/wizard/auction_lots_sms_send_view.xml create mode 100644 addons/auction/wizard/auction_pay_buy.py create mode 100644 addons/auction/wizard/auction_pay_buy_view.xml create mode 100644 addons/auction/wizard/auction_pay_sel.py create mode 100644 addons/auction/wizard/auction_pay_sel_view.xml rename addons/auction/wizard/{auction_wizard_able_taken.py => auction_payer_sel.py} (51%) create mode 100644 addons/auction/wizard/auction_payer_sel_view.xml create mode 100644 addons/auction/wizard/auction_taken.py create mode 100644 addons/auction/wizard/auction_taken_view.xml delete mode 100644 addons/auction/wizard/auction_wizard_enable_taken.py delete mode 100644 addons/auction/wizard/wizard_auction_invoice_buyer.py delete mode 100644 addons/auction/wizard/wizard_auction_journal.py delete mode 100644 addons/auction/wizard/wizard_emporte.py delete mode 100644 addons/auction/wizard/wizard_lot_date_move.py delete mode 100644 addons/auction/wizard/wizard_lots_pay.py delete mode 100644 addons/auction/wizard/wizard_lots_sms.py delete mode 100644 addons/auction/wizard/wizard_pay.py delete mode 100644 addons/auction/wizard/wizard_payer.py diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py index 83064640266..c3f9058f070 100644 --- a/addons/auction/__terp__.py +++ b/addons/auction/__terp__.py @@ -34,6 +34,16 @@ 'init_xml': ['auction_sequence.xml'], 'update_xml': [ 'security/ir.model.access.csv', + 'wizard/auction_lots_able_view.xml', + 'wizard/auction_lots_enable_view.xml', + 'wizard/auction_lots_make_invoice_buyer_view.xml', + 'wizard/auction_lots_make_invoice_view.xml', + 'wizard/auction_taken_view.xml', + 'wizard/auction_lots_auction_move_view.xml', + 'wizard/auction_pay_buy_view.xml', + 'wizard/auction_payer_sel_view.xml', + 'wizard/auction_lots_sms_send_view.xml', + 'auction_view.xml', 'auction_report.xml', 'auction_wizard.xml' diff --git a/addons/auction/auction.py b/addons/auction/auction.py index 0ece4690d9f..979f2c6cf42 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -478,13 +478,15 @@ class auction_lots(osv.osv): result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name','obj_num'])] return result - def name_search(self, cr, user, name, args=[], operator='ilike', context={}): + def name_search(self, cr, user, name, args=None, operator='ilike', context={}): + if not args: + args = [] try: - ids = self.search(cr, user, [('obj_num','=',int(name))]+ args) + ids = self.search(cr, user, [('obj_num','=',int(name))] + args) except: ids = [] if not ids: - ids = self.search(cr, user, [('name',operator,name)]+ args) + ids = self.search(cr, user, [('name',operator,name)] + args) return self.name_get(cr, user, ids) def _sum_taxes_by_type_and_id(self, taxes): diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 2189253f3ce..ee1004ab0f3 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -3,7 +3,8 @@ - + + ======================================================= Auction Management/Configuration/artist ======================================================= @@ -203,6 +204,7 @@ + @@ -277,7 +279,7 @@ - +