[BUGFIX] Correctly renumber sorting values for value 0 04/59604/6
authorHelmut Hummel <typo3@helhum.io>
Fri, 1 Feb 2019 12:09:54 +0000 (13:09 +0100)
committerDaniel Goerz <daniel.goerz@posteo.de>
Fri, 30 Aug 2019 07:13:54 +0000 (09:13 +0200)
The called method reorders all elements not including
the given sorting number, leading to an off by one error
when the element in question has sorting number 0.

Resolves: #87612
Releases: master, 9.5
Change-Id: I4cc3ccb96bb4c308026096993d9f09f1b806c77e
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/59604
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Roman Schilter <roman.schilter10@gmail.com>
Tested-by: Daniel Goerz <daniel.goerz@posteo.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Roman Schilter <roman.schilter10@gmail.com>
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
18 files changed:
typo3/sysext/core/Classes/DataHandling/DataHandler.php
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageAddMonoglotHotelChildNCopyPageWSynchronization.csv
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWExclude.csv
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddHotelChildWSynchronization.csv
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizePageNAddMonoglotHotelChildWSynchronization.csv
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/localizeParentContentLanguageSynchronization.csv
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/localizeParentContentChainLanguageSynchronizationSource.csv
typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithDifferentImageToExistingData.csv
typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseAssertions/importPagesAndRelatedTtContentWithSameImageToExistingData.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/DataSet/moveParentContentToDifferentPageNChangeSorting.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPage.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/DataSet/copyPageWHotelBeforeParentContent.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPage.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/DataSet/copyPageWHotelBeforeParentContent.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPage.csv
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/DataSet/copyPageWHotelBeforeParentContent.csv

index 3670e19..00f8d2a 100644 (file)
@@ -6847,7 +6847,7 @@ class DataHandler implements LoggerAwareInterface
                 }
                 // If the record sorting value < 1 we must resort all the records under this pid
                 if ($row[$sortColumn] < 1) {
-                    $this->increaseSortingOfFollowingRecords($table, (int)$pid, 0);
+                    $this->increaseSortingOfFollowingRecords($table, (int)$pid);
                     // Lowest sorting value after full resorting is $sortIntervals
                     return $this->sortIntervals;
                 }
@@ -6934,7 +6934,7 @@ class DataHandler implements LoggerAwareInterface
     }
 
     /**
-     * Increases sorting field value of all records with sorting higher than $sortingNumber
+     * Increases sorting field value of all records with sorting higher than $sortingValue
      *
      * Used internally by getSortNumber() to "make space" in sorting values when inserting new record
      *
@@ -6943,7 +6943,7 @@ class DataHandler implements LoggerAwareInterface
      * @param int $sortingValue All sorting numbers larger than this number will be shifted
      * @see getSortNumber()
      */
