diff -r 07daa505d309 -r ae5e8d740173 www/import/from_brouwhulp.php --- a/www/import/from_brouwhulp.php Fri Nov 30 22:11:47 2018 +0100 +++ b/www/import/from_brouwhulp.php Sat Dec 01 22:24:46 2018 +0100 @@ -974,18 +974,18 @@ $stage = "Plan"; // Default value. $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid')); - $psql = "INSERT INTO prod_main SET uuid='" . $uuid; // So we can link the records. + $psql = "INSERT INTO prod_main SET puuid='" . $uuid; // So we can link the records. $rsql = "INSERT INTO prod_recipes SET uuid='" . $uuid; - $psql .= "', name='" . mysqli_real_escape_string($db, $recipe->NAME); + $psql .= "', pname='" . mysqli_real_escape_string($db, $recipe->NAME); $rsql .= "', name='" . mysqli_real_escape_string($db, $recipe->NAME); if ($recipe->NOTES) { $rsql .= "', notes='" . mysqli_real_escape_string($db, $recipe->NOTES); // Duplicate the notes - $psql .= "', notes='" . mysqli_real_escape_string($db, $recipe->NOTES); + $psql .= "', pnotes='" . mysqli_real_escape_string($db, $recipe->NOTES); } else { $rsql .= "', notes='"; - $psql .= "', notes='"; + $psql .= "', pnotes='"; } if ($recipe->TYPE) $rsql .= "', type='" . mysqli_real_escape_string($db, $recipe->TYPE); @@ -1321,11 +1321,11 @@ ($recipe->INVENTORY_REDUCED == 'TRUE') ? $psql .= "', inventory_reduced='1" : $psql .= "', inventory_reduced='0"; if (($recipe->LOCKED == 'TRUE') && ($stage == 'Ready')) { - $psql .= "', locked='1"; + $psql .= "', plocked='1"; $rsql .= "', locked='1"; $stage = "Closed"; } else { - $psql .= "', locked='0"; + $psql .= "', plocked='0"; $rsql .= "', locked='0"; }