odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

account,base,base_setup,l10n_xxx,account_chart,hr_timesheet_invoice: improve accounting 

- add new module account_chart that remove minimal account -> all account chart must depend on it
- remove currency_id on account for some charts
- remove definition of devise in all account, now there are all in the base module
- add to base_setup the currency of the company
- move menu for country/currency from Partner to Administration

bzr revid: ced-82903b23fd5ccd0153b57239c4eb0a91cc12bd63
This commit is contained in:
ced 2007-07-23 05:15:37 +00:00
parent 5cea630e4a
commit 73a8d22514
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/account/report/third_party_ledger.py
View File

@ -47,23 +47,14 @@ class third_party_ledger(report_sxw.rml_parse):
self.cr.execute(
"SELECT DISTINCT line.partner_id " \
"FROM account_move_line AS line, account_account AS account " \
<<<<<<< HEAD:server/bin/addons/account/report/third_party_ledger.py
"WHERE line.partner_id IS NOT NULL AND line.date>=%s AND line.date<=%s AND line.state<>'draft' AND line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d) " \
"AND line.account_id = account.id AND account.company_id = %d AND account.active",
=======
"WHERE line.partner_id IS NOT NULL AND line.date>=%s AND line.date<=%s AND line.state<>'draft' AND line.period_id in (SELECT id FROM account_period WHERE fiscalyear_id=%d)" \
"AND line.account_id = account.id AND account.company_id = %d",
>>>>>>> account: add multi company to third party ledger report:server/bin/addons/account/report/third_party_ledger.py
(data['form']['date1'], data['form']['date2'], data['form']['fiscalyear'], data['form']['company_id']))
new_ids = [id for (id,) in self.cr.fetchall()]
self.cr.execute(
"SELECT a.id " \
"FROM account_account a LEFT JOIN account_account_type t ON (a.type=t.code) " \
<<<<<<< HEAD:server/bin/addons/account/report/third_party_ledger.py
"WHERE t.partner_account=TRUE AND a.company_id = %d AND a.active", (data['form']['company_id'],))
=======
"WHERE t.partner_account=TRUE AND a.company_id = %d", (data['form']['company_id'],))
>>>>>>> account: add multi company to third party ledger report:server/bin/addons/account/report/third_party_ledger.py
self.account_ids = ','.join([str(a) for (a,) in self.cr.fetchall()])
self.partner_ids = ','.join(map(str, new_ids))
objects = self.pool.get('res.partner').browse(self.cr, self.uid, new_ids)