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
1
Merge Requests
1
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
Romain Courteaud
slapos.core
Commits
1bbea36a
Commit
1bbea36a
authored
May 06, 2021
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_accounting: Adjust chinese taxation for 1%
parent
cf069086
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
518 additions
and
31 deletions
+518
-31
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_subscription_trade_condition.xml
...module/slapos_aggregated_subscription_trade_condition.xml
+70
-1
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_subscription_trade_condition/1.xml
...dule/slapos_aggregated_subscription_trade_condition/1.xml
+3
-3
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_subscription_trade_condition/3.xml
...dule/slapos_aggregated_subscription_trade_condition/3.xml
+4
-6
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition.xml
...de_condition_module/slapos_aggregated_trade_condition.xml
+3
-5
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/1.xml
..._condition_module/slapos_aggregated_trade_condition/1.xml
+158
-1
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/5.xml
..._condition_module/slapos_aggregated_trade_condition/5.xml
+256
-0
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
...ting/OrderBuilder_generateSlapOSAggregatedMovementList.py
+6
-2
master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/template_wechat_pre_payment_subscription_sale_invoice_transaction/1.xml
...t_pre_payment_subscription_sale_invoice_transaction/1.xml
+1
-1
master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_requestPaymentTransaction.py
..._request/SubscriptionRequest_requestPaymentTransaction.py
+6
-1
master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionCDNScenario.py
...components/test.erp5.testSlapOSSubscriptionCDNScenario.py
+5
-5
master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionDualOrganisationScenario.py
...st.erp5.testSlapOSSubscriptionDualOrganisationScenario.py
+1
-1
master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionScenario.py
...al_components/test.erp5.testSlapOSSubscriptionScenario.py
+5
-5
No files found.
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_subscription_trade_condition.xml
View file @
1bbea36a
...
@@ -212,11 +212,17 @@
...
@@ -212,11 +212,17 @@
<value>
<value>
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
validation
_workflow
</string>
</key>
<key>
<string>
edit
_workflow
</string>
</key>
<value>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAg=
</string>
</persistent>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAg=
</string>
</persistent>
</value>
</value>
</item>
</item>
<item>
<key>
<string>
validation_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAk=
</string>
</persistent>
</value>
</item>
</dictionary>
</dictionary>
</value>
</value>
</item>
</item>
...
@@ -224,6 +230,69 @@
...
@@ -224,6 +230,69 @@
</pickle>
</pickle>
</record>
</record>
<record
id=
"8"
aka=
"AAAAAAAAAAg="
>
<record
id=
"8"
aka=
"AAAAAAAAAAg="
>
<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>
edit
</string>
</value>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
error_message
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
991.53635.62912.26897
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
<value>
<string>
current
</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>
1620318646.43
</float>
<string>
UTC
</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"9"
aka=
"AAAAAAAAAAk="
>
<pickle>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.Workflow"
/>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.Workflow"
/>
</pickle>
</pickle>
...
...
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_subscription_trade_condition/1.xml
View file @
1bbea36a
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
default_reference
</string>
</key>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
VAT
_EUR
</string>
</value>
<value>
<string>
VAT
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
...
@@ -188,7 +188,7 @@
...
@@ -188,7 +188,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
991.53633.
45708.36590
</string>
</value>
<value>
<string>
991.53633.
57403.44373
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -206,7 +206,7 @@
...
@@ -206,7 +206,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1620
065392.55
</float>
<float>
1620
318646.42
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_subscription_trade_condition/3.xml
View file @
1bbea36a
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
default_reference
</string>
</key>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
VAT
_CNY
</string>
</value>
<value>
<string>
VAT
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
...
@@ -53,7 +53,6 @@
...
@@ -53,7 +53,6 @@
<value>
<value>
<tuple>
<tuple>
<string>
price_currency
</string>
<string>
price_currency
</string>
<string>
resource
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -62,7 +61,6 @@
...
@@ -62,7 +61,6 @@
<value>
<value>
<tuple>
<tuple>
<string>
price_currency/currency_module/CNY
</string>
<string>
price_currency/currency_module/CNY
</string>
<string>
resource/service_module/slapos_instance_subscription
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
@@ -72,7 +70,7 @@
...
@@ -72,7 +70,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
price
</string>
</key>
<key>
<string>
price
</string>
</key>
<value>
<float>
0.
2
</float>
</value>
<value>
<float>
0.
01
</float>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
quantity
</string>
</key>
<key>
<string>
quantity
</string>
</key>
...
@@ -190,7 +188,7 @@
...
@@ -190,7 +188,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
991.5
3652.31735.11434
</string>
</value>
<value>
<string>
991.5
7855.43043.56797
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -208,7 +206,7 @@
...
@@ -208,7 +206,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1620
066600.95
</float>
<float>
1620
326231.38
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition.xml
View file @
1bbea36a
...
@@ -280,9 +280,7 @@
...
@@ -280,9 +280,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
<value>
<value>
<string>
Deleted objects: [\'1\', \'2\']
</string>
</value>
<none/>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
error_message
</string>
</key>
<key>
<string>
error_message
</string>
</key>
...
@@ -290,7 +288,7 @@
...
@@ -290,7 +288,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
99
0.36941.15111.50278
</string>
</value>
<value>
<string>
99
1.57853.29905.57463
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -308,7 +306,7 @@
...
@@ -308,7 +306,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
16
15227411.66
</float>
<float>
16
20318739.43
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/1.xml
View file @
1bbea36a
...
@@ -42,6 +42,28 @@
...
@@ -42,6 +42,28 @@
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
1
</string>
</value>
<value>
<string>
1
</string>
</value>
</item>
</item>
<item>
<key>
<string>
int_index
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
membership_criterion_base_category
</string>
</key>
<value>
<tuple>
<string>
price_currency
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
membership_criterion_category
</string>
</key>
<value>
<tuple>
<string>
price_currency/currency_module/EUR
</string>
</tuple>
</value>
</item>
<item>
<item>
<key>
<string>
portal_type
</string>
</key>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Trade Model Line
</string>
</value>
<value>
<string>
Trade Model Line
</string>
</value>
...
@@ -54,13 +76,31 @@
...
@@ -54,13 +76,31 @@
<key>
<string>
quantity
</string>
</key>
<key>
<string>
quantity
</string>
</key>
<value>
<float>
1.0
</float>
</value>
<value>
<float>
1.0
</float>
</value>
</item>
</item>
<item>
<key>
<string>
string_index
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<item>
<key>
<string>
target_delivery
</string>
</key>
<key>
<string>
target_delivery
</string>
</key>
<value>
<int>
0
</int>
</value>
<value>
<int>
0
</int>
</value>
</item>
</item>
<item>
<key>
<string>
test_method_id
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
VAT
</string>
</value>
<value>
<string>
VAT (EURO)
</string>
</value>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAQ=
</string>
</persistent>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
@@ -95,4 +135,121 @@
...
@@ -95,4 +135,121 @@
</dictionary>
</dictionary>
</pickle>
</pickle>
</record>
</record>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
edit_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAU=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"5"
aka=
"AAAAAAAAAAU="
>
<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>
edit
</string>
</value>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAY=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
error_message
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
0.0.0.0
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
<value>
<string>
current
</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>
1620318743.66
</float>
<string>
UTC
</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"6"
aka=
"AAAAAAAAAAY="
>
<pickle>
<global
name=
"Message"
module=
"Products.ERP5Type.Message"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
default
</string>
</key>
<value>
<string>
Object copied from ${source_item}
</string>
</value>
</item>
<item>
<key>
<string>
domain
</string>
</key>
<value>
<string>
erp5_ui
</string>
</value>
</item>
<item>
<key>
<string>
mapping
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
source_item
</string>
</key>
<value>
<string>
/erp5/sale_trade_condition_module/slapos_aggregated_subscription_trade_condition/1
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
message
</string>
</key>
<value>
<string>
Object copied from ${source_item}
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
</ZopeData>
master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition/5.xml
0 → 100644
View file @
1bbea36a
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Trade Model Line"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_identity_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
_range_criterion
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
categories
</string>
</key>
<value>
<tuple>
<string>
resource/service_module/slapos_tax
</string>
<string>
base_application/base_amount/invoicing/taxable
</string>
<string>
trade_phase/slapos/tax
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
VAT
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
5
</string>
</value>
</item>
<item>
<key>
<string>
int_index
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
membership_criterion_base_category
</string>
</key>
<value>
<tuple>
<string>
price_currency
</string>
<string>
resource
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
membership_criterion_category
</string>
</key>
<value>
<tuple>
<string>
price_currency/currency_module/CNY
</string>
</tuple>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Trade Model Line
</string>
</value>
</item>
<item>
<key>
<string>
price
</string>
</key>
<value>
<float>
0.01
</float>
</value>
</item>
<item>
<key>
<string>
quantity
</string>
</key>
<value>
<float>
1.0
</float>
</value>
</item>
<item>
<key>
<string>
string_index
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
target_delivery
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
test_method_id
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
VAT (CNY)
</string>
</value>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAQ=
</string>
</persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
edit_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAU=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"5"
aka=
"AAAAAAAAAAU="
>
<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>
edit
</string>
</value>
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAY=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
error_message
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
0.0.0.0
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
<value>
<string>
current
</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>
1620318743.66
</float>
<string>
UTC
</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"6"
aka=
"AAAAAAAAAAY="
>
<pickle>
<global
name=
"Message"
module=
"Products.ERP5Type.Message"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
default
</string>
</key>
<value>
<string>
Object copied from ${source_item}
</string>
</value>
</item>
<item>
<key>
<string>
domain
</string>
</key>
<value>
<string>
erp5_ui
</string>
</value>
</item>
<item>
<key>
<string>
mapping
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
source_item
</string>
</key>
<value>
<string>
/erp5/sale_trade_condition_module/slapos_aggregated_subscription_trade_condition/3
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
message
</string>
</key>
<value>
<string>
Object copied from ${source_item}
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
View file @
1bbea36a
...
@@ -66,6 +66,10 @@ for movement in movement_list:
...
@@ -66,6 +66,10 @@ for movement in movement_list:
# XXX Shamefully hardcoded values
# XXX Shamefully hardcoded values
if
movement
.
getResource
()
==
'service_module/slapos_instance_subscription'
:
if
movement
.
getResource
()
==
'service_module/slapos_instance_subscription'
:
if
movement
.
getPriceCurrency
()
==
"currency_module/CNY"
:
# reduce tax from there directly
temp_movement
.
edit
(
price
=
movement
.
getPrice
(
0.0
)
/
1.01
)
else
:
# reduce tax from there directly
# reduce tax from there directly
temp_movement
.
edit
(
price
=
movement
.
getPrice
(
0.0
)
/
1.2
)
temp_movement
.
edit
(
price
=
movement
.
getPrice
(
0.0
)
/
1.2
)
elif
movement
.
getResource
()
==
'service_module/slapos_reservation_refund'
:
elif
movement
.
getResource
()
==
'service_module/slapos_reservation_refund'
:
...
...
master/bt5/slapos_subscription_request/PathTemplateItem/accounting_module/template_wechat_pre_payment_subscription_sale_invoice_transaction/1.xml
View file @
1bbea36a
...
@@ -35,8 +35,8 @@
...
@@ -35,8 +35,8 @@
<string>
use/trade/sale
</string>
<string>
use/trade/sale
</string>
<string>
resource/service_module/slapos_reservation_fee
</string>
<string>
resource/service_module/slapos_reservation_fee
</string>
<string>
quantity_unit/unit/piece
</string>
<string>
quantity_unit/unit/piece
</string>
<string>
base_contribution/base_amount/invoicing
</string>
<string>
variation/service_module/slapos_reservation_fee/default
</string>
<string>
variation/service_module/slapos_reservation_fee/default
</string>
<string>
base_contribution/base_amount/invoicing/taxable
</string>
</tuple>
</tuple>
</value>
</value>
</item>
</item>
...
...
master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_requestPaymentTransaction.py
View file @
1bbea36a
...
@@ -48,7 +48,12 @@ if current_invoice is None:
...
@@ -48,7 +48,12 @@ if current_invoice is None:
# with taxes, but for now it is hardcoded.
# with taxes, but for now it is hardcoded.
tax
=
0
tax
=
0
if
'base_amount/invoicing/taxable'
in
invoice_line
.
getBaseContributionList
():
if
'base_amount/invoicing/taxable'
in
invoice_line
.
getBaseContributionList
():
tax
=
0.2
specialise
=
invoice_line
.
getSpecialiseValue
(
portal_type
=
'Sale Trade Condition'
)
if
specialise
is
not
None
:
for
trade_model_line
in
specialise
.
getAggregatedAmountList
(
invoice_line
):
tax
=
trade_model_line
.
getPrice
()
# For simplification consider tax is a single value.
break
for
line
in
current_payment
.
contentValues
():
for
line
in
current_payment
.
contentValues
():
if
line
.
getSource
()
==
"account_module/payment_to_encash"
:
if
line
.
getSource
()
==
"account_module/payment_to_encash"
:
...
...
master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionCDNScenario.py
View file @
1bbea36a
...
@@ -33,12 +33,12 @@ class TestSlapOSSubscriptionCDNScenarioMixin(TestSlapOSSubscriptionScenarioMixin
...
@@ -33,12 +33,12 @@ class TestSlapOSSubscriptionCDNScenarioMixin(TestSlapOSSubscriptionScenarioMixin
self
.
expected_reservation_tax
=
0.166666666666667
self
.
expected_reservation_tax
=
0.166666666666667
self
.
expected_price_currency
=
"currency_module/EUR"
self
.
expected_price_currency
=
"currency_module/EUR"
self
.
expected_zh_individual_price_without_tax
=
33.333333333333333
self
.
expected_zh_individual_price_without_tax
=
40
self
.
expected_zh_individual_price_with_tax
=
40.
0
self
.
expected_zh_individual_price_with_tax
=
40.
4
self
.
expected_zh_reservation_fee
=
8.0
self
.
expected_zh_reservation_fee
=
8.0
8
self
.
expected_zh_reservation_fee_without_tax
=
8.0
self
.
expected_zh_reservation_fee_without_tax
=
8.0
self
.
expected_zh_reservation_quantity_tax
=
0
self
.
expected_zh_reservation_quantity_tax
=
8.08
self
.
expected_zh_reservation_tax
=
0
self
.
expected_zh_reservation_tax
=
0
.08
self
.
resource_variation_reference
=
"CDN"
self
.
resource_variation_reference
=
"CDN"
...
...
master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionDualOrganisationScenario.py
View file @
1bbea36a
...
@@ -29,7 +29,7 @@ class testSlapOSSubscriptionDualOrganisationScenario(TestSlapOSSubscriptionScena
...
@@ -29,7 +29,7 @@ class testSlapOSSubscriptionDualOrganisationScenario(TestSlapOSSubscriptionScena
self
.
expected_source
=
fr_organisation
.
getRelativeUrl
()
self
.
expected_source
=
fr_organisation
.
getRelativeUrl
()
self
.
expected_source_section
=
fr_organisation
.
getRelativeUrl
()
self
.
expected_source_section
=
fr_organisation
.
getRelativeUrl
()
self
.
expected_zh_reservation_fee
=
18
8.00
self
.
expected_zh_reservation_fee
=
18
9.88
self
.
subscription_condition
.
edit
(
self
.
subscription_condition
.
edit
(
source
=
self
.
expected_source
,
source
=
self
.
expected_source
,
...
...
master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionScenario.py
View file @
1bbea36a
...
@@ -40,12 +40,12 @@ class TestSlapOSSubscriptionScenarioMixin(DefaultScenarioMixin):
...
@@ -40,12 +40,12 @@ class TestSlapOSSubscriptionScenarioMixin(DefaultScenarioMixin):
self
.
expected_price_currency
=
"currency_module/EUR"
self
.
expected_price_currency
=
"currency_module/EUR"
self
.
expected_zh_individual_price_without_tax
=
1
573.3333333333335
self
.
expected_zh_individual_price_without_tax
=
1
888
self
.
expected_zh_individual_price_with_tax
=
1
888.00
self
.
expected_zh_individual_price_with_tax
=
1
906.88
self
.
expected_zh_reservation_fee
=
18
8.00
self
.
expected_zh_reservation_fee
=
18
9.88
self
.
expected_zh_reservation_fee_without_tax
=
188
self
.
expected_zh_reservation_fee_without_tax
=
188
self
.
expected_zh_reservation_quantity_tax
=
0
self
.
expected_zh_reservation_quantity_tax
=
188
self
.
expected_zh_reservation_tax
=
0
self
.
expected_zh_reservation_tax
=
1.88
self
.
expected_notification_language
=
"en"
self
.
expected_notification_language
=
"en"
self
.
expected_source
=
self
.
expected_slapos_organisation
self
.
expected_source
=
self
.
expected_slapos_organisation
...
...
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