diff --git a/bt5/erp5_user_tutorial_ui_test/CategoryTemplateItem/portal_categories/base_amount.xml b/bt5/erp5_user_tutorial_ui_test/CategoryTemplateItem/portal_categories/base_amount.xml index 6c5ef1188f93f92fc33019b3bb5a36614bad4cd2..3f0edea60f1578e4f0b5c0f376e9b73f72470468 100644 --- a/bt5/erp5_user_tutorial_ui_test/CategoryTemplateItem/portal_categories/base_amount.xml +++ b/bt5/erp5_user_tutorial_ui_test/CategoryTemplateItem/portal_categories/base_amount.xml @@ -105,10 +105,6 @@ <none/> </value> </item> - <item> - <key> <string>last_id</string> </key> - <value> <string>4</string> </value> - </item> <item> <key> <string>membership_criterion_base_category</string> </key> <value> diff --git a/bt5/erp5_user_tutorial_ui_test/CategoryTemplateItem/portal_categories/delivery_mode.xml b/bt5/erp5_user_tutorial_ui_test/CategoryTemplateItem/portal_categories/delivery_mode.xml index e3631c831b0b8e99b4688846d63d6ced42fbdfa2..1dca2fe56e9a19dd5a0d94971f1bc83bf990b249 100644 --- a/bt5/erp5_user_tutorial_ui_test/CategoryTemplateItem/portal_categories/delivery_mode.xml +++ b/bt5/erp5_user_tutorial_ui_test/CategoryTemplateItem/portal_categories/delivery_mode.xml @@ -108,10 +108,6 @@ <none/> </value> </item> - <item> - <key> <string>last_id</string> </key> - <value> <string>3</string> </value> - </item> <item> <key> <string>membership_criterion_base_category</string> </key> <value> diff --git a/bt5/erp5_user_tutorial_ui_test/CategoryTemplateItem/portal_categories/incoterm.xml b/bt5/erp5_user_tutorial_ui_test/CategoryTemplateItem/portal_categories/incoterm.xml index 52f2054e7f35772cd5a5299ec662c1087ce55af5..47027a9fb5f1ad16705eb1e3bf8db97b65ad8250 100644 --- a/bt5/erp5_user_tutorial_ui_test/CategoryTemplateItem/portal_categories/incoterm.xml +++ b/bt5/erp5_user_tutorial_ui_test/CategoryTemplateItem/portal_categories/incoterm.xml @@ -116,10 +116,6 @@ <none/> </value> </item> - <item> - <key> <string>last_id</string> </key> - <value> <string>4</string> </value> - </item> <item> <key> <string>membership_criterion_base_category</string> </key> <value> diff --git a/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpPaymentTest.xml b/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpPaymentTest.xml new file mode 100644 index 0000000000000000000000000000000000000000..f5efa4e693f3d0fa549d4b4ef11c415af38168ec --- /dev/null +++ b/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpPaymentTest.xml @@ -0,0 +1,83 @@ +<?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>_body</string> </key> + <value> <string>portal = context.getPortalObject()\n +howto_dict = context.Zuite_getHowToInfo()\n +\n +# check if there is already the euro curency on the instance\n +\n +invoice = context.portal_catalog.getResultValue(\n + portal_type=\'Sale Invoice Transaction\',\n + title=\'ZUITE-TEST-SALEORDER-PRODUCT-001\',)\n +if portal.portal_workflow.isTransitionPossible(invoice, "start"):\n + invoice.start()\n +if not start_only:\n + invoice.stop()\n + invoice.deliver()\n +# Clear cache\n +portal.portal_caches.clearAllCache()\n +\n +return "Init Ok"\n +</string> </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>clean=True,start_only=False</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Zuite_setUpPaymentTest</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpSaleInvoiceTest.xml b/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpSaleInvoiceTest.xml new file mode 100644 index 0000000000000000000000000000000000000000..65850c5e9830792166ce36ec1875a2f0d684d4c4 --- /dev/null +++ b/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpSaleInvoiceTest.xml @@ -0,0 +1,80 @@ +<?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>_body</string> </key> + <value> <string>portal = context.getPortalObject()\n +howto_dict = context.Zuite_getHowToInfo()\n +\n +# check if there is already the euro curency on the instance\n +\n +sale_packing_list = context.portal_catalog.getResultValue(\n + portal_type=\'Sale Packing List\',\n + title=\'ZUITE-TEST-SALEORDER-PRODUCT-001\',)\n +sale_packing_list.start()\n +sale_packing_list.deliver()\n +# Clear cache\n +portal.portal_caches.clearAllCache()\n +\n +return "Init Ok"\n +</string> </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>clean=True</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Zuite_setUpSaleInvoiceTest</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpSaleOrderTest.xml b/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpSaleOrderTest.xml index 1231c556a689948a9e3f61204440311d8757c060..a3e1a412fe7aa39d98f086cf4a982d853bfe1ead 100644 --- a/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpSaleOrderTest.xml +++ b/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpSaleOrderTest.xml @@ -73,7 +73,6 @@ if context.portal_templates.getInstalledBusinessTemplate("erp5_simulation_test") business_process.account_credit_path.setSourceValue(context.account_module.receivable)\n if isTransitionPossible(business_process, \'validate\'):\n business_process.validate()\n - # check if there is already the euro curency on the instance\n currency = context.portal_catalog.getResultValue(portal_type=\'Currency\',\n title=howto_dict[\'sale_howto_currency_title\'])\n diff --git a/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpSalePackingListTest.xml b/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpSalePackingListTest.xml new file mode 100644 index 0000000000000000000000000000000000000000..2da4de0a21f9ba1ac32c6170c1485cdc7efaab3f --- /dev/null +++ b/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_setUpSalePackingListTest.xml @@ -0,0 +1,120 @@ +<?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>_body</string> </key> + <value> <string>\n +portal = context.getPortalObject()\n +howto_dict = context.Zuite_getHowToInfo()\n +\n +# check if there is already the euro curency on the instance\n +currency = context.portal_catalog.getResultValue(portal_type=\'Currency\',\n + title=howto_dict[\'sale_howto_currency_title\'])\n +\n +# add default sale order trade condition\n +sale_order_trade_condition = context.portal_catalog.getResultValue(portal_type=\'Sale Trade Condition\',\n + reference=\'STC-General\')\n +\n +# Get the documents created by setUpSaleOrder\n +product = context.portal_catalog.getResultValue(portal_type=\'Product\',\n + title=howto_dict[\'sale_howto_product_title\'])\n +\n +my_organisation = context.portal_catalog.getResultValue(portal_type=\'Organisation\',\n + title=howto_dict[\'sale_howto_organisation_title\'],\n + corporate_name=howto_dict[\'sale_howto_organisation_title\'])\n +\n +organisation = context.portal_catalog.getResultValue(portal_type=\'Organisation\',\n + title=howto_dict[\'sale_howto_organisation2_title\'],\n + corporate_name=howto_dict[\'sale_howto_organisation2_title\'])\n +\n +person = context.portal_catalog.getResultValue(portal_type=\'Person\',\n + title=howto_dict[\'sale_howto_person_title\'],\n + career_subordination_title=howto_dict[\'sale_howto_organisation_title\'])\n +\n +\n +sale_order = portal.sale_order_module.newContent(\n + portal_type=\'Sale Order\', title=\'ZUITE-TEST-SALEORDER-PRODUCT-001\', specialise=sale_order_trade_condition.getRelativeUrl(),\n + destination_section=organisation.getRelativeUrl(),\n + destination=organisation.getRelativeUrl(),\n + source_section=my_organisation.getRelativeUrl(),\n + source=my_organisation.getRelativeUrl(),\n + source_decision=my_organisation.getRelativeUrl(),\n + destination_decision=organisation.getRelativeUrl(),\n + destination_administration=person.getRelativeUrl(),\n + source_administration=my_organisation.getRelativeUrl(),\n + delivery_mode=\'delivery_mode/air\',\n + order=\'order/normal\',\n + start_date=DateTime(),\n + stop_date=DateTime()+1,\n +)\n +sale_order.setPriceCurrency(currency.getRelativeUrl())\n +sale_order.setIncoterm(\'incoterm/cpt\')\n +\n +sale_order.newContent(portal_type=\'Sale Order Line\',\n + resource=product.getRelativeUrl(), price=1.0, quantity=100000.0)\n +sale_order.confirm()\n +# Clear cache\n +portal.portal_caches.clearAllCache()\n +\n +return "Init Ok"\n +</string> </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string>clean=True</string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>Zuite_setUpSalePackingListTest</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_viewTestMacroLibrary.xml b/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_viewTestMacroLibrary.xml index 4e7056422d8ad99010bca2d777917efe37652327..4dcb764465477a37ee9e3bd7273f210cea1d7f49 100644 --- a/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_viewTestMacroLibrary.xml +++ b/bt5/erp5_user_tutorial_ui_test/SkinTemplateItem/portal_skins/erp5_user_tutorial_ui_test/Zuite_viewTestMacroLibrary.xml @@ -119,7 +119,7 @@ </tal:block>\n \n <tal:block metal:define-macro="invoke_simulation_alarms">\n - <!-- Wait for activities to finish -->\n + <span metal:use-macro="container/Zuite_viewTestMacroLibrary/macros/wait_for_activities"> Wait for activities </span>\\ <!-- Wait for activities to finish -->\n <tr>\n <td>openAndWait</td>\n <td>${base_url}/Zuite_invokeSimulationAlarmList</td>\n @@ -130,6 +130,7 @@ <td>Done.</td>\n <td></td>\n </tr> \n + <span metal:use-macro="container/Zuite_viewTestMacroLibrary/macros/wait_for_activities"> Wait for activities </span>\n </tal:block>\n \n <tal:block metal:define-macro="login_as_functional_test_user">\n diff --git a/bt5/erp5_user_tutorial_ui_test/bt/dependency_list b/bt5/erp5_user_tutorial_ui_test/bt/dependency_list index e57b6bfcfa36779541cddaaa776f12d8f4f9dcf4..1037d15c20e7753f9373ed1ccc68c378db21498d 100644 --- a/bt5/erp5_user_tutorial_ui_test/bt/dependency_list +++ b/bt5/erp5_user_tutorial_ui_test/bt/dependency_list @@ -1 +1 @@ -erp5_base +erp5_base \ No newline at end of file diff --git a/bt5/erp5_user_tutorial_ui_test/bt/revision b/bt5/erp5_user_tutorial_ui_test/bt/revision index 535afc9412af2af1d4adf1594a6e4d882b0c2971..bc93f9457e9e028f9b047a765d809ab78dc3dd88 100644 --- a/bt5/erp5_user_tutorial_ui_test/bt/revision +++ b/bt5/erp5_user_tutorial_ui_test/bt/revision @@ -1 +1 @@ -785 \ No newline at end of file +786 \ No newline at end of file diff --git a/bt5/erp5_user_tutorial_ui_test/bt/template_base_category_list b/bt5/erp5_user_tutorial_ui_test/bt/template_base_category_list index 6b1b9bbd795596c291993db61d75ae0d033fdf77..f6a88658b09f0ec44507682895aab05a97db055a 100644 --- a/bt5/erp5_user_tutorial_ui_test/bt/template_base_category_list +++ b/bt5/erp5_user_tutorial_ui_test/bt/template_base_category_list @@ -1,3 +1,3 @@ base_amount delivery_mode -incoterm +incoterm \ No newline at end of file diff --git a/bt5/erp5_user_tutorial_ui_test/bt/template_path_list b/bt5/erp5_user_tutorial_ui_test/bt/template_path_list index 4d7ce04649fdaf14c0be129350e485e1e0e2d9ae..c7dec240c3d243dddbc7978d3cd4a0bd3015f1ee 100644 --- a/bt5/erp5_user_tutorial_ui_test/bt/template_path_list +++ b/bt5/erp5_user_tutorial_ui_test/bt/template_path_list @@ -5,8 +5,8 @@ portal_categories/function/marketing portal_categories/function/marketing/marketing_manager portal_categories/function/sales portal_categories/function/sales/manager -portal_categories/gender/male portal_categories/gender/female +portal_categories/gender/male portal_categories/group/my_group portal_categories/incoterm/cpt portal_categories/nationality/french @@ -18,6 +18,4 @@ portal_categories/quantity_unit/unit portal_categories/quantity_unit/unit/** portal_categories/region/brazil portal_categories/role/** -portal_categories/use/test_functional_incoming_service -sale_trade_condition_module/1 -sale_trade_condition_module/1/** +portal_categories/use/test_functional_incoming_service \ No newline at end of file