From 39d1e4b55b7f77e0fbdd162b0576e8f362dc93da Mon Sep 17 00:00:00 2001 From: Harshad Modi Date: Mon, 15 Sep 2008 14:21:52 +0530 Subject: [PATCH] merge rpa branch bzr revid: hmo@tinyerp.com-20080915085152-gd53rsx0txlqxdbn --- addons/association_vertical/aso_data.xml | 14 +- .../aso_vertical_view.xml | 31 ++-- addons/association_vertical/crm_fund_demo.xml | 19 +-- addons/auction/auction.py | 21 +-- addons/auction/auction_view.xml | 150 +++++++++--------- addons/auction/auction_wizard.xml | 9 +- addons/auction/report/artists_lots.py | 2 - addons/auction/report/auction_objects.py | 6 - addons/auction/report/auction_total_rml.py | 7 - addons/auction/report/buyer_form_report.py | 10 -- addons/auction/report/buyer_list.py | 1 - addons/auction/report/catalog2.py | 13 +- addons/auction/report/lots_list.py | 2 - addons/auction/report/lots_list_inventory.py | 2 - addons/auction/report/seller_form_report.py | 12 -- .../auction/wizard/auction_catalog_flagey.py | 1 - addons/auction/wizard/wizard_aie_send.py | 16 +- .../wizard/wizard_auction_invoice_buyer.py | 2 - addons/auction/wizard/wizard_emporte.py | 4 +- addons/auction/wizard/wizard_lots_cancel.py | 1 - addons/auction/wizard/wizard_pay.py | 3 + .../wizard/wizard_transfer_unsold_object.py | 2 - addons/crm_configuration/__terp__.py | 42 ++--- addons/crm_configuration/crm_config.py | 44 ++++- addons/crm_configuration/crm_config_view.xml | 46 ++++++ addons/crm_configuration/crm_jobs_demo.xml | 6 +- addons/crm_configuration/crm_meeting_demo.xml | 58 +++---- .../crm_opportunity_demo.xml | 14 +- addons/event/__terp__.py | 2 +- addons/hr_holidays/hr.py | 29 +++- addons/hr_holidays/hr_view.xml | 6 + addons/mrp/mrp.py | 5 +- addons/purchase/stock.py | 2 +- addons/report_stock/report_stock.py | 31 ++++ addons/report_stock/report_stock_view.xml | 30 +++- addons/sale/stock.py | 3 +- addons/sale/stock_view.xml | 1 + addons/stock/stock.py | 10 +- addons/stock/stock_view.xml | 1 + 39 files changed, 402 insertions(+), 256 deletions(-) create mode 100644 addons/crm_configuration/crm_config_view.xml diff --git a/addons/association_vertical/aso_data.xml b/addons/association_vertical/aso_data.xml index b240e19d26a..a09c33029b6 100644 --- a/addons/association_vertical/aso_data.xml +++ b/addons/association_vertical/aso_data.xml @@ -2,25 +2,25 @@ diff --git a/addons/association_vertical/aso_vertical_view.xml b/addons/association_vertical/aso_vertical_view.xml index 76c8535262a..cb810f113d1 100644 --- a/addons/association_vertical/aso_vertical_view.xml +++ b/addons/association_vertical/aso_vertical_view.xml @@ -6,22 +6,33 @@ - + - + - - - - - - - + + diff --git a/addons/association_vertical/crm_fund_demo.xml b/addons/association_vertical/crm_fund_demo.xml index b8df8c882d0..e5f1a83e6ae 100644 --- a/addons/association_vertical/crm_fund_demo.xml +++ b/addons/association_vertical/crm_fund_demo.xml @@ -51,8 +51,9 @@ - - + + + Funds crm.case @@ -72,7 +73,7 @@ - + @@ -100,7 +101,7 @@ - + My Funds Waiting Validation @@ -127,7 +128,7 @@ - + My Funds To Be Processed @@ -154,7 +155,7 @@ - + @@ -182,7 +183,7 @@ - + All Funds Waiting Validation @@ -209,7 +210,7 @@ - + All Funds To Be Processed @@ -236,7 +237,7 @@ - + diff --git a/addons/auction/auction.py b/addons/auction/auction.py index d01165954fb..4b8135f3ba8 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -92,7 +92,6 @@ class auction_dates(osv.osv): _order = "auction1 desc" def close(self, cr, uid, ids, *args): - print "GGGGGGGGGGGGGGGggg" """ Close an auction date. @@ -107,13 +106,11 @@ class auction_dates(osv.osv): ach_uids = {} cr.execute('select id from auction_lots where auction_id in ('+','.join(map(str,ids))+') and state=%s and obj_price>0', ('draft',)) r=self.pool.get('auction.lots').lots_invoice(cr, uid, [x[0] for x in cr.fetchall()],{},None) - print "RRRRRRRRRRRRRRRRrrrr",r cr.execute('select id from auction_lots where auction_id in ('+','.join(map(str,ids))+') and obj_price>0') ids2 = [x[0] for x in cr.fetchall()] # for auction in auction_ids: c=self.pool.get('auction.lots').seller_trans_create(cr, uid, ids2,{}) self.write(cr, uid, ids, {'state':'closed'}) #close the auction - print "jjjjjjjjjjjjjjjj" return True auction_dates() @@ -443,7 +440,7 @@ class auction_lots(osv.osv): 'ach_login': fields.char('Buyer Username',size=64), 'ach_uid': fields.many2one('res.partner', 'Buyer'), 'ach_emp': fields.boolean('Taken Away'), - 'is_ok': fields.boolean('Buyer s payment'), + 'is_ok': fields.boolean('Buyer\'s payment'), 'ach_inv_id': fields.many2one('account.invoice','Buyer Invoice', readonly=True, states={'draft':[('readonly',False)]}), 'sel_inv_id': fields.many2one('account.invoice','Seller Invoice', readonly=True, states={'draft':[('readonly',False)]}), 'vnd_lim': fields.float('Seller limit'), @@ -644,6 +641,8 @@ class auction_lots(osv.osv): res = self.pool.get('res.partner').address_get(cr, uid, [partner_ref], ['contact', 'invoice']) contact_addr_id = res['contact'] invoice_addr_id = res['invoice'] + if not invoice_addr_id: + raise orm.except_orm('No Invoice Address', 'The Buyer "%s" has no Invoice Address.' % (contact_addr_id,)) inv = { 'name': 'Auction proforma:' +lot.name, 'journal_id': lot.auction_id.journal_id.id, @@ -756,9 +755,7 @@ class auction_lots(osv.osv): dt = time.strftime('%Y-%m-%d') inv_ref=self.pool.get('account.invoice') invoices={} - print "KKKKKKKKKKKKKKKKK" for lot in self.browse(cr, uid, ids,context): - print "LLLLLLLLLLLLLLLL" # partner_ref = lot.ach_uid.id if not lot.auction_id.id: continue @@ -768,6 +765,9 @@ class auction_lots(osv.osv): if (lot.auction_id.id,lot.ach_uid.id) in invoices: inv_id = invoices[(lot.auction_id.id,lot.ach_uid.id)] else: + add = partner_r.read(cr, uid, [lot.ach_uid.id], ['address'])[0]['address'] + if not len(add): + raise orm.except_orm('Missed Address !', 'The Buyer has no Invoice Address.') price = lot.obj_price or 0.0 lot_name =lot.obj_num inv={ @@ -776,13 +776,13 @@ class auction_lots(osv.osv): 'journal_id': lot.auction_id.journal_id.id, 'partner_id': lot.ach_uid.id, 'type': 'out_invoice', + } if invoice_number: inv['number'] = invoice_number inv.update(inv_ref.onchange_partner_id(cr,uid, [], 'out_invoice', lot.ach_uid.id)['value']) #inv['account_id'] = inv['account_id'] and inv['account_id'][0] inv_id = inv_ref.create(cr, uid, inv, context) - print "IN>>>>>>>>>>>>ID",inv_id invoices[(lot.auction_id.id,lot.ach_uid.id)] = inv_id self.write(cr,uid,[lot.id],{'ach_inv_id':inv_id,'state':'sold'}) #calcul des taxes @@ -848,7 +848,10 @@ class auction_bid(osv.osv): if not partner_id: return {'value': {'contact_tel':False}} contact = self.pool.get('res.partner').browse(cr, uid, partner_id) - v_contact=contact.address[0] and contact.address[0].phone or False + if len(contact.address): + v_contact=contact.address[0] and contact.address[0].phone + else: + v_contact = False return {'value': {'contact_tel': v_contact}} auction_bid() @@ -876,7 +879,6 @@ class auction_bid_lines(osv.osv): # lots=self.browse(cr,uid,ids) # for lot in lots: # res[lot.id] = lot.lot_id.auction_id.name -# print lot.lot_id.auction_id.name # return res _columns = { 'name': fields.char('Bid date',size=64), @@ -1026,6 +1028,7 @@ class report_seller_auction2(osv.osv): _name = "report.seller.auction2" _description = "Auction Reporting on seller view2" _auto = False + _rec_name = 'date' _columns = { 'seller': fields.many2one('res.partner','Seller',readonly=True, select=1), 'auction': fields.many2one('auction.dates', 'Auction date',readonly=True, select=1), diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index ea8d8cbc4e0..28b6b2422b6 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -1,8 +1,8 @@ - - + + ======================================================= Auction Management/Configuration/artist @@ -39,7 +39,7 @@ form - + ======================================================= Auction Management/Configuration/objectcategories @@ -74,7 +74,7 @@ form - + ======================================================= Auction Management/Auction Dates/New Auction Dates ======================================================= @@ -126,7 +126,9 @@ Auction Management/Auction Dates/New Auction Dates [('state','=','draft')] - + + + ======================================================= Auction Management/Auction Dates/Old Auction Dates ======================================================= @@ -137,15 +139,14 @@ Auction Management/Auction Dates/New Auction Dates [('state','=','closed')] - + auction.dates form - - + @@ -288,10 +289,9 @@ Auction Management/Auction Dates/Reporting