Skip to content

Commit

Permalink
[IMP]:Remove print statement
Browse files Browse the repository at this point in the history
  • Loading branch information
ksa (Open ERP) committed Jul 6, 2010
1 parent c5996ce commit 601be37
Show file tree
Hide file tree
Showing 5,157 changed files with 2,525 additions and 3,314 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
Empty file modified .bzrignore
100644 → 100755
Empty file.
Empty file modified account_analytic_package/__init__.py
100644 → 100755
Empty file.
Empty file modified account_analytic_package/__terp__.py
100644 → 100755
Empty file.
Empty file modified account_analytic_package/account_analytic_package.py
100644 → 100755
Empty file.
Empty file modified account_analytic_package/account_analytic_package_view.xml
100644 → 100755
Empty file.
Empty file modified account_analytic_package/i18n/account_analytic_package.pot
100644 → 100755
Empty file.
Empty file modified account_analytic_package/i18n/fr_BE.po
100644 → 100755
Empty file.
Empty file modified account_analytic_package/security/ir.model.access.csv
100644 → 100755
Empty file.
Empty file modified account_analytic_progress/__init__.py
100644 → 100755
Empty file.
Empty file modified account_analytic_progress/__terp__.py
100644 → 100755
Empty file.
Empty file modified account_analytic_progress/account_analytic_progress_view.xml
100644 → 100755
Empty file.
Empty file modified account_analytic_progress/i18n/account_analytic_progress.pot
100644 → 100755
Empty file.
Empty file modified account_analytic_progress/i18n/fr_BE.po
100644 → 100755
Empty file.
Empty file modified account_asset/__init__.py
100644 → 100755
Empty file.
Empty file modified account_asset/__terp__.py
100644 → 100755
Empty file.
11 changes: 5 additions & 6 deletions account_asset/account_asset.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
Expand All @@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################

Expand Down Expand Up @@ -63,7 +63,7 @@ def validate(self, cr, uid, ids, context={}):

