Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5-Boxiang
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hamza
erp5-Boxiang
Commits
65d39fde
Commit
65d39fde
authored
Jun 29, 2017
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
accounting: fix python code warnings
parent
74d8b5f7
Changes
39
Hide whitespace changes
Inline
Side-by-side
Showing
39 changed files
with
114 additions
and
146 deletions
+114
-146
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.py
...accounting/AccountModule_getAccountListForTrialBalance.py
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
...ccounting/AccountModule_getAccountListForTrialBalance.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAvailableGapList.py
...kins/erp5_accounting/AccountModule_getAvailableGapList.py
+0
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountsReportSectionList.py
...ounting/AccountModule_getBankAccountsReportSectionList.py
+12
-12
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getFiscalReportCreditorNodeBalance.py
...nting/AccountModule_getFiscalReportCreditorNodeBalance.py
+3
-3
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getFiscalReportCreditorPaymentBalance.py
...ng/AccountModule_getFiscalReportCreditorPaymentBalance.py
+3
-3
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getFiscalReportDebitorNodeBalance.py
...unting/AccountModule_getFiscalReportDebitorNodeBalance.py
+3
-3
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getFiscalReportDebitorPaymentBalance.py
...ing/AccountModule_getFiscalReportDebitorPaymentBalance.py
+3
-3
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getMirrorAccountUrl.py
...kins/erp5_accounting/AccountModule_getMirrorAccountUrl.py
+5
-8
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTransactionListUrl.py
...ns/erp5_accounting/AccountModule_getTransactionListUrl.py
+7
-7
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml
...unting/Account_getNotGroupedAccountingTransactionList.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_hashGapItemList.py
...m/portal_skins/erp5_accounting/Account_hashGapItemList.py
+2
-0
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_hashGapItemList.xml
.../portal_skins/erp5_accounting/Account_hashGapItemList.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createRelatedPaymentTransactionList.py
...gTransactionModule_createRelatedPaymentTransactionList.py
+2
-4
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createRelatedPaymentTransactionList.xml
...TransactionModule_createRelatedPaymentTransactionList.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createReversalTransactionList.py
...ountingTransactionModule_createReversalTransactionList.py
+1
-4
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createReversalTransactionList.xml
...untingTransactionModule_createReversalTransactionList.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportReportSectionList.py
...sactionModule_getAccountingLineReportReportSectionList.py
+1
-3
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAgedBalanceReportSectionList.py
...ntingTransactionModule_getAgedBalanceReportSectionList.py
+2
-3
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.py
.../AccountingTransactionModule_getJournalSectionLineList.py
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml
...AccountingTransactionModule_getJournalSectionLineList.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionStatList.py
.../AccountingTransactionModule_getJournalSectionStatList.py
+0
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSummaryAgedBalanceLineList.py
...ountingTransactionModule_getSummaryAgedBalanceLineList.py
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getTransactionLineListForGroupingReference.py
...ctionModule_getTransactionLineListForGroupingReference.py
+2
-4
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.py
...nting/AccountingTransactionModule_setGroupingReference.py
+7
-12
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.xml
...ting/AccountingTransactionModule_setGroupingReference.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_updateGroupingReference.xml
...g/AccountingTransactionModule_updateGroupingReference.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.py
...ing/AccountingTransaction_addAccountingTransactionLine.py
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getAccountingTransactionLineList.xml
...ccountingTransaction_getAccountingTransactionLineList.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationCurrencyConvertible.py
...AccountingTransaction_isDestinationCurrencyConvertible.py
+4
-4
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isSourceCurrencyConvertible.py
...ting/AccountingTransaction_isSourceCurrencyConvertible.py
+4
-4
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_importGapFile.py
...teItem/portal_skins/erp5_accounting/Base_importGapFile.py
+16
-19
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InternalInvoiceTransaction_getAuthenticatedUserSection.py
...InternalInvoiceTransaction_getAuthenticatedUserSection.py
+0
-2
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_createRelatedPaymentTransaction.py
...rp5_accounting/Invoice_createRelatedPaymentTransaction.py
+11
-15
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_getRemainingTotalPayablePrice.py
.../erp5_accounting/Invoice_getRemainingTotalPayablePrice.py
+9
-13
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getExplanationTitleAndAnalytics.py
...p5_accounting/Movement_getExplanationTitleAndAnalytics.py
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml
...ins/erp5_accounting/Node_getAccountingTransactionList.xml
+1
-1
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_statAccountingBalance.py
...ortal_skins/erp5_accounting/Node_statAccountingBalance.py
+1
-1
bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_period_workflow/scripts/checkDates.py
...workflow/accounting_period_workflow/scripts/checkDates.py
+1
-2
No files found.
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.py
View file @
65d39fde
...
...
@@ -609,7 +609,7 @@ for key, data in line_per_account.iteritems():
if
expand_accounts
and
mirror_section_uid
is
not
MARKER
:
mirror_section_title
=
getObject
(
mirror_section_uid
).
getTitle
()
else
:
mirror_section_title
=
None
mirror_section_title
=
None
node_uid
,
node_title
,
node_id
,
node_string_index
,
node
=
getNodeTitleAndId
(
node_relative_url
)
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountListForTrialBalance.xml
View file @
65d39fde
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
show_empty_accounts, expand_accounts, at_date, from_date, period_start_date, section_uid, simulation_state, precision, node_uid, gap_root=None, per_account_class_summary=0, portal_type=None, function=None, funding=None, project=None, ledger=None, group_analytic=
[]
, mirror_section_category=None, show_detailed_balance_columns=False, src__=False, **kw
</string>
</value>
<value>
<string>
show_empty_accounts, expand_accounts, at_date, from_date, period_start_date, section_uid, simulation_state, precision, node_uid, gap_root=None, per_account_class_summary=0, portal_type=None, function=None, funding=None, project=None, ledger=None, group_analytic=
()
, mirror_section_category=None, show_detailed_balance_columns=False, src__=False, **kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAvailableGapList.py
View file @
65d39fde
...
...
@@ -7,7 +7,6 @@ item_list = [('', '')]
countries
=
context
.
portal_categories
.
gap
.
objectValues
()
for
country
in
countries
:
for
gap
in
country
.
objectValues
()
:
title
=
country
.
getTranslatedTitle
()
+
'/'
+
gap
.
getTranslatedTitle
()
path
=
gap
.
getRelativeUrl
()
item_list
.
append
(
((
country
.
getTranslatedTitle
()
+
'/'
+
gap
.
getTranslatedTitle
()),
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountsReportSectionList.py
View file @
65d39fde
...
...
@@ -11,7 +11,7 @@ transaction_simulation_state = request['transaction_simulation_state']
from_date
=
request
.
get
(
'from_date'
,
None
)
result
=
[]
params
=
{
params
=
{
'to_date'
:
to_date
,
'section_category'
:
transaction_section_category
,
'simulation_state'
:
transaction_simulation_state
,
...
...
@@ -19,36 +19,36 @@ params = {
'report_depth'
:
5
}
if
from_date
:
params
[
'from_date'
]
=
from_date
if
from_date
:
params
[
'from_date'
]
=
from_date
groupCategory
=
context
.
portal_categories
.
restrictedTraverse
(
transaction_section_category
)
entities
=
groupCategory
.
getGroupRelatedValueList
(
portal_type
=
(
'Organisation'
,
'Person'
))
entity_columns
=
(
(
'title'
,
'Title'
),
entity_columns
=
(
(
'title'
,
'Title'
),
(
'getStopDate'
,
'Date'
),
(
'reference'
,
'Invoice No'
),
(
'getDestinationSectionTitle'
,
'Third Party'
),
(
'source_reference'
,
'Reference'
),
(
'reference'
,
'Invoice No'
),
(
'getDestinationSectionTitle'
,
'Third Party'
),
(
'source_reference'
,
'Reference'
),
(
'simulation_state'
,
'State'
),
(
'source_debit'
,
'Debit'
),
(
'source_credit'
,
'Credit'
),
(
'source_balance'
,
'Balance'
),
)
)
for
entity
in
entities
:
result
.
append
(
ReportSection
(
path
=
context
.
getPhysicalPath
(),
result
.
append
(
ReportSection
(
path
=
context
.
getPhysicalPath
(),
title
=
'Bank accounts for %s'
%
entity
.
getTitle
(),
level
=
1
,
form_id
=
None
)
)
for
bank
in
entity
.
searchFolder
(
portal_type
=
'Bank Account'
):
o
=
bank
.
getObject
()
o
=
bank
.
getObject
()
result
.
append
(
ReportSection
(
title
=
'%s (%s)'
%
(
o
.
getTitle
(),
entity
.
getTitle
()),
level
=
2
,
path
=
o
.
getPhysicalPath
(),
path
=
o
.
getPhysicalPath
(),
form_id
=
'BankAccount_viewAccountingTransactionList'
,
## XXX Here we must use accounting_selection, because stat scripts read this selection
## XXX Here we must use accounting_selection, because stat scripts read this selection
selection_name
=
'accounting_selection'
,
selection_params
=
params
,
selection_columns
=
entity_columns
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getFiscalReportCreditorNodeBalance.py
View file @
65d39fde
...
...
@@ -17,10 +17,10 @@ if request.get('account_id_list_conversion_script_id'):
else
:
kw
[
'node_category'
]
=
account_id_list
sum
=
0.0
sum
_
=
0.0
for
inventory
in
portal
.
portal_simulation
.
getInventoryList
(
group_by_node
=
1
,
**
kw
):
if
inventory
.
total_price
<
0
:
sum
+=
(
inventory
.
total_price
or
0
)
return
sum
sum
_
+=
(
inventory
.
total_price
or
0
)
return
sum
_
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getFiscalReportCreditorPaymentBalance.py
View file @
65d39fde
...
...
@@ -17,11 +17,11 @@ if request.get('account_id_list_conversion_script_id'):
else
:
kw
[
'node_category'
]
=
account_id_list
sum
=
0.0
sum
_
=
0.0
for
inventory
in
portal
.
portal_simulation
.
getInventoryList
(
group_by_payment
=
1
,
group_by_node
=
1
,
**
kw
):
if
inventory
.
total_price
<
0
:
sum
+=
(
inventory
.
total_price
or
0
)
return
sum
sum
_
+=
(
inventory
.
total_price
or
0
)
return
sum
_
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getFiscalReportDebitorNodeBalance.py
View file @
65d39fde
...
...
@@ -17,10 +17,10 @@ if request.get('account_id_list_conversion_script_id'):
else
:
kw
[
'node_category'
]
=
account_id_list
sum
=
0.0
sum
_
=
0.0
for
inventory
in
portal
.
portal_simulation
.
getInventoryList
(
group_by_node
=
1
,
**
kw
):
if
inventory
.
total_price
>
0
:
sum
+=
inventory
.
total_price
return
sum
sum
_
+=
inventory
.
total_price
return
sum
_
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getFiscalReportDebitorPaymentBalance.py
View file @
65d39fde
...
...
@@ -17,11 +17,11 @@ if request.get('account_id_list_conversion_script_id'):
else
:
kw
[
'node_category'
]
=
account_id_list
sum
=
0.0
sum
_
=
0.0
for
inventory
in
portal
.
portal_simulation
.
getInventoryList
(
group_by_payment
=
1
,
group_by_node
=
1
,
**
kw
):
if
inventory
.
total_price
>
0
:
sum
+=
inventory
.
total_price
return
sum
sum
_
+=
inventory
.
total_price
return
sum
_
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getMirrorAccountUrl.py
View file @
65d39fde
index
=
context
.
portal_selections
.
getSelectionIndexFor
(
selection_name
)
object
=
brain
.
getObject
()
object
=
object
.
getDestinationValue
()
if
object
is
None
:
url
=
None
else
:
url
=
object
.
absolute_url
()
+
'/view?selection_index=%s&selection_name=%s&reset=1'
%
(
index
,
selection_name
)
return
url
account
=
brain
.
getObject
()
account
=
account
.
getDestinationValue
()
if
account
is
not
None
:
return
'%s/view?selection_index=%s&selection_name=%s&reset=1'
%
(
account
.
absolute_url
(),
index
,
selection_name
)
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTransactionListUrl.py
View file @
65d39fde
...
...
@@ -2,16 +2,16 @@ from ZTUtils import make_query
from
Products.PythonScripts.standard
import
html_quote
index
=
context
.
portal_selections
.
getSelectionIndexFor
(
selection_name
)
objec
t
=
brain
.
getObject
()
accoun
t
=
brain
.
getObject
()
# this is for domain_tree mode
if
object
.
getPortalType
()
==
"Category"
:
return
"#"
if
account
.
getPortalType
()
==
"Category"
:
return
"#"
method
=
'Account_viewAccountingTransactionList'
kw
=
{
'selection_index'
:
str
(
index
),
'selection_name'
:
selection_name
,
'reset'
:
'1'
,
'selection_name'
:
selection_name
,
'reset'
:
'1'
,
}
return
html_quote
(
'%s/%s?%s'
%
(
object
.
absolute_url
(),
method
,
make_query
(
kw
)))
return
html_quote
(
'%s/Account_viewAccountingTransactionList?%s'
%
(
account
.
absolute_url
(),
make_query
(
kw
)))
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_getNotGroupedAccountingTransactionList.xml
View file @
65d39fde
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
selection=None, sort_on=
[]
, node_category=None, node_category_strict_membership=None, from_date=None, selection_name=None, function=None, project_uid=None, analytic_column_list=(), **kw
</string>
</value>
<value>
<string>
selection=None, sort_on=
()
, node_category=None, node_category_strict_membership=None, from_date=None, selection_name=None, function=None, project_uid=None, analytic_column_list=(), **kw
</string>
</value>
</item>
<item>
<key>
<string>
_proxy_roles
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_hashGapItemList.py
View file @
65d39fde
portal
=
context
.
getPortalObject
()
Base_translateString
=
portal
.
Base_translateString
split_depth
=
2
if
default_sub_field_property_dict
is
None
:
default_sub_field_property_dict
=
{}
def
getSubFieldDict
():
def
getSubFieldDictCache
():
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_hashGapItemList.xml
View file @
65d39fde
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
item_list, value_list, default_sub_field_property_dict=
{}
, is_right_display=0
</string>
</value>
<value>
<string>
item_list, value_list, default_sub_field_property_dict=
None
, is_right_display=0
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createRelatedPaymentTransactionList.py
View file @
65d39fde
from
Products.ERP5Type.Message
import
translateString
try
:
from
zExceptions
import
Redirect
except
:
Redirect
=
'Redirect'
from
zExceptions
import
Redirect
portal
=
context
.
getPortalObject
()
stool
=
portal
.
portal_selections
getObject
=
portal
.
portal_catalog
.
getObject
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createRelatedPaymentTransactionList.xml
View file @
65d39fde
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
node, payment_mode, payment, selection_index=None, uids=
[], listbox_uid=[]
,selection_name=\'\', **kw
</string>
</value>
<value>
<string>
node, payment_mode, payment, selection_index=None, uids=
(), listbox_uid=()
,selection_name=\'\', **kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createReversalTransactionList.py
View file @
65d39fde
from
Products.ERP5Type.Message
import
translateString
try
:
from
zExceptions
import
Redirect
except
:
Redirect
=
'Redirect'
from
zExceptions
import
Redirect
portal
=
context
.
getPortalObject
()
stool
=
portal
.
portal_selections
getObject
=
portal
.
portal_catalog
.
getObject
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_createReversalTransactionList.xml
View file @
65d39fde
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
cancellation_amount=False, date=None, plan=False, uids=
[], listbox_uid=[]
, selection_name=\'\', form_id=\'view\', **kw
</string>
</value>
<value>
<string>
cancellation_amount=False, date=None, plan=False, uids=
(), listbox_uid=()
, selection_name=\'\', form_id=\'view\', **kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportReportSectionList.py
View file @
65d39fde
from
Products.ERP5Form.Report
import
ReportSection
portal
=
context
.
getPortalObject
()
request
=
container
.
REQUEST
selection_columns
=
(
(
'title'
,
'Title'
,),
...
...
@@ -20,7 +18,7 @@ selection_columns = (
(
'mirror_payment_title'
,
'Third Party Bank Account'
,),
(
'mirror_section_region_title'
,
'Third Party Region'
,),
(
'function_reference'
,
'%s Reference'
%
context
.
AccountingTransactionLine_getFunctionBaseCategoryTitle
()),
'%s Reference'
%
context
.
AccountingTransactionLine_getFunctionBaseCategoryTitle
()),
(
'function_title'
,
context
.
AccountingTransactionLine_getFunctionBaseCategoryTitle
()),
(
'funding_reference'
,
'Funding Reference'
,),
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAgedBalanceReportSectionList.py
View file @
65d39fde
from
Products.ERP5Type.Message
import
translateString
from
Products.ERP5Form.Report
import
ReportSection
portal
=
context
.
getPortalObject
()
request
=
container
.
REQUEST
section_category
=
request
[
'section_category'
]
section_category_strict
=
request
[
'section_category_strict'
]
...
...
@@ -55,7 +54,7 @@ ledger = request.get('ledger', None)
if
ledger
:
selection_params
[
'ledger'
]
=
ledger
return
[
ReportSection
(
form_id
=
(
detailed
and
return
[
ReportSection
(
form_id
=
(
detailed
and
'AccountingTransactionModule_viewDetailedAgedBalanceReportSection'
or
'AccountingTransactionModule_viewSummaryAgedBalanceReportSection'
),
path
=
context
.
getPhysicalPath
(),
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.py
View file @
65d39fde
...
...
@@ -111,7 +111,7 @@ for brain in portal.portal_simulation.getMovementHistoryList(
debit
=
debit
,
credit
=
credit
,)
analytic_info
=
{}
for
analytic_column
,
analytic_column_title
in
analytic_column_list
:
for
analytic_column
,
analytic_column_title
in
analytic_column_list
:
# pylint: disable=unused-variable
if
analytic_column
==
'project'
:
analytic_info
[
'project'
]
=
brain
.
Movement_getProjectTitle
()
elif
analytic_column
==
'funding'
:
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml
View file @
65d39fde
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
selection, at_date, from_date, portal_type, simulation_state, section_uid, payment_mode=None, payment=None, gap_root=None, group_by=None, analytic_column_list=
[]
, project_uid=None, ledger_uid=None, **kw
</string>
</value>
<value>
<string>
selection, at_date, from_date, portal_type, simulation_state, section_uid, payment_mode=None, payment=None, gap_root=None, group_by=None, analytic_column_list=
()
, project_uid=None, ledger_uid=None, **kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionStatList.py
View file @
65d39fde
from
Products.PythonScripts.standard
import
Object
request
=
container
.
REQUEST
portal
=
context
.
getPortalObject
()
return
[
Object
(
debit
=
request
.
get
(
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getSummaryAgedBalanceLineList.py
View file @
65d39fde
...
...
@@ -8,7 +8,7 @@ detail_line_list = portal\
simulation_state
,
period_list
,
account_type
,
detail
=
False
,
**
kw
)
period_id_list
=
[
'period_future'
]
for
idx
,
period
in
enumerate
(
period_list
):
for
idx
,
_
in
enumerate
(
period_list
):
period_id_list
.
append
(
'period_%s'
%
idx
)
period_id_list
.
append
(
'period_%s'
%
(
idx
+
1
))
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getTransactionLineListForGroupingReference.py
View file @
65d39fde
...
...
@@ -2,8 +2,6 @@ from Products.ZSQLCatalog.SQLCatalog import Query, NegatedQuery, ComplexQuery
request
=
container
.
REQUEST
portal
=
context
.
getPortalObject
()
ctool
=
portal
.
portal_catalog
stool
=
portal
.
portal_simulation
# we use a different selection for dialog params, because we never want this
# selection to be reseteted
...
...
@@ -77,7 +75,7 @@ if debit_price:
if
credit_price
:
try
:
search_kw
[
'stock.total_price'
]
=
-
float
(
credit_price
[
'query'
])
except
ValueError
,
e
:
except
ValueError
:
# happens when user entered a complex query (like "> 100 AND < 200")
# in that case, there is not much we can do.
search_kw
[
'stock.total_price'
]
=
credit_price
[
'query'
]
...
...
@@ -85,7 +83,7 @@ if date:
search_kw
[
'stock.date'
]
=
date
return
stool
.
getMovementHistoryList
(
return
portal
.
portal_simulation
.
getMovementHistoryList
(
section_uid
=
section_uid
,
simulation_state
=
[
'stopped'
,
'delivered'
],
sort_on
=
sort_on
,
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.py
View file @
65d39fde
"""Set grouping reference for selected lines.
Used as a fast input dialog action.
"""
from
ZTUtils
import
make_query
from
ZODB.POSException
import
ConflictError
from
Products.CMFCore.WorkflowCore
import
WorkflowException
portal
=
context
.
getPortalObject
()
getobject
=
portal
.
portal_catalog
.
getobject
stool
=
portal
.
portal_selections
Base_translateString
=
portal
.
Base_translateString
psm
=
Base_translateString
(
'Nothing matches.'
)
request
=
container
.
REQUEST
precision
=
request
.
get
(
'precision'
,
2
)
# update selected uids
stool
.
updateSelectionCheckedUidList
(
portal
.
portal_selections
.
updateSelectionCheckedUidList
(
list_selection_name
,
uids
=
uids
,
listbox_uid
=
listbox_uid
,
REQUEST
=
request
)
uids
=
stool
.
getSelectionCheckedUidsFor
(
list_selection_name
)
uids
=
portal
.
portal_selections
.
getSelectionCheckedUidsFor
(
list_selection_name
)
# XXX when should it be validated ?
if
node
==
''
:
...
...
@@ -59,7 +56,7 @@ if grouping == 'grouping':
mapping
=
dict
(
grouped_line_count
=
len
(
grouped_line_list
)))
# make sure nothing will be checked next time
stool
.
setSelectionCheckedUidsFor
(
list_selection_name
,
[])
portal
.
portal_selections
.
setSelectionCheckedUidsFor
(
list_selection_name
,
[])
# we check if we can mark some transaction as payed.
transaction_list
=
{}
...
...
@@ -103,9 +100,7 @@ if grouping == 'grouping':
try
:
portal
.
portal_workflow
.
doActionFor
(
transaction
,
'clear_action'
,
payment_date
=
date
)
except
ConflictError
:
raise
except
:
except
WorkflowException
:
# Workflow action not supported
pass
...
...
@@ -119,12 +114,12 @@ else:
for
line
in
line_list
:
if
line
.
getGroupingReference
():
ungrouped_line_list
.
extend
(
line
.
AccountingTransactionLine_resetGroupingReference
())
psm
=
Base_translateString
(
'${ungrouped_line_count} lines ungrouped.'
,
mapping
=
dict
(
ungrouped_line_count
=
len
(
ungrouped_line_list
)))
# make sure nothing will be checked next time
stool
.
setSelectionCheckedUidsFor
(
list_selection_name
,
[])
portal
.
portal_selections
.
setSelectionCheckedUidsFor
(
list_selection_name
,
[])
request
.
set
(
'portal_status_message'
,
psm
)
return
context
.
AccountingTransactionModule_viewGroupingFastInputDialog
(
request
)
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.xml
View file @
65d39fde
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
uids=
[], listbox=None, listbox_uid=[]
, list_selection_name=\'\', grouping=\'\', node=\'\', mirror_section=\'\', update=0, **kw
</string>
</value>
<value>
<string>
uids=
(), listbox=None, listbox_uid=()
, list_selection_name=\'\', grouping=\'\', node=\'\', mirror_section=\'\', update=0, **kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_updateGroupingReference.xml
View file @
65d39fde
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
uids=
[], listbox=None, listbox_uid=[]
, list_selection_name=\'\', node=\'\', mirror_section=\'\', cancel_url=\'\', **kw
</string>
</value>
<value>
<string>
uids=
(), listbox=None, listbox_uid=()
, list_selection_name=\'\', node=\'\', mirror_section=\'\', cancel_url=\'\', **kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.py
View file @
65d39fde
...
...
@@ -5,7 +5,7 @@ use.
from
Products.ERP5Type.Message
import
translateString
request
=
container
.
REQUEST
for
i
in
range
(
line_count
):
for
_
in
range
(
line_count
):
context
.
newContent
(
portal_type
=
line_portal_type
)
request
.
set
(
'portal_status_message'
,
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_getAccountingTransactionLineList.xml
View file @
65d39fde
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
portal_type=
[]
, **kw
</string>
</value>
<value>
<string>
portal_type=
()
, **kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationCurrencyConvertible.py
View file @
65d39fde
...
...
@@ -3,12 +3,12 @@ section_value = context.getDestinationSectionValue()
if
section_value
is
None
or
\
section_value
.
getProperty
(
'price_currency'
,
None
)
is
None
:
# If no section defined, no way to convert currencies
return
0
return
False
transaction_currency
=
context
.
getResource
()
if
transaction_currency
is
not
None
and
\
transaction_currency
!=
section_value
.
getProperty
(
'price_currency'
,
None
):
return
1
return
True
for
line
in
context
.
getMovementList
(
portal_type
=
context
.
getPortalAccountingMovementTypeList
()):
...
...
@@ -16,6 +16,6 @@ for line in context.getMovementList(
line
.
getDestinationInventoriatedTotalAssetCredit
())
or
(
line
.
getDestinationDebit
()
!=
line
.
getDestinationInventoriatedTotalAssetDebit
())):
return
1
return
True
return
0
return
False
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isSourceCurrencyConvertible.py
View file @
65d39fde
...
...
@@ -3,12 +3,12 @@ section_value = context.getSourceSectionValue()
if
section_value
is
None
or
\
section_value
.
getProperty
(
'price_currency'
,
None
)
is
None
:
# If no section defined, no way to convert currencies
return
0
return
False
transaction_currency
=
context
.
getResource
()
if
transaction_currency
is
not
None
and
\
transaction_currency
!=
section_value
.
getProperty
(
'price_currency'
,
None
):
return
1
return
True
for
line
in
context
.
getMovementList
(
portal_type
=
context
.
getPortalAccountingMovementTypeList
()):
...
...
@@ -16,6 +16,6 @@ for line in context.getMovementList(
line
.
getSourceInventoriatedTotalAssetCredit
())
or
(
line
.
getSourceDebit
()
!=
line
.
getSourceInventoriatedTotalAssetDebit
())):
return
1
return
True
return
0
return
False
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_importGapFile.py
View file @
65d39fde
...
...
@@ -38,13 +38,12 @@ def splitCsvLine(str_line):
return
clean_list
def
getSubCategory
(
parent
,
id
):
def
getSubCategory
(
parent
,
category_
id
):
try
:
return
parent
[
id
]
return
parent
[
category_
id
]
except
KeyError
:
return
parent
.
newContent
(
id
=
id
)
return
parent
.
newContent
(
id
=
category_
id
)
request
=
context
.
REQUEST
csv_file_line_list
=
import_file
.
readlines
()
csv_line_list
=
[]
...
...
@@ -54,18 +53,16 @@ for csv_line in csv_file_line_list:
object_list
=
[]
csv_property_list
=
splitCsvLine
(
csv_line_list
[
0
])
csv_title_list
=
splitCsvLine
(
csv_line_list
[
1
])
for
csv_line
in
csv_line_list
[
2
:]:
obje
ct
=
{}
property_di
ct
=
{}
csv_data_list
=
splitCsvLine
(
csv_line
)
data_n
=
0
for
property
in
csv_property_list
:
object
[
property
]
=
csv_data_list
[
data_n
]
for
property
_
in
csv_property_list
:
property_dict
[
property_
]
=
csv_data_list
[
data_n
]
data_n
+=
1
object_list
.
append
(
obje
ct
)
object_list
.
append
(
property_di
ct
)
root
=
context
.
getPortalObject
().
portal_categories
for
path
in
gap_root_path
.
split
(
'/'
):
...
...
@@ -74,10 +71,10 @@ for path in gap_root_path.split('/'):
existing_path_list
=
recursiveDocumentList
(
root
)
existing_path_list
.
remove
(
root
.
getPath
())
for
obje
ct
in
object_list
:
description
=
obje
ct
.
get
(
'Description'
,
None
)
or
''
gap
=
obje
ct
.
get
(
'Gap'
,
None
)
or
''
title
=
obje
ct
.
get
(
'Title'
,
None
)
or
''
for
property_di
ct
in
object_list
:
description
=
property_di
ct
.
get
(
'Description'
,
None
)
or
''
gap
=
property_di
ct
.
get
(
'Gap'
,
None
)
or
''
title
=
property_di
ct
.
get
(
'Title'
,
None
)
or
''
gap
=
str
(
gap
)
if
gap
:
gap
=
gap
.
replace
(
'CLASSE '
,
''
)
...
...
@@ -95,11 +92,11 @@ for object in object_list:
existing_path_list
.
sort
(
key
=
len
,
reverse
=
True
)
for
path
in
existing_path_list
:
objec
t
=
context
.
restrictedTraverse
(
path
)
description
=
objec
t
.
getDescription
()
or
''
gap
=
objec
t
.
getId
()
or
''
title
=
objec
t
.
getTitle
()
or
''
documen
t
=
context
.
restrictedTraverse
(
path
)
description
=
documen
t
.
getDescription
()
or
''
gap
=
documen
t
.
getId
()
or
''
title
=
documen
t
.
getTitle
()
or
''
print
'- %s - %s - %s'
%
(
gap
or
''
,
title
or
''
,
description
or
''
)
object
.
getParentValue
().
deleteContent
(
objec
t
.
getId
())
document
.
getParentValue
().
deleteContent
(
documen
t
.
getId
())
return
printed
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InternalInvoiceTransaction_getAuthenticatedUserSection.py
View file @
65d39fde
...
...
@@ -11,8 +11,6 @@ if person is None:
from
DateTime
import
DateTime
now
=
DateTime
()
destination_group
=
section_group
=
None
assigned_group_set
=
set
()
# groups on which the user is assigned
for
assignment
in
person
.
contentValues
(
portal_type
=
'Assignment'
):
if
assignment
.
getGroup
()
\
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_createRelatedPaymentTransaction.py
View file @
65d39fde
...
...
@@ -10,7 +10,6 @@ Base_translateString = context.Base_translateString
if
date
is
None
:
date
=
DateTime
()
portal
=
context
.
getPortalObject
()
payment_dict
=
{}
is_source
=
context
.
AccountingTransaction_isSourceView
()
line_portal_type
=
'Accounting Transaction Line'
...
...
@@ -58,12 +57,10 @@ related_payment = portal.accounting_module.newContent(
if
is_source
:
related_payment
.
edit
(
destination_payment
=
context
.
getDestinationPayment
(),
source_payment
=
payment
)
section
=
context
.
getSourceSection
()
mirror_section
=
context
.
getDestinationSection
()
else
:
related_payment
.
edit
(
destination_payment
=
payment
,
source_payment
=
context
.
getSourcePayment
())
section
=
context
.
getDestinationSection
()
mirror_section
=
context
.
getSourceSection
()
bank
=
related_payment
.
newContent
(
...
...
@@ -77,30 +74,29 @@ for (line_node, line_mirror_section), quantity in\
if
line_mirror_section
==
mirror_section
:
bank_quantity
+=
quantity
if
is_source
:
line
=
related_payment
.
newContent
(
related_payment
.
newContent
(
portal_type
=
line_portal_type
,
source
=
line_node
,
quantity
=
quantity
)
else
:
line
=
related_payment
.
newContent
(
related_payment
.
newContent
(
portal_type
=
line_portal_type
,
destination
=
line_node
,
quantity
=-
quantity
)
if
is_source
:
bank
.
edit
(
source
=
node
,
quantity
=-
bank_quantity
)
bank
.
setSource
(
node
)
bank
.
setQuantity
(
-
bank_quantity
)
else
:
bank
.
edit
(
destination
=
node
,
quantity
=
bank_quantity
)
bank
.
setDestination
(
node
)
bank
.
setQuantity
(
bank_quantity
)
if
plan
:
related_payment
.
plan
()
if
not
batch_mode
:
return
context
.
REQUEST
.
RESPONSE
.
redirect
(
"%s/view?portal_status_message=%s"
%
(
related_payment
.
absolute_url
(),
Base_translateString
(
'Related payment created.'
)))
else
:
return
related_payment
return
related_payment
.
Base_redirect
(
'view'
,
keep_items
=
{
'portal_status_message'
:
Base_translateString
(
'Related payment created.'
)})
return
related_payment
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_getRemainingTotalPayablePrice.py
View file @
65d39fde
...
...
@@ -59,7 +59,7 @@ def getIsSourceMovementItemList(invoice):
btt_is_source
=
btt
.
AccountingTransaction_isSourceView
()
for
btt_movement
in
btt
.
getMovementList
(
portal_type
=
portal
.
getPortalAccountingMovementTypeList
()):
movement_item_list
.
append
((
btt_is_source
,
btt_movement
))
movement_item_list
.
append
((
btt_is_source
,
btt_movement
))
return
movement_item_list
...
...
@@ -71,7 +71,6 @@ for is_source, line in getIsSourceMovementItemList(context):
if
is_source
:
node_value
=
line
.
getSourceValue
(
portal_type
=
'Account'
)
line_section
=
line
.
getSourceSection
()
mirror_section
=
line
.
getDestinationSection
()
if
quantity
:
amount
=
-
line
.
getQuantity
()
...
...
@@ -79,7 +78,6 @@ for is_source, line in getIsSourceMovementItemList(context):
amount
=
line
.
getSourceInventoriatedTotalAssetPrice
()
or
0
else
:
node_value
=
line
.
getDestinationValue
(
portal_type
=
'Account'
)
line_section
=
line
.
getDestinationSection
()
mirror_section
=
line
.
getSourceSection
()
if
quantity
:
amount
=
line
.
getQuantity
()
...
...
@@ -88,7 +86,7 @@ for is_source, line in getIsSourceMovementItemList(context):
if
at_date
is
None
and
line
.
getGroupingReference
():
continue
if
node_value
is
not
None
:
if
account_id
is
not
None
and
node_value
.
getId
()
not
in
account_id
:
continue
...
...
@@ -110,7 +108,7 @@ for related_transaction in related_transaction_list:
continue
if
related_transaction
.
getProperty
(
'origin_id'
)
==
'MAJO'
:
continue
# if we have a payment related to multiple invoices, we cannot say the
# remaining price on those invoices.
for
other_invoice
in
[
tr
for
tr
in
related_transaction
.
getCausalityValueList
(
...
...
@@ -128,18 +126,18 @@ for related_transaction in related_transaction_list:
else
:
other_invoice_line_account
=
other_line
.
getDestinationValue
()
other_invoice_line_mirror_section
=
other_line
.
getSourceSection
()
if
other_invoice_line_account
in
accounts_in_context
:
# unless this line is for another mirror_section, we cannot calculate
if
mirror_section_relative_url
is
None
or
\
other_invoice_line_mirror_section
==
mirror_section_relative_url
:
raise
ValueError
(
'Unable to calculate %s'
%
context
.
getPath
())
related_transaction_is_source
=
related_transaction
.
\
AccountingTransaction_isSourceView
()
for
line
in
related_transaction
.
getMovementList
(
portal_type
=
portal
.
getPortalAccountingMovementTypeList
()):
if
at_date
is
None
and
line
.
getGroupingReference
():
continue
...
...
@@ -148,10 +146,9 @@ for related_transaction in related_transaction_list:
raise
ValueError
(
"Unable to calculate"
", related transaction %s uses different currency"
%
line
.
getRelativeUrl
())
if
related_transaction_is_source
:
node_value
=
line
.
getSourceValue
(
portal_type
=
'Account'
)
line_section
=
line
.
getSourceSection
()
mirror_section
=
line
.
getDestinationSection
()
if
quantity
:
amount
=
-
line
.
getQuantity
()
...
...
@@ -160,14 +157,13 @@ for related_transaction in related_transaction_list:
date
=
line
.
getStartDate
().
earliestTime
()
else
:
node_value
=
line
.
getDestinationValue
(
portal_type
=
'Account'
)
line_section
=
line
.
getDestinationSection
()
mirror_section
=
line
.
getSourceSection
()
if
quantity
:
amount
=
line
.
getQuantity
()
else
:
amount
=
line
.
getDestinationInventoriatedTotalAssetPrice
()
or
0
date
=
line
.
getStopDate
().
earliestTime
()
if
node_value
is
not
None
:
if
account_id
is
not
None
and
node_value
.
getId
()
not
in
account_id
:
continue
...
...
@@ -185,7 +181,7 @@ if detailed:
else
:
if
mirror_section_relative_url
:
total_amount
=
0
for
(
node
,
mirror_section
),
amount
in
total_payable_price_per_node_section
.
items
():
for
(
node
,
mirror_section
),
amount
in
total_payable_price_per_node_section
.
items
():
# pylint: disable=unused-variable
if
mirror_section
==
mirror_section_relative_url
:
total_amount
+=
amount
return
total_amount
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Movement_getExplanationTitleAndAnalytics.py
View file @
65d39fde
...
...
@@ -10,7 +10,7 @@ else:
analytic_property_list
=
[
explanation
.
getReference
()]
for
property_name
,
property_title
in
request
[
'analytic_column_list'
]:
for
property_name
,
property_title
in
request
[
'analytic_column_list'
]:
#pylint: disable=unused-variable
# XXX it would be a little better to reuse editable field
if
property_name
==
'project'
:
analytic_property_list
.
append
(
brain
.
Movement_getProjectTitle
())
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_getAccountingTransactionList.xml
View file @
65d39fde
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
selection=None, sort_on=
[]
, node_category=None, node_category_strict_membership=None, mirror_section_category=None, from_date=None, selection_name=None, src__=0, **kw
</string>
</value>
<value>
<string>
selection=None, sort_on=
()
, node_category=None, node_category_strict_membership=None, mirror_section_category=None, from_date=None, selection_name=None, src__=0, **kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Node_statAccountingBalance.py
View file @
65d39fde
from
Products.ZSQLCatalog.SQLCatalog
import
Query
,
SimpleQuery
,
ComplexQuery
from
Products.ZSQLCatalog.SQLCatalog
import
Query
portal
=
context
.
getPortalObject
()
params
=
portal
.
ERP5Site_getAccountingSelectionParameterDict
(
selection_name
=
selection_name
)
...
...
bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_period_workflow/scripts/checkDates.py
View file @
65d39fde
...
...
@@ -2,7 +2,6 @@ from Products.DCWorkflow.DCWorkflow import ValidationFailed
from
Products.ERP5Type.Message
import
translateString
closing_period
=
state_change
[
'object'
]
portal
=
closing_period
.
getPortalObject
()
valid_state_list
=
[
'started'
,
'stopped'
,
'delivered'
]
closing_period
.
Base_checkConsistency
()
...
...
@@ -25,7 +24,7 @@ for period in period_list:
raise
ValidationFailed
,
translateString
(
"${date} is already in an open accounting period."
,
mapping
=
{
'date'
:
start_date
})
if
len
(
period_list
)
>
1
:
last_period
=
period_list
[
-
1
].
getObject
()
if
last_period
.
getId
()
==
closing_period
.
getId
():
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment