Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
Léo-Paul Géneau
slapos.core
Commits
873be052
Commit
873be052
authored
May 27, 2020
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_accounting&payzen: newTempSimulationMovement was replaced by newContent
parent
39594073
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
...ting/OrderBuilder_generateSlapOSAggregatedMovementList.py
+4
-2
master/bt5/slapos_payzen/SkinTemplateItem/portal_skins/slapos_payzen/OrderBuilder_generateUnrelatedInvoiceList.py
...lapos_payzen/OrderBuilder_generateUnrelatedInvoiceList.py
+5
-4
No files found.
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
View file @
873be052
select_kw
=
kwargs
.
copy
()
select_kw
.
pop
(
'portal_type'
,
None
)
select_kw
.
pop
(
'delivery_relative_url_list'
,
None
)
from
Products.ERP5Type.Document
import
newTempSimulationMovement
from
Products.ZSQLCatalog.SQLCatalog
import
Query
,
NegatedQuery
,
ComplexQuery
portal
=
context
.
getPortalObject
()
newTempSimulationMovement
=
portal
.
portal_trash
.
newContent
business_process_uid_list
=
[
portal
.
business_process_module
.
slapos_reservation_refound_business_process
.
getUid
(),
portal
.
business_process_module
.
slapos_subscription_business_process
.
getUid
()]
...
...
@@ -50,7 +51,8 @@ for movement in movement_list:
if
movement
.
getGroupingReference
()
is
not
None
:
continue
temp_movement
=
newTempSimulationMovement
(
portal
,
movement
.
getRelativeUrl
(),
temp_object
=
True
,
id
=
movement
.
getRelativeUrl
(),
portal_type
=
"Simulation Movement"
,
quantity
=
movement
.
getQuantity
(),
resource
=
movement
.
getResource
(),
source
=
movement
.
getDestination
(),
...
...
master/bt5/slapos_payzen/SkinTemplateItem/portal_skins/slapos_payzen/OrderBuilder_generateUnrelatedInvoiceList.py
View file @
873be052
from
Products.ERP5Type.Document
import
newTempSimulationMovement
portal
=
context
.
getPortalObject
()
newTempSimulationMovement
=
portal
.
portal_trash
.
newContent
select_dict
=
{
'causality_payment_transaction_related_uid'
:
None
,
'causality_subscription_request_related_uid'
:
None
,
...
...
@@ -38,6 +38,7 @@ for invoice in portal.portal_catalog(**select_kw):
default_source_uid
=
default_source_uid
):
quantity
+=
movement
.
getQuantity
()
temp_movement_kw
=
dict
(
portal_type
=
"Simulation Movement"
,
causality
=
invoice
.
getRelativeUrl
(),
source_section
=
invoice
.
getSourceSection
(),
destination_section
=
invoice
.
getDestinationSection
(),
...
...
@@ -50,7 +51,7 @@ for invoice in portal.portal_catalog(**select_kw):
source_payment
=
'organisation_module/slapos/bank_account'
,
# the other place defnied: business process
)
temp_movement_rec
=
newTempSimulationMovement
(
portal
,
str
(
id
),
temp_object
=
True
,
id
=
str
(
id
),
quantity
=-
1
*
quantity
,
source
=
'account_module/receivable'
,
destination
=
'account_module/payable'
,
...
...
@@ -58,7 +59,7 @@ for invoice in portal.portal_catalog(**select_kw):
)
id
+=
1
temp_movement_bank
=
newTempSimulationMovement
(
portal
,
str
(
id
),
temp_object
=
True
,
id
=
str
(
id
),
quantity
=
1
*
quantity
,
source
=
'account_module/bank'
,
destination
=
'account_module/bank'
,
...
...
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