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 @@ - +