diff --git a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/confirmed_state.zpt b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/confirmed_state.zpt index 53c8a2193d33b57f15f689246df7569a025b11b1..67d6e1afbeb3b06b76a58b0307aa6f1ba851d2bc 100644 --- a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/confirmed_state.zpt +++ b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/confirmed_state.zpt @@ -10,7 +10,7 @@ Test stock browser for confirmed state <tbody tal:define="init_method string:PdmZuite_createDelivery?state=confirmed"> <!-- Setup {{{ --> -<tal:block metal:use-macro="here/PdmZuite_CommonTemplate/macros/init" /> +<tal:block metal:use-macro="here/PdmZuite_checkStockBrowser/macros/init" /> <!-- }}} --> <!-- Check source --> diff --git a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/delivered_state.zpt b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/delivered_state.zpt index 950cece780672849b9f0e33289053ba8a920b8cb..7b9270f27acc72426bc436259e57c16aae69cb06 100644 --- a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/delivered_state.zpt +++ b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/delivered_state.zpt @@ -10,7 +10,7 @@ Test stock browser for delivered state <tbody tal:define="init_method string:PdmZuite_createDelivery?state=delivered"> <!-- Setup {{{ --> -<tal:block metal:use-macro="here/PdmZuite_CommonTemplate/macros/init" /> +<tal:block metal:use-macro="here/PdmZuite_checkStockBrowser/macros/init" /> <!-- }}} --> <!-- Check source --> diff --git a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/draft_state.zpt b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/draft_state.zpt index 666f4fa398bd3485e1a1be5cce9e91f4d2122618..9bc4f5e091104d2410f3ef0cef10716bbce5325e 100644 --- a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/draft_state.zpt +++ b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/draft_state.zpt @@ -10,7 +10,7 @@ Test stock browser for draft state <tbody tal:define="init_method string:PdmZuite_createDelivery?state=draft"> <!-- Setup {{{ --> -<tal:block metal:use-macro="here/PdmZuite_CommonTemplate/macros/init" /> +<tal:block metal:use-macro="here/PdmZuite_checkStockBrowser/macros/init" /> <!-- }}} --> <!-- Check source --> diff --git a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/node_category_preference.zpt b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/node_category_preference.zpt index 607694ae2807b130fb000627dde31e7a49199793..aed162237c1e55a77bdd1beca3f8899ba9f8931d 100644 --- a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/node_category_preference.zpt +++ b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/node_category_preference.zpt @@ -11,7 +11,7 @@ Test stock browser with node category preference set_node_category_preference python: True"> <!-- Setup {{{ --> -<tal:block metal:use-macro="here/PdmZuite_CommonTemplate/macros/init" /> +<tal:block metal:use-macro="here/PdmZuite_checkStockBrowser/macros/init" /> <!-- }}} --> <!-- Check destination --> diff --git a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/ordered_state.zpt b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/ordered_state.zpt index 9d465a96e23dcde257e5bee8303d8d270dca379d..aea55c2716cf670abed10240a90f76bc5c5f0318 100644 --- a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/ordered_state.zpt +++ b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/ordered_state.zpt @@ -10,7 +10,7 @@ Test stock browser for ordered state <tbody tal:define="init_method string:PdmZuite_createDelivery?state=ordered"> <!-- Setup {{{ --> -<tal:block metal:use-macro="here/PdmZuite_CommonTemplate/macros/init" /> +<tal:block metal:use-macro="here/PdmZuite_checkStockBrowser/macros/init" /> <!-- }}} --> <!-- Check source --> diff --git a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/planned_state.zpt b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/planned_state.zpt index 7f050f4fe23134f65426dfd7571d946c9a7efa92..91a69872d1b763a79d82ea569b21a93a864421a4 100644 --- a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/planned_state.zpt +++ b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/planned_state.zpt @@ -10,7 +10,7 @@ Test stock browser for planned state <tbody tal:define="init_method string:PdmZuite_createDelivery?state=planned"> <!-- Setup {{{ --> -<tal:block metal:use-macro="here/PdmZuite_CommonTemplate/macros/init" /> +<tal:block metal:use-macro="here/PdmZuite_checkStockBrowser/macros/init" /> <!-- }}} --> <!-- Check source --> diff --git a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/ready_state.zpt b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/ready_state.zpt index 0ef2693eaffde9a183f01e423d5be6eea3fcbf59..df787f42627546d63f6276bdf5a216c83ce0e236 100644 --- a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/ready_state.zpt +++ b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/ready_state.zpt @@ -10,7 +10,7 @@ Test stock browser for ready state <tbody tal:define="init_method string:PdmZuite_createDelivery?state=ready"> <!-- Setup {{{ --> -<tal:block metal:use-macro="here/PdmZuite_CommonTemplate/macros/init" /> +<tal:block metal:use-macro="here/PdmZuite_checkStockBrowser/macros/init" /> <!-- }}} --> <!-- Check source --> diff --git a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/started_state.zpt b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/started_state.zpt index 454bede869383d64b9fe4ce7f2e2a1434a2f91cc..1384728a7ab5d72f2b474e34bd3e67c04dc1d413 100644 --- a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/started_state.zpt +++ b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/started_state.zpt @@ -10,7 +10,7 @@ Test stock browser for started state <tbody tal:define="init_method string:PdmZuite_createDelivery?state=started"> <!-- Setup {{{ --> -<tal:block metal:use-macro="here/PdmZuite_CommonTemplate/macros/init" /> +<tal:block metal:use-macro="here/PdmZuite_checkStockBrowser/macros/init" /> <!-- }}} --> <!-- Check source --> diff --git a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/stopped_state.zpt b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/stopped_state.zpt index 46f78fffb80a1a3378d4c486c06fe51deffdf7b3..e51ecef6b88881342c315e5db161205aff957c49 100644 --- a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/stopped_state.zpt +++ b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/stock_browser_zuite/stopped_state.zpt @@ -10,7 +10,7 @@ Test stock browser for stopped state <tbody tal:define="init_method string:PdmZuite_createDelivery?state=stopped"> <!-- Setup {{{ --> -<tal:block metal:use-macro="here/PdmZuite_CommonTemplate/macros/init" /> +<tal:block metal:use-macro="here/PdmZuite_checkStockBrowser/macros/init" /> <!-- }}} --> <!-- Check source --> diff --git a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.zpt b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.zpt index 7cc029bf9d6b63b64130e6a9c7b863a76a75dc57..c4af91aa7083bb9ce482675aff408325e1895af9 100644 --- a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.zpt +++ b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.zpt @@ -67,11 +67,6 @@ <td>${base_url}/product_module/erp5_pdm_ui_test_product/</td> <td></td> </tr> - <tr> - <td>clickAndWait</td> - <td>//button[@name="Base_doReport:method"]</td> - <td></td> - </tr> </tal:block> <tal:block metal:define-macro="toggleSaleSupplyLineBasePricePerSlice"> diff --git a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_checkStockBrowser.zpt b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_checkStockBrowser.zpt index a2140b25377baaf334d8163c7b657c12ffa02bb9..187f971694f97c13e10119ae6bbd1e6777ae4536 100644 --- a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_checkStockBrowser.zpt +++ b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_checkStockBrowser.zpt @@ -1,6 +1,15 @@ <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal"> + <tal:block metal:define-macro="init"> + <tal:block metal:use-macro="here/PdmZuite_CommonTemplate/macros/init" /> + <tr> + <td>clickAndWait</td> + <td>//button[@name="Base_doReport:method"]</td> + <td></td> + </tr> + </tal:block> + <tal:block metal:define-macro="check_inventory" tal:define="base_url python: '/' + here.getPortalObject().getId();