Skip to content

S
slapos.core
Commit 7289398c authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Chinese taxation is 0% for our services 

See merge request nexedi/slapos.core!470
parents 7af4099e b9f41bfb
Pipeline #25788 passed with stage
    in 0 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 2544 additions and 65 deletions
    master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_subscription_trade_condition.xml
    View file @ 7289398c
    ......@@ -118,7 +118,7 @@
    </tuple>
    <state>
    <tuple>
    <float>1622160000.0</float>
    <float>1648684800.0</float>
    <string>UTC</string>
    </tuple>
    </state>
    ......@@ -248,11 +248,17 @@
    <value>
    <dictionary>
    <item>
    <key> <string>validation_workflow</string> </key>
    <key> <string>edit_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>validation_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    ......@@ -260,6 +266,69 @@
    </pickle>
    </record>
    <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>rafael.monnerat</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>1002.11023.15578.35225</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>1671482181.01</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="9" aka="AAAAAAAAAAk=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    ......
    master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_subscription_trade_condition/3.xml
    View file @ 7289398c
    ......@@ -70,7 +70,7 @@
    </item>
    <item>
    <key> <string>price</string> </key>
    <value> <float>0.01</float> </value>
    <value> <float>0.0</float> </value>
    </item>
    <item>
    <key> <string>quantity</string> </key>
    ......@@ -174,7 +174,7 @@
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    <value> <string>rafael.monnerat</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    ......@@ -188,7 +188,7 @@
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>991.57855.43043.56797</string> </value>
    <value> <string>1002.11023.15578.35225</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    ......@@ -206,7 +206,7 @@
    </tuple>
    <state>
    <tuple>
    <float>1620326231.38</float>
    <float>1671482486.11</float>
    <string>UTC</string>
    </tuple>
    </state>
    ......
    master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition_2022/1.xml 0 → 100644
    View file @ 7289398c
    <?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>1</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>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_category</string> </key>
    <value>
    <tuple>
    <string>price_currency/currency_module/EUR</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.2</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 (EURO)</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>rafael.monnerat</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>1671482083.62</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</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/PathTemplateItem/sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition_2022/3.xml 0 → 100644
    View file @ 7289398c
    <?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>3</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>
    </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>rafael.monnerat</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>1671482083.63</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</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/PathTemplateItem/sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition_2022/4/path_0.xml 0 → 100644
    View file @ 7289398c
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Sale Supply Cell" 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>_local_properties</string> </key>
    <value>
    <tuple>
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>base_id</string> </value>
    </item>
    <item>
    <key> <string>type</string> </key>
    <value> <string>string</string> </value>
    </item>
    </dictionary>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>_range_criterion</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>base_id</string> </key>
    <value> <string>path</string> </value>
    </item>
    <item>
    <key> <string>base_price</string> </key>
    <value> <float>1.0</float> </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/1</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>criterion_property</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>path_0</string> </value>
    </item>
    <item>
    <key> <string>mapped_value_property_list</string> </key>
    <value>
    <tuple>
    <string>base_price</string>
    <string>base_unit_price</string>
    <string>slice_base_price</string>
    <string>slice_quantity_range</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_base_category</string> </key>
    <value>
    <tuple>
    <string>variation</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_category</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/1</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>multimembership_criterion_base_category</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Sale Supply Cell</string> </value>
    </item>
    <item>
    <key> <string>test_method_id</string> </key>
    <value>
    <tuple/>
    </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>
    </ZopeData>
    master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition_2022/4/path_1.xml 0 → 100644
    View file @ 7289398c
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Sale Supply Cell" 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>_local_properties</string> </key>
    <value>
    <tuple>
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>base_id</string> </value>
    </item>
    <item>
    <key> <string>type</string> </key>
    <value> <string>string</string> </value>
    </item>
    </dictionary>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>_range_criterion</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>base_id</string> </key>
    <value> <string>path</string> </value>
    </item>
    <item>
    <key> <string>base_price</string> </key>
    <value> <float>25.0</float> </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/default</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>criterion_property</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>path_1</string> </value>
    </item>
    <item>
    <key> <string>mapped_value_property_list</string> </key>
    <value>
    <tuple>
    <string>base_price</string>
    <string>base_unit_price</string>
    <string>slice_base_price</string>
    <string>slice_quantity_range</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_base_category</string> </key>
    <value>
    <tuple>
    <string>variation</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_category</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/default</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>multimembership_criterion_base_category</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Sale Supply Cell</string> </value>
    </item>
    <item>
    <key> <string>test_method_id</string> </key>
    <value>
    <tuple/>
    </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>
    </ZopeData>
    master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition_2022/4/path_2.xml 0 → 100644
    View file @ 7289398c
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Sale Supply Cell" 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>_local_properties</string> </key>
    <value>
    <tuple>
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>base_id</string> </value>
    </item>
    <item>
    <key> <string>type</string> </key>
    <value> <string>string</string> </value>
    </item>
    </dictionary>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>_range_criterion</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>base_id</string> </key>
    <value> <string>path</string> </value>
    </item>
    <item>
    <key> <string>base_price</string> </key>
    <value> <float>65.0</float> </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/3</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>criterion_property</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>path_2</string> </value>
    </item>
    <item>
    <key> <string>mapped_value_property_list</string> </key>
    <value>
    <tuple>
    <string>base_price</string>
    <string>base_unit_price</string>
    <string>slice_base_price</string>
    <string>slice_quantity_range</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_base_category</string> </key>
    <value>
    <tuple>
    <string>variation</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_category</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/3</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>multimembership_criterion_base_category</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Sale Supply Cell</string> </value>
    </item>
    <item>
    <key> <string>test_method_id</string> </key>
    <value>
    <tuple/>
    </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>
    </ZopeData>
    master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition_2022/5/path_0.xml 0 → 100644
    View file @ 7289398c
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Sale Supply Cell" 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>_local_properties</string> </key>
    <value>
    <tuple>
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>base_id</string> </value>
    </item>
    <item>
    <key> <string>type</string> </key>
    <value> <string>string</string> </value>
    </item>
    </dictionary>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>_range_criterion</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>base_id</string> </key>
    <value> <string>path</string> </value>
    </item>
    <item>
    <key> <string>base_price</string> </key>
    <value> <float>8.0</float> </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/1</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>criterion_property</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>path_0</string> </value>
    </item>
    <item>
    <key> <string>mapped_value_property_list</string> </key>
    <value>
    <tuple>
    <string>base_price</string>
    <string>base_unit_price</string>
    <string>slice_base_price</string>
    <string>slice_quantity_range</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_base_category</string> </key>
    <value>
    <tuple>
    <string>variation</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_category</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/1</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>multimembership_criterion_base_category</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Sale Supply Cell</string> </value>
    </item>
    <item>
    <key> <string>test_method_id</string> </key>
    <value>
    <tuple/>
    </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>
    </ZopeData>
    master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition_2022/5/path_1.xml 0 → 100644
    View file @ 7289398c
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Sale Supply Cell" 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>_local_properties</string> </key>
    <value>
    <tuple>
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>base_id</string> </value>
    </item>
    <item>
    <key> <string>type</string> </key>
    <value> <string>string</string> </value>
    </item>
    </dictionary>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>_range_criterion</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>base_id</string> </key>
    <value> <string>path</string> </value>
    </item>
    <item>
    <key> <string>base_price</string> </key>
    <value> <float>188.0</float> </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/default</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>criterion_property</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>path_1</string> </value>
    </item>
    <item>
    <key> <string>mapped_value_property_list</string> </key>
    <value>
    <tuple>
    <string>base_price</string>
    <string>base_unit_price</string>
    <string>slice_base_price</string>
    <string>slice_quantity_range</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_base_category</string> </key>
    <value>
    <tuple>
    <string>variation</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_category</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/default</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>multimembership_criterion_base_category</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Sale Supply Cell</string> </value>
    </item>
    <item>
    <key> <string>test_method_id</string> </key>
    <value>
    <tuple/>
    </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>
    </ZopeData>
    master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition_2022/5/path_2.xml 0 → 100644
    View file @ 7289398c
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="Sale Supply Cell" 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>_local_properties</string> </key>
    <value>
    <tuple>
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>base_id</string> </value>
    </item>
    <item>
    <key> <string>type</string> </key>
    <value> <string>string</string> </value>
    </item>
    </dictionary>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>_range_criterion</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>base_id</string> </key>
    <value> <string>path</string> </value>
    </item>
    <item>
    <key> <string>base_price</string> </key>
    <value> <float>488.0</float> </value>
    </item>
    <item>
    <key> <string>categories</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/3</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>criterion_property</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>path_2</string> </value>
    </item>
    <item>
    <key> <string>mapped_value_property_list</string> </key>
    <value>
    <tuple>
    <string>base_price</string>
    <string>base_unit_price</string>
    <string>slice_base_price</string>
    <string>slice_quantity_range</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_base_category</string> </key>
    <value>
    <tuple>
    <string>variation</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>membership_criterion_category</string> </key>
    <value>
    <tuple>
    <string>variation/service_module/slapos_reservation_fee/3</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>multimembership_criterion_base_category</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>portal_type</string> </key>
    <value> <string>Sale Supply Cell</string> </value>
    </item>
    <item>
    <key> <string>test_method_id</string> </key>
    <value>
    <tuple/>
    </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>
    </ZopeData>
    master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py
    View file @ 7289398c
    ......@@ -73,7 +73,7 @@ for movement in movement_list:
    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)
    temp_movement.edit(price=movement.getPrice(0.0))
    else:
    # reduce tax from there directly
    temp_movement.edit(price=movement.getPrice(0.0)/1.2)
    ......
    master/bt5/slapos_accounting/bt/template_keep_last_workflow_history_only_path_list
    View file @ 7289398c
    ......@@ -14,4 +14,6 @@ sale_trade_condition_module/slapos_reservation_refund_trade_condition/**
    sale_trade_condition_module/slapos_subscription_trade_condition
    sale_trade_condition_module/slapos_subscription_trade_condition/**
    sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition
    sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition/**
    \ No newline at end of file
    sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition/**
    sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition_2022
    sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition_2022/**
    \ No newline at end of file
    master/bt5/slapos_accounting/bt/template_path_list
    View file @ 7289398c
    ......@@ -84,6 +84,8 @@ sale_trade_condition_module/slapos_aggregated_trade_condition/**
    sale_trade_condition_module/slapos_consumption_trade_condition
    sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition
    sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition/**
    sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition_2022
    sale_trade_condition_module/slapos_legacy_aggregated_subscription_trade_condition_2022/**
    sale_trade_condition_module/slapos_legacy_aggregated_trade_condition
    sale_trade_condition_module/slapos_legacy_aggregated_trade_condition/**
    sale_trade_condition_module/slapos_reservation_refund_trade_condition
    ......
    master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionCDNScenario.py
    View file @ 7289398c
    ......@@ -34,11 +34,11 @@ class TestSlapOSSubscriptionCDNScenarioMixin(TestSlapOSSubscriptionScenarioMixin
    self.expected_price_currency = "currency_module/EUR"
    self.expected_zh_individual_price_without_tax = 40
    self.expected_zh_individual_price_with_tax = 40.4
    self.expected_zh_reservation_fee = 8.08
    self.expected_zh_individual_price_with_tax = 40
    self.expected_zh_reservation_fee = 8.0
    self.expected_zh_reservation_fee_without_tax = 8.0
    self.expected_zh_reservation_quantity_tax = 8.0
    self.expected_zh_reservation_tax = 0.08
    self.expected_zh_reservation_tax = 0
    self.resource_variation_reference = "CDN"
    ......
    master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionCDNScenario.xml
    View file @ 7289398c
    ......@@ -6,12 +6,6 @@
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_recorded_property_dict</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>default_reference</string> </key>
    <value> <string>testSlapOSSubscriptionCDNScenario</string> </value>
    ......@@ -61,28 +55,13 @@
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</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>
    ......@@ -95,7 +74,7 @@
    <item>
    <key> <string>component_validation_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    </dictionary>
    ......@@ -104,7 +83,7 @@
    </dictionary>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    ......
    master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionDualOrganisationScenario.py
    View file @ 7289398c
    ......@@ -29,7 +29,7 @@ class testSlapOSSubscriptionDualOrganisationScenario(TestSlapOSSubscriptionScena
    self.expected_source = fr_organisation.getRelativeUrl()
    self.expected_source_section = fr_organisation.getRelativeUrl()
    self.expected_zh_reservation_fee = 189.88
    self.expected_zh_reservation_fee = 188.00
    self.subscription_condition.edit(
    source=self.expected_source,
    ......
    master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionDualOrganisationScenario.xml
    View file @ 7289398c
    ......@@ -6,12 +6,6 @@
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_recorded_property_dict</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>default_reference</string> </key>
    <value> <string>testSlapOSSubscriptionDualOrganisationScenario</string> </value>
    ......@@ -61,28 +55,13 @@
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAI=</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>
    ......@@ -95,7 +74,7 @@
    <item>
    <key> <string>component_validation_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value>
    </item>
    </dictionary>
    ......@@ -104,7 +83,7 @@
    </dictionary>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <record id="3" aka="AAAAAAAAAAM=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    ......
    master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionScenario.py
    View file @ 7289398c
    ......@@ -41,11 +41,11 @@ class TestSlapOSSubscriptionScenarioMixin(DefaultScenarioMixin):
    self.expected_zh_individual_price_without_tax = 1888
    self.expected_zh_individual_price_with_tax = 1906.88
    self.expected_zh_reservation_fee = 189.88
    self.expected_zh_individual_price_with_tax = 1888
    self.expected_zh_reservation_fee = 188.00
    self.expected_zh_reservation_fee_without_tax = 188
    self.expected_zh_reservation_quantity_tax = 188
    self.expected_zh_reservation_tax = 1.88
    self.expected_zh_reservation_tax = 0
    self.expected_notification_language = "en"
    self.expected_source = self.expected_slapos_organisation
    ......
    master/bt5/slapos_subscription_request/TestTemplateItem/portal_components/test.erp5.testSlapOSSubscriptionSkins.py
    View file @ 7289398c
    ......@@ -513,9 +513,9 @@ class TestSubscriptionRequest_requestPaymentTransaction(TestSubscriptionSkinsMix
    for line in current_payment.contentValues():
    if line.getSource() == "account_module/payment_to_encash":
    self.assertEqual(line.getQuantity(), -189.88*quantity)
    self.assertEqual(line.getQuantity(), -188*quantity)
    if line.getSource() == "account_module/receivable":
    self.assertEqual(line.getQuantity(), 189.88*quantity)
    self.assertEqual(line.getQuantity(), 188*quantity)
    @simulate('SubscriptionRequest_createRelatedSaleInvoiceTransaction', 'price, tag, payment, template, REQUEST=None',"""assert REQUEST == None
    assert payment
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7