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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 717 deletions
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 @@
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>slapos_sale_business_process</string> </value>
<value> <string>slapos_aggregated_business_process</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -102,7 +102,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>slapos_sale_business_process</string> </value>
<value> <string>slapos_aggregated_business_process</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
......@@ -114,7 +114,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>SlapOS Sale Business Process</string> </value>
<value> <string>SlapOS Aggregated Business Process</string> </value>
</item>
<item>
<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 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>specialise/business_process_module/slapos_sale_business_process</string>
<string>specialise/business_process_module/slapos_aggregated_business_process</string>
</tuple>
</value>
</item>
......@@ -104,6 +104,10 @@
<none/>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>slapos_aggregated_trade_condition</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
......@@ -112,7 +116,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>slapos_trade_condition</string> </value>
<value> <string>slapos_aggregated_trade_condition</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
......@@ -120,7 +124,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Default SlapOS Sale Trade Condition</string> </value>
<value> <string>SlapOS Aggregated Trade Condition</string> </value>
</item>
<item>
<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 @@
</item>
<item>
<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>
<key> <string>id</string> </key>
......
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingConstraint.py
View file @ 6db47987
......@@ -158,7 +158,7 @@ class TestSaleInvoiceTransaction(TestSlapOSConstraintMixin):
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))
@withAbort
......@@ -183,7 +183,7 @@ class TestSaleInvoiceTransaction(TestSlapOSConstraintMixin):
invoice = self.portal.accounting_module.newContent(
portal_type='Sale Invoice Transaction',
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.,
base_contribution='base_amount/invoicing/taxable')
......
master/bt5/slapos_accounting/TestTemplateItem/testSlapOSAccountingRule.py
View file @ 6db47987
......@@ -69,7 +69,7 @@ class TestDefaultInvoiceTransactionRule(testSlapOSMixin):
use='trade/sale',
trade_phase='slapos/invoicing',
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'
'rocess/invoice_path', 'business_process_module/slapos_sale_b'
'usiness_process/invoice'],
......@@ -203,7 +203,7 @@ class TestDefaultInvoicingRule(testSlapOSMixin):
use='trade/sale',
trade_phase='slapos/delivery',
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'
'rocess/delivery_path', 'business_process_module/slapos_sale_'
'business_process/deliver'])
......@@ -321,7 +321,7 @@ class TestDefaultPaymentRule(testSlapOSMixin):
use='trade/sale',
trade_phase='slapos/accounting',
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'
's_process/account'],
delivery_value=self.portal.accounting_module.newContent(
......@@ -693,7 +693,7 @@ class TestDefaultTradeModelRule(testSlapOSMixin):
use='trade/sale',
trade_phase='slapos/invoicing',
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'
'rocess/invoice_path', 'business_process_module/slapos_sale_b'
'usiness_process/invoice'],
......@@ -767,7 +767,7 @@ class TestDefaultTradeModelRule(testSlapOSMixin):
.original_getSimulationState
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 newArrow():
return self.portal.organisation_module.newContent(
......
master/bt5/slapos_accounting/bt/revision
View file @ 6db47987
145
\ No newline at end of file
146
\ 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
account_module/refundable_vat
account_module/sales
business_process_module
business_process_module/slapos_sale_business_process
business_process_module/slapos_aggregated_business_process
currency_module/EUR
organisation_module/slapos
organisation_module/slapos/bank_account
......
master/bt5/slapos_accounting/bt/template_local_roles_list
View file @ 6db47987
......@@ -10,7 +10,7 @@ account_module/receivable
account_module/refundable_vat
account_module/sales
business_process_module
business_process_module/slapos_sale_business_process
business_process_module/slapos_aggregated_business_process
currency_module/EUR
organisation_module/slapos
organisation_module/slapos/bank_account
......
master/bt5/slapos_accounting/bt/template_path_list
View file @ 6db47987
......@@ -11,10 +11,10 @@ account_module/refundable_vat
account_module/sales
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_sale_business_process
business_process_module/slapos_sale_business_process/**
business_process_module/slapos_subscription_business_process
business_process_module/slapos_subscription_business_process/**
currency_module/EUR
......@@ -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_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_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_instance_cleanup
service_module/slapos_instance_setup
......
master/bt5/slapos_cloud/PreferenceTemplateItem/portal_preferences/slapos_default_system_preference.xml
View file @ 6db47987
......@@ -83,7 +83,7 @@
</item>
<item>
<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>
<key> <string>preferred_credential_recovery_automatic_approval</string> </key>
......
master/bt5/slapos_cloud/bt/revision
View file @ 6db47987
251
\ No newline at end of file
252
\ 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