-    protected function increaseSortingOfFollowingRecords(string $table, int $pid, int $sortingValue): void
+    protected function increaseSortingOfFollowingRecords(string $table, int $pid, int $sortingValue = null): void
     {
         $sortBy = $GLOBALS['TCA'][$table]['ctrl']['sortby'] ?? '';
         if ($sortBy) {
@@ -6952,8 +6952,10 @@ class DataHandler implements LoggerAwareInterface
             $queryBuilder
                 ->update($table)
                 ->where($queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter($pid, \PDO::PARAM_INT)))
-                ->andWhere($queryBuilder->expr()->gt($sortBy, $sortingValue))
                 ->set($sortBy, $queryBuilder->quoteIdentifier($sortBy) . ' + ' . $this->sortIntervals . ' + ' . $this->sortIntervals, false);
+            if ($sortingValue !== null) {
+                $queryBuilder->andWhere($queryBuilder->expr()->gt($sortBy, $sortingValue));
+            }
 
             $deleteColumn = $GLOBALS['TCA'][$table]['ctrl']['delete'] ?? '';
             if ($deleteColumn) {
index 5cab96b..e4c0e2f 100644 (file)
@@ -20,10 +20,10 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
 ,4,89,640,0,0,0,0,0,0,0,0,0,"Hotel #2",7
 ,5,89,576,0,0,0,0,0,0,0,0,0,"Hotel #1",8
 ,6,89,544,0,0,0,2,0,0,0,0,0,"Hotel #0",
-,7,89,0,0,0,0,0,0,0,0,0,0,"Hotel #007",
+,7,89,512,0,0,0,0,0,0,0,0,0,"Hotel #007",
 ,8,89,256,0,0,0,0,0,0,0,0,0,"Hotel #007",
 ,9,92,513,0,0,0,2,0,0,0,0,0,"Hotel #0",
-,10,92,0,0,0,0,7,0,0,0,0,0,"Hotel #007",
+,10,92,512,0,0,0,7,0,0,0,0,0,"Hotel #007",
 ,11,92,544,0,0,0,6,0,0,0,0,0,"Hotel #0",
 ,12,92,256,0,0,0,8,0,0,0,0,0,"Hotel #007",
 ,13,92,576,0,0,0,5,0,0,0,0,0,"Hotel #1",9
index d15e8d2..f7e46b5 100644 (file)
@@ -16,7 +16,7 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
 ,4,89,640,0,0,0,0,0,0,0,0,0,"Hotel #2",7
 ,5,89,576,0,0,0,0,0,0,0,0,0,"Hotel #1",8
 ,6,89,544,0,1,2,2,0,0,0,0,0,"Hotel #0",
-,7,89,0,0,0,0,0,0,0,0,0,0,"Hotel #007",
+,7,89,512,0,0,0,0,0,0,0,0,0,"Hotel #007",
 ,8,89,256,0,1,7,0,0,0,0,0,0,"Hotel #007",
 tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
index 8417639..56a38e9 100644 (file)
@@ -16,7 +16,7 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
 ,4,89,640,0,0,0,0,0,0,0,0,0,"Hotel #2",7
 ,5,89,576,0,0,0,0,0,0,0,0,0,"Hotel #1",8
 ,6,89,544,0,1,2,2,0,0,0,0,0,"[Translate to Dansk:] Hotel #0",
-,7,89,0,0,0,0,0,0,0,0,0,0,"Hotel #007",
+,7,89,512,0,0,0,0,0,0,0,0,0,"Hotel #007",
 ,8,89,256,0,1,7,0,0,0,0,0,0,"[Translate to Dansk:] Hotel #007",
 tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
index 27ac6ba..0e8b346 100644 (file)
@@ -16,7 +16,7 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
 ,4,89,640,0,0,0,0,0,0,0,0,0,"Hotel #2",7
 ,5,89,576,0,0,0,0,0,0,0,0,0,"Hotel #1",8
 ,6,89,544,0,0,0,2,0,0,0,0,0,"Hotel #0",
-,7,89,0,0,0,0,0,0,0,0,0,0,"Hotel #007",
+,7,89,512,0,0,0,0,0,0,0,0,0,"Hotel #007",
 ,8,89,256,0,0,0,0,0,0,0,0,0,"Hotel #007",
 tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
index d402c50..6f2f020 100644 (file)
@@ -10,7 +10,7 @@ tx_irretutorial_1ncsv_hotel,,,,,,,,,,,,,,
 ,4,89,640,0,0,0,0,0,0,0,0,0,"Hotel #2",7
 ,5,89,576,0,0,0,0,0,0,0,0,0,"Hotel #1",8
 ,6,89,608,0,1,5,5,0,0,0,0,0,"[Translate to Dansk:] Hotel #1",9
-,7,89,0,0,0,0,0,0,0,0,0,0,"Hotel #2",
+,7,89,512,0,0,0,0,0,0,0,0,0,"Hotel #2",
 ,8,89,256,0,1,7,0,0,0,0,0,0,"[Translate to Dansk:] Hotel #2",
 tx_irretutorial_1ncsv_offer,,,,,,,,,,,,,,
 ,uid,pid,sorting,deleted,sys_language_uid,l18n_parent,t3_origuid,t3ver_wsid,t3ver_state,t3ver_stage,t3ver_oid,t3ver_move_id,title,prices
index 714a0de..94ddf9e 100644 (file)
@@ -6,9 +6,9 @@
 ,300,89,1024,0,2,298,299,299,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Regular Element #2",2,"{""tx_irretutorial_1nff_hotels"":""source""}",
 "tx_irretutorial_1nff_hotel",,,,,,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3_origuid","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title","parentid","parenttable","parentidentifier","offers"
-,2,89,1025,0,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
-,3,89,1025,0,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
-,4,89,2050,0,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
+,2,89,513,0,0,0,0,0,0,0,0,0,"Hotel #0",89,"pages",,0
+,3,89,513,0,0,0,0,0,0,0,0,0,"Hotel #1",297,"tt_content",,2
+,4,89,1538,0,0,0,0,0,0,0,0,0,"Hotel #2",297,"tt_content",,1
 ,5,89,1,0,0,0,0,0,0,0,0,0,"Hotel #1",298,"tt_content",,1
 ,6,89,1,0,1,5,5,0,0,0,0,0,"[Translate to Dansk:] Hotel #1",299,"tt_content",,1
 ,7,89,1,0,2,5,6,0,0,0,0,0,"[Translate to Deutsch:] [Translate to Dansk:] Hotel #1",300,"tt_content",,1
index 2648755..f49b904 100644 (file)
 ,12,89,8,0,0,0,0,0,0,0,0,"Price #2.1.1",
 ,13,89,4,0,0,0,0,0,0,0,0,"Price #1.1.1",
 ,14,-1,4,0,0,0,1,4,0,13,0,"Price #1.1.1",
-,15,90,6400,0,0,0,1,3,0,0,13,"[MOVE-TO PLACEHOLDER for #13, WS#1]",
+,15,90,768,0,0,0,1,3,0,0,13,"[MOVE-TO PLACEHOLDER for #13, WS#1]",
 ,16,-1,256,0,0,0,1,4,0,7,0,"Price #1.1.1",
 ,17,-1,128,0,0,0,1,4,0,8,0,"Price #1.1.2",
 ,18,-1,64,0,0,0,1,4,0,9,0,"Price #1.1.3",
 ,19,-1,32,0,0,0,1,4,0,10,0,"Price #1.2.1",
 ,20,-1,16,0,0,0,1,4,0,11,0,"Price #1.2.2",
 ,21,-1,8,0,0,0,1,4,0,12,0,"Price #2.1.1",
-,22,90,256,0,0,0,1,3,0,0,7,"[MOVE-TO PLACEHOLDER for #7, WS#1]",
-,23,90,768,0,0,0,1,3,0,0,8,"[MOVE-TO PLACEHOLDER for #8, WS#1]",
-,24,90,1280,0,0,0,1,3,0,0,9,"[MOVE-TO PLACEHOLDER for #9, WS#1]",
-,25,90,1792,0,0,0,1,3,0,0,10,"[MOVE-TO PLACEHOLDER for #10, WS#1]",
-,26,90,0,0,0,0,1,3,0,0,11,"[MOVE-TO PLACEHOLDER for #11, WS#1]",
-,27,90,2304,0,0,0,1,3,0,0,12,"[MOVE-TO PLACEHOLDER for #12, WS#1]",
+,22,90,0,0,0,0,1,3,0,0,7,"[MOVE-TO PLACEHOLDER for #7, WS#1]",
+,23,90,1,0,0,0,1,3,0,0,8,"[MOVE-TO PLACEHOLDER for #8, WS#1]",
+,24,90,2,0,0,0,1,3,0,0,9,"[MOVE-TO PLACEHOLDER for #9, WS#1]",
+,25,90,4,0,0,0,1,3,0,0,10,"[MOVE-TO PLACEHOLDER for #10, WS#1]",
+,26,90,8,0,0,0,1,3,0,0,11,"[MOVE-TO PLACEHOLDER for #11, WS#1]",
+,27,90,16,0,0,0,1,3,0,0,12,"[MOVE-TO PLACEHOLDER for #12, WS#1]",
index f715d3a..e493137 100644 (file)
 ,8,90,256,0,0,0,0,0,0,0,0,"Offer #1.1",13
 "tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
-,7,90,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,8,90,768,0,0,0,0,0,0,0,0,"Price #1.1.2",
-,9,90,1280,0,0,0,0,0,0,0,0,"Price #1.1.3",
-,10,90,1792,0,0,0,0,0,0,0,0,"Price #1.2.1",
-,11,90,0,0,0,0,0,0,0,0,0,"Price #1.2.2",
-,12,90,2304,0,0,0,0,0,0,0,0,"Price #2.1.1",
-,13,90,6400,0,0,0,0,0,0,0,0,"Price #1.1.1",
+,7,90,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
+,8,90,1,0,0,0,0,0,0,0,0,"Price #1.1.2",
+,9,90,2,0,0,0,0,0,0,0,0,"Price #1.1.3",
+,10,90,4,0,0,0,0,0,0,0,0,"Price #1.2.1",
+,11,90,8,0,0,0,0,0,0,0,0,"Price #1.2.2",
+,12,90,16,0,0,0,0,0,0,0,0,"Price #2.1.1",
+,13,90,768,0,0,0,0,0,0,0,0,"Price #1.1.1",
index f715d3a..e493137 100644 (file)
 ,8,90,256,0,0,0,0,0,0,0,0,"Offer #1.1",13
 "tx_irretutorial_1ncsv_price",,,,,,,,,,,,,
 ,"uid","pid","sorting","deleted","sys_language_uid","l18n_parent","t3ver_wsid","t3ver_state","t3ver_stage","t3ver_oid","t3ver_move_id","title",
-,7,90,256,0,0,0,0,0,0,0,0,"Price #1.1.1",
-,8,90,768,0,0,0,0,0,0,0,0,"Price #1.1.2",
-,9,90,1280,0,0,0,0,0,0,0,0,"Price #1.1.3",
-,10,90,1792,0,0,0,0,0,0,0,0,"Price #1.2.1",
-,11,90,0,0,0,0,0,0,0,0,0,"Price #1.2.2",
-,12,90,2304,0,0,0,0,0,0,0,0,"Price #2.1.1",
-,13,90,6400,0,0,0,0,0,0,0,0,"Price #1.1.1",
+,7,90,0,0,0,0,0,0,0,0,0,"Price #1.1.1",
+,8,90,1,0,0,0,0,0,0,0,0,"Price #1.1.2",
+,9,90,2,0,0,0,0,0,0,0,0,"Price #1.1.3",
+,10,90,4,0,0,0,0,0,0,0,0,"Price #1.2.1",
+,11,90,8,0,0,0,0,0,0,0,0,"Price #1.2.2",
+,12,90,16,0,0,0,0,0,0,0,0,"Price #2.1.1",
+,13,90,768,0,0,0,0,0,0,0,0,"Price #1.1.1",
index b0e9a60..175a720 100644 (file)
 ,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
 ,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
 ,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,91,1537,0,0,0,1,1,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
+,14,91,1025,0,0,0,1,1,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
 ,15,-1,256,0,0,0,1,-1,0,14,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
 ,16,91,513,0,0,0,1,1,0,0,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
 ,17,-1,0,0,0,0,1,-1,0,16,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
 ,18,91,514,0,0,0,1,1,0,0,0,"Price #1.1.2",11,"tx_irretutorial_1nff_offer",,
 ,19,-1,256,0,0,0,1,-1,0,18,0,"Price #1.1.2",11,"tx_irretutorial_1nff_offer",,
 ,20,91,515,0,0,0,1,1,0,0,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,
-,21,-1,256,0,0,0,1,-1,0,20,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,
+,21,-1,128,0,0,0,1,-1,0,20,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,
 ,22,91,1,0,0,0,1,1,0,0,0,"Price #1.2.1",13,"tx_irretutorial_1nff_offer",,
 ,23,-1,0,0,0,0,1,-1,0,22,0,"Price #1.2.1",13,"tx_irretutorial_1nff_offer",,
 ,24,91,2,0,0,0,1,1,0,0,0,"Price #1.2.2",13,"tx_irretutorial_1nff_offer",,
index b5bba77..ca9fc0c 100644 (file)
 ,11,89,2,0,0,0,0,0,0,0,0,"Price #1.2.2",6,"tx_irretutorial_1nff_offer",,
 ,12,89,1,0,0,0,0,0,0,0,0,"Price #2.1.1",7,"tx_irretutorial_1nff_offer",,
 ,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
-,14,91,1537,0,0,0,1,1,0,0,0,"Price #2.1.1",9,"tx_irretutorial_1nff_offer",,
+,14,91,1025,0,0,0,1,1,0,0,0,"Price #2.1.1",9,"tx_irretutorial_1nff_offer",,
 ,15,-1,256,0,0,0,1,-1,0,14,0,"Price #2.1.1",9,"tx_irretutorial_1nff_offer",,
-,16,91,1537,0,0,0,1,1,0,0,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
+,16,91,1025,0,0,0,1,1,0,0,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
 ,17,-1,0,0,0,0,1,-1,0,16,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
 ,18,91,513,0,0,0,1,1,0,0,0,"Price #1.1.1",13,"tx_irretutorial_1nff_offer",,
 ,19,-1,0,0,0,0,1,-1,0,18,0,"Price #1.1.1",13,"tx_irretutorial_1nff_offer",,
 ,20,91,514,0,0,0,1,1,0,0,0,"Price #1.1.2",13,"tx_irretutorial_1nff_offer",,
 ,21,-1,256,0,0,0,1,-1,0,20,0,"Price #1.1.2",13,"tx_irretutorial_1nff_offer",,
 ,22,91,515,0,0,0,1,1,0,0,0,"Price #1.1.3",13,"tx_irretutorial_1nff_offer",,
-,23,-1,256,0,0,0,1,-1,0,22,0,"Price #1.1.3",13,"tx_irretutorial_1nff_offer",,
+,23,-1,128,0,0,0,1,-1,0,22,0,"Price #1.1.3",13,"tx_irretutorial_1nff_offer",,
 ,24,91,1,0,0,0,1,1,0,0,0,"Price #1.2.1",15,"tx_irretutorial_1nff_offer",,
 ,25,-1,0,0,0,0,1,-1,0,24,0,"Price #1.2.1",15,"tx_irretutorial_1nff_offer",,
 ,26,91,2,0,0,0,1,1,0,0,0,"Price #1.2.2",15,"tx_irretutorial_1nff_offer",,
index d6c2c65..238100a 100644 (file)
@@ -42,8 +42,8 @@
 ,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
 ,14,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
 ,16,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
-,18,91,2,0,0,0,0,0,0,0,0,"Price #1.1.2",11,"tx_irretutorial_1nff_offer",,
-,20,91,3,0,0,0,0,0,0,0,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,
+,18,91,3,0,0,0,0,0,0,0,0,"Price #1.1.2",11,"tx_irretutorial_1nff_offer",,
+,20,91,2,0,0,0,0,0,0,0,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,
 ,22,91,1,0,0,0,0,0,0,0,0,"Price #1.2.1",13,"tx_irretutorial_1nff_offer",,
 ,24,91,2,0,0,0,0,0,0,0,0,"Price #1.2.2",13,"tx_irretutorial_1nff_offer",,
 ,26,91,1,0,0,0,0,0,0,0,0,"Price #2.1.1",15,"tx_irretutorial_1nff_offer",,
index 070eb42..539f5f8 100644 (file)
@@ -43,7 +43,7 @@
 ,14,91,1,0,0,0,0,0,0,0,0,"Price #2.1.1",9,"tx_irretutorial_1nff_offer",,
 ,16,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
 ,18,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",13,"tx_irretutorial_1nff_offer",,
-,20,91,2,0,0,0,0,0,0,0,0,"Price #1.1.2",13,"tx_irretutorial_1nff_offer",,
-,22,91,3,0,0,0,0,0,0,0,0,"Price #1.1.3",13,"tx_irretutorial_1nff_offer",,
+,20,91,3,0,0,0,0,0,0,0,0,"Price #1.1.2",13,"tx_irretutorial_1nff_offer",,
+,22,91,2,0,0,0,0,0,0,0,0,"Price #1.1.3",13,"tx_irretutorial_1nff_offer",,
 ,24,91,1,0,0,0,0,0,0,0,0,"Price #1.2.1",15,"tx_irretutorial_1nff_offer",,
 ,26,91,2,0,0,0,0,0,0,0,0,"Price #1.2.2",15,"tx_irretutorial_1nff_offer",,
index d6c2c65..238100a 100644 (file)
@@ -42,8 +42,8 @@
 ,13,89,1,0,0,0,0,0,0,0,0,"Price #1.1.1",8,"tx_irretutorial_1nff_offer",,
 ,14,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",9,"tx_irretutorial_1nff_offer",,
 ,16,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
-,18,91,2,0,0,0,0,0,0,0,0,"Price #1.1.2",11,"tx_irretutorial_1nff_offer",,
-,20,91,3,0,0,0,0,0,0,0,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,
+,18,91,3,0,0,0,0,0,0,0,0,"Price #1.1.2",11,"tx_irretutorial_1nff_offer",,
+,20,91,2,0,0,0,0,0,0,0,0,"Price #1.1.3",11,"tx_irretutorial_1nff_offer",,
 ,22,91,1,0,0,0,0,0,0,0,0,"Price #1.2.1",13,"tx_irretutorial_1nff_offer",,
 ,24,91,2,0,0,0,0,0,0,0,0,"Price #1.2.2",13,"tx_irretutorial_1nff_offer",,
 ,26,91,1,0,0,0,0,0,0,0,0,"Price #2.1.1",15,"tx_irretutorial_1nff_offer",,
index 070eb42..539f5f8 100644 (file)
@@ -43,7 +43,7 @@
 ,14,91,1,0,0,0,0,0,0,0,0,"Price #2.1.1",9,"tx_irretutorial_1nff_offer",,
 ,16,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",11,"tx_irretutorial_1nff_offer",,
 ,18,91,1,0,0,0,0,0,0,0,0,"Price #1.1.1",13,"tx_irretutorial_1nff_offer",,
-,20,91,2,0,0,0,0,0,0,0,0,"Price #1.1.2",13,"tx_irretutorial_1nff_offer",,
-,22,91,3,0,0,0,0,0,0,0,0,"Price #1.1.3",13,"tx_irretutorial_1nff_offer",,
+,20,91,3,0,0,0,0,0,0,0,0,"Price #1.1.2",13,"tx_irretutorial_1nff_offer",,
+,22,91,2,0,0,0,0,0,0,0,0,"Price #1.1.3",13,"tx_irretutorial_1nff_offer",,
 ,24,91,1,0,0,0,0,0,0,0,0,"Price #1.2.1",15,"tx_irretutorial_1nff_offer",,
 ,26,91,2,0,0,0,0,0,0,0,0,"Price #1.2.2",15,"tx_irretutorial_1nff_offer",,