From be8fcf14fbb2567db1179c6c36b63f23534330e1 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 19 Sep 2010 15:35:12 +0200 Subject: [PATCH] fix bzr revid: fp@tinyerp.com-20100919133512-fy0g0jhn0drpx96h --- addons/account/invoice.py | 4 ---- addons/account/test/account_fiscalyear_close.yml | 13 ++++++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index afd3345911d..42e4bee12b6 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -390,8 +390,6 @@ class account_invoice(osv.osv): invoice_addr_id = res['invoice'] p = self.pool.get('res.partner').browse(cr, uid, partner_id) if company_id: - print p - print p.property_account_receivable, p.property_account_receivable.company_id, p.property_account_payable, p.property_account_payable.company_id if p.property_account_receivable.company_id.id != company_id and p.property_account_payable.company_id.id != company_id: property_obj = self.pool.get('ir.property') rec_pro_id = property_obj.search(cr,uid,[('name','=','property_account_receivable'),('res_id','=','res.partner,'+str(partner_id)+''),('company_id','=',company_id)]) @@ -597,13 +595,11 @@ class account_invoice(osv.osv): # return the ids of the move lines which has the same account than the invoice # whose id is in ids def move_line_id_payment_get(self, cr, uid, ids, *args): - print '** la' if not ids: return [] result = self.move_line_id_payment_gets(cr, uid, ids, *args) return result.get(ids[0], []) def move_line_id_payment_gets(self, cr, uid, ids, *args): - print '** ICI' res = {} if not ids: return res cr.execute('SELECT i.id, l.id '\ diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml index 3f99a66d719..59cbfdafc0b 100644 --- a/addons/account/test/account_fiscalyear_close.yml +++ b/addons/account/test/account_fiscalyear_close.yml @@ -21,16 +21,23 @@ - I made modification in journal so it can move entries - - !record {model: account.journal, id: account.sales_journal}: + !record {model: account.journal, id: account.close_journal}: + name: End of Year + code: NEW + type: situation + sequence_id: sequence_journal + default_debit_account_id: cash + default_credit_account_id: cash + company_id: base.main_company + view_id: account_journal_bank_view centralisation: 1 - - I called the Generate Fiscalyear Opening Entries wizard - !record {model: account.fiscalyear.close, id: account_fiscalyear_close_0}: fy2_id: account_fiscalyear_fiscalyear0 fy_id: account.data_fiscalyear - journal_id: account.sales_journal + journal_id: account.close_journal period_id: account_period_jan11 report_name: End of Fiscal Year Entry -