diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index 0b03f8fc608..49bded5a45b 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -504,7 +504,7 @@ if (empty($reshook)) // Action update else if ( - ($action == 'settracking_number' + ($action == 'settracking_number' || $action == 'settracking_url' || $action == 'settrueWeight' || $action == 'settrueWidth' @@ -1503,11 +1503,11 @@ if ($action == 'create') print ''; print ''; - //print $line->fk_product.' - '.$dbatch->batch; + //print '|'.$line->fk_product.'|'.$dbatch->batch.'|
'; print $langs->trans("Batch").': '; $result = $productlotObject->fetch(0, $line->fk_product, $dbatch->batch); if ($result > 0) print $productlotObject->getNomUrl(1); - else print 'TableLotIncompleteRunRepair'; + else print 'TableLotIncompleteRunRepairWithParamStandardEqualConfirmed'; print ' ('.$dbatch->qty.')'; $quantityToBeDelivered -= $deliverableQty; if ($quantityToBeDelivered < 0) diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 1ad1beca350..1fbda8e8abb 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -811,7 +811,7 @@ if ($ok && GETPOST('clean_product_stock_batch','alpha')) } -// clean_linked_elements: Check and clean linked elements +// clean_product_stock_negative_if_batch if ($ok && GETPOST('clean_product_stock_negative_if_batch','alpha')) { print '
Clean table product_batch, methodtofix='.$methodtofix.' (possible values: updatestock or updatebatch)'; @@ -835,12 +835,13 @@ if ($ok && GETPOST('clean_product_stock_negative_if_batch','alpha')) $obj=$db->fetch_object($resql); print ''.$obj->rowid.'-'.$obj->ref.'-'.$obj->fk_entrepot.' -> '.$obj->psrowid.': '.$obj->reel.' != '.$obj->reelbatch; + // TODO } } } } -// clean_linked_elements: Check and clean linked elements +// set_empty_time_spent_amount if ($ok && GETPOST('set_empty_time_spent_amount','alpha')) { print '
*** Set value of time spent without amount'; @@ -901,7 +902,7 @@ if ($ok && GETPOST('set_empty_time_spent_amount','alpha')) } -// clean_old_module_entries: Clean data into const when files of module were removed without being +// force_disable_of_modules_not_found if ($ok && GETPOST('force_disable_of_modules_not_found','alpha')) { print '
*** Force modules not found to be disabled (only modules adding js, css or hooks can be detected as removed)'; @@ -1072,7 +1073,7 @@ if ($ok && GETPOST('clean_perm_table','alpha')) -// clean_linked_elements: Check and clean linked elements +// force utf8 on tables if ($ok && GETPOST('force_utf8_on_tables','alpha')) { print '
*** Force page code and collation of tables into utf8/utf8_unicode_ci (for mysql/mariadb only)'; diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php index 8370e8ce080..2ac89def512 100644 --- a/htdocs/product/stock/class/productlot.class.php +++ b/htdocs/product/stock/class/productlot.class.php @@ -166,7 +166,7 @@ class Productlot extends CommonObject $error++; } } - + if (! $error && ! $notrigger) { // Uncomment this and change MYOBJECT to your own tag if you // want this action to call a trigger. @@ -234,7 +234,7 @@ class Productlot extends CommonObject //$this->ref = $obj->fk_product.'_'.$obj->batch; $this->batch = $obj->batch; - $this->entity = (!empty($obj->entity)?$obj->entity:$conf->entity); // Prevent "null" entity + $this->entity = (!empty($obj->entity)?$obj->entity:$conf->entity); // Prevent "null" entity $this->fk_product = $obj->fk_product; $this->eatby = $this->db->jdate($obj->eatby); $this->sellby = $this->db->jdate($obj->sellby); @@ -300,7 +300,7 @@ class Productlot extends CommonObject // Check parameters // Put here code to add a control on parameters values - + if (empty($this->oldcopy)) { $org=new self($this->db); @@ -340,7 +340,7 @@ class Productlot extends CommonObject $error++; } } - + if (!$error && !$notrigger) { // Uncomment this and change MYOBJECT to your own tag if you // want this action calls a trigger.