diff --git a/ChangeLog b/ChangeLog index 5e5bb5ae2d5..dd6c12d1b72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ English Dolibarr ChangeLog -------------------------------------------------------------- ***** ChangeLog for 3.5.4 compared to 3.5.3 ***** +Fix: [ bug #1431 ] Reception and Send supplier order box has a weird top margin. Fix: [ bug #1428 ] "Nothing" is shown in the middle of the screen in a supplier order. Fix: The object deliverycompany was not used anymore and output of details for delivery reports was lost during 3.5. Rewrite code to diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 287c2ed1c83..21d165c118e 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -198,7 +198,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer) } if (GETPOST('addline_predefined') || (! GETPOST('dp_desc') && ! GETPOST('addline_predefined') && GETPOST('idprod', 'int')>0) // we push enter onto qty field - ) + ) { $predef=(($conf->global->MAIN_FEATURES_LEVEL < 2) ? '_predef' : ''); $idprod=GETPOST('idprod', 'int'); @@ -221,7 +221,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer) } if (! GETPOST('addline_predefined') && ( GETPOST('pu')==='')) // Unit price can be 0 but not '' { - + setEventMessage($langs->trans($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice'))), 'errors'); $error++; } @@ -760,10 +760,10 @@ else if ($action == 'add' && $user->rights->fournisseur->commande->creer) $object->mode_reglement_id = GETPOST('mode_reglement_id'); $object->note_private = GETPOST('note_private'); $object->note_public = GETPOST('note_public'); - + // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost($extralabels,$object); - + $id = $object->create($user); if ($id < 0) { @@ -1118,12 +1118,12 @@ if ($action=="create") // Other options $parameters=array(); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook - + if (empty($reshook) && ! empty($extrafields->attribute_label)) { print $object->showOptionals($extrafields,'edit'); } - + // Bouton "Create Draft" print "\n"; @@ -1140,9 +1140,9 @@ elseif (! empty($object->id)) $title=$langs->trans("SupplierOrder"); dol_fiche_head($head, 'card', $title, 0, 'order'); - + $res=$object->fetch_optionals($object->id,$extralabels); - + /* * Confirmation de la suppression de la commande */ @@ -1470,7 +1470,7 @@ elseif (! empty($object->id)) } } } - + // Ligne de 3 colonnes print '