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
Jérome Perrin
slapos.core
Commits
42361690
Commit
42361690
authored
Jul 08, 2020
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_cloud&accounting&subscription: Unhardcode pre-payment templates
Move definition into preferences
parent
463ddab7
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
689 additions
and
14 deletions
+689
-14
master/bt5/slapos_accounting/PropertySheetTemplateItem/portal_property_sheets/SlapOSAccountingSystemPreference/preferred_default_pre_payment_subscription_invoice_template_property.xml
...lt_pre_payment_subscription_invoice_template_property.xml
+67
-0
master/bt5/slapos_accounting/PropertySheetTemplateItem/portal_property_sheets/SlapOSAccountingSystemPreference/preferred_default_pre_payment_template_property.xml
...rence/preferred_default_pre_payment_template_property.xml
+67
-0
master/bt5/slapos_accounting/PropertySheetTemplateItem/portal_property_sheets/SlapOSAccountingSystemPreference/preferred_zh_pre_payment_subscription_invoice_template_property.xml
...zh_pre_payment_subscription_invoice_template_property.xml
+67
-0
master/bt5/slapos_accounting/PropertySheetTemplateItem/portal_property_sheets/SlapOSAccountingSystemPreference/preferred_zh_pre_payment_template_property.xml
...Preference/preferred_zh_pre_payment_template_property.xml
+67
-0
master/bt5/slapos_cloud/PreferenceTemplateItem/portal_preferences/slapos_default_system_preference.xml
...m/portal_preferences/slapos_default_system_preference.xml
+22
-0
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SystemPreference_viewSlapOS.xml
...portal_skins/slapos_cloud/SystemPreference_viewSlapOS.xml
+4
-0
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SystemPreference_viewSlapOS/my_preferred_default_pre_payment_subscription_invoice_template.xml
...red_default_pre_payment_subscription_invoice_template.xml
+96
-0
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SystemPreference_viewSlapOS/my_preferred_default_pre_payment_template.xml
..._viewSlapOS/my_preferred_default_pre_payment_template.xml
+96
-0
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SystemPreference_viewSlapOS/my_preferred_zh_pre_payment_subscription_invoice_template.xml
...referred_zh_pre_payment_subscription_invoice_template.xml
+96
-0
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SystemPreference_viewSlapOS/my_preferred_zh_pre_payment_template.xml
...rence_viewSlapOS/my_preferred_zh_pre_payment_template.xml
+96
-0
master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/slapos_pre_payment_template/1.xml
...eItem/accounting_module/slapos_pre_payment_template/1.xml
+1
-1
master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/slapos_pre_payment_template/2.xml
...eItem/accounting_module/slapos_pre_payment_template/2.xml
+1
-1
master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/slapos_wechat_pre_payment_template/1.xml
...ccounting_module/slapos_wechat_pre_payment_template/1.xml
+1
-1
master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/slapos_wechat_pre_payment_template/2.xml
...ccounting_module/slapos_wechat_pre_payment_template/2.xml
+1
-1
master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_createRelatedSaleInvoiceTransaction.py
...ubscriptionRequest_createRelatedSaleInvoiceTransaction.py
+2
-2
master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_requestPaymentTransaction.py
..._request/SubscriptionRequest_requestPaymentTransaction.py
+5
-8
No files found.
master/bt5/slapos_accounting/PropertySheetTemplateItem/portal_property_sheets/SlapOSAccountingSystemPreference/preferred_default_pre_payment_subscription_invoice_template_property.xml
0 → 100644
View file @
42361690
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Standard Property"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_local_properties
</string>
</key>
<value>
<tuple>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
mode
</string>
</value>
</item>
<item>
<key>
<string>
type
</string>
</key>
<value>
<string>
string
</string>
</value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
elementary_type/string
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
preferred_default_pre_payment_subscription_invoice_template_property
</string>
</value>
</item>
<item>
<key>
<string>
mode
</string>
</key>
<value>
<string>
w
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
</item>
<item>
<key>
<string>
preference
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
property_default
</string>
</key>
<value>
<string>
python: \'\'
</string>
</value>
</item>
<item>
<key>
<string>
write_permission
</string>
</key>
<value>
<string>
Manage properties
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_accounting/PropertySheetTemplateItem/portal_property_sheets/SlapOSAccountingSystemPreference/preferred_default_pre_payment_template_property.xml
0 → 100644
View file @
42361690
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Standard Property"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_local_properties
</string>
</key>
<value>
<tuple>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
mode
</string>
</value>
</item>
<item>
<key>
<string>
type
</string>
</key>
<value>
<string>
string
</string>
</value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
elementary_type/string
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
preferred_default_pre_payment_template_property
</string>
</value>
</item>
<item>
<key>
<string>
mode
</string>
</key>
<value>
<string>
w
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
</item>
<item>
<key>
<string>
preference
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
property_default
</string>
</key>
<value>
<string>
python: \'\'
</string>
</value>
</item>
<item>
<key>
<string>
write_permission
</string>
</key>
<value>
<string>
Manage properties
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_accounting/PropertySheetTemplateItem/portal_property_sheets/SlapOSAccountingSystemPreference/preferred_zh_pre_payment_subscription_invoice_template_property.xml
0 → 100644
View file @
42361690
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Standard Property"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_local_properties
</string>
</key>
<value>
<tuple>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
mode
</string>
</value>
</item>
<item>
<key>
<string>
type
</string>
</key>
<value>
<string>
string
</string>
</value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
elementary_type/string
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
preferred_zh_pre_payment_subscription_invoice_template_property
</string>
</value>
</item>
<item>
<key>
<string>
mode
</string>
</key>
<value>
<string>
w
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
</item>
<item>
<key>
<string>
preference
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
property_default
</string>
</key>
<value>
<string>
python: \'\'
</string>
</value>
</item>
<item>
<key>
<string>
write_permission
</string>
</key>
<value>
<string>
Manage properties
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_accounting/PropertySheetTemplateItem/portal_property_sheets/SlapOSAccountingSystemPreference/preferred_zh_pre_payment_template_property.xml
0 → 100644
View file @
42361690
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Standard Property"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_local_properties
</string>
</key>
<value>
<tuple>
<dictionary>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
mode
</string>
</value>
</item>
<item>
<key>
<string>
type
</string>
</key>
<value>
<string>
string
</string>
</value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
elementary_type/string
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
preferred_zh_pre_payment_template_property
</string>
</value>
</item>
<item>
<key>
<string>
mode
</string>
</key>
<value>
<string>
w
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Standard Property
</string>
</value>
</item>
<item>
<key>
<string>
preference
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
property_default
</string>
</key>
<value>
<string>
python: \'\'
</string>
</value>
</item>
<item>
<key>
<string>
write_permission
</string>
</key>
<value>
<string>
Manage properties
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cloud/PreferenceTemplateItem/portal_preferences/slapos_default_system_preference.xml
View file @
42361690
...
@@ -119,6 +119,14 @@
...
@@ -119,6 +119,14 @@
<key>
<string>
preferred_credential_request_automatic_approval
</string>
</key>
<key>
<string>
preferred_credential_request_automatic_approval
</string>
</key>
<value>
<int>
1
</int>
</value>
<value>
<int>
1
</int>
</value>
</item>
</item>
<item>
<key>
<string>
preferred_default_pre_payment_subscription_invoice_template
</string>
</key>
<value>
<string>
accounting_module/template_pre_payment_subscription_sale_invoice_transaction
</string>
</value>
</item>
<item>
<key>
<string>
preferred_default_pre_payment_template
</string>
</key>
<value>
<string>
accounting_module/slapos_pre_payment_template
</string>
</value>
</item>
<item>
<item>
<key>
<string>
preferred_document_conversion_server_url
</string>
</key>
<key>
<string>
preferred_document_conversion_server_url
</string>
</key>
<value>
<value>
...
@@ -304,6 +312,12 @@
...
@@ -304,6 +312,12 @@
</tuple>
</tuple>
</value>
</value>
</item>
</item>
<item>
<key>
<string>
preferred_support_request_creation_limit
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<item>
<key>
<string>
preferred_support_request_resource
</string>
</key>
<key>
<string>
preferred_support_request_resource
</string>
</key>
<value>
<value>
...
@@ -344,6 +358,14 @@
...
@@ -344,6 +358,14 @@
<key>
<string>
preferred_wechat_payment_service_reference
</string>
</key>
<key>
<string>
preferred_wechat_payment_service_reference
</string>
</key>
<value>
<string>
PSERV-Wechat-Test
</string>
</value>
<value>
<string>
PSERV-Wechat-Test
</string>
</value>
</item>
</item>
<item>
<key>
<string>
preferred_zh_pre_payment_subscription_invoice_template
</string>
</key>
<value>
<string>
accounting_module/template_wechat_pre_payment_subscription_sale_invoice_transaction
</string>
</value>
</item>
<item>
<key>
<string>
preferred_zh_pre_payment_template
</string>
</key>
<value>
<string>
accounting_module/slapos_wechat_pre_payment_template
</string>
</value>
</item>
<item>
<item>
<key>
<string>
preffered_force_username_check_in_password
</string>
</key>
<key>
<string>
preffered_force_username_check_in_password
</string>
</key>
<value>
<int>
1
</int>
</value>
<value>
<int>
1
</int>
</value>
...
...
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SystemPreference_viewSlapOS.xml
View file @
42361690
...
@@ -84,6 +84,8 @@
...
@@ -84,6 +84,8 @@
<string>
my_preferred_aggregated_sale_trade_condition
</string>
<string>
my_preferred_aggregated_sale_trade_condition
</string>
<string>
my_preferred_aggregated_subscription_sale_trade_condition
</string>
<string>
my_preferred_aggregated_subscription_sale_trade_condition
</string>
<string>
my_preferred_aggregated_consumption_sale_trade_condition
</string>
<string>
my_preferred_aggregated_consumption_sale_trade_condition
</string>
<string>
my_preferred_zh_pre_payment_subscription_invoice_template
</string>
<string>
my_preferred_default_pre_payment_subscription_invoice_template
</string>
<string>
my_preferred_rest_api_token_server_url
</string>
<string>
my_preferred_rest_api_token_server_url
</string>
</list>
</list>
</value>
</value>
...
@@ -100,6 +102,8 @@
...
@@ -100,6 +102,8 @@
<list>
<list>
<string>
my_preferred_open_sale_order_line_template
</string>
<string>
my_preferred_open_sale_order_line_template
</string>
<string>
my_preferred_open_sale_order_template
</string>
<string>
my_preferred_open_sale_order_template
</string>
<string>
my_preferred_zh_pre_payment_template
</string>
<string>
my_preferred_default_pre_payment_template
</string>
<string>
my_preferred_instance_delivery_template
</string>
<string>
my_preferred_instance_delivery_template
</string>
<string>
my_preferred_hateoas_url
</string>
<string>
my_preferred_hateoas_url
</string>
<string>
my_preferred_slapos_web_site_url
</string>
<string>
my_preferred_slapos_web_site_url
</string>
...
...
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SystemPreference_viewSlapOS/my_preferred_default_pre_payment_subscription_invoice_template.xml
0 → 100644
View file @
42361690
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_preferred_default_pre_payment_subscription_invoice_template
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_string_field
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Preferred Chinese Pre Payment Sale Invoice Template
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SystemPreference_viewSlapOS/my_preferred_default_pre_payment_template.xml
0 → 100644
View file @
42361690
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_preferred_default_pre_payment_template
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_string_field
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Preferred Default Pre Payment Template
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SystemPreference_viewSlapOS/my_preferred_zh_pre_payment_subscription_invoice_template.xml
0 → 100644
View file @
42361690
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_preferred_zh_pre_payment_subscription_invoice_template
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_string_field
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Preferred Default Pre Payment Sale Invoice Template
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_cloud/SkinTemplateItem/portal_skins/slapos_cloud/SystemPreference_viewSlapOS/my_preferred_zh_pre_payment_template.xml
0 → 100644
View file @
42361690
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_preferred_zh_pre_payment_template
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_string_field
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Preferred Chinese Pre Payment Template
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/slapos_pre_payment_template/1.xml
View file @
42361690
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
quantity
</string>
</key>
<key>
<string>
quantity
</string>
</key>
<value>
<float>
0
.0
</float>
</value>
<value>
<float>
25
.0
</float>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/slapos_pre_payment_template/2.xml
View file @
42361690
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
quantity
</string>
</key>
<key>
<string>
quantity
</string>
</key>
<value>
<float>
0
.0
</float>
</value>
<value>
<float>
-25
.0
</float>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/slapos_wechat_pre_payment_template/1.xml
View file @
42361690
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
quantity
</string>
</key>
<key>
<string>
quantity
</string>
</key>
<value>
<float>
0
.0
</float>
</value>
<value>
<float>
188
.0
</float>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/slapos_wechat_pre_payment_template/2.xml
View file @
42361690
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
quantity
</string>
</key>
<key>
<string>
quantity
</string>
</key>
<value>
<float>
0
.0
</float>
</value>
<value>
<float>
-188
.0
</float>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_createRelatedSaleInvoiceTransaction.py
View file @
42361690
...
@@ -8,9 +8,9 @@ current_invoice = context.getCausalityValue()
...
@@ -8,9 +8,9 @@ current_invoice = context.getCausalityValue()
if
current_invoice
is
None
:
if
current_invoice
is
None
:
if
target_language
==
"zh"
:
# Wechat payment
if
target_language
==
"zh"
:
# Wechat payment
invoice_template_path
=
"accounting_module/template_wechat_pre_payment_subscription_sale_invoice_transaction"
invoice_template_path
=
portal
.
portal_preferences
.
getPreferredZhPrePaymentSubscriptionInvoiceTemplate
()
else
:
else
:
invoice_template_path
=
"accounting_module/template_pre_payment_subscription_sale_invoice_transaction"
invoice_template_path
=
portal
.
portal_preferences
.
getPreferredDefaultPrePaymentSubscriptionInvoiceTemplate
()
invoice_template
=
portal
.
restrictedTraverse
(
invoice_template_path
)
invoice_template
=
portal
.
restrictedTraverse
(
invoice_template_path
)
current_invoice
=
invoice_template
.
Base_createCloneDocument
(
batch_mode
=
1
)
current_invoice
=
invoice_template
.
Base_createCloneDocument
(
batch_mode
=
1
)
...
...
master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_requestPaymentTransaction.py
View file @
42361690
...
@@ -9,11 +9,9 @@ current_payment = None
...
@@ -9,11 +9,9 @@ current_payment = None
if
current_invoice
is
None
:
if
current_invoice
is
None
:
if
target_language
==
"zh"
:
# Wechat payment, reservation fee is 188 CNY
if
target_language
==
"zh"
:
# Wechat payment, reservation fee is 188 CNY
payment_template
=
portal
.
restrictedTraverse
(
"accounting_module/slapos_wechat_pre_payment_template"
)
payment_template
=
portal
.
restrictedTraverse
(
portal
.
portal_preferences
.
getPreferredZhPrePaymentTemplate
())
quantity
=
int
(
amount
)
*
188
else
:
# Payzen payment, reservation fee is 25 EUR
else
:
# Payzen payment, reservation fee is 25 EUR
payment_template
=
portal
.
restrictedTraverse
(
"accounting_module/slapos_pre_payment_template"
)
payment_template
=
portal
.
restrictedTraverse
(
portal
.
portal_preferences
.
getPreferredDefaultPrePaymentTemplate
())
quantity
=
int
(
amount
)
*
25
current_payment
=
payment_template
.
Base_createCloneDocument
(
batch_mode
=
1
)
current_payment
=
payment_template
.
Base_createCloneDocument
(
batch_mode
=
1
)
current_payment
.
edit
(
current_payment
.
edit
(
...
@@ -28,9 +26,8 @@ if current_invoice is None:
...
@@ -28,9 +26,8 @@ if current_invoice is None:
for
line
in
current_payment
.
contentValues
():
for
line
in
current_payment
.
contentValues
():
if
line
.
getSource
()
==
"account_module/bank"
:
if
line
.
getSource
()
in
[
"account_module/bank"
,
"account_module/receivable"
]:
line
.
setQuantity
(
-
1
*
quantity
)
quantity
=
int
(
amount
)
*
line
.
getQuantity
()
if
line
.
getSource
()
==
"account_module/receivable"
:
line
.
setQuantity
(
quantity
)
line
.
setQuantity
(
quantity
)
# Accelarate job of alarms before proceed to payment.
# Accelarate job of alarms before proceed to payment.
...
...
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