Fix setup
This commit is contained in:
parent
e202c4db98
commit
5ad8735a89
12
account.py
12
account.py
|
@ -8,7 +8,11 @@ import operator
|
|||
from sql.aggregate import Sum
|
||||
from sql.conditionals import Coalesce
|
||||
from collections import OrderedDict
|
||||
from itertools import izip, groupby
|
||||
from itertools import groupby
|
||||
try:
|
||||
from itertools import izip
|
||||
except ImportError:
|
||||
izip = zip
|
||||
|
||||
from trytond.i18n import gettext
|
||||
from trytond.model import ModelView, ModelSQL, fields
|
||||
|
@ -368,7 +372,6 @@ class AuxiliaryBook(Report):
|
|||
|
||||
end1 = timer()
|
||||
delta1 = (end1 - start)
|
||||
print('Delta 1.... ', delta1)
|
||||
id2start_account = {}
|
||||
for account in start_accounts:
|
||||
id2start_account[account.id] = account
|
||||
|
@ -399,7 +402,6 @@ class AuxiliaryBook(Report):
|
|||
|
||||
end2 = timer()
|
||||
delta2 = (end2 - end1)
|
||||
print('Delta 2.... ', delta2)
|
||||
id2end_account = {}
|
||||
for account in end_accounts:
|
||||
id2end_account[account.id] = account
|
||||
|
@ -416,7 +418,6 @@ class AuxiliaryBook(Report):
|
|||
|
||||
end3 = timer()
|
||||
delta3 = (end3 - end2)
|
||||
print('Delta 3.... ', delta3)
|
||||
|
||||
account_id2lines = cls.lines(accounts,
|
||||
list(set(end_periods).difference(set(start_periods))),
|
||||
|
@ -436,11 +437,9 @@ class AuxiliaryBook(Report):
|
|||
|
||||
end4 = timer()
|
||||
delta4 = (end4 - end3)
|
||||
print('Delta 4.... ', delta4)
|
||||
|
||||
end = timer()
|
||||
delta_total = (end - start)
|
||||
print('tiempo total --- :', delta_total)
|
||||
return report_context
|
||||
|
||||
@classmethod
|
||||
|
@ -2022,7 +2021,6 @@ class TrialBalanceClassic(Report):
|
|||
report_context['digits'] = company.currency.digits
|
||||
report_context['sumto'] = lambda accounts, field: cls.sumto(accounts, field)
|
||||
report_context['type_balance'] = data['detailed']
|
||||
print('----', data['detailed'])
|
||||
return report_context
|
||||
|
||||
@classmethod
|
||||
|
|
6
party.py
6
party.py
|
@ -5,10 +5,10 @@ from trytond.model import fields, ModelView, ModelSQL, Unique
|
|||
from trytond.pyson import Eval
|
||||
from trytond.transaction import Transaction
|
||||
from trytond.wizard import Wizard, StateView, Button, StateTransition
|
||||
from sql import Table
|
||||
from invoice import TYPE_INVOICE
|
||||
from .exceptions import ValidatePartyWarning
|
||||
from trytond.exceptions import UserError
|
||||
from .invoice import TYPE_INVOICE
|
||||
from .exceptions import ValidatePartyWarning
|
||||
from sql import Table
|
||||
|
||||
PRIMOS = [71, 67, 59, 53, 47, 43, 41, 37, 29, 23, 19, 17, 13, 7, 3]
|
||||
K = 11
|
||||
|
|
2
setup.py
2
setup.py
|
@ -113,4 +113,4 @@ setup(name=name,
|
|||
test_suite='tests',
|
||||
test_loader='trytond.test_loader:Loader',
|
||||
tests_require=tests_require,
|
||||
)
|
||||
)
|
||||
|
|
|
@ -6,7 +6,7 @@ this repository contains the full copyright notices and license terms. -->
|
|||
<xpath
|
||||
expr="/form/notebook/page[@id='reports']/separator[@name='header']"
|
||||
position="before">
|
||||
<group colspan="4">
|
||||
<group id="group_manager" colspan="4">
|
||||
<label name="manager"/>
|
||||
<field name="manager"/>
|
||||
<label name="accountant"/>
|
||||
|
@ -16,7 +16,6 @@ this repository contains the full copyright notices and license terms. -->
|
|||
<xpath
|
||||
expr="/form/notebook/page[@id='reports']/field[@name='footer']"
|
||||
position="after">
|
||||
|
||||
<separator name="logo"/>
|
||||
<field name="logo" height="250" widget="image" xexpand="0"
|
||||
width="250" colspan="2" xfill="1" yfill="1"/>
|
||||
|
|
Loading…
Reference in New Issue