Skip to content

S
slapos.core
Commit 5db9750d authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

Updates for a rebase erp5-vifib branch 

See merge request nexedi/slapos.core!480
parents f47e8f4e f9a1745f
Pipeline #26296 failed with stage
    in 0 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 461 additions and 40 deletions
    master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_aggregated_business_process.xml
    View file @ 5db9750d
    ......@@ -14,9 +14,7 @@
    <string>Assignor</string>
    <string>Associate</string>
    <string>Auditor</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -27,9 +25,7 @@
    <string>Assignee</string>
    <string>Assignor</string>
    <string>Associate</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -40,9 +36,7 @@
    <string>Assignee</string>
    <string>Assignor</string>
    <string>Associate</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -54,9 +48,7 @@
    <string>Assignor</string>
    <string>Associate</string>
    <string>Auditor</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -120,6 +112,12 @@
    <key> <string>version</string> </key>
    <value> <string>1</string> </value>
    </item>
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......@@ -145,4 +143,83 @@
    <none/>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>validation_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="6" aka="AAAAAAAAAAY=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1675127930.34</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_consumption_business_process.xml
    View file @ 5db9750d
    ......@@ -14,9 +14,7 @@
    <string>Assignor</string>
    <string>Associate</string>
    <string>Auditor</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -27,9 +25,7 @@
    <string>Assignee</string>
    <string>Assignor</string>
    <string>Associate</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -40,9 +36,7 @@
    <string>Assignee</string>
    <string>Assignor</string>
    <string>Associate</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -54,9 +48,7 @@
    <string>Assignor</string>
    <string>Associate</string>
    <string>Auditor</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -120,6 +112,12 @@
    <key> <string>version</string> </key>
    <value> <string>1</string> </value>
    </item>
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......@@ -145,4 +143,83 @@
    <none/>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>validation_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="6" aka="AAAAAAAAAAY=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1675127930.36</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_reservation_refound_business_process.xml
    View file @ 5db9750d
    ......@@ -14,9 +14,7 @@
    <string>Assignor</string>
    <string>Associate</string>
    <string>Auditor</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -27,9 +25,7 @@
    <string>Assignee</string>
    <string>Assignor</string>
    <string>Associate</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -40,9 +36,7 @@
    <string>Assignee</string>
    <string>Assignor</string>
    <string>Associate</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -54,9 +48,7 @@
    <string>Assignor</string>
    <string>Associate</string>
    <string>Auditor</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -120,6 +112,12 @@
    <key> <string>version</string> </key>
    <value> <string>1</string> </value>
    </item>
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......@@ -145,4 +143,83 @@
    <none/>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>validation_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="6" aka="AAAAAAAAAAY=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1675127930.27</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_accounting/PathTemplateItem/business_process_module/slapos_subscription_business_process.xml
    View file @ 5db9750d
    ......@@ -14,9 +14,7 @@
    <string>Assignor</string>
    <string>Associate</string>
    <string>Auditor</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -27,9 +25,7 @@
    <string>Assignee</string>
    <string>Assignor</string>
    <string>Associate</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -40,9 +36,7 @@
    <string>Assignee</string>
    <string>Assignor</string>
    <string>Associate</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -54,9 +48,7 @@
    <string>Assignor</string>
    <string>Associate</string>
    <string>Auditor</string>
    <string>Author</string>
    <string>Manager</string>
    <string>Owner</string>
    </tuple>
    </value>
    </item>
    ......@@ -120,6 +112,12 @@
    <key> <string>version</string> </key>
    <value> <string>1</string> </value>
    </item>
    <item>
    <key> <string>workflow_history</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    ......@@ -145,4 +143,83 @@
    <none/>
    </pickle>
    </record>
    <record id="5" aka="AAAAAAAAAAU=">
    <pickle>
    <global name="PersistentMapping" module="Persistence.mapping"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>data</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>validation_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="6" aka="AAAAAAAAAAY=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>validate</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="DateTime" module="DateTime.DateTime"/>
    </klass>
    <tuple>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1675127930.28</float>
    <string>UTC</string>
    </tuple>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>validation_state</string> </key>
    <value> <string>validated</string> </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/Entity_createPaymentTransaction.py
    View file @ 5db9750d
    ......@@ -31,10 +31,10 @@ current_payment = portal.accounting_module.newContent(
    portal_type="Payment Transaction",
    causality=current_invoice.getRelativeUrl(),
    source_section=current_invoice.getSourceSection(),
    destination_section=current_invoice.getDestinationSection(),
    resource=current_invoice.getResource(),
    price_currency=current_invoice.getResource(),
    specialise=current_invoice.getSpecialise(),
    destination_section=current_invoice.getDestinationSection(),
    payment_mode=current_invoice.getPaymentMode(),
    start_date=current_invoice.getStartDate(),
    stop_date=current_invoice.getStopDate(),
    ......@@ -66,12 +66,8 @@ comment = translateString("Initialised by Entity_createPaymentTransaction.")
    payment_tag ="sale_invoice_transaction_create_payment_%s" % current_invoice.getUid()
    current_payment.activate(tag=payment_tag).immediateReindexObject()
    # Call script rather them call confirm(), since it would set security and fail whenever
    # start is called.
    current_payment.AccountingTransaction_setReference()
    comment = translateString("Initialised by Entity_createPaymentTransaction.")
    current_payment.start(comment=comment)
    current_payment.PaymentTransaction_start(comment=comment)
    # Set a flag on the request for prevent 2 calls on the same transaction
    context.REQUEST.set(payment_tag, 1)
    ......
    master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/PaymentTransaction_start.py 0 → 100644
    View file @ 5db9750d
    from zExceptions import Unauthorized
    if REQUEST is not None:
    raise Unauthorized
    if context.getPortalType() != "Payment Transaction":
    raise Unauthorized
    context.confirm(comment=comment)
    context.start(comment=comment)
    master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/PaymentTransaction_start.xml 0 → 100644
    View file @ 5db9750d
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>Script_magic</string> </key>
    <value> <int>3</int> </value>
    </item>
    <item>
    <key> <string>_bind_names</string> </key>
    <value>
    <object>
    <klass>
    <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_asgns</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>name_container</string> </key>
    <value> <string>container</string> </value>
    </item>
    <item>
    <key> <string>name_context</string> </key>
    <value> <string>context</string> </value>
    </item>
    <item>
    <key> <string>name_m_self</string> </key>
    <value> <string>script</string> </value>
    </item>
    <item>
    <key> <string>name_subpath</string> </key>
    <value> <string>traverse_subpath</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>_params</string> </key>
    <value> <string>comment="", REQUEST=None</string> </value>
    </item>
    <item>
    <key> <string>_proxy_roles</string> </key>
    <value>
    <tuple>
    <string>Manager</string>
    </tuple>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>PaymentTransaction_start</string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    master/bt5/slapos_accounting/TestTemplateItem/portal_components/test.erp5.testSlapOSAccountingSkins.py
    View file @ 5db9750d
    ......@@ -816,3 +816,32 @@ class TestSlapOSAccounting(SlapOSTestCaseMixin):
    self.assertIn('account_module/receivable',
    [i.getRelativeUrl() for i in account_list])
    def test_PaymentTransaction_start(self):
    sale_invoice_transaction = self.portal.accounting_module.newContent(
    portal_type="Sale Invoice Transaction",
    start_date=DateTime()
    )
    payment_transaction = self.portal.accounting_module.newContent(
    portal_type="Payment Transaction",
    start_date=DateTime()
    )
    self.assertRaises(Unauthorized,
    payment_transaction.PaymentTransaction_start,
    REQUEST=self.portal.REQUEST)
    self.assertRaises(Unauthorized,
    sale_invoice_transaction.PaymentTransaction_start,
    REQUEST=self.portal.REQUEST)
    self.assertRaises(Unauthorized,
    sale_invoice_transaction.PaymentTransaction_start,
    REQUEST=None)
    payment_transaction.PaymentTransaction_start()
    self.assertEqual("started",
    payment_transaction.getSimulationState())
    master/bt5/slapos_accounting/bt/template_keep_last_workflow_history_only_path_list
    View file @ 5db9750d
    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_reservation_refound_business_process
    business_process_module/slapos_reservation_refound_business_process/**
    business_process_module/slapos_subscription_business_process
    business_process_module/slapos_subscription_business_process/**
    currency_module/CNY
    currency_module/EUR
    sale_trade_condition_module/slapos_aggregated_consumption_trade_condition
    ......
    master/bt5/slapos_configurator/TestTemplateItem/portal_components/test.erp5.testSlapOSConfigurator.py
    View file @ 5db9750d
    ......@@ -397,6 +397,7 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
    'erp5_multimedia',
    'erp5_corporate_identity',
    'erp5_officejs',
    'erp5_oauth2_resource',
    'erp5_notebook',
    'erp5_smart_assistant',
    'erp5_interaction_drop',
    ......
    master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
    View file @ 5db9750d
    ......@@ -44,6 +44,7 @@ common2_folder_list = """erp5_accounting_l10n_fr
    erp5_certificate_authority
    erp5_item
    erp5_item_trade
    erp5_oauth2_resource
    erp5_upgrader
    erp5_access_tab
    erp5_access_token
    ......
    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