diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index bf0c691084f..8bd9f7ffa98 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2130,6 +2130,22 @@ if ($action == 'create')
print '';
}
+ $tmparray=$object->getTotalWeightVolume();
+ $totalWeight=$tmparray['weight'];
+ $totalVolume=$tmparray['volume'];
+ if ($totalWeight) {
+ print '
| ' . $langs->trans("CalculatedWeight") . ' | ';
+ print '';
+ print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
+ print ' |
';
+ }
+ if ($totalVolume) {
+ print '| ' . $langs->trans("CalculatedVolume") . ' | ';
+ print '';
+ print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
+ print ' |
';
+ }
+
// Incoterms
if (!empty($conf->incoterm->enabled))
{
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 2d4d138f61a..24ab03c831a 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2300,12 +2300,15 @@ if ($action == 'create' && $user->rights->commande->creer)
$tmparray=$object->getTotalWeightVolume();
$totalWeight=$tmparray['weight'];
$totalVolume=$tmparray['volume'];
- if ($totalWeight || $totalVolume)
+ if ($totalWeight)
{
print '| '.$langs->trans("CalculatedWeight").' | ';
print '';
print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no');
print ' |
';
+ }
+ if ($totalVolume)
+ {
print '| '.$langs->trans("CalculatedVolume").' | ';
print '';
print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no');
|