bzr revid: fp@tinyerp.com-20100919133512-fy0g0jhn0drpx96h
This commit is contained in:
Fabien Pinckaers 2010-09-19 15:35:12 +02:00
parent 76846858fc
commit be8fcf14fb
2 changed files with 10 additions and 7 deletions

View File

@ -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 '\

View File

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