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
Lu Xu
slapos.core
Commits
5db9750d
Commit
5db9750d
authored
Feb 01, 2023
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
Updates for a rebase erp5-vifib branch
See merge request
nexedi/slapos.core!480
parents
f47e8f4e
f9a1745f
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
461 additions
and
40 deletions
+461
-40
master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_aggregated_business_process.xml
...ess_process_module/slapos_aggregated_business_process.xml
+85
-8
master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_consumption_business_process.xml
...ss_process_module/slapos_consumption_business_process.xml
+85
-8
master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_reservation_refound_business_process.xml
...ss_module/slapos_reservation_refound_business_process.xml
+85
-8
master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_subscription_business_process.xml
...s_process_module/slapos_subscription_business_process.xml
+85
-8
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Entity_createPaymentTransaction.py
...kins/slapos_accounting/Entity_createPaymentTransaction.py
+2
-6
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/PaymentTransaction_start.py
...ortal_skins/slapos_accounting/PaymentTransaction_start.py
+9
-0
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/PaymentTransaction_start.xml
...rtal_skins/slapos_accounting/PaymentTransaction_start.xml
+70
-0
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingSkins.py
.../portal_components/test.erp5.testSlapOSAccountingSkins.py
+30
-1
master/bt5/slapos_accounting/bt/template_keep_last_workflow_history_only_path_list
...ing/bt/template_keep_last_workflow_history_only_path_list
+8
-0
master/bt5/slapos_category/bt/publication_url
master/bt5/slapos_category/bt/publication_url
+0
-1
master/bt5/slapos_configurator/TestTemplateItem/portal_components/test.erp5.testSlapOSConfigurator.py
...tem/portal_components/test.erp5.testSlapOSConfigurator.py
+1
-0
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
...ortal_components/test.erp5.testSlapOSERP5SkinSelection.py
+1
-0
No files found.
master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_aggregated_business_process.xml
View file @
5db9750d
...
@@ -14,9 +14,7 @@
...
@@ -14,9 +14,7 @@
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Auditor
</string>
<string>
Auditor
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -27,9 +25,7 @@
...
@@ -27,9 +25,7 @@
<string>
Assignee
</string>
<string>
Assignee
</string>
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -40,9 +36,7 @@
...
@@ -40,9 +36,7 @@
<string>
Assignee
</string>
<string>
Assignee
</string>
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -54,9 +48,7 @@
...
@@ -54,9 +48,7 @@
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Auditor
</string>
<string>
Auditor
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -120,6 +112,12 @@
...
@@ -120,6 +112,12 @@
<key>
<string>
version
</string>
</key>
<key>
<string>
version
</string>
</key>
<value>
<string>
1
</string>
</value>
<value>
<string>
1
</string>
</value>
</item>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAU=
</string>
</persistent>
</value>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</record>
...
@@ -145,4 +143,83 @@
...
@@ -145,4 +143,83 @@
<none/>
<none/>
</pickle>
</pickle>
</record>
</record>
<record
id=
"5"
aka=
"AAAAAAAAAAU="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
validation_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAY=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"6"
aka=
"AAAAAAAAAAY="
>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.Workflow"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
validate
</string>
</value>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
error_message
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
time
</string>
</key>
<value>
<object>
<klass>
<global
name=
"DateTime"
module=
"DateTime.DateTime"
/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>
1675127930.34
</float>
<string>
UTC
</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
validation_state
</string>
</key>
<value>
<string>
validated
</string>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
</ZopeData>
master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_consumption_business_process.xml
View file @
5db9750d
...
@@ -14,9 +14,7 @@
...
@@ -14,9 +14,7 @@
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Auditor
</string>
<string>
Auditor
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -27,9 +25,7 @@
...
@@ -27,9 +25,7 @@
<string>
Assignee
</string>
<string>
Assignee
</string>
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -40,9 +36,7 @@
...
@@ -40,9 +36,7 @@
<string>
Assignee
</string>
<string>
Assignee
</string>
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -54,9 +48,7 @@
...
@@ -54,9 +48,7 @@
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Auditor
</string>
<string>
Auditor
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -120,6 +112,12 @@
...
@@ -120,6 +112,12 @@
<key>
<string>
version
</string>
</key>
<key>
<string>
version
</string>
</key>
<value>
<string>
1
</string>
</value>
<value>
<string>
1
</string>
</value>
</item>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAU=
</string>
</persistent>
</value>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</record>
...
@@ -145,4 +143,83 @@
...
@@ -145,4 +143,83 @@
<none/>
<none/>
</pickle>
</pickle>
</record>
</record>
<record
id=
"5"
aka=
"AAAAAAAAAAU="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
validation_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAY=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"6"
aka=
"AAAAAAAAAAY="
>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.Workflow"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
validate
</string>
</value>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
error_message
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
time
</string>
</key>
<value>
<object>
<klass>
<global
name=
"DateTime"
module=
"DateTime.DateTime"
/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>
1675127930.36
</float>
<string>
UTC
</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
validation_state
</string>
</key>
<value>
<string>
validated
</string>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
</ZopeData>
master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_reservation_refound_business_process.xml
View file @
5db9750d
...
@@ -14,9 +14,7 @@
...
@@ -14,9 +14,7 @@
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Auditor
</string>
<string>
Auditor
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -27,9 +25,7 @@
...
@@ -27,9 +25,7 @@
<string>
Assignee
</string>
<string>
Assignee
</string>
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -40,9 +36,7 @@
...
@@ -40,9 +36,7 @@
<string>
Assignee
</string>
<string>
Assignee
</string>
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -54,9 +48,7 @@
...
@@ -54,9 +48,7 @@
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Auditor
</string>
<string>
Auditor
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -120,6 +112,12 @@
...
@@ -120,6 +112,12 @@
<key>
<string>
version
</string>
</key>
<key>
<string>
version
</string>
</key>
<value>
<string>
1
</string>
</value>
<value>
<string>
1
</string>
</value>
</item>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAU=
</string>
</persistent>
</value>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</record>
...
@@ -145,4 +143,83 @@
...
@@ -145,4 +143,83 @@
<none/>
<none/>
</pickle>
</pickle>
</record>
</record>
<record
id=
"5"
aka=
"AAAAAAAAAAU="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
validation_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAY=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"6"
aka=
"AAAAAAAAAAY="
>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.Workflow"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
validate
</string>
</value>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
error_message
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
time
</string>
</key>
<value>
<object>
<klass>
<global
name=
"DateTime"
module=
"DateTime.DateTime"
/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>
1675127930.27
</float>
<string>
UTC
</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
validation_state
</string>
</key>
<value>
<string>
validated
</string>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
</ZopeData>
master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_subscription_business_process.xml
View file @
5db9750d
...
@@ -14,9 +14,7 @@
...
@@ -14,9 +14,7 @@
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Auditor
</string>
<string>
Auditor
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -27,9 +25,7 @@
...
@@ -27,9 +25,7 @@
<string>
Assignee
</string>
<string>
Assignee
</string>
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -40,9 +36,7 @@
...
@@ -40,9 +36,7 @@
<string>
Assignee
</string>
<string>
Assignee
</string>
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -54,9 +48,7 @@
...
@@ -54,9 +48,7 @@
<string>
Assignor
</string>
<string>
Assignor
</string>
<string>
Associate
</string>
<string>
Associate
</string>
<string>
Auditor
</string>
<string>
Auditor
</string>
<string>
Author
</string>
<string>
Manager
</string>
<string>
Manager
</string>
<string>
Owner
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -120,6 +112,12 @@
...
@@ -120,6 +112,12 @@
<key>
<string>
version
</string>
</key>
<key>
<string>
version
</string>
</key>
<value>
<string>
1
</string>
</value>
<value>
<string>
1
</string>
</value>
</item>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAU=
</string>
</persistent>
</value>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</record>
...
@@ -145,4 +143,83 @@
...
@@ -145,4 +143,83 @@
<none/>
<none/>
</pickle>
</pickle>
</record>
</record>
<record
id=
"5"
aka=
"AAAAAAAAAAU="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
validation_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAY=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"6"
aka=
"AAAAAAAAAAY="
>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.Workflow"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
validate
</string>
</value>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
error_message
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
time
</string>
</key>
<value>
<object>
<klass>
<global
name=
"DateTime"
module=
"DateTime.DateTime"
/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>
1675127930.28
</float>
<string>
UTC
</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
validation_state
</string>
</key>
<value>
<string>
validated
</string>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
</ZopeData>
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Entity_createPaymentTransaction.py
View file @
5db9750d
...
@@ -31,10 +31,10 @@ current_payment = portal.accounting_module.newContent(
...
@@ -31,10 +31,10 @@ current_payment = portal.accounting_module.newContent(
portal_type
=
"Payment Transaction"
,
portal_type
=
"Payment Transaction"
,
causality
=
current_invoice
.
getRelativeUrl
(),
causality
=
current_invoice
.
getRelativeUrl
(),
source_section
=
current_invoice
.
getSourceSection
(),
source_section
=
current_invoice
.
getSourceSection
(),
destination_section
=
current_invoice
.
getDestinationSection
(),
resource
=
current_invoice
.
getResource
(),
resource
=
current_invoice
.
getResource
(),
price_currency
=
current_invoice
.
getResource
(),
price_currency
=
current_invoice
.
getResource
(),
specialise
=
current_invoice
.
getSpecialise
(),
specialise
=
current_invoice
.
getSpecialise
(),
destination_section
=
current_invoice
.
getDestinationSection
(),
payment_mode
=
current_invoice
.
getPaymentMode
(),
payment_mode
=
current_invoice
.
getPaymentMode
(),
start_date
=
current_invoice
.
getStartDate
(),
start_date
=
current_invoice
.
getStartDate
(),
stop_date
=
current_invoice
.
getStopDate
(),
stop_date
=
current_invoice
.
getStopDate
(),
...
@@ -66,12 +66,8 @@ comment = translateString("Initialised by Entity_createPaymentTransaction.")
...
@@ -66,12 +66,8 @@ comment = translateString("Initialised by Entity_createPaymentTransaction.")
payment_tag
=
"sale_invoice_transaction_create_payment_%s"
%
current_invoice
.
getUid
()
payment_tag
=
"sale_invoice_transaction_create_payment_%s"
%
current_invoice
.
getUid
()
current_payment
.
activate
(
tag
=
payment_tag
).
immediateReindexObject
()
current_payment
.
activate
(
tag
=
payment_tag
).
immediateReindexObject
()
# Call script rather them call confirm(), since it would set security and fail whenever
# start is called.
current_payment
.
AccountingTransaction_setReference
()
comment
=
translateString
(
"Initialised by Entity_createPaymentTransaction."
)
comment
=
translateString
(
"Initialised by Entity_createPaymentTransaction."
)
current_payment
.
start
(
comment
=
comment
)
current_payment
.
PaymentTransaction_
start
(
comment
=
comment
)
# Set a flag on the request for prevent 2 calls on the same transaction
# Set a flag on the request for prevent 2 calls on the same transaction
context
.
REQUEST
.
set
(
payment_tag
,
1
)
context
.
REQUEST
.
set
(
payment_tag
,
1
)
...
...
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/PaymentTransaction_start.py
0 → 100644
View file @
5db9750d
from
zExceptions
import
Unauthorized
if
REQUEST
is
not
None
:
raise
Unauthorized
if
context
.
getPortalType
()
!=
"Payment Transaction"
:
raise
Unauthorized
context
.
confirm
(
comment
=
comment
)
context
.
start
(
comment
=
comment
)
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/PaymentTransaction_start.xml
0 → 100644
View file @
5db9750d
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"PythonScript"
module=
"Products.PythonScripts.PythonScript"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
Script_magic
</string>
</key>
<value>
<int>
3
</int>
</value>
</item>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_container
</string>
</key>
<value>
<string>
container
</string>
</value>
</item>
<item>
<key>
<string>
name_context
</string>
</key>
<value>
<string>
context
</string>
</value>
</item>
<item>
<key>
<string>
name_m_self
</string>
</key>
<value>
<string>
script
</string>
</value>
</item>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
comment="", REQUEST=None
</string>
</value>
</item>
<item>
<key>
<string>
_proxy_roles
</string>
</key>
<value>
<tuple>
<string>
Manager
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
PaymentTransaction_start
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingSkins.py
View file @
5db9750d
...
@@ -816,3 +816,32 @@ class TestSlapOSAccounting(SlapOSTestCaseMixin):
...
@@ -816,3 +816,32 @@ class TestSlapOSAccounting(SlapOSTestCaseMixin):
self
.
assertIn
(
'account_module/receivable'
,
self
.
assertIn
(
'account_module/receivable'
,
[
i
.
getRelativeUrl
()
for
i
in
account_list
])
[
i
.
getRelativeUrl
()
for
i
in
account_list
])
def
test_PaymentTransaction_start
(
self
):
sale_invoice_transaction
=
self
.
portal
.
accounting_module
.
newContent
(
portal_type
=
"Sale Invoice Transaction"
,
start_date
=
DateTime
()
)
payment_transaction
=
self
.
portal
.
accounting_module
.
newContent
(
portal_type
=
"Payment Transaction"
,
start_date
=
DateTime
()
)
self
.
assertRaises
(
Unauthorized
,
payment_transaction
.
PaymentTransaction_start
,
REQUEST
=
self
.
portal
.
REQUEST
)
self
.
assertRaises
(
Unauthorized
,
sale_invoice_transaction
.
PaymentTransaction_start
,
REQUEST
=
self
.
portal
.
REQUEST
)
self
.
assertRaises
(
Unauthorized
,
sale_invoice_transaction
.
PaymentTransaction_start
,
REQUEST
=
None
)
payment_transaction
.
PaymentTransaction_start
()
self
.
assertEqual
(
"started"
,
payment_transaction
.
getSimulationState
())
master/bt5/slapos_accounting/bt/template_keep_last_workflow_history_only_path_list
View file @
5db9750d
business_process_module/slapos_aggregated_business_process
business_process_module/slapos_aggregated_business_process/**
business_process_module/slapos_consumption_business_process
business_process_module/slapos_consumption_business_process/**
business_process_module/slapos_reservation_refound_business_process
business_process_module/slapos_reservation_refound_business_process/**
business_process_module/slapos_subscription_business_process
business_process_module/slapos_subscription_business_process/**
currency_module/CNY
currency_module/CNY
currency_module/EUR
currency_module/EUR
sale_trade_condition_module/slapos_aggregated_consumption_trade_condition
sale_trade_condition_module/slapos_aggregated_consumption_trade_condition
...
...
master/bt5/slapos_category/bt/publication_url
deleted
100644 → 0
View file @
f47e8f4e
None
\ No newline at end of file
master/bt5/slapos_configurator/TestTemplateItem/portal_components/test.erp5.testSlapOSConfigurator.py
View file @
5db9750d
...
@@ -397,6 +397,7 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
...
@@ -397,6 +397,7 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
'erp5_multimedia'
,
'erp5_multimedia'
,
'erp5_corporate_identity'
,
'erp5_corporate_identity'
,
'erp5_officejs'
,
'erp5_officejs'
,
'erp5_oauth2_resource'
,
'erp5_notebook'
,
'erp5_notebook'
,
'erp5_smart_assistant'
,
'erp5_smart_assistant'
,
'erp5_interaction_drop'
,
'erp5_interaction_drop'
,
...
...
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
View file @
5db9750d
...
@@ -44,6 +44,7 @@ common2_folder_list = """erp5_accounting_l10n_fr
...
@@ -44,6 +44,7 @@ common2_folder_list = """erp5_accounting_l10n_fr
erp5_certificate_authority
erp5_certificate_authority
erp5_item
erp5_item
erp5_item_trade
erp5_item_trade
erp5_oauth2_resource
erp5_upgrader
erp5_upgrader
erp5_access_tab
erp5_access_tab
erp5_access_token
erp5_access_token
...
...
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