Skip to content

S
slapos.core
Commit 6db47987 authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

Replace with aggregated variants of STC and BPM.

parent 02e3c0f7
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 717 deletions
master/bt5/slapos_accounting/LocalRolesTemplateItem/business_process_module/slapos_sale_business_process.xml → master/bt5/slapos_accounting/LocalRolesTemplateItem/business_process_module/slapos_aggregated_business_process.xml
View file @ 6db47987
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<role id='R-COMPUTER'> <role id='R-COMPUTER'>
<item>Auditor</item> <item>Auditor</item>
</role> </role>
<role id='superluke'> <role id='zope'>
<item>Owner</item> <item>Owner</item>
</role> </role>
</local_roles> </local_roles>
......
master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_sale_business_process.xml → master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_aggregated_business_process.xml
View file @ 6db47987
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</item> </item>
<item> <item>
<key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
<value> <string>slapos_sale_business_process</string> </value> <value> <string>slapos_aggregated_business_process</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>slapos_sale_business_process</string> </value> <value> <string>slapos_aggregated_business_process</string> </value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>SlapOS Sale Business Process</string> </value> <value> <string>SlapOS Aggregated Business Process</string> </value>
</item> </item>
<item> <item>
<key> <string>version</string> </key> <key> <string>version</string> </key>
......
master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_sale_business_process/pay.xml deleted 100644 → 0
View file @ 02e3c0f7
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Business Link" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<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>modification_date</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>date</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>creation_date</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>date</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>categories</string> </key>
<value>
<tuple>
<string>trade_phase/slapos/payment</string>
<string>predecessor/trade_state/accounted</string>
<string>successor/trade_state/paid</string>
<string>source/account_module/bank</string>
<string>destination/account_module/bank</string>
<string>delivery_builder/portal_deliveries/slapos_payment_transaction_builder</string>
</tuple>
</value>
</item>
<item>
<key> <string>completed_state</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>creation_date</string> </key>
<value>
<object>
<klass>
<global id="1.1" name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1324249200.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>deliverable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>frozen_state</string> </key>
<value>
<tuple>
<string>delivered</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>pay</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value> <int>7</int> </value>
</item>
<item>
<key> <string>language</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>modification_date</string> </key>
<value>
<object>
<klass> <reference id="1.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1324249200.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Business Link</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>pay</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_sale_business_process/payment_credit_path.xml deleted 100644 → 0
View file @ 02e3c0f7
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Trade Model Path" 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>modification_date</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>date</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>creation_date</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>date</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>categories</string> </key>
<value>
<tuple>
<string>trade_phase/slapos/payment</string>
<string>source/account_module/receivable</string>
<string>destination/account_module/payable</string>
</tuple>
</value>
</item>
<item>
<key> <string>creation_date</string> </key>
<value>
<object>
<klass>
<global id="1.1" name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1324249200.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>TMP-PAYMENT-CREDIT</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>This business path is just a template thus disabled by using \'python:False\' in Predicate.\n
For real use, it is required to set an appropriate source (= account) category in Profile.</string> </value>
</item>
<item>
<key> <string>efficiency</string> </key>
<value> <float>-1.0</float> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>payment_credit_path</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value> <int>7</int> </value>
</item>
<item>
<key> <string>language</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>modification_date</string> </key>
<value>
<object>
<klass> <reference id="1.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1324249200.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>payment_end_of_month</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Trade Model Path</string> </value>
</item>
<item>
<key> <string>string_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>test_tales_expression</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payment Credit</string> </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/business_process_module/slapos_sale_business_process/payment_debit_path.xml deleted 100644 → 0
View file @ 02e3c0f7
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Trade Model Path" 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>modification_date</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>date</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>creation_date</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>date</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>categories</string> </key>
<value>
<tuple>
<string>trade_phase/slapos/payment</string>
<string>source/account_module/bank</string>
<string>destination/account_module/bank</string>
<string>source_payment/organisation_module/slapos/bank_account</string>
</tuple>
</value>
</item>
<item>
<key> <string>creation_date</string> </key>
<value>
<object>
<klass>
<global id="1.1" name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1324249200.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>TMP-PAYMENT-DEBIT</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>This business path is just a template thus disabled by using \'python:False\' in Predicate.\n
For real use, it is required to set an appropriate source (= account) category in Profile.</string> </value>
</item>
<item>
<key> <string>efficiency</string> </key>
<value> <float>1.0</float> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>payment_debit_path</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value> <int>8</int> </value>
</item>
<item>
<key> <string>language</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>modification_date</string> </key>
<value>
<object>
<klass> <reference id="1.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1324249200.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>payment_end_of_month</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Trade Model Path</string> </value>
</item>
<item>
<key> <string>string_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>test_tales_expression</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Payment Debit</string> </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_trade_condition.xml → master/bt5/slapos_accounting/PathTemplateItem/sale_trade_condition_module/slapos_aggregated_trade_condition.xml
View file @ 6db47987
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<key> <string>categories</string> </key> <key> <string>categories</string> </key>
<value> <value>
<tuple> <tuple>
<string>specialise/business_process_module/slapos_sale_business_process</string> <string>specialise/business_process_module/slapos_aggregated_business_process</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -104,6 +104,10 @@ ...@@ -104,6 +104,10 @@
<none/> <none/>
</value> </value>
</item> </item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>slapos_aggregated_trade_condition</string> </value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <value>
...@@ -112,7 +116,7 @@ ...@@ -112,7 +116,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>slapos_trade_condition</string> </value> <value> <string>slapos_aggregated_trade_condition</string> </value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
...@@ -120,7 +124,7 @@ ...@@ -120,7 +124,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Default SlapOS Sale Trade Condition</string> </value> <value> <string>SlapOS Aggregated Trade Condition</string> </value>
</item> </item>
<item> <item>
<key> <string>version</string> </key> <key> <string>version</string> </key>
......
master/bt5/slapos_accounting/PropertySheetTemplateItem/portal_property_sheets/SlapOSAccountingSaleInvoiceTransactionConstraint/specialise_value_constraint.xml
View file @ 6db47987
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
</item> </item>
<item> <item>
<key> <string>expression</string> </key> <key> <string>expression</string> </key>
<value> <string>python: object.getSpecialise() == "sale_trade_condition_module/slapos_trade_condition"</string> </value> <value> <string>python: object.getSpecialise() == "sale_trade_condition_module/slapos_aggregated_trade_condition"</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingBuilder.py
View file @ 6db47987
...@@ -59,7 +59,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin): ...@@ -59,7 +59,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin):
'source/organisation_module/slapos', 'source/organisation_module/slapos',
'source_section/organisation_module/slapos', 'source_section/organisation_module/slapos',
'price_currency/currency_module/EUR', 'price_currency/currency_module/EUR',
'specialise/sale_trade_condition_module/slapos_trade_condition'] \ 'specialise/sale_trade_condition_module/slapos_aggregated_trade_condition'] \
+ convertCategoryList('destination', + convertCategoryList('destination',
simulation_movement.getDestinationList()) \ simulation_movement.getDestinationList()) \
+ convertCategoryList('destination_section', + convertCategoryList('destination_section',
...@@ -84,7 +84,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin): ...@@ -84,7 +84,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin):
aggregate=hosting_subscription.getRelativeUrl(), aggregate=hosting_subscription.getRelativeUrl(),
base_contribution=['base_amount/invoicing/discounted', base_contribution=['base_amount/invoicing/discounted',
'base_amount/invoicing/taxable'], 'base_amount/invoicing/taxable'],
causality=['business_process_module/slapos_sale_business_process' causality=['business_process_module/slapos_aggregated_business_process'
'/deliver', 'business_process_module/slapos_sale_business_pr' '/deliver', 'business_process_module/slapos_sale_business_pr'
'ocess/delivery_path'], 'ocess/delivery_path'],
destination=person.getRelativeUrl(), destination=person.getRelativeUrl(),
...@@ -95,7 +95,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin): ...@@ -95,7 +95,7 @@ class TestSlapOSSalePackingListBuilder(testSlapOSMixin):
resource='service_module/slapos_instance_subscription', resource='service_module/slapos_instance_subscription',
source='organisation_module/slapos', source='organisation_module/slapos',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/delivery', trade_phase='slapos/delivery',
use='trade/sale', use='trade/sale',
) )
...@@ -162,7 +162,7 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder): ...@@ -162,7 +162,7 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder):
price_currency='currency_module/EUR', price_currency='currency_module/EUR',
source='organisation_module/slapos', source='organisation_module/slapos',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
) )
delivery_line_kw = dict( delivery_line_kw = dict(
portal_type='Sale Packing List Line', portal_type='Sale Packing List Line',
...@@ -208,7 +208,7 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder): ...@@ -208,7 +208,7 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder):
aggregate=hosting_subscription.getRelativeUrl(), aggregate=hosting_subscription.getRelativeUrl(),
base_contribution=['base_amount/invoicing/discounted', base_contribution=['base_amount/invoicing/discounted',
'base_amount/invoicing/taxable'], 'base_amount/invoicing/taxable'],
causality=['business_process_module/slapos_sale_business_process' causality=['business_process_module/slapos_aggregated_business_process'
'/deliver', 'business_process_module/slapos_sale_business_pr' '/deliver', 'business_process_module/slapos_sale_business_pr'
'ocess/delivery_path'], 'ocess/delivery_path'],
destination=person.getRelativeUrl(), destination=person.getRelativeUrl(),
...@@ -219,7 +219,7 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder): ...@@ -219,7 +219,7 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder):
resource='service_module/slapos_instance_subscription', resource='service_module/slapos_instance_subscription',
source='organisation_module/slapos', source='organisation_module/slapos',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/delivery', trade_phase='slapos/delivery',
use='trade/sale', use='trade/sale',
delivery_ratio=1.0 delivery_ratio=1.0
...@@ -254,8 +254,8 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder): ...@@ -254,8 +254,8 @@ class TestSlapOSSaleInvoiceBuilder(TestSlapOSSalePackingListBuilder):
invoice_movement_kw = simulation_movement_kw.copy() invoice_movement_kw = simulation_movement_kw.copy()
invoice_movement_kw.update( invoice_movement_kw.update(
causality=[ causality=[
'business_process_module/slapos_sale_business_process/invoice', 'business_process_module/slapos_aggregated_business_process/invoice',
'business_process_module/slapos_sale_business_process/invoice_path' 'business_process_module/slapos_aggregated_business_process/invoice_path'
], ],
trade_phase='slapos/invoicing' trade_phase='slapos/invoicing'
) )
...@@ -338,7 +338,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -338,7 +338,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
price_currency='currency_module/EUR', price_currency='currency_module/EUR',
resource='currency_module/EUR', resource='currency_module/EUR',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
created_by_builder=1 created_by_builder=1
) )
invoice_line_kw = dict( invoice_line_kw = dict(
...@@ -402,8 +402,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -402,8 +402,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
# create new simulation movements # create new simulation movements
invoice_movement_kw = dict( invoice_movement_kw = dict(
causality=[ causality=[
'business_process_module/slapos_sale_business_process/invoice', 'business_process_module/slapos_aggregated_business_process/invoice',
'business_process_module/slapos_sale_business_process/invoice_path' 'business_process_module/slapos_aggregated_business_process/invoice_path'
], ],
trade_phase='slapos/invoicing', trade_phase='slapos/invoicing',
delivery_ratio=1.0, delivery_ratio=1.0,
...@@ -420,7 +420,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -420,7 +420,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
resource='service_module/slapos_instance_subscription', resource='service_module/slapos_instance_subscription',
source='organisation_module/slapos', source='organisation_module/slapos',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
use='trade/sale', use='trade/sale',
) )
invoice_rule_1 = simulation_movement_1.newContent( invoice_rule_1 = simulation_movement_1.newContent(
...@@ -440,13 +440,13 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -440,13 +440,13 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
delivery_ratio=1., delivery_ratio=1.,
delivery_error=0., delivery_error=0.,
price_currency='currency_module/EUR', price_currency='currency_module/EUR',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
resource='service_module/slapos_tax', resource='service_module/slapos_tax',
base_application='base_amount/invoicing/taxable', base_application='base_amount/invoicing/taxable',
use='trade/tax', use='trade/tax',
causality=['business_process_module/slapos_sale_business_process/tax', causality=['business_process_module/slapos_aggregated_business_process/tax',
'business_process_module/slapos_sale_business_process/trade_model_path', 'business_process_module/slapos_aggregated_business_process/trade_model_path',
'sale_trade_condition_module/slapos_trade_condition/1'], 'sale_trade_condition_module/slapos_aggregated_trade_condition/1'],
) )
trade_model_rule_1 = invoice_movement_1.newContent( trade_model_rule_1 = invoice_movement_1.newContent(
portal_type='Applied Rule', portal_type='Applied Rule',
...@@ -500,8 +500,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -500,8 +500,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
) )
transaction_movement_1_rec = transaction_rule_1.newContent( transaction_movement_1_rec = transaction_rule_1.newContent(
portal_type='Simulation Movement', portal_type='Simulation Movement',
causality=['business_process_module/slapos_sale_business_process/account', causality=['business_process_module/slapos_aggregated_business_process/account',
'business_process_module/slapos_sale_business_process/account_debi' 'business_process_module/slapos_aggregated_business_process/account_debi'
't_path'], 't_path'],
destination=['account_module/payable'], destination=['account_module/payable'],
destination_decision=invoice_movement_1.getDestinationDecision(), destination_decision=invoice_movement_1.getDestinationDecision(),
...@@ -510,7 +510,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -510,7 +510,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
resource='currency_module/EUR', resource='currency_module/EUR',
source='account_module/receivable', source='account_module/receivable',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/accounting', trade_phase='slapos/accounting',
price=1.0, price=1.0,
quantity=invoice_movement_1.getTotalPrice() * -1, quantity=invoice_movement_1.getTotalPrice() * -1,
...@@ -520,8 +520,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -520,8 +520,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
transaction_movement_1_rec_bis.edit(delivery=None, delivery_ratio=1.0) transaction_movement_1_rec_bis.edit(delivery=None, delivery_ratio=1.0)
transaction_movement_1_sal = transaction_rule_1.newContent( transaction_movement_1_sal = transaction_rule_1.newContent(
portal_type='Simulation Movement', portal_type='Simulation Movement',
causality=['business_process_module/slapos_sale_business_process/account', causality=['business_process_module/slapos_aggregated_business_process/account',
'business_process_module/slapos_sale_business_process/account_cred' 'business_process_module/slapos_aggregated_business_process/account_cred'
'it_path'], 'it_path'],
destination=['account_module/purchase'], destination=['account_module/purchase'],
destination_decision=invoice_movement_1.getDestinationDecision(), destination_decision=invoice_movement_1.getDestinationDecision(),
...@@ -530,7 +530,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -530,7 +530,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
resource='currency_module/EUR', resource='currency_module/EUR',
source='account_module/receivable', source='account_module/receivable',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/accounting', trade_phase='slapos/accounting',
price=1.0, price=1.0,
quantity=invoice_movement_1.getTotalPrice(), quantity=invoice_movement_1.getTotalPrice(),
...@@ -542,8 +542,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -542,8 +542,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
) )
transation_model_movement_1_rec = transation_model_rule_1.newContent( transation_model_movement_1_rec = transation_model_rule_1.newContent(
portal_type='Simulation Movement', portal_type='Simulation Movement',
causality=['business_process_module/slapos_sale_business_process/account', causality=['business_process_module/slapos_aggregated_business_process/account',
'business_process_module/slapos_sale_business_process/accounting_tax2'], 'business_process_module/slapos_aggregated_business_process/accounting_tax2'],
destination=['account_module/payable'], destination=['account_module/payable'],
destination_decision=invoice_movement_1.getDestinationDecision(), destination_decision=invoice_movement_1.getDestinationDecision(),
destination_section=invoice_movement_1.getDestinationSection(), destination_section=invoice_movement_1.getDestinationSection(),
...@@ -551,7 +551,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -551,7 +551,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
resource='currency_module/EUR', resource='currency_module/EUR',
source='account_module/receivable', source='account_module/receivable',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/accounting', trade_phase='slapos/accounting',
price=1.0, price=1.0,
quantity=trade_movement_1.getTotalPrice() * -1, quantity=trade_movement_1.getTotalPrice() * -1,
...@@ -561,8 +561,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -561,8 +561,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
transation_model_movement_1_rec_bis.edit(delivery=None, delivery_ratio=1.0) transation_model_movement_1_rec_bis.edit(delivery=None, delivery_ratio=1.0)
transation_model_movement_1_sal = transation_model_rule_1.newContent( transation_model_movement_1_sal = transation_model_rule_1.newContent(
portal_type='Simulation Movement', portal_type='Simulation Movement',
causality=['business_process_module/slapos_sale_business_process/account', causality=['business_process_module/slapos_aggregated_business_process/account',
'business_process_module/slapos_sale_business_process/accounting_tax1'], 'business_process_module/slapos_aggregated_business_process/accounting_tax1'],
destination=['account_module/refundable_vat'], destination=['account_module/refundable_vat'],
destination_decision=invoice_movement_1.getDestinationDecision(), destination_decision=invoice_movement_1.getDestinationDecision(),
destination_section=invoice_movement_1.getDestinationSection(), destination_section=invoice_movement_1.getDestinationSection(),
...@@ -570,7 +570,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -570,7 +570,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
resource='currency_module/EUR', resource='currency_module/EUR',
source='account_module/coll_vat', source='account_module/coll_vat',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/accounting', trade_phase='slapos/accounting',
price=1.0, price=1.0,
quantity=trade_movement_1.getTotalPrice(), quantity=trade_movement_1.getTotalPrice(),
...@@ -582,8 +582,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -582,8 +582,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
) )
transaction_movement_2_rec = transaction_rule_2.newContent( transaction_movement_2_rec = transaction_rule_2.newContent(
portal_type='Simulation Movement', portal_type='Simulation Movement',
causality=['business_process_module/slapos_sale_business_process/account', causality=['business_process_module/slapos_aggregated_business_process/account',
'business_process_module/slapos_sale_business_process/account_debi' 'business_process_module/slapos_aggregated_business_process/account_debi'
't_path'], 't_path'],
destination=['account_module/payable'], destination=['account_module/payable'],
destination_decision=invoice_movement_2.getDestinationDecision(), destination_decision=invoice_movement_2.getDestinationDecision(),
...@@ -592,15 +592,15 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -592,15 +592,15 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
resource='currency_module/EUR', resource='currency_module/EUR',
source='account_module/receivable', source='account_module/receivable',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/accounting', trade_phase='slapos/accounting',
price=1.0, price=1.0,
quantity=invoice_movement_2.getTotalPrice() * -1, quantity=invoice_movement_2.getTotalPrice() * -1,
) )
transaction_movement_2_sal = transaction_rule_2.newContent( transaction_movement_2_sal = transaction_rule_2.newContent(
portal_type='Simulation Movement', portal_type='Simulation Movement',
causality=['business_process_module/slapos_sale_business_process/account', causality=['business_process_module/slapos_aggregated_business_process/account',
'business_process_module/slapos_sale_business_process/account_cred' 'business_process_module/slapos_aggregated_business_process/account_cred'
'it_path'], 'it_path'],
destination=['account_module/purchase'], destination=['account_module/purchase'],
destination_decision=invoice_movement_2.getDestinationDecision(), destination_decision=invoice_movement_2.getDestinationDecision(),
...@@ -609,7 +609,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -609,7 +609,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
resource='currency_module/EUR', resource='currency_module/EUR',
source='account_module/receivable', source='account_module/receivable',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/accounting', trade_phase='slapos/accounting',
price=1.0, price=1.0,
quantity=invoice_movement_2.getTotalPrice(), quantity=invoice_movement_2.getTotalPrice(),
...@@ -621,8 +621,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -621,8 +621,8 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
) )
transation_model_movement_2_rec = transation_model_rule_2.newContent( transation_model_movement_2_rec = transation_model_rule_2.newContent(
portal_type='Simulation Movement', portal_type='Simulation Movement',
causality=['business_process_module/slapos_sale_business_process/account', causality=['business_process_module/slapos_aggregated_business_process/account',
'business_process_module/slapos_sale_business_process/accounting_tax2'], 'business_process_module/slapos_aggregated_business_process/accounting_tax2'],
destination=['account_module/payable'], destination=['account_module/payable'],
destination_decision=invoice_movement_2.getDestinationDecision(), destination_decision=invoice_movement_2.getDestinationDecision(),
destination_section=invoice_movement_2.getDestinationSection(), destination_section=invoice_movement_2.getDestinationSection(),
...@@ -630,15 +630,15 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -630,15 +630,15 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
resource='currency_module/EUR', resource='currency_module/EUR',
source='account_module/receivable', source='account_module/receivable',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/accounting', trade_phase='slapos/accounting',
price=1.0, price=1.0,
quantity=trade_movement_2.getTotalPrice() * -1, quantity=trade_movement_2.getTotalPrice() * -1,
) )
transation_model_movement_2_sal = transation_model_rule_2.newContent( transation_model_movement_2_sal = transation_model_rule_2.newContent(
portal_type='Simulation Movement', portal_type='Simulation Movement',
causality=['business_process_module/slapos_sale_business_process/account', causality=['business_process_module/slapos_aggregated_business_process/account',
'business_process_module/slapos_sale_business_process/accounting_tax1'], 'business_process_module/slapos_aggregated_business_process/accounting_tax1'],
destination=['account_module/refundable_vat'], destination=['account_module/refundable_vat'],
destination_decision=invoice_movement_2.getDestinationDecision(), destination_decision=invoice_movement_2.getDestinationDecision(),
destination_section=invoice_movement_2.getDestinationSection(), destination_section=invoice_movement_2.getDestinationSection(),
...@@ -646,7 +646,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -646,7 +646,7 @@ class TestSlapOSSaleInvoiceTransactionBuilder(TestSlapOSSalePackingListBuilder):
resource='currency_module/EUR', resource='currency_module/EUR',
source='account_module/coll_vat', source='account_module/coll_vat',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/accounting', trade_phase='slapos/accounting',
price=1.0, price=1.0,
quantity=trade_movement_2.getTotalPrice(), quantity=trade_movement_2.getTotalPrice(),
...@@ -827,7 +827,7 @@ class TestSlapOSSaleInvoiceTransactionTradeModelBuilder(TestSlapOSSalePackingLis ...@@ -827,7 +827,7 @@ class TestSlapOSSaleInvoiceTransactionTradeModelBuilder(TestSlapOSSalePackingLis
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
price_currency='currency_module/EUR', price_currency='currency_module/EUR',
resource='currency_module/EUR', resource='currency_module/EUR',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
created_by_builder=1 created_by_builder=1
) )
invoice_line_kw = dict( invoice_line_kw = dict(
...@@ -875,8 +875,8 @@ class TestSlapOSSaleInvoiceTransactionTradeModelBuilder(TestSlapOSSalePackingLis ...@@ -875,8 +875,8 @@ class TestSlapOSSaleInvoiceTransactionTradeModelBuilder(TestSlapOSSalePackingLis
# create new simulation movements # create new simulation movements
invoice_movement_kw = dict( invoice_movement_kw = dict(
causality=[ causality=[
'business_process_module/slapos_sale_business_process/invoice', 'business_process_module/slapos_aggregated_business_process/invoice',
'business_process_module/slapos_sale_business_process/invoice_path' 'business_process_module/slapos_aggregated_business_process/invoice_path'
], ],
trade_phase='slapos/invoicing', trade_phase='slapos/invoicing',
delivery_ratio=1.0, delivery_ratio=1.0,
...@@ -893,7 +893,7 @@ class TestSlapOSSaleInvoiceTransactionTradeModelBuilder(TestSlapOSSalePackingLis ...@@ -893,7 +893,7 @@ class TestSlapOSSaleInvoiceTransactionTradeModelBuilder(TestSlapOSSalePackingLis
resource='service_module/slapos_instance_subscription', resource='service_module/slapos_instance_subscription',
source='organisation_module/slapos', source='organisation_module/slapos',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
use='trade/sale', use='trade/sale',
) )
invoice_rule_1 = simulation_movement_1.newContent( invoice_rule_1 = simulation_movement_1.newContent(
...@@ -933,7 +933,7 @@ class TestSlapOSSaleInvoiceTransactionTradeModelBuilder(TestSlapOSSalePackingLis ...@@ -933,7 +933,7 @@ class TestSlapOSSaleInvoiceTransactionTradeModelBuilder(TestSlapOSSalePackingLis
quantity_unit='unit/piece', quantity_unit='unit/piece',
source='organisation_module/slapos', source='organisation_module/slapos',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
portal_type='Simulation Movement', portal_type='Simulation Movement',
) )
model_rule_1 = invoice_movement_1.newContent( model_rule_1 = invoice_movement_1.newContent(
...@@ -946,9 +946,9 @@ class TestSlapOSSaleInvoiceTransactionTradeModelBuilder(TestSlapOSSalePackingLis ...@@ -946,9 +946,9 @@ class TestSlapOSSaleInvoiceTransactionTradeModelBuilder(TestSlapOSSalePackingLis
destination_decision=invoice_movement_1.getDestinationDecision(), destination_decision=invoice_movement_1.getDestinationDecision(),
resource='service_module/slapos_tax', resource='service_module/slapos_tax',
trade_phase='slapos/tax', trade_phase='slapos/tax',
causality=['business_process_module/slapos_sale_business_process/tax', causality=['business_process_module/slapos_aggregated_business_process/tax',
'business_process_module/slapos_sale_business_process/trade_model_path', 'business_process_module/slapos_aggregated_business_process/trade_model_path',
'sale_trade_condition_module/slapos_trade_condition/1', 'sale_trade_condition_module/slapos_aggregated_trade_condition/1',
], ],
price=.196, price=.196,
quantity=invoice_movement_1.getTotalPrice(), quantity=invoice_movement_1.getTotalPrice(),
...@@ -965,9 +965,9 @@ class TestSlapOSSaleInvoiceTransactionTradeModelBuilder(TestSlapOSSalePackingLis ...@@ -965,9 +965,9 @@ class TestSlapOSSaleInvoiceTransactionTradeModelBuilder(TestSlapOSSalePackingLis
destination_decision=invoice_movement_2.getDestinationDecision(), destination_decision=invoice_movement_2.getDestinationDecision(),
resource='service_module/slapos_tax', resource='service_module/slapos_tax',
trade_phase='slapos/tax', trade_phase='slapos/tax',
causality=['business_process_module/slapos_sale_business_process/tax', causality=['business_process_module/slapos_aggregated_business_process/tax',
'business_process_module/slapos_sale_business_process/trade_model_path', 'business_process_module/slapos_aggregated_business_process/trade_model_path',
'sale_trade_condition_module/slapos_trade_condition/1', 'sale_trade_condition_module/slapos_aggregated_trade_condition/1',
], ],
price=.196, price=.196,
quantity=invoice_movement_2.getTotalPrice(), quantity=invoice_movement_2.getTotalPrice(),
...@@ -1138,8 +1138,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1138,8 +1138,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
quantity=-10.0, quantity=-10.0,
start_date=DateTime('2012/01/01'), start_date=DateTime('2012/01/01'),
stop_date=DateTime('2012/01/10'), stop_date=DateTime('2012/01/10'),
causality=['business_process_module/slapos_sale_business_process/pay', causality=['business_process_module/slapos_aggregated_business_process/pay',
'business_process_module/slapos_sale_business_process/payment_debit_path'], 'business_process_module/slapos_aggregated_business_process/payment_debit_path'],
destination='account_module/bank', destination='account_module/bank',
destination_section=person.getRelativeUrl(), destination_section=person.getRelativeUrl(),
quantity_unit='unit/piece', quantity_unit='unit/piece',
...@@ -1147,7 +1147,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1147,7 +1147,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
source='account_module/bank', source='account_module/bank',
source_payment='organisation_module/slapos/bank_account', source_payment='organisation_module/slapos/bank_account',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/payment' trade_phase='slapos/payment'
) )
payment_movement_1_rec_bank_bis = payment_movement_1_rec_bank.Base_createCloneDocument( payment_movement_1_rec_bank_bis = payment_movement_1_rec_bank.Base_createCloneDocument(
...@@ -1158,8 +1158,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1158,8 +1158,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
quantity=10.0, quantity=10.0,
start_date=DateTime('2012/01/01'), start_date=DateTime('2012/01/01'),
stop_date=DateTime('2012/01/10'), stop_date=DateTime('2012/01/10'),
causality=['business_process_module/slapos_sale_business_process/pay', causality=['business_process_module/slapos_aggregated_business_process/pay',
'business_process_module/slapos_sale_business_process/payment_credit_path'], 'business_process_module/slapos_aggregated_business_process/payment_credit_path'],
destination='account_module/payable', destination='account_module/payable',
destination_section=person.getRelativeUrl(), destination_section=person.getRelativeUrl(),
quantity_unit='unit/piece', quantity_unit='unit/piece',
...@@ -1167,7 +1167,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1167,7 +1167,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
source='account_module/receivable', source='account_module/receivable',
source_payment='organisation_module/slapos/bank_account', source_payment='organisation_module/slapos/bank_account',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/payment' trade_phase='slapos/payment'
) )
payment_rule_model_1 = transation_model_movement_1_rec.newContent( payment_rule_model_1 = transation_model_movement_1_rec.newContent(
...@@ -1179,8 +1179,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1179,8 +1179,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
quantity=-10.0, quantity=-10.0,
start_date=DateTime('2012/01/01'), start_date=DateTime('2012/01/01'),
stop_date=DateTime('2012/01/10'), stop_date=DateTime('2012/01/10'),
causality=['business_process_module/slapos_sale_business_process/pay', causality=['business_process_module/slapos_aggregated_business_process/pay',
'business_process_module/slapos_sale_business_process/payment_debit_path'], 'business_process_module/slapos_aggregated_business_process/payment_debit_path'],
destination='account_module/bank', destination='account_module/bank',
destination_section=person.getRelativeUrl(), destination_section=person.getRelativeUrl(),
quantity_unit='unit/piece', quantity_unit='unit/piece',
...@@ -1188,7 +1188,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1188,7 +1188,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
source='account_module/bank', source='account_module/bank',
source_payment='organisation_module/slapos/bank_account', source_payment='organisation_module/slapos/bank_account',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/payment' trade_phase='slapos/payment'
) )
payment_model_movement_1_rec_rec = payment_rule_1_rec.newContent( payment_model_movement_1_rec_rec = payment_rule_1_rec.newContent(
...@@ -1197,8 +1197,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1197,8 +1197,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
quantity=10.0, quantity=10.0,
start_date=DateTime('2012/01/01'), start_date=DateTime('2012/01/01'),
stop_date=DateTime('2012/01/10'), stop_date=DateTime('2012/01/10'),
causality=['business_process_module/slapos_sale_business_process/pay', causality=['business_process_module/slapos_aggregated_business_process/pay',
'business_process_module/slapos_sale_business_process/payment_credit_path'], 'business_process_module/slapos_aggregated_business_process/payment_credit_path'],
destination='account_module/payable', destination='account_module/payable',
destination_section=person.getRelativeUrl(), destination_section=person.getRelativeUrl(),
quantity_unit='unit/piece', quantity_unit='unit/piece',
...@@ -1206,7 +1206,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1206,7 +1206,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
source='account_module/receivable', source='account_module/receivable',
source_payment='organisation_module/slapos/bank_account', source_payment='organisation_module/slapos/bank_account',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/payment' trade_phase='slapos/payment'
) )
payment_rule_2_rec = transaction_movement_2_rec.newContent( payment_rule_2_rec = transaction_movement_2_rec.newContent(
...@@ -1218,8 +1218,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1218,8 +1218,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
quantity=-10.0, quantity=-10.0,
start_date=DateTime('2012/01/01'), start_date=DateTime('2012/01/01'),
stop_date=DateTime('2012/01/10'), stop_date=DateTime('2012/01/10'),
causality=['business_process_module/slapos_sale_business_process/pay', causality=['business_process_module/slapos_aggregated_business_process/pay',
'business_process_module/slapos_sale_business_process/payment_debit_path'], 'business_process_module/slapos_aggregated_business_process/payment_debit_path'],
destination='account_module/bank', destination='account_module/bank',
destination_section=person.getRelativeUrl(), destination_section=person.getRelativeUrl(),
quantity_unit='unit/piece', quantity_unit='unit/piece',
...@@ -1227,7 +1227,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1227,7 +1227,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
source='account_module/bank', source='account_module/bank',
source_payment='organisation_module/slapos/bank_account', source_payment='organisation_module/slapos/bank_account',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/payment' trade_phase='slapos/payment'
) )
payment_movement_2_rec_rec = payment_rule_2_rec.newContent( payment_movement_2_rec_rec = payment_rule_2_rec.newContent(
...@@ -1236,8 +1236,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1236,8 +1236,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
quantity=10.0, quantity=10.0,
start_date=DateTime('2012/01/01'), start_date=DateTime('2012/01/01'),
stop_date=DateTime('2012/01/10'), stop_date=DateTime('2012/01/10'),
causality=['business_process_module/slapos_sale_business_process/pay', causality=['business_process_module/slapos_aggregated_business_process/pay',
'business_process_module/slapos_sale_business_process/payment_credit_path'], 'business_process_module/slapos_aggregated_business_process/payment_credit_path'],
destination='account_module/payable', destination='account_module/payable',
destination_section=person.getRelativeUrl(), destination_section=person.getRelativeUrl(),
quantity_unit='unit/piece', quantity_unit='unit/piece',
...@@ -1245,7 +1245,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1245,7 +1245,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
source='account_module/receivable', source='account_module/receivable',
source_payment='organisation_module/slapos/bank_account', source_payment='organisation_module/slapos/bank_account',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/payment' trade_phase='slapos/payment'
) )
payment_rule_model_2 = transation_model_movement_2_rec.newContent( payment_rule_model_2 = transation_model_movement_2_rec.newContent(
...@@ -1257,8 +1257,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1257,8 +1257,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
quantity=-10.0, quantity=-10.0,
start_date=DateTime('2012/01/01'), start_date=DateTime('2012/01/01'),
stop_date=DateTime('2012/01/10'), stop_date=DateTime('2012/01/10'),
causality=['business_process_module/slapos_sale_business_process/pay', causality=['business_process_module/slapos_aggregated_business_process/pay',
'business_process_module/slapos_sale_business_process/payment_debit_path'], 'business_process_module/slapos_aggregated_business_process/payment_debit_path'],
destination='account_module/bank', destination='account_module/bank',
destination_section=person.getRelativeUrl(), destination_section=person.getRelativeUrl(),
quantity_unit='unit/piece', quantity_unit='unit/piece',
...@@ -1266,7 +1266,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1266,7 +1266,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
source='account_module/bank', source='account_module/bank',
source_payment='organisation_module/slapos/bank_account', source_payment='organisation_module/slapos/bank_account',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/payment' trade_phase='slapos/payment'
) )
payment_model_movement_2_rec_rec = payment_rule_2_rec.newContent( payment_model_movement_2_rec_rec = payment_rule_2_rec.newContent(
...@@ -1275,8 +1275,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1275,8 +1275,8 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
quantity=10.0, quantity=10.0,
start_date=DateTime('2012/01/01'), start_date=DateTime('2012/01/01'),
stop_date=DateTime('2012/01/10'), stop_date=DateTime('2012/01/10'),
causality=['business_process_module/slapos_sale_business_process/pay', causality=['business_process_module/slapos_aggregated_business_process/pay',
'business_process_module/slapos_sale_business_process/payment_credit_path'], 'business_process_module/slapos_aggregated_business_process/payment_credit_path'],
destination='account_module/payable', destination='account_module/payable',
destination_section=person.getRelativeUrl(), destination_section=person.getRelativeUrl(),
quantity_unit='unit/piece', quantity_unit='unit/piece',
...@@ -1284,7 +1284,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1284,7 +1284,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
source='account_module/receivable', source='account_module/receivable',
source_payment='organisation_module/slapos/bank_account', source_payment='organisation_module/slapos/bank_account',
source_section='organisation_module/slapos', source_section='organisation_module/slapos',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
trade_phase='slapos/payment' trade_phase='slapos/payment'
) )
self.tic() self.tic()
...@@ -1392,7 +1392,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder): ...@@ -1392,7 +1392,7 @@ class TestSlapOSPaymentTransactionBuilder(TestSlapOSSalePackingListBuilder):
def checkPayment(simulation_movement, payment): def checkPayment(simulation_movement, payment):
category_list = ['resource/currency_module/EUR', category_list = ['resource/currency_module/EUR',
'source_section/organisation_module/slapos', 'source_section/organisation_module/slapos',
'specialise/sale_trade_condition_module/slapos_trade_condition'] 'specialise/sale_trade_condition_module/slapos_aggregated_trade_condition']
category_list.append('causality/%s' % simulation_movement.getParentValue()\ category_list.append('causality/%s' % simulation_movement.getParentValue()\
.getParentValue().getDeliveryValue().getParentValue().getRelativeUrl()) .getParentValue().getDeliveryValue().getParentValue().getRelativeUrl())
category_list.append('destination_section/%s' % category_list.append('destination_section/%s' %
......
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingConstraint.py
View file @ 6db47987
...@@ -158,7 +158,7 @@ class TestSaleInvoiceTransaction(TestSlapOSConstraintMixin): ...@@ -158,7 +158,7 @@ class TestSaleInvoiceTransaction(TestSlapOSConstraintMixin):
self.assertTrue(message in self.getMessageList(invoice)) self.assertTrue(message in self.getMessageList(invoice))
invoice.setSpecialise('sale_trade_condition_module/slapos_trade_condition') invoice.setSpecialise('sale_trade_condition_module/slapos_aggregated_trade_condition')
self.assertFalse(message in self.getMessageList(invoice)) self.assertFalse(message in self.getMessageList(invoice))
@withAbort @withAbort
...@@ -183,7 +183,7 @@ class TestSaleInvoiceTransaction(TestSlapOSConstraintMixin): ...@@ -183,7 +183,7 @@ class TestSaleInvoiceTransaction(TestSlapOSConstraintMixin):
invoice = self.portal.accounting_module.newContent( invoice = self.portal.accounting_module.newContent(
portal_type='Sale Invoice Transaction', portal_type='Sale Invoice Transaction',
price_currency='currency_module/EUR', price_currency='currency_module/EUR',
specialise='sale_trade_condition_module/slapos_trade_condition') specialise='sale_trade_condition_module/slapos_aggregated_trade_condition')
invoice.newContent(portal_type='Invoice Line', quantity=1., price=1., invoice.newContent(portal_type='Invoice Line', quantity=1., price=1.,
base_contribution='base_amount/invoicing/taxable') base_contribution='base_amount/invoicing/taxable')
......
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingRule.py
View file @ 6db47987
...@@ -69,7 +69,7 @@ class TestDefaultInvoiceTransactionRule(testSlapOSMixin): ...@@ -69,7 +69,7 @@ class TestDefaultInvoiceTransactionRule(testSlapOSMixin):
use='trade/sale', use='trade/sale',
trade_phase='slapos/invoicing', trade_phase='slapos/invoicing',
quantity_unit='unit/piece', quantity_unit='unit/piece',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
causality_list=['business_process_module/slapos_sale_business_p' causality_list=['business_process_module/slapos_sale_business_p'
'rocess/invoice_path', 'business_process_module/slapos_sale_b' 'rocess/invoice_path', 'business_process_module/slapos_sale_b'
'usiness_process/invoice'], 'usiness_process/invoice'],
...@@ -203,7 +203,7 @@ class TestDefaultInvoicingRule(testSlapOSMixin): ...@@ -203,7 +203,7 @@ class TestDefaultInvoicingRule(testSlapOSMixin):
use='trade/sale', use='trade/sale',
trade_phase='slapos/delivery', trade_phase='slapos/delivery',
quantity_unit='unit/piece', quantity_unit='unit/piece',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
causality_list=['business_process_module/slapos_sale_business_p' causality_list=['business_process_module/slapos_sale_business_p'
'rocess/delivery_path', 'business_process_module/slapos_sale_' 'rocess/delivery_path', 'business_process_module/slapos_sale_'
'business_process/deliver']) 'business_process/deliver'])
...@@ -321,7 +321,7 @@ class TestDefaultPaymentRule(testSlapOSMixin): ...@@ -321,7 +321,7 @@ class TestDefaultPaymentRule(testSlapOSMixin):
use='trade/sale', use='trade/sale',
trade_phase='slapos/accounting', trade_phase='slapos/accounting',
quantity_unit='unit/piece', quantity_unit='unit/piece',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
causality_list=['business_process_module/slapos_sale_busines' causality_list=['business_process_module/slapos_sale_busines'
's_process/account'], 's_process/account'],
delivery_value=self.portal.accounting_module.newContent( delivery_value=self.portal.accounting_module.newContent(
...@@ -693,7 +693,7 @@ class TestDefaultTradeModelRule(testSlapOSMixin): ...@@ -693,7 +693,7 @@ class TestDefaultTradeModelRule(testSlapOSMixin):
use='trade/sale', use='trade/sale',
trade_phase='slapos/invoicing', trade_phase='slapos/invoicing',
quantity_unit='unit/piece', quantity_unit='unit/piece',
specialise='sale_trade_condition_module/slapos_trade_condition', specialise='sale_trade_condition_module/slapos_aggregated_trade_condition',
causality_list=['business_process_module/slapos_sale_business_p' causality_list=['business_process_module/slapos_sale_business_p'
'rocess/invoice_path', 'business_process_module/slapos_sale_b' 'rocess/invoice_path', 'business_process_module/slapos_sale_b'
'usiness_process/invoice'], 'usiness_process/invoice'],
...@@ -767,7 +767,7 @@ class TestDefaultTradeModelRule(testSlapOSMixin): ...@@ -767,7 +767,7 @@ class TestDefaultTradeModelRule(testSlapOSMixin):
.original_getSimulationState .original_getSimulationState
class TestDefaultDeliveryRule(testSlapOSMixin): class TestDefaultDeliveryRule(testSlapOSMixin):
trade_condition = 'sale_trade_condition_module/slapos_trade_condition' trade_condition = 'sale_trade_condition_module/slapos_aggregated_trade_condition'
def test(self): def test(self):
def newArrow(): def newArrow():
return self.portal.organisation_module.newContent( return self.portal.organisation_module.newContent(
......
master/bt5/slapos_accounting/bt/revision
View file @ 6db47987
145 146
\ No newline at end of file \ No newline at end of file
master/bt5/slapos_accounting/bt/template_local_role_list
View file @ 6db47987
...@@ -10,7 +10,7 @@ account_module/receivable ...@@ -10,7 +10,7 @@ account_module/receivable
account_module/refundable_vat account_module/refundable_vat
account_module/sales account_module/sales
business_process_module business_process_module
business_process_module/slapos_sale_business_process business_process_module/slapos_aggregated_business_process
currency_module/EUR currency_module/EUR
organisation_module/slapos organisation_module/slapos
organisation_module/slapos/bank_account organisation_module/slapos/bank_account
......
master/bt5/slapos_accounting/bt/template_local_roles_list
View file @ 6db47987
...@@ -10,7 +10,7 @@ account_module/receivable ...@@ -10,7 +10,7 @@ account_module/receivable
account_module/refundable_vat account_module/refundable_vat
account_module/sales account_module/sales
business_process_module business_process_module
business_process_module/slapos_sale_business_process business_process_module/slapos_aggregated_business_process
currency_module/EUR currency_module/EUR
organisation_module/slapos organisation_module/slapos
organisation_module/slapos/bank_account organisation_module/slapos/bank_account
......
master/bt5/slapos_accounting/bt/template_path_list
View file @ 6db47987
...@@ -11,10 +11,10 @@ account_module/refundable_vat ...@@ -11,10 +11,10 @@ account_module/refundable_vat
account_module/sales account_module/sales
accounting_module/template_sale_invoice_transaction accounting_module/template_sale_invoice_transaction
accounting_module/template_sale_invoice_transaction/** accounting_module/template_sale_invoice_transaction/**
business_process_module/slapos_aggregated_business_process
business_process_module/slapos_aggregated_business_process/**
business_process_module/slapos_consumption_business_process business_process_module/slapos_consumption_business_process
business_process_module/slapos_consumption_business_process/** business_process_module/slapos_consumption_business_process/**
business_process_module/slapos_sale_business_process
business_process_module/slapos_sale_business_process/**
business_process_module/slapos_subscription_business_process business_process_module/slapos_subscription_business_process
business_process_module/slapos_subscription_business_process/** business_process_module/slapos_subscription_business_process/**
currency_module/EUR currency_module/EUR
...@@ -64,11 +64,11 @@ portal_rules/slapos_trade_model_simulation_rule/** ...@@ -64,11 +64,11 @@ portal_rules/slapos_trade_model_simulation_rule/**
sale_packing_list_module/slapos_accounting_instance_delivery_line_template sale_packing_list_module/slapos_accounting_instance_delivery_line_template
sale_packing_list_module/slapos_accounting_instance_delivery_line_template/** sale_packing_list_module/slapos_accounting_instance_delivery_line_template/**
sale_packing_list_module/slapos_accounting_instance_delivery_template sale_packing_list_module/slapos_accounting_instance_delivery_template
sale_trade_condition_module/slapos_aggregated_trade_condition
sale_trade_condition_module/slapos_aggregated_trade_condition/1
sale_trade_condition_module/slapos_consumption_trade_condition sale_trade_condition_module/slapos_consumption_trade_condition
sale_trade_condition_module/slapos_subscription_trade_condition sale_trade_condition_module/slapos_subscription_trade_condition
sale_trade_condition_module/slapos_subscription_trade_condition/** sale_trade_condition_module/slapos_subscription_trade_condition/**
sale_trade_condition_module/slapos_trade_condition
sale_trade_condition_module/slapos_trade_condition/1
service_module/slapos_discount service_module/slapos_discount
service_module/slapos_instance_cleanup service_module/slapos_instance_cleanup
service_module/slapos_instance_setup service_module/slapos_instance_setup
......
master/bt5/slapos_cloud/PreferenceTemplateItem/portal_preferences/slapos_default_system_preference.xml
View file @ 6db47987
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
</item> </item>
<item> <item>
<key> <string>preferred_aggregated_sale_trade_condition</string> </key> <key> <string>preferred_aggregated_sale_trade_condition</string> </key>
<value> <string>sale_trade_condition_module/slapos_trade_condition</string> </value> <value> <string>sale_trade_condition_module/slapos_aggregated_trade_condition</string> </value>
</item> </item>
<item> <item>
<key> <string>preferred_credential_recovery_automatic_approval</string> </key> <key> <string>preferred_credential_recovery_automatic_approval</string> </key>
......
master/bt5/slapos_cloud/bt/revision
View file @ 6db47987
251 252
\ No newline at end of file \ No newline at end of file
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