diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index b2e318b7074..e4886602080 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1349,7 +1349,7 @@ ir.actions.act_window account.config.fiscalyear form - tree + form new @@ -1357,8 +1357,8 @@ - Define fiscal years - Define fiscal years + Define Fiscal Years + Define Fiscal Years open @@ -1525,13 +1525,13 @@ - Account Tax Templates + Tax Templates account.tax.template form tree,form - + @@ -1565,12 +1565,12 @@ - Account Tax Code Templates + Tax Code Templates account.tax.code.template form tree,form - + diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index ad5a6284292..d580ff02285 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -4,7 +4,7 @@ - + res.partner.property.form.inherit res.partner @@ -34,7 +34,7 @@ - +
diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py index 3317c81bd16..14698abb3ac 100644 --- a/addons/account/report/general_ledger.py +++ b/addons/account/report/general_ledger.py @@ -109,7 +109,7 @@ class general_ledger(report_sxw.rml_parse): res = [] return res - def lines(self, account, form): + def lines(self, account, form, history=False): self.ids +=[account.id] if not account.check_history and not history: return [] diff --git a/addons/account/wizard/wizard_account_chart.py b/addons/account/wizard/wizard_account_chart.py index 1a0e0dcfa18..1a1dcd51b8d 100644 --- a/addons/account/wizard/wizard_account_chart.py +++ b/addons/account/wizard/wizard_account_chart.py @@ -69,7 +69,8 @@ class wizard_account_chart(wizard.interface): id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id'] result = act_obj.read(cr, uid, [id])[0] result['context'] = str({'fiscalyear': data['form']['fiscalyear'],'target_move':data['form']['target_move']}) - result['name']+=':'+pooler.get_pool(cr.dbname).get('account.fiscalyear').read(cr,uid,[data['form']['fiscalyear']])[0]['code'] + if data['form']['fiscalyear']: + result['name']+=':'+pooler.get_pool(cr.dbname).get('account.fiscalyear').read(cr,uid,[data['form']['fiscalyear']])[0]['code'] return result states = { diff --git a/addons/account/wizard/wizard_statement_from_invoice.py b/addons/account/wizard/wizard_statement_from_invoice.py index 1e231569758..b32d4933ad6 100644 --- a/addons/account/wizard/wizard_statement_from_invoice.py +++ b/addons/account/wizard/wizard_statement_from_invoice.py @@ -147,7 +147,7 @@ class PopulateStatementFromInv(wizard.interface): 'fields':START_FIELD, 'state': [ ('end', '_Cancel'), - ('customer', 'C_ustomer invoices', '', True), + ('customer', '_Customer invoices', '', True), ('supplier', '_Supplier invoices', '', True) ] }, diff --git a/addons/account_balance/report/account_balance.py b/addons/account_balance/report/account_balance.py index 85a548461f8..1bfc55034b6 100644 --- a/addons/account_balance/report/account_balance.py +++ b/addons/account_balance/report/account_balance.py @@ -396,7 +396,7 @@ class account_balance(report_sxw.rml_parse): ctx['fiscalyear'] = id ctx['periods'] = form['periods'][0][2] - ctx['period_manner']=form['select_periods'] + ctx['period_manner']=form['period_manner'] tmp = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx.copy()) if len(tmp): @@ -454,7 +454,7 @@ class account_balance(report_sxw.rml_parse): ctx['fiscalyear'] = id ctx['periods'] = form['periods'][0][2] - ctx['period_manner']=form['select_periods'] + ctx['period_manner']=form['period_manner'] tmp1 = self.pool.get('account.account').browse(self.cr, self.uid, ids,ctx.copy()) diff --git a/addons/account_balance/wizard/wizard_account_balance_report.py b/addons/account_balance/wizard/wizard_account_balance_report.py index 1e6a88db9bc..58e855d3717 100644 --- a/addons/account_balance/wizard/wizard_account_balance_report.py +++ b/addons/account_balance/wizard/wizard_account_balance_report.py @@ -55,7 +55,7 @@ dates_form = ''' - + @@ -70,18 +70,18 @@ dates_fields = { 'landscape': {'string': 'Show Report in Landscape Form', 'type': 'boolean'}, 'format_perc': {'string': 'Show Comparision in %', 'type': 'boolean'}, 'compare_pattern':{'string':"Compare Selected Years In Terms Of",'type':'selection','selection':[('bal_cash','Cash'),('bal_perc','Percentage'),('none','Don'+ "'" +'t Compare')]}, - 'select_periods':{'string':"Select Invoices Based on Their",'type':'selection','selection':[('actual','Actual Period (Duration)'),('created','Creation Date')]}, + 'period_manner':{'string':"Entries Selection Based on",'type':'selection','selection':[('actual','Financial Period'),('created','Creation Date')]}, 'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'} } back_form=''' - + - -
 - + - + - - - - - - - + + 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