def _amount_total(self, cr, uid, ids, name, args, context={}):
id_set=",".join(map(str,ids))
cr.execute("""SELECT l.asset_id,abs(SUM(l.debit-l.credit)) AS amount FROM
cr.execute("""SELECT l.asset_id,abs(SUM(l.debit-l.credit)) AS amount FROM
account_move_line l
WHERE l.asset_id IN ("""+id_set+") GROUP BY l.asset_id ")
res=dict(cr.fetchall())
Expand Down Expand Up @@ -113,7 +113,6 @@ def _compute_move(self, cr, uid, property, period, context={}):
total += move.debit-move.credit
for move in property.entry_asset_ids:
if move.account_id == property.account_asset_ids:
print 'XXXXXXXXXXXXXXX : ', move.debit
total += move.debit
total += -move.credit
periods = (len(property.entry_asset_ids)/2) - property.method_delay
Expand Down Expand Up @@ -178,7 +177,7 @@ def _compute_entries(self, cr, uid, asset, period_id, context={}):
class account_asset_property(osv.osv):
def _amount_total(self, cr, uid, ids, name, args, context={}):
id_set=",".join(map(str,ids))
cr.execute("""SELECT l.asset_id,abs(SUM(l.debit-l.credit)) AS amount FROM
cr.execute("""SELECT l.asset_id,abs(SUM(l.debit-l.credit)) AS amount FROM
account_asset_property p
left join
account_move_line l on (p.asset_id=l.asset_id)
Expand All @@ -190,7 +189,7 @@ def _amount_total(self, cr, uid, ids, name, args, context={}):

def _amount_residual(self, cr, uid, ids, name, args, context={}):
id_set=",".join(map(str,ids))
cr.execute("""SELECT
cr.execute("""SELECT
r.asset_property_id,SUM(abs(l.debit-l.credit)) AS amount
FROM
account_move_asset_entry_rel r
Expand Down
Empty file modified account_asset/account_asset_invoice.py
100644 → 100755
Empty file.
Empty file modified account_asset/account_asset_invoice_view.xml
100644 → 100755
Empty file.
Empty file modified account_asset/account_asset_view.xml
100644 → 100755
Empty file.
Empty file modified account_asset/account_asset_wizard.xml
100644 → 100755
Empty file.
Empty file modified account_asset/i18n/account_asset.pot
100644 → 100755
Empty file.
Empty file modified account_asset/i18n/de.po
100644 → 100755
Empty file.
Empty file modified account_asset/i18n/fr_BE.po
100644 → 100755
Empty file.
Empty file modified account_asset/i18n/pl.po
100644 → 100755
Empty file.
Empty file modified account_asset/security/ir.model.access.csv
100644 → 100755
Empty file.
Empty file modified account_asset/wizard/__init__.py
100644 → 100755
Empty file.
Empty file modified account_asset/wizard/wizard_asset_close.py
100644 → 100755
Empty file.
Empty file modified account_asset/wizard/wizard_asset_compute.py
100644 → 100755
Empty file.
Empty file modified account_asset/wizard/wizard_asset_modify.py
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/__init__.py
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/__openerp__.py
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/account_balance_report.py
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/account_balance_report_reports.xml
100644 → 100755
Empty file.
Empty file.
Empty file modified account_balance_reporting/account_balance_report_view.xml
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/account_balance_report_wizard.xml
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/account_balance_report_workflow.xml
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/i18n/account_balance_reporting.pot
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/i18n/ca_ES.po
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/i18n/es_ES.po
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/report/__init__.py
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/report/generic_non_zero_report.rml
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/report/generic_report.odt
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/report/generic_report.rml
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/security/ir.model.access.csv
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/wizard/__init__.py
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/wizard/wizard_calculate.py
100644 → 100755
Empty file.
Empty file modified account_balance_reporting/wizard/wizard_print.py
100644 → 100755
Empty file.
Empty file modified account_banking/__init__.py
100644 → 100755
Empty file.
Empty file modified account_banking/__terp__.py
100644 → 100755
Empty file.
Empty file modified account_banking/account_banking.py
100644 → 100755
Empty file.
Empty file modified account_banking/account_banking_demo.xml
100644 → 100755
Empty file.
Empty file modified account_banking/account_banking_import_wizard.xml
100644 → 100755
Empty file.
Empty file modified account_banking/account_banking_view.xml
100644 → 100755
Empty file.
Empty file modified account_banking/account_banking_workflow.xml
100644 → 100755
Empty file.
Empty file modified account_banking/i18n/account_banking.pot
100644 → 100755
Empty file.
Empty file modified account_banking/i18n/en_US.po
100644 → 100755
Empty file.
Empty file modified account_banking/i18n/nl.po
100644 → 100755
Empty file.
Empty file modified account_banking/i18n/nl_NL.po
100644 → 100755
Empty file.
Empty file modified account_banking/parsers/__init__.py
100644 → 100755
Empty file.
Empty file modified account_banking/parsers/convert.py
100644 → 100755
Empty file.
Empty file modified account_banking/parsers/models.py
100644 → 100755
Empty file.
Empty file modified account_banking/record.py
100644 → 100755
Empty file.
Empty file modified account_banking/sepa/__init__.py
100644 → 100755
Empty file.
Empty file modified account_banking/sepa/bbantoiban.py
100644 → 100755
Empty file.
18 changes: 5 additions & 13 deletions account_banking/sepa/iban.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def __init__(self, ibanfmt, bbanfmt='%A', nolz=False):
Specify the structure of the SEPA account in relation to the local
account. The XXZZ prefix that all SEPA accounts have is not part of
the structure in BBANFormat.
ibanfmt: string of identifiers from position 5 (start = 1):
A = Account position
N = Account digit
Expand All @@ -95,7 +95,7 @@ def __init__(self, ibanfmt, bbanfmt='%A', nolz=False):
leading-zero-stripped account numbers.
Example: (NL) 'CCCCAAAAAAAAAA'
will convert 'INGB0001234567' into
will convert 'INGB0001234567' into
bankcode 'INGB' and account '0001234567'
bbanfmt: string of placeholders for the local bank account
Expand All @@ -119,7 +119,7 @@ def __init__(self, ibanfmt, bbanfmt='%A', nolz=False):
self._iban = ibanfmt
self._bban = bbanfmt
self._nolz = nolz

def __extract__(self, spec, value):
'''Extract the value based on the spec'''
i = self._iban.find(spec)
Expand Down Expand Up @@ -147,7 +147,7 @@ def account(self, iban):
else:
prefix = ''
return prefix + self.__extract__('A', iban)

def BBAN(self, iban):
'''
Format the BBAN part of the IBAN in iban following the local
Expand Down Expand Up @@ -387,7 +387,7 @@ def BIC_searchkey(self):
The bank code seems to be world wide unique. Knowing this,
one can use the country + bankcode info from BIC to narrow a
search for the bank itself.
Note that some countries use one single localization code for
all bank transactions in that country, while others do not. This
makes it impossible to use an algorithmic approach for generating
Expand Down Expand Up @@ -426,11 +426,3 @@ def BBAN(self):
import sys
for arg in sys.argv[1:]:
iban = IBAN(arg)
print 'IBAN:', iban
print 'country code:', iban.countrycode
print 'bank code:', iban.bankcode
print 'branch code:', iban.branchcode
print 'BBAN:', iban.BBAN
print 'localized BBAN:', iban.localized_BBAN
print 'check digits:', iban.checkdigits
print 'checksum:', iban.checksum
Empty file modified account_banking/sepa/online.py
100644 → 100755
Empty file.
Empty file modified account_banking/sepa/postalcode.py
100644 → 100755
Empty file.
Empty file modified account_banking/sepa/urlagent.py
100644 → 100755
Empty file.
1 change: 0 additions & 1 deletion account_banking/struct.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,3 @@ def show(self, indent=0, align=False, ralign=False):
else:
fmt = '%*.*s%%s: %%s' % (indent, indent, '')
for item in self.iteritems():
print fmt % item
Empty file modified account_banking/wizard/__init__.py
100644 → 100755
Empty file.
Empty file modified account_banking/wizard/bank_import.py
100644 → 100755
Empty file.
Empty file modified account_banking/wizard/banktools.py
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/__init__.py
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/__terp__.py
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/account_banking_export_wizard.xml
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/account_banking_nl_clieop.py
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/account_banking_nl_clieop.xml
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/data/banking_export_clieop.xml
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/i18n/account_banking_nl_clieop.pot
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/i18n/en_US.po
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/i18n/nl.po
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/i18n/nl_NL.po
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/wizard/__init__.py
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/wizard/clieop.py
100644 → 100755
Empty file.
Empty file modified account_banking_nl_clieop/wizard/export_clieop.py
100644 → 100755
Empty file.
Empty file modified account_banking_nl_multibank/__init__.py
100644 → 100755
Empty file.
Empty file modified account_banking_nl_multibank/__terp__.py
100644 → 100755
Empty file.
Empty file.
Empty file modified account_banking_nl_multibank/i18n/en_US.po
100644 → 100755
Empty file.
Empty file modified account_banking_nl_multibank/i18n/nl.po
100644 → 100755
Empty file.
Empty file modified account_banking_nl_multibank/i18n/nl_NL.po
100644 → 100755
Empty file.
Empty file modified account_banking_nl_multibank/multibank.py
100644 → 100755
Empty file.
Empty file modified account_base/__init__.py
100644 → 100755
Empty file.
Empty file modified account_base/__terp__.py
100644 → 100755
Empty file.
Empty file modified account_base/i18n/account_base.pot
100644 → 100755
Empty file.
Empty file modified account_base/i18n/fr_BE.po
100644 → 100755
Empty file.
Empty file modified account_base/i18n/pl.po
100644 → 100755
Empty file.
Empty file modified account_base/partner.py
100644 → 100755
Empty file.
Empty file modified account_base/partner_view.xml
100644 → 100755
Empty file.
Empty file modified account_base/wizard/__init__.py
100644 → 100755
Empty file.
Empty file modified account_base/wizard/account_setup.py
100644 → 100755
Empty file.
Empty file modified account_base/wizard/account_setup_view.xml
100644 → 100755
Empty file.
Empty file modified account_bob_import/__init__.py
100644 → 100755
Empty file.
Empty file modified account_bob_import/__terp__.py
100644 → 100755
Empty file.
Empty file modified account_bob_import/account_bob_import_config.xml
100644 → 100755
Empty file.
Empty file modified account_bob_import/bob_import_step_1.py
100644 → 100755
Empty file.
44 changes: 18 additions & 26 deletions account_bob_import/bob_import_step_2.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
Expand All @@ -15,14 +15,17 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################

import csv
import datetime
import time
from datetime import date, timedelta
import netsvc
logger = netsvc.Logger()

if __name__ != '__main__':
from tools import config
else:
Expand Down Expand Up @@ -139,7 +142,7 @@ def _check_code_4_usertype(x):
# return 'account_type_expense'
# if x['AID,A,10'].startswith('7'):
# return 'income'
return 'account_type_root'
return 'account_type_root'

def _check_code_4_type(x):
if x['AID,A,10'].startswith('40'):
Expand All @@ -150,11 +153,11 @@ def _check_code_4_type(x):
return 'payable'
if len(x['AID,A,10']) <= 4:
return 'view'
return 'other'
return 'other'


account_map = {
'id': lambda x: 'account_'+x['AID,A,10'],
'id': lambda x: 'account_'+x['AID,A,10'],
'code': lambda x: x['AID,A,10'],
'name': lambda x: x['HEADING1,A,40'],
'note': lambda x: x['AMEMO,M,11'],
Expand Down Expand Up @@ -257,8 +260,8 @@ def import_journal(reader_journal, writer_journal, journals_map):


# -= C. Partners Data =-
#Beware: If 2 partners have the same name, we have to create only one partner with several adresses.
#We also have to record all their old names because they can be referenced in another files (e.g. the account_move_line one).
#Beware: If 2 partners have the same name, we have to create only one partner with several adresses.
#We also have to record all their old names because they can be referenced in another files (e.g. the account_move_line one).
#That's the reason why we keep a dictionary to match the IDS.

def _get_cat(record):
Expand Down Expand Up @@ -732,7 +735,7 @@ def import_moves_and_lines(reader_move, writer_move, writer, move_map, map, dict
for row in reader_move:
count += 1
if (count%1000) == 0:
print count
logger.notifyChannel(count)

if row['HCURRENCY,A,3'] not in currencies:
currencies.append(row['HCURRENCY,A,3'])
Expand Down Expand Up @@ -798,7 +801,7 @@ def import_moves_and_lines(reader_move, writer_move, writer, move_map, map, dict
vat_move_list = _create_vat_move(row, vat_dict, tvacount)
for vat_move in vat_move_list:
writer.writerow(convert2utf(vat_move))

writer.writerow(record)


Expand Down Expand Up @@ -832,46 +835,39 @@ def _get_partner_id(char):
currencies = []

def run():
print 'importing chart of accounts'
reader_account = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/accoun.csv','rb'))
reader_account = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/accoun.csv','rb'))
writer_account = csv.DictWriter(file(config['addons_path']+'/account_bob_import/account.account.csv', 'wb'), account_map.keys())
import_account(reader_account, writer_account, account_map)

print 'importing financial journals'
reader_journal = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/dbk.csv','rb'))
writer_journal = csv.DictWriter(file(config['addons_path']+'/account_bob_import/account.journal.csv', 'wb'), journals_map.keys())
import_journal(reader_journal, writer_journal, journals_map)

print 'importing partners'
reader_partner = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/compan.csv','rb'))
reader_partner = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/compan.csv','rb'))
writer_partner = csv.DictWriter(file(config['addons_path']+'/account_bob_import/res.partner.csv', 'wb'), partners_map.keys())
writer_address = csv.DictWriter(file(config['addons_path']+'/account_bob_import/res.partner.address.csv','wb'), partner_add_map.keys())
writer_bank = csv.DictWriter(file(config['addons_path']+'/account_bob_import/res.partner.bank.csv','wb'), partner_bank_map.keys())
import_partner(reader_partner, writer_partner, partners_map, writer_address, partner_add_map, writer_bank, partner_bank_map)

print 'importing contacts'
reader_contact = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/contacts.csv','rb'))
reader_contact = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/contacts.csv','rb'))
writer_contact = csv.DictWriter(file(config['addons_path']+'/account_bob_import/res.partner.contact.csv','wb'),contacts_map.keys())
writer_job = csv.DictWriter(file(config['addons_path']+'/account_bob_import/res.partner.job.csv','wb'),job_map.keys())
import_contact(reader_contact, writer_contact, contacts_map, writer_job, job_map)

print 'importing fiscal years'
reader_fyear = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/period.csv','rb'))
reader_fyear = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/period.csv','rb'))
writer_fyear = csv.DictWriter(file(config['addons_path']+'/account_bob_import/account.fiscalyear.csv', 'wb'), fyear_map.keys())
import_fyear(reader_fyear, writer_fyear, fyear_map)

print 'importing periods'
reader_period = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/period.csv','rb'))
writer_period = csv.DictWriter(file(config['addons_path']+'/account_bob_import/account.period.csv', 'wb'), periods_map.keys())
import_period(reader_period, writer_period, periods_map)

#import the account_tax from vat.csv
#import the account_tax from vat.csv
# constructing table account_tax => account_tax_code (for move and move_line)
reader_vat_code = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/vatcas.csv','rb'))
reader_vat_code = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/vatcas.csv','rb'))
reader_vat = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/vat.csv','rb'))
vat_dict = construct_vat_dict(reader_vat_code, reader_vat, {})

print 'importing account.move.reconcile'
reader_ahisto = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/ahisto_matchings.csv','rb'))
writer_reconcile = csv.DictWriter(file(config['addons_path']+'/account_bob_import/account.move.reconcile-1.csv', 'wb'), arecon_map.keys())
dict_ahisto = import_areconcile(reader_ahisto, writer_reconcile, arecon_map)
Expand All @@ -881,15 +877,11 @@ def run():
dict_chisto = import_creconcile(reader_chisto, writer_reconcile2, crecon_map)


print "importing account.move.line"
reader_move = csv.DictReader(file(config['addons_path']+'/account_bob_import/original_csv/ahisto.csv','rb'))
writer_move = csv.DictWriter(file(config['addons_path']+'/account_bob_import/account.move.csv', 'wb'), move_map.keys())
writer_move_line = csv.DictWriter(file(config['addons_path']+'/account_bob_import/account.move.line.csv', 'wb'), move_line_map.keys())
import_moves_and_lines(reader_move, writer_move, writer_move_line, move_map, move_line_map, dict_ahisto, dict_chisto, vat_dict)

print "Make sure that you installed the following languages:",langs
print "\n"
print "Make sure that you installed the following currencies:",currencies

if __name__ == '__main__':
run()
Expand Down
Empty file modified account_bob_import/i18n/account_bob_import.pot
100644 → 100755
Empty file.
Empty file modified account_bob_import/i18n/fr_BE.po
100644 → 100755
Empty file.
Empty file modified account_bob_import/misc_data.xml
100644 → 100755
Empty file.
Empty file modified account_bob_import/security/ir.model.access.csv
100644 → 100755
Empty file.
Empty file modified account_budget_project/__init__.py
100644 → 100755
Empty file.
Empty file modified account_budget_project/__terp__.py
100644 → 100755
Empty file.
Empty file modified account_budget_project/account_budget_project.py
100644 → 100755
Empty file.
Empty file modified account_budget_project/account_budget_project_view.xml
100644 → 100755
Empty file.
Empty file modified account_budget_project/i18n/account_budget_project.pot
100644 → 100755
Empty file.
Empty file modified account_budget_project/i18n/fr_BE.po
100644 → 100755
Empty file.
Empty file modified account_cash_discount/__init__.py
100644 → 100755
Empty file.
Empty file modified account_cash_discount/__terp__.py
100644 → 100755
Empty file.
Empty file modified account_cash_discount/account_cash_discount.py
100644 → 100755
Empty file.
Empty file modified account_cash_discount/account_cash_discount_view.xml
100644 → 100755
Empty file.
Empty file modified account_cash_discount/i18n/account_cash_discount.pot
100644 → 100755
Empty file.
Empty file modified account_cash_discount/i18n/fr_BE.po
100644 → 100755
Empty file.
Empty file modified account_cash_discount/security/ir.model.access.csv
100644 → 100755
Empty file.
Empty file modified account_financial_report/__init__.py
100644 → 100755
Empty file.
Empty file modified account_financial_report/__terp__.py
100644 → 100755
Empty file.
Empty file modified account_financial_report/account_report_report.xml
100644 → 100755
Empty file.
Empty file modified account_financial_report/account_report_wizard.xml
100644 → 100755
Empty file.
Empty file modified account_financial_report/report/__init__.py
100644 → 100755
Empty file.
11 changes: 5 additions & 6 deletions account_financial_report/report/account_chart.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def set_context(self, objects, data, ids, report_type = None):
else:
new_ids.append(data['form']['account'])
objects = self.pool.get('account.account').browse(self.cr, self.uid, new_ids)
super(account_chart, self).set_context(objects, data, new_ids, report_type)

super(account_chart, self).set_context(objects, data, new_ids, report_type)


def lines(self,ids={}, done=None, level=1):
Expand Down Expand Up @@ -94,17 +94,16 @@ def sort_result(self,account,rupture):
# if account_elem['level'] < 5:
# res_sort['type_dr'] = 2
# res_sort['name_dr'] = account_elem['name']
#
# print ind_type_dr
#
account_result.append(res_sort)
ind_rup+=1
ind_type+=1
# si on a remplis une page on fait la rupture de la page
# if (ind_rup >= rupture):
# # On multiplie la rupture par 2 pour repositionner le tableau correctement
# ind_rup = 0
# ind_rup = 0
# ind_type = ind_type + rupture

return account_result


Expand Down
Empty file modified account_financial_report/report/account_chart.rml
100644 → 100755
Empty file.
4 changes: 1 addition & 3 deletions account_financial_report/report/account_move_line_record.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# OpenERP, Open Source Management Solution
# Copyright (c) 2009 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
# Jordi Esteve <[email protected]>
# $Id$
Expand Down Expand Up @@ -41,8 +41,6 @@ def set_context(self, objects, data, ids, report_type = None):
journal_ids = data['form']['journal_ids'][0][2]
periods = ','.join([str(id) for id in period_ids])
journals = ','.join([str(id) for id in journal_ids])
#print "periods=", periods
#print "journals=", journals
self.cr.execute('select id from account_move where period_id in ('+ periods +') and journal_id in ('+ journals +') and state<>\'draft\' order by ('+ data['form']['sort_selection'] +'),id')
move_ids = map(lambda x: x[0], self.cr.fetchall())
else:
Expand Down
7 changes: 2 additions & 5 deletions account_financial_report/report/general_ledger.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def get_periods(self, form):
period_ids = ",".join([str(x) for x in form['periods'][0][2] if x])
self.cr.execute("SELECT name FROM account_period WHERE id in (%s)" % (period_ids))
res = self.cr.fetchall()
len_res = len(res)
len_res = len(res)
for r in res:
if (r == res[len_res-1]):
result+=r[0]+". "
Expand All @@ -106,7 +106,7 @@ def get_periods(self, form):
result+=r.name+". "
else:
result+=r.name+", "

return str(result and result[:-1]) or ''


Expand Down Expand Up @@ -216,9 +216,6 @@ def get_context_date_period(self, form):
self.min_date = date_min
else:
self.min_date = period_min
# print "ctx=", self.ctx
# print "ctxfy=", self.ctxfy
# print "query=", self.query


def get_children_accounts(self, account, form):
Expand Down
Empty file modified account_financial_report/report/general_ledger.rml
100644 → 100755
Empty file.
7 changes: 2 additions & 5 deletions account_financial_report/report/general_ledger_landscape.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def get_periods(self, form):
period_ids = ",".join([str(x) for x in form['periods'][0][2] if x])
self.cr.execute("SELECT name FROM account_period WHERE id in (%s)" % (period_ids))
res = self.cr.fetchall()
len_res = len(res)
len_res = len(res)
for r in res:
if (r == res[len_res-1]):
result+=r[0]+". "
Expand All @@ -107,7 +107,7 @@ def get_periods(self, form):
result+=r.name+". "
else:
result+=r.name+", "

return str(result and result[:-1]) or ''


Expand Down Expand Up @@ -217,9 +217,6 @@ def get_context_date_period(self, form):
self.min_date = date_min
else:
self.min_date = period_min
# print "ctx=", self.ctx
# print "ctxfy=", self.ctxfy
# print "query=", self.query


def get_children_accounts(self, account, form):
Expand Down
Empty file modified account_financial_report/report/general_ledger_landscape.rml
100644 → 100755
Empty file.
5 changes: 2 additions & 3 deletions account_financial_report/report/invoice_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ def set_context(self, objects, data, ids, report_type = None):
if data['form']['state'] in ['bydate','all','none']:
where.append(('date_invoice','>=',data['form']['date_from']))
where.append(('date_invoice','<=',data['form']['date_to']))
#print where
ids = invoice_obj.search(self.cr, self.uid, where)
objects = invoice_obj.browse(self.cr, self.uid, ids)

Expand All @@ -106,7 +105,7 @@ def set_context(self, objects, data, ids, report_type = None):

if not ids :
return super(print_invoice_list, self).set_context(objects, data, ids, report_type)

if not isinstance(ids, list) :
ids = [ids]
# we create temp list that will be used for store invoices by type
Expand Down Expand Up @@ -136,7 +135,7 @@ def set_context(self, objects, data, ids, report_type = None):

def filter_invoices(self, list, dest, order_by=None):
if not list :
return
return
tmp = {}
#
# Sort by invoice "number", "date + number" or "partner + reference"
Expand Down
Empty file modified account_financial_report/report/invoice_list.rml
100644 → 100755
Empty file.
Loading

0 comments on commit 601be37

Please sign in to comment.