diff --git a/htdocs/expedition/expedition.class.php b/htdocs/expedition/expedition.class.php index b96ffd86cf2..80ee34caf59 100644 --- a/htdocs/expedition/expedition.class.php +++ b/htdocs/expedition/expedition.class.php @@ -251,8 +251,18 @@ class Expedition extends CommonObject $this->modelpdf = $obj->model_pdf; $this->expedition_method_id = $obj->fk_expedition_methode; $this->tracking_number = $obj->tracking_number; + $this->trueWeight = $obj->weight; $this->weight_units = $obj->weight_units; + + $this->trueWidth = $obj->width; + $this->width_units = $obj->size_units; + $this->trueHeight = $obj->height; + $this->height_units = $obj->size_units; + $this->trueDepth = $obj->size; + $this->depth_units = $obj->size_units; + + // A denormalized value $this->trueSize = $obj->size."x".$obj->width."x".$obj->height; $this->size_units = $obj->size_units; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 0989dafb234..81d483a0346 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -29,11 +29,12 @@ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); +require_once(DOL_DOCUMENT_ROOT."/html.formproduct.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/sendings.lib.php"); -if ($conf->produit->enabled) require_once(DOL_DOCUMENT_ROOT."/product.class.php"); -if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); +if ($conf->produit->enabled) require_once(DOL_DOCUMENT_ROOT."/product.class.php"); +if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); -if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); +if ($conf->stock->enabled) require_once(DOL_DOCUMENT_ROOT."/product/stock/entrepot.class.php"); $langs->load("companies"); $langs->load("bills"); @@ -194,6 +195,7 @@ llxHeader('',$langs->trans('Sending'),'Expedition'); $html = new Form($db); $formfile = new FormFile($db); +$formproduct = new FormProduct($db); /********************************************************************* * @@ -295,16 +297,16 @@ if ($_GET["action"] == 'create') print ''; print ''; print '
'; print $langs->trans("Weight"); print ''; - print $html->select_measuring_units("weight_units","weight"); + print $formproduct->select_measuring_units("weight_units","weight"); print '
'; - print $langs->trans("width"); + print $langs->trans("Width"); print '  
'; - print $langs->trans("height"); + print $langs->trans("Height"); print ''; - print $html->select_measuring_units("size_units","size"); + print $formproduct->select_measuring_units("size_units","size"); print '
'; - print $langs->trans("depth"); + print $langs->trans("Depth"); print ' 
'; @@ -671,7 +673,7 @@ else // Taille print ''.$langs->trans("Size").''; print ''; - if ($expedition->trueSize != 'xx' || measuring_units_string($expedition->size_units,"size")) + if ($expedition->trueWidth || $expedition->trueHeight || $expedition->trueDepth) { // If sending size defined print $expedition->trueSize.' '.measuring_units_string($expedition->size_units,"size"); diff --git a/htdocs/html.formfile.class.php b/htdocs/html.formfile.class.php index 5b9bf0afab4..1a5f483f1c5 100644 --- a/htdocs/html.formfile.class.php +++ b/htdocs/html.formfile.class.php @@ -277,7 +277,7 @@ class FormFile if (empty($noform)) print '
'; print ''; - print_titre($langs->trans("Documents")); + print_titre($langs->trans("BuildDocuments")); print ''; print ''; diff --git a/htdocs/html.formproduct.class.php b/htdocs/html.formproduct.class.php index 6dd0eaa5d87..dca536b0366 100644 --- a/htdocs/html.formproduct.class.php +++ b/htdocs/html.formproduct.class.php @@ -65,7 +65,7 @@ class FormProduct $sql = "SELECT e.rowid, e.label FROM ".MAIN_DB_PREFIX."entrepot as e"; $sql .= " WHERE statut = 1"; $sql .= " ORDER BY e.label"; - + dolibarr_syslog('FormProduct::loadWarehouses sql='.$sql,LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) @@ -82,13 +82,13 @@ class FormProduct } return $num; } - else + else { dolibarr_print_error($this->db); return -1; } } - + /** * \brief Retourne la liste des modes de paiements possibles * \param selected Id du mode de paiement pré-sélectionné @@ -118,7 +118,7 @@ class FormProduct print ''; } - + /** * \brief Selection des unites de mesure * \param name Nom champ html @@ -145,6 +145,13 @@ class FormProduct $measuring_units[-6] = $langs->trans("VolumeUnitcm3"); $measuring_units[-9] = $langs->trans("VolumeUnitmm3"); } + else if ($measuring_style == 'size') + { + $measuring_units[0] = $langs->trans("SizeUnitm"); + $measuring_units[-1] = $langs->trans("SizeUnitdm"); + $measuring_units[-2] = $langs->trans("SizeUnitcm"); + $measuring_units[-3] = $langs->trans("SizeUnitmm"); + } print ''; } - + } ?> diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index dde9a9cc9eb..155f67b6b6f 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -438,6 +438,7 @@ YouCanChangeValuesForThisListFromDictionnarySetup=You can change values for this Color=Color Documents=Linked files Documents2=Documents +BuildDocuments=Generated documents UploadDisabled=Upload disabled MenuECM=Documents MenuAWStats=AWStats diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 53bf815f2eb..c8ee0dd852f 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -437,6 +437,7 @@ YouCanChangeValuesForThisListFromDictionnarySetup=Vous pouvez changer ces valeur Color=Couleur Documents=Fichiers joints Documents2=Documents +BuildDocuments=Documents générés UploadDisabled=Transfert désactivé MenuECM=Documents MenuAWStats=AWStats