Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
6d0d0fcb
Commit
6d0d0fcb
authored
Mar 29, 2019
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*: refactor with 2to3's ne fixer
parent
1cb15442
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
22 additions
and
22 deletions
+22
-22
bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_createInventory.py
...Item/portal_skins/erp5_archive/Archive_createInventory.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_new_not_emitted_workflow/scripts/validateVaultBalance.py
..._new_not_emitted_workflow/scripts/validateVaultBalance.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.py
...ow/cash_movement_workflow/scripts/validateVaultBalance.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/scripts/validateVaultBalance.py
...ounter_rendering_workflow/scripts/validateVaultBalance.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/destruction_survey_workflow/scripts/validateVaultBalance.py
...struction_survey_workflow/scripts/validateVaultBalance.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.py
...tary_destruction_workflow/scripts/validateVaultBalance.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/scripts/validateVaultBalance.py
...w/monetary_issue_workflow/scripts/validateVaultBalance.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/scripts/ValidateVaultBalance.py
.../monetary_recall_workflow/scripts/ValidateVaultBalance.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/scripts/validateVaultBalance.py
.../monetary_survey_workflow/scripts/validateVaultBalance.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.py
...eposit_rendering_workflow/scripts/validateVaultBalance.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/scripts/CheckTransitionDeliver.py
...lated_banknote_workflow/scripts/CheckTransitionDeliver.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/scripts/validateVaultBalance.py
...l_cash_rendering_workflow/scripts/validateVaultBalance.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/scripts/validateVaultBalance.py
...al_cash_transfer_workflow/scripts/validateVaultBalance.py
+1
-1
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/scripts/validateVaultBalance.py
...w/vault_transfer_workflow/scripts/validateVaultBalance.py
+1
-1
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_getVariationForMatrixInput.py
...rp5_banking_core/CashDetail_getVariationForMatrixInput.py
+3
-3
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.py
...l_skins/erp5_banking_core/CashDetail_saveFastInputLine.py
+1
-1
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_getTicketDetailedEventsLineList.py
..._skins/erp5_crm/Folder_getTicketDetailedEventsLineList.py
+1
-1
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistory.py
...ateItem/portal_skins/erp5_core/Base_getWorkflowHistory.py
+2
-2
product/ERP5Banking/tests/TestERP5BankingMixin.py
product/ERP5Banking/tests/TestERP5BankingMixin.py
+1
-1
No files found.
bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_createInventory.py
View file @
6d0d0fcb
...
...
@@ -69,7 +69,7 @@ for inventory in node_inventory_list:
inv_line
.
updateCellRange
(
script_id
=
'CashDetail_asCellRange'
,
base_id
=
base_id
)
# create cell
cell_range_key_list
=
inv_line
.
getCellRangeKeyList
(
base_id
=
base_id
)
if
cell_range_key_list
<>
[[
None
,
None
]]
:
if
cell_range_key_list
!=
[[
None
,
None
]]
:
for
k
in
cell_range_key_list
:
category_list
=
filter
(
lambda
k_item
:
k_item
is
not
None
,
k
)
cell
=
inv_line
.
newCell
(
*
k
,
**
line_kwd
)
...
...
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_new_not_emitted_workflow/scripts/validateVaultBalance.py
View file @
6d0d0fcb
...
...
@@ -36,6 +36,6 @@ if resource == 2:
elif
amount
!=
total_price
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Amount differ from total price."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/scripts/validateVaultBalance.py
View file @
6d0d0fcb
...
...
@@ -61,6 +61,6 @@ if resource == 2:
elif
amount
!=
total_price
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Amount differ from total price."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/scripts/validateVaultBalance.py
View file @
6d0d0fcb
...
...
@@ -30,6 +30,6 @@ if resource == 2:
elif
amount
!=
total_price
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Amount differ from total price."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/destruction_survey_workflow/scripts/validateVaultBalance.py
View file @
6d0d0fcb
...
...
@@ -19,6 +19,6 @@ if resource == 2:
elif
amount
!=
total_price
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Amount differ from total price."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/scripts/validateVaultBalance.py
View file @
6d0d0fcb
...
...
@@ -77,6 +77,6 @@ if resource == 2:
elif
amount
!=
total_price
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Amount differ from total price."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/scripts/validateVaultBalance.py
View file @
6d0d0fcb
...
...
@@ -25,6 +25,6 @@ if resource == 2:
elif
amount
!=
total_price
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Amount differ from total price."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/scripts/ValidateVaultBalance.py
View file @
6d0d0fcb
...
...
@@ -29,6 +29,6 @@ if resource == 2:
elif
amount
!=
total_price
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Amount differ from total price."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/scripts/validateVaultBalance.py
View file @
6d0d0fcb
...
...
@@ -41,6 +41,6 @@ if resource == 2:
elif
amount
!=
total_price
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Amount differ from total price."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/scripts/validateVaultBalance.py
View file @
6d0d0fcb
...
...
@@ -26,6 +26,6 @@ if resource == 2:
elif
amount
!=
total_price
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Amount differ from total price."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/scripts/CheckTransitionDeliver.py
View file @
6d0d0fcb
...
...
@@ -27,6 +27,6 @@ resource = ob.CashDelivery_checkCounterInventory(source=vault, portal_type='Outg
if
resource
==
2
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"No Returned banknote defined."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/scripts/validateVaultBalance.py
View file @
6d0d0fcb
...
...
@@ -32,6 +32,6 @@ if resource == 2:
elif
amount
!=
total_price
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Amount differ from total price."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/scripts/validateVaultBalance.py
View file @
6d0d0fcb
...
...
@@ -33,6 +33,6 @@ if resource == 2:
elif
amount
!=
total_price
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Amount differ from total price."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/scripts/validateVaultBalance.py
View file @
6d0d0fcb
...
...
@@ -38,6 +38,6 @@ if resource == 2:
elif
amount
!=
total_price
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Amount differ from total price."
)
raise
ValidationFailed
(
msg
,)
elif
resource
<>
0
:
elif
resource
!=
0
:
msg
=
Message
(
domain
=
"ui"
,
message
=
"Insufficient Balance."
)
raise
ValidationFailed
(
msg
,)
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_getVariationForMatrixInput.py
View file @
6d0d0fcb
...
...
@@ -22,13 +22,13 @@ else :
default_column_base
=
'variation'
allow_add_line
=
False
if
len
(
default_emission_letter_list
)
>
1
and
default_column_base
<>
'emission_letter'
:
if
len
(
default_emission_letter_list
)
>
1
and
default_column_base
!=
'emission_letter'
:
return_list
.
append
([
'emission_letter'
,
'Emission Letter'
])
allow_add_line
=
True
if
len
(
default_cash_status_list
)
>
1
and
default_column_base
<>
'cash_status'
:
if
len
(
default_cash_status_list
)
>
1
and
default_column_base
!=
'cash_status'
:
return_list
.
append
([
'cash_status'
,
'Cash Status'
])
allow_add_line
=
True
if
len
(
default_variation_list
)
>
1
and
default_column_base
<>
'variation'
:
if
len
(
default_variation_list
)
>
1
and
default_column_base
!=
'variation'
:
return_list
.
append
([
'variation'
,
'Variation'
])
allow_add_line
=
True
...
...
bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CashDetail_saveFastInputLine.py
View file @
6d0d0fcb
...
...
@@ -205,7 +205,7 @@ if not error:
line
.
updateCellRange
(
script_id
=
'CashDetail_asCellRange'
,
base_id
=
cell_base_id
)
# create cell
cell_range_key_list
=
line
.
getCellRangeKeyList
(
base_id
=
cell_base_id
)
if
cell_range_key_list
<>
[[
None
,
None
]]
:
if
cell_range_key_list
!=
[[
None
,
None
]]
:
for
k
in
cell_range_key_list
:
# check we don't create a cell for variation which is not defined
key
=
"%s_%s_%s"
%
(
k
[
2
],
k
[
0
],
k
[
1
])
...
...
bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Folder_getTicketDetailedEventsLineList.py
View file @
6d0d0fcb
...
...
@@ -49,7 +49,7 @@ for r_ticket in ticket_list:
for
r_event_causality
in
event_causality_list
:
event_causality
=
r_event_causality
.
getObject
()
#check that one event it isn't related by causality and follow-up with the same ticket
if
ticket
.
getUid
()
<>
event_causality
.
getFollowUpUid
():
if
ticket
.
getUid
()
!=
event_causality
.
getFollowUpUid
():
line_list
.
append
(
Object
(
uid
=
'new_'
,
ticket
=
''
,
type
=
event_causality
.
getTranslatedPortalType
(),
...
...
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistory.py
View file @
6d0d0fcb
...
...
@@ -23,7 +23,7 @@ for history_name in history_name_list:
history_element_title_list
=
[]
for
history_element_title
in
list_history_item
[
-
1
].
keys
():
if
history_element_title
<>
history_name
:
if
history_element_title
!=
history_name
:
new_title
=
history_element_title
.
replace
(
'_'
,
' '
).
title
()
history_element_title_list
.
append
(
new_title
)
...
...
@@ -31,7 +31,7 @@ for history_name in history_name_list:
for
history_item
in
list_history_item
:
history_item_info
=
()
for
history_element_title
in
list_history_item
[
-
1
].
keys
():
if
history_element_title
<>
history_name
:
if
history_element_title
!=
history_name
:
history_item_info
+=
(
history_item
.
get
(
history_element_title
),)
history_item_list
.
append
(
history_item_info
)
history_item_list
.
reverse
()
...
...
product/ERP5Banking/tests/TestERP5BankingMixin.py
View file @
6d0d0fcb
...
...
@@ -1197,7 +1197,7 @@ class TestERP5BankingMixin(ERP5TypeTestCase):
line
.
setVariationCategoryList
(
variation_category_list
)
line
.
updateCellRange
(
script_id
=
'CashDetail_asCellRange'
,
base_id
=
base_id
)
cell_range_key_list
=
line
.
getCellRangeKeyList
(
base_id
=
base_id
)
if
cell_range_key_list
<>
[[
None
,
None
]]
:
if
cell_range_key_list
!=
[[
None
,
None
]]
:
for
k
in
cell_range_key_list
:
category_list
=
filter
(
lambda
k_item
:
k_item
is
not
None
,
k
)
c
=
line
.
newCell
(
*
k
,
**
line_kwd
)
...
...
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