editing lot creation after updating

@@ -99,9 +99,11 @@ fill tender general info
     run keyword if condition is not none                        ${procurement_method_type}  select from list by value  ${tender_form_procurement_method_type_input_locator}  ${procurement_method_type}
     wait until page does not contain element                    ${tender_load_form_after_mode_locator}
 
+    capture page screenshot
     ${lots} =                                                   get from dictionary by keys  ${data}  lots
     run keyword if condition is not none                        ${lots}  Run Keyword And Ignore Error  Execute Javascript  $('[id$="form-is_multilot"]').click()
     wait until page does not contain element                    ${tender_load_form_after_mode_locator}  20
+    capture page screenshot
 
     open popup by btn locator                                   ${plan_form_general_panel_edit_btn_locator}
     ${plan_path} =                                              Get Variable Value  ${ARTIFACT_FILE}  artifact_plan.yaml
@@ -440,12 +442,16 @@ fill tender form lots
     ${prepared_tender_data} =                                   Get From Dictionary    ${td_railway_crutch}  data
     ${milestones1} =                                            Run Keyword If  "${mode}" in "negotiation"  Get From Dictionary    ${prepared_tender_data}   milestones
     ##### EOF - TMP #####
+    capture page screenshot
     :FOR  ${lot_attributes}  IN  @{lot_attributes_array}
     \  run keyword if  '${mode}' not in 'open_framework'        open popup by btn locator   ${tender_form_lots_panel_edit_btn_locator}
-    \  ...  ELSE                                                click visible element    ${tender_form_lots_edit_lot1_btn_locator}
+    \  ...  ELSE                                                Execute Javascript   $('#Lots #collapseLots #Lots0 .actions-wrapper a.btn.btn-default.btn-update.js-form-popup-update:first').click()
+#    \  run keyword if  '${mode}' not in 'open_framework'        open popup by btn locator   ${tender_form_lots_panel_edit_btn_locator}
+#    \  ...  ELSE                                                click visible element    ${tender_form_lots_edit_lot1_btn_locator}
 #    \  open popup by btn locator                                ${tender_form_lots_panel_edit_btn_locator}
 #    \  click visible element                                    ${tender_form_lots_panel_edit_btn_locator}
 #    \  wait until popup is visible
+    \  capture page screenshot
     \  fill lot form in opened popup                            ${lot_attributes}
     \  submit current visible popup
     \  ${features} =                                            get from dictionary by keys  ${lot_attributes}  features
@@ -455,6 +461,7 @@ fill tender form lots
     \  run keyword if condition is none                         ${milestones}  run keyword if  "${mode}" in "negotiation"  fill tender form milestones  ${milestones1}
     \  ${items} =                                               get from dictionary by keys  ${lot_attributes}  items
     \  run keyword if condition is not none                     ${items}  fill tender form items  ${items}
+    capture page screenshot
 
 fill tender form lots 2 stage
     [Arguments]                                                 ${lot_attributes_array}

@@ -154,7 +154,8 @@ ${milestone_form_popup_code_input_locator} =                        jquery=.fanc
 ${milestone_form_popup_duration_days_input_locator} =               jquery=.fancybox-is-open:last .tab-content:first > .tab-pane.active:first [id$="-duration_days"]
 ${milestone_form_popup_duration_type_input_locator} =               jquery=.fancybox-is-open:last .tab-content:first > .tab-pane.active:first [id$="-duration_type"]
 
-${tender_form_lots_panel_edit_btn_locator} =                        jquery=a.btn.btn-default.btn-update.js-form-popup-add
+${tender_form_lots_panel_edit_btn_locator} =                        jquery=#Lots0 a.btn.btn-default.btn-update[data-url*="#lots0-form-popup"]
+#${tender_form_lots_panel_edit_btn_locator} =                        jquery=a.btn.btn-default.btn-update.js-form-popup-add
 ${lot_form_popup_add_btn_locator} =                                 jquery=[href$="#add-milestones"]
 ${lot_form_popup_title_input_locator} =                             jquery=.fancybox-is-open [id$="-title"]
 ${lot_form_popup_description_input_locator} =                       jquery=.fancybox-is-open [id$="-description"]