' . $langs->trans('RefCustomer') . ' ';
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index af603d0606b..668b093e7db 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -67,7 +67,7 @@ if ($object->id > 0)
{
$object->fetch_thirdparty();
$upload_dir = $conf->propal->dir_output.'/'.dol_sanitizeFileName($object->ref);
- include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+ include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
}
/*
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index da8b9012b14..f2d2e24d269 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1442,7 +1442,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print '';
// Reference
- print '' . $langs->trans('Ref') . ' ' . $langs->trans("Draft") . ' ' . $langs->trans('Ref') . ' ' . $langs->trans("Draft") . ' ' . $langs->trans('RefCustomer') . ' ';
@@ -1732,8 +1732,12 @@ if ($action == 'create' && $user->rights->commande->creer)
dol_fiche_end();
// Button "Create Draft"
- print '
';
-
+ print '';
+ print '
';
+
print '';
// Show origin lines
@@ -1993,6 +1997,19 @@ if ($action == 'create' && $user->rights->commande->creer)
}
print ' ';
+ print $langs->trans('OutstandingBill');
+ print ' ';
+ print price($soc->get_OutstandingBill()) . ' / ';
+ print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
+ print ' ';
+ print '' . $langs->trans("EditRelativeDiscounts") . ' ';
$addabsolutediscount = '' . $langs->trans("EditGlobalDiscounts") . ' ';
$addcreditnote = '' . $langs->trans("AddCreditNote") . ' ';
@@ -2232,6 +2248,19 @@ if ($action == 'create' && $user->rights->commande->creer)
// print ''.$langs->trans("DictionarySource").' ';
print '';
+ $tmparray=$object->getTotalWeightVolume();
+ $totalWeight=$tmparray['weight'];
+ $totalVolume=$tmparray['volume'];
+ if ($totalWeight || $totalVolume)
+ {
+ print ''.$langs->trans("CalculatedWeight").' / '.$langs->trans("CalculatedVolume").' ';
+ 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 ' / ';
+ 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 ' ';
- print $langs->trans('OutstandingBill');
- print ' ';
- print price($soc->get_OutstandingBill()) . ' / ';
- print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency);
- print ' ';
- print '';
// Ref
- print '' . $langs->trans('Ref') . ' ' . $langs->trans('Draft') . ' ' . $langs->trans('Ref') . ' ' . $langs->trans('Draft') . ' ' . $langs->trans('Customer') . ' ';
@@ -2381,7 +2381,7 @@ if ($action == 'create')
{
$langs->load('projects');
print '' . $langs->trans('Project') . ' ';
- $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
+ $numprojet = $formproject->select_projects($socid, $projectid, 'projectid', 0);
print ' id).'">' . $langs->trans("AddProject") . ' ';
print '
';
+ print '';
+ print '
';
if (is_object($objectsrc))
{
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 49466c7fcb0..95da343e3af 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -77,7 +77,7 @@ $modulepart='contract';
/*
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/*
diff --git a/htdocs/core/tpl/document_actions_pre_headers.tpl.php b/htdocs/core/actions_linkedfiles.inc.php
similarity index 97%
rename from htdocs/core/tpl/document_actions_pre_headers.tpl.php
rename to htdocs/core/actions_linkedfiles.inc.php
index 1c0d8a8367f..22ff9155fd1 100644
--- a/htdocs/core/tpl/document_actions_pre_headers.tpl.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -19,10 +19,6 @@
*/
-// TODO This is an action include, not a presentation template.
-// Move this file into htdocs/core/actions_document.inc.php
-
-
// Variable $upload_dir must be defined when entering here
// Variable $upload_dirold may also exists.
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a65573a7947..059ce7e5e25 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2939,6 +2939,68 @@ abstract class CommonObject
return price2num($total_discount);
}
+
+ /**
+ * Return into unit=0, the calculated total of weight and volume of all lines * qty
+ * Calculate by adding weight and volume of each product line, so properties ->volume/volume_units/weight/weight_units must be loaded on line.
+ *
+ * @return array array('weight'=>...,'volume'=>...)
+ */
+ function getTotalWeightVolume()
+ {
+ $weightUnit=0;
+ $volumeUnit=0;
+ $totalWeight = '';
+ $totalVolume = '';
+ $totalOrdered = ''; // defined for shipment only
+ $totalToShip = ''; // defined for shipment only
+
+ foreach ($this->lines as $line)
+ {
+
+ $totalOrdered+=$line->qty_asked; // defined for shipment only
+ $totalToShip+=$line->qty_shipped; // defined for shipment only
+
+ // Define qty, weight, volume, weight_units, volume_units
+ if ($this->element == 'shipping') $qty=$line->qty_shipped; // for shipments
+ else $qty=$line->qty;
+ $weight=$line->weight;
+ $volume=$line->volume;
+ $weight_units=$line->weight_units;
+ $volume_units=$line->volume_units;
+
+ $weightUnit=0;
+ $volumeUnit=0;
+ if (! empty($weight_units)) $weightUnit = $weight_units;
+ if (! empty($volume_units)) $volumeUnit = $volume_units;
+
+ //var_dump($line->volume_units);
+ if ($weight_units < 50) // >50 means a standard unit (power of 10 of official unit) > 50 means an exotic unit (like inch)
+ {
+ $trueWeightUnit=pow(10, $weightUnit);
+ $totalWeight += $weight * $qty * $trueWeightUnit;
+ }
+ else
+ {
+ $totalWeight += $weight * $qty; // This may be wrong if we mix different units
+ }
+ if ($volume_units < 50) // >50 means a standard unit (power of 10 of official unit) > 50 means an exotic unit (like inch)
+ {
+ //print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
+ $trueVolumeUnit=pow(10, $volumeUnit);
+ //print $line->volume;
+ $totalVolume += $volume * $qty * $trueVolumeUnit;
+ }
+ else
+ {
+ $totalVolume += $volume * $qty; // This may be wrong if we mix different units
+ }
+ }
+
+ return array('weight'=>$totalWeight, 'volume'=>$totalVolume, 'ordered'=>$totalOrdered, 'toship'=>$totalToShip);
+ }
+
+
/**
* Set extra parameters
*
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index 74d14af0819..8cacf7065b1 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -25,8 +25,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
/**
- * \class CommonOrder
- * \brief Superclass for orders classes
+ * Superclass for orders classes
*/
abstract class CommonOrder extends CommonObject
{
@@ -34,8 +33,7 @@ abstract class CommonOrder extends CommonObject
}
/**
- * \class CommonOrderLine
- * \brief Superclass for orders classes
+ * Superclass for orders classes
*/
abstract class CommonOrderLine extends CommonObjectLine
{
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 239369b2a1c..565acd828b2 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -863,11 +863,15 @@ class FormFile
{
$fileinfo = pathinfo($file['name']);
print '';
- $minifile=$fileinfo['filename'].'_mini.'.strtolower($fileinfo['extension']); // Thumbs are created with filename in lower case
if (image_format_supported($file['name']) > 0)
{
- print '';
- print ' ';
+ print ' ';
}
else print ' ';
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index a9e8e7dd941..c6256475592 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1465,7 +1465,13 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
$destpath=$upload_dir . "/" . preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
$destfile=preg_replace('/__file__/',$TFile['name'][$i],$savingdocmask);
}
-
+
+ // lowercase extension
+ $info = pathinfo($destpath);
+ $destpath = $info['dirname'].'/'.$info['filename'].'.'.strtolower($info['extension']);
+ $info = pathinfo($destfile);
+ $destfile = $info['filename'].'.'.strtolower($info['extension']);
+
$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destpath, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles);
if (is_numeric($resupload) && $resupload > 0)
{
@@ -1482,7 +1488,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
{
// Create small thumbs for image (Ratio is near 16/9)
// Used on logon for example
- $imgThumbSmall = vignette($destpath, $maxwidthsmall, $maxheigthsmall, '_small', 50, "thumbs");
+ $imgThumbSmall = vignette($destpath, $maxwidthsmall, $maxheightsmall, '_small', 50, "thumbs");
// Create mini thumbs for image (Ratio is near 16/9)
// Used on menu or for setup page for example
$imgThumbMini = vignette($destpath, $maxwidthmini, $maxheightmini, '_mini', 50, "thumbs");
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 00c805b98ba..bedb2a78bae 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3420,28 +3420,29 @@ function price2num($amount,$rounding='',$alreadysqlnb=0)
* @param string $type 'weight', 'volume', ...
* @param Translate $outputlangs Translate language object
* @param int $round -1 = non rounding, x = number of decimal
+ * @param string $forceunitoutput 'no' or numeric (-3, -6, ...) compared to $unit
* @return string String to show dimensions
*/
-function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=-1)
+function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round=-1, $forceunitouput='no')
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
- if ($dimension < 1/10000)
+ if (($forceunitouput == 'no' && $dimension < 1/10000) || (is_numeric($forceunitouput) && $forceunitouput == -6))
{
$dimension = $dimension * 1000000;
$unit = $unit - 6;
}
- elseif ($dimension < 1/10)
+ elseif (($forceunitouput == 'no' && $dimension < 1/10) || (is_numeric($forceunitouput) && $forceunitouput == -3))
{
$dimension = $dimension * 1000;
$unit = $unit - 3;
}
- elseif ($dimension > 100000000)
+ elseif (($forceunitouput == 'no' && $dimension > 100000000) || (is_numeric($forceunitouput) && $forceunitouput == 6))
{
$dimension = $dimension / 1000000;
$unit = $unit + 6;
}
- elseif ($dimension > 100000)
+ elseif (($forceunitouput == 'no' && $dimension > 100000) || (is_numeric($forceunitouput) && $forceunitouput == 3))
{
$dimension = $dimension / 1000;
$unit = $unit + 3;
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 20a58d7021c..669da7b751b 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -301,7 +301,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x=0, $s
* @param string $extName Extension to differenciate thumb file name ('_small', '_mini')
* @param int $quality Quality of compression (0=worst, 100=best)
* @param string $outdir Directory where to store thumb
- * @param int $targetformat New format of target (1,2,3,... or 0 to keep old format)
+ * @param int $targetformat New format of target (IMAGETYPE_GIF, IMAGETYPE_JPG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_WBMP ... or 0 to keep old format)
* @return string Full path of thumb or '' if it fails
*/
function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $quality=50, $outdir='thumbs', $targetformat=0)
@@ -473,6 +473,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
}
// Initialisation des variables selon l'extension de l'image
+ // $targetformat is 0 by default, in such case, we keep original extension
switch($targetformat)
{
case IMAGETYPE_GIF: // 1
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 67bebc0d6d7..81454a52222 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -189,13 +189,13 @@ class modStock extends DolibarrModules
$this->import_icon[$r]=$this->picto;
$this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r]=array('ps'=>MAIN_DB_PREFIX.'product_stock');
- $this->import_fields_array[$r]=array('ps.fk_product'=>"Product*",'ps.fk_entrepot'=>"Warehouse*",'ps.reel'=>"Stock*",'ps.pmp'=>"PMP" );
+ $this->import_fields_array[$r]=array('ps.fk_product'=>"Product*",'ps.fk_entrepot'=>"Warehouse*",'ps.reel'=>"Stock*");
$this->import_convertvalue_array[$r]=array(
'ps.fk_product'=>array('rule'=>'fetchidfromref','classfile'=>'/product/class/product.class.php','class'=>'Product','method'=>'fetch','element'=>'product'),
'ps.fk_entrepot'=>array('rule'=>'fetchidfromref','classfile'=>'/product/stock/class/entrepot.class.php','class'=>'Entrepot','method'=>'fetch','element'=>'label')
);
- $this->import_examplevalues_array[$r]=array('ps.fk_product'=>"PREF123456",'ps.fk_entrepot'=>"ALM001",'ps.reel'=>"10",'ps.pmp'=>"25"
+ $this->import_examplevalues_array[$r]=array('ps.fk_product'=>"PREF123456",'ps.fk_entrepot'=>"ALM001",'ps.reel'=>"10"
);
}
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 793bdadd3b1..706eb4b70f7 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -72,7 +72,7 @@ $modulepart='don';
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/*
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 6915594dd92..af973886071 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1373,7 +1373,7 @@ else if ($id || $ref)
{
if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
//print $totalWeight.' '.measuring_units_string(0,"weight");
- print showDimensionInBestUnit($totalWeight, 0, "weight", $langs);
+ 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');
//if (empty($object->trueWeight)) print ' ('.$langs->trans("Calculated").')';
if (!empty($object->trueWeight)) print ')';
}
@@ -1432,7 +1432,7 @@ else if ($id || $ref)
if ($volumeUnit < 50)
{
//print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
- print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs);
+ print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "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');
}
else print $calculatedVolume.' '.measuring_units_string($volumeUnit,"volume");
}
@@ -1440,7 +1440,7 @@ else if ($id || $ref)
{
if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
//print $totalVolume.' '.measuring_units_string(0,"volume");
- print showDimensionInBestUnit($totalVolume, 0, "volume", $langs);
+ 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');
//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
if ($calculatedVolume) print ')';
}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 0978688f3f3..a0ba1567c24 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1204,6 +1204,22 @@ class Expedition extends CommonObject
if ($result < 0) { $error++; }
// End call triggers
+ if (! empty($this->origin) && $this->origin_id > 0)
+ {
+ $this->fetch_origin();
+ $origin=$this->origin;
+ if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS) // If order source of shipment is "shipment in progress"
+ {
+ // Check if there is no more shipment. If not, we can move back status of order to "validated" instead of "shipment in progress"
+ $this->$origin->loadExpeditions();
+ //var_dump($this->$origin->expeditions);exit;
+ if (count($this->$origin->expeditions) <= 0)
+ {
+ $this->$origin->setStatut(Commande::STATUS_VALIDATED);
+ }
+ }
+ }
+
if (! $error)
{
$this->db->commit();
@@ -1742,56 +1758,6 @@ class Expedition extends CommonObject
}
- /**
- * Return into unit=0, the calculated total of weight and volume of all lines * qty
- * Calculate by adding weight and volume of each product line.
- *
- * @return array array('weight'=>...,'volume'=>...)
- */
- function getTotalWeightVolume()
- {
- $weightUnit=0;
- $volumeUnit=0;
- $totalWeight = '';
- $totalVolume = '';
- $totalOrdered = '';
- $totalToShip = '';
- foreach ($this->lines as $line)
- {
- $totalOrdered+=$line->qty_asked;
- $totalToShip+=$line->qty_shipped;
-
- $weightUnit=0;
- $volumeUnit=0;
- if (! empty($line->weight_units)) $weightUnit = $line->weight_units;
- if (! empty($line->volume_units)) $volumeUnit = $line->volume_units;
-
- //var_dump($line->volume_units);
- if ($line->weight_units < 50) // >50 means a standard unit (power of 10 of official unit) > 50 means an exotic unit (like inch)
- {
- $trueWeightUnit=pow(10,$weightUnit);
- $totalWeight += $line->weight*$line->qty_shipped*$trueWeightUnit;
- }
- else
- {
- $totalWeight += $line->weight*$line->qty_shipped; // This may be wrong if we mix different units
- }
- if ($line->volume_units < 50) // >50 means a standard unit (power of 10 of official unit) > 50 means an exotic unit (like inch)
- {
- //print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
- $trueVolumeUnit=pow(10,$volumeUnit);
- //print $line->volume;
- $totalVolume += $line->volume*$line->qty_shipped*$trueVolumeUnit;
- }
- else
- {
- $totalVolume += $line->volume*$line->qty_shipped; // This may be wrong if we mix different units
- }
- }
-
- return array('weight'=>$totalWeight, 'volume'=>$totalVolume, 'ordered'=>$totalOrdered, 'toship'=>$totalToShip);
- }
-
/**
* Forge an set tracking url
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index c14d3471421..d09c478d63d 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -38,6 +38,7 @@ foreach($linkedObjectBlock as $key => $objectlink)
>
trans("Shipment"); ?>
getNomUrl(1); ?>
+ date_delivery,'day'); ?>
rights->expedition->lire) {
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index f16d6ca14e1..249a85f4ef2 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -72,7 +72,7 @@ $modulepart='trip';
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/*
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 71fec224137..964b5f648b1 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1179,6 +1179,8 @@ if ($action == 'create')
print '';
print '
';
print '';
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 2acf7d39093..38176068d72 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -72,7 +72,7 @@ $modulepart='fichinter';
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/*
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 61c2d3862af..255d7f2cda0 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -138,11 +138,6 @@ if ($object->id > 0)
print '
';
print '';
- // Alias names (commercial, trademark or alias names)
- print ''.$langs->trans('AliasNameShort').' ';
- print $object->name_alias;
- print " '.$langs->trans('Prefix').' '.$object->prefix_comm.' ';
// Ref
- print ''.$langs->trans('Ref').' '.$langs->trans('Draft').' '.$langs->trans('Ref').' '.$langs->trans('Draft').' '.$langs->trans('Supplier').' ';
@@ -1569,7 +1571,7 @@ if ($action=='create')
}
else
{
- print $form->select_company((empty($socid)?'':$socid),'socid','s.fournisseur = 1',1);
+ print $form->select_company((empty($socid)?'':$socid), 'socid', 's.fournisseur = 1', 'SelectThirdParty');
}
print '';
@@ -1608,7 +1610,18 @@ if ($action=='create')
print '' . $langs->trans('Project') . ' ';
+ $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)?$societe->id:-1), $projectid, 'projectid', 0, 0, 1, 1);
+ print ' ';
@@ -1692,7 +1705,11 @@ if ($action=='create')
dol_fiche_end();
- print '
';
+ print '';
+ print '
';
print "\n";
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 2949aedcf14..e78320c0043 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -78,7 +78,7 @@ $object->fetch_thirdparty();
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/*
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 5dad9e2f706..aa57910794d 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -60,6 +60,7 @@ $confirm = GETPOST("confirm");
$ref = GETPOST('ref','alpha');
$cancel = GETPOST('cancel','alpha');
$lineid = GETPOST('lineid', 'int');
+$projectid = GETPOST('projectid','int');
//PDF
$hidedetails = (GETPOST('hidedetails','int') ? GETPOST('hidedetails','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
@@ -865,7 +866,7 @@ if (empty($reshook))
elseif ($action == 'classin')
{
$object->fetch($id);
- $result=$object->setProject($_POST['projectid']);
+ $result=$object->setProject($projectid);
}
@@ -1374,7 +1375,7 @@ if ($action == 'create')
print '';
// Ref
- print ''.$langs->trans('Ref').' '.$langs->trans('Draft').' '.$langs->trans('Ref').' '.$langs->trans('Draft').' '.$langs->trans('Supplier').' ';
@@ -1387,7 +1388,7 @@ if ($action == 'create')
}
else
{
- print $form->select_company(GETPOST('socid','int'),'socid','s.fournisseur = 1',1);
+ print $form->select_company(GETPOST('socid','int'), 'socid', 's.fournisseur = 1', 'SelectThirdParty');
}
print ''.$langs->trans('BankAccount').' ';
+ $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
+ print ' ';
+ print ''.fieldLabel('Currency','multicurrency_code').' ';
+ print '';
+ print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
+ print ' ';
+ }
+
// Project
if (! empty($conf->projet->enabled))
{
@@ -1522,21 +1538,6 @@ if ($action == 'create')
print '';
}
- // Bank Account
- print ''.$langs->trans('BankAccount').' ';
- $form->select_comptes($fk_account, 'fk_account', 0, '', 1);
- print ' ';
- print ''.fieldLabel('Currency','multicurrency_code').' ';
- print '';
- print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
- print ' ';
- }
-
// Public note
print ''.$langs->trans('NotePublic').' ';
print '';
@@ -1649,7 +1650,11 @@ if ($action == 'create')
dol_fiche_end();
- print '
';
+ print '';
+ print '
';
print "\n";
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 7b36ec62c37..673d679b4b5 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -72,7 +72,7 @@ if ($object->fetch($id, $ref))
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/*
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 63d07cebddf..ab588812c32 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -72,7 +72,7 @@ $modulepart='holiday';
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/*
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 97d5c226507..362aa84843c 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -66,7 +66,7 @@ $modulepart='loan';
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/*
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 7c3d3591341..facff9f9a52 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -111,7 +111,7 @@ if (empty($reshook))
}
// Action sending file
- include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_pre_headers.tpl.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
}
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 1c6db9a50fa..b59d725fecd 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -907,6 +907,62 @@ else
}
}
+ // Add button to create objects from project
+ if (! empty($conf->global->PROJECT_SHOW_CREATE_OBJECT_BUTTON))
+ {
+ if (! empty($conf->propal->enabled) && $user->rights->propal->creer)
+ {
+ $langs->load("propal");
+ print '';
+ }
+ if (! empty($conf->commande->enabled) && $user->rights->commande->creer)
+ {
+ $langs->load("orders");
+ print '';
+ }
+ if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
+ {
+ $langs->load("bills");
+ print '';
+ }
+ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer)
+ {
+ $langs->load("supplier_proposal");
+ print '';
+ }
+ if (! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->creer)
+ {
+ $langs->load("suppliers");
+ print '';
+ }
+ if (! empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->creer)
+ {
+ $langs->load("suppliers");
+ print '';
+ }
+ if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer)
+ {
+ $langs->load("interventions");
+ print '';
+ }
+ if (! empty($conf->contrat->enabled) && $user->rights->contrat->creer)
+ {
+ $langs->load("contracts");
+ print '';
+ }
+ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->creer)
+ {
+ $langs->load("expensereports");
+ $langs->load("trips");
+ print '';
+ }
+ if (! empty($conf->don->enabled) && $user->rights->don->creer)
+ {
+ $langs->load("donations");
+ print '';
+ }
+ }
+
// Clone
if ($user->rights->projet->creer)
{
@@ -925,7 +981,7 @@ else
{
if ($userDelete > 0)
{
- print '';
+ print '';
}
else
{
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index ce033f0e193..0911798ec76 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -70,7 +70,7 @@ if (! $sortfield) $sortfield="name";
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/*
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 30a8f87a4fa..955c1c6dd7b 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -189,6 +189,7 @@ $listofreferent=array(
'class'=>'Propal',
'table'=>'propal',
'datefieldname'=>'datep',
+ 'urlnew'=>DOL_URL_ROOT.'/comm/propal.php?action=create&project_id='.$id,
'test'=>$conf->propal->enabled && $user->rights->propale->lire),
'order'=>array(
'name'=>"CustomersOrders",
@@ -196,6 +197,7 @@ $listofreferent=array(
'class'=>'Commande',
'table'=>'commande',
'datefieldname'=>'date_commande',
+ 'urlnew'=>DOL_URL_ROOT.'/commande/card.php?action=create&project_id='.$id,
'test'=>$conf->commande->enabled && $user->rights->commande->lire),
'invoice'=>array(
'name'=>"CustomersInvoices",
@@ -204,6 +206,7 @@ $listofreferent=array(
'margin'=>'add',
'table'=>'facture',
'datefieldname'=>'datef',
+ 'urlnew'=>DOL_URL_ROOT.'/compta/facture/card.php?action=create&project_id='.$id,
'test'=>$conf->facture->enabled && $user->rights->facture->lire),
'invoice_predefined'=>array(
'name'=>"PredefinedInvoices",
@@ -218,7 +221,8 @@ $listofreferent=array(
'class'=>'CommandeFournisseur',
'table'=>'commande_fournisseur',
'datefieldname'=>'date_commande',
- 'test'=>$conf->supplier_order->enabled && $user->rights->fournisseur->commande->lire),
+ 'urlnew'=>DOL_URL_ROOT.'/fourn/commande/card.php?action=create&project_id='.$id,
+ 'test'=>$conf->supplier_order->enabled && $user->rights->fournisseur->commande->lire),
'invoice_supplier'=>array(
'name'=>"BillsSuppliers",
'title'=>"ListSupplierInvoicesAssociatedProject",
@@ -226,7 +230,8 @@ $listofreferent=array(
'margin'=>'minus',
'table'=>'facture_fourn',
'datefieldname'=>'datef',
- 'test'=>$conf->supplier_invoice->enabled && $user->rights->fournisseur->facture->lire),
+ 'urlnew'=>DOL_URL_ROOT.'/fourn/facture/card.php?action=create&project_id='.$id,
+ 'test'=>$conf->supplier_invoice->enabled && $user->rights->fournisseur->facture->lire),
'contract'=>array(
'name'=>"Contracts",
'title'=>"ListContractAssociatedProject",
@@ -241,6 +246,7 @@ $listofreferent=array(
'table'=>'fichinter',
'datefieldname'=>'date_valid',
'disableamount'=>1,
+ 'urlnew'=>DOL_URL_ROOT.'/contract/card.php?action=create&project_id='.$id,
'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire),
'trip'=>array(
'name'=>"TripsAndExpenses",
@@ -250,7 +256,8 @@ $listofreferent=array(
'datefieldname'=>'dated',
'margin'=>'minus',
'disableamount'=>1,
- 'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire),
+ 'urlnew'=>DOL_URL_ROOT.'/fichinter/card.php?action=create&project_id='.$id,
+ 'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire),
'expensereport'=>array(
'name'=>"ExpenseReports",
'title'=>"ListExpenseReportsAssociatedProject",
@@ -259,7 +266,8 @@ $listofreferent=array(
'datefieldname'=>'date',
'margin'=>'minus',
'disableamount'=>0,
- 'test'=>$conf->expensereport->enabled && $user->rights->expensereport->lire),
+ 'urlnew'=>DOL_URL_ROOT.'/expensereport/card.php?action=create&project_id='.$id,
+ 'test'=>$conf->expensereport->enabled && $user->rights->expensereport->lire),
'agenda'=>array(
'name'=>"Agenda",
'title'=>"ListActionsAssociatedProject",
@@ -267,7 +275,8 @@ $listofreferent=array(
'table'=>'actioncomm',
'datefieldname'=>'datep',
'disableamount'=>1,
- 'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire),
+ 'urlnew'=>DOL_URL_ROOT.'/action/comm/card.php?action=create&project_id='.$id,
+ 'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire),
'donation'=>array(
'name'=>"Donation",
'title'=>"ListDonationsAssociatedProject",
@@ -276,7 +285,8 @@ $listofreferent=array(
'table'=>'don',
'datefieldname'=>'datedon',
'disableamount'=>0,
- 'test'=>$conf->don->enabled && $user->rights->don->lire),
+ 'urlnew'=>DOL_URL_ROOT.'/donation/card.php?action=create&project_id='.$id,
+ 'test'=>$conf->don->enabled && $user->rights->don->lire),
'project_task'=>array(
'name'=>"TaskTimeValorised",
'title'=>"ListTaskTimeUserProject",
@@ -501,7 +511,8 @@ foreach ($listofreferent as $key => $value)
$tablename=$value['table'];
$datefieldname=$value['datefieldname'];
$qualified=$value['test'];
-
+ $urlnew=$value['urlnew'];
+
if ($qualified)
{
// If we want the project task array to have details of users
@@ -524,7 +535,7 @@ foreach ($listofreferent as $key => $value)
elseif($selectList)
{
// Define form with the combo list of elements to link
- $addform.='';
}
}
-
+ /*if (empty($conf->global->PROJECT_CREATE_ELEM_DISABLE) && $urlnew) // Not yet ready. Use instead button on project card
+ {
+ $addform.='';
+ $addform.='
'.$langs->trans("Create").' ';
+ $addform.='
';
+ }*/
+
print load_fiche_titre($langs->trans($title), $addform, '');
print '
';
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 97a09ad1f87..07fda131407 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -108,7 +108,7 @@ if ($id > 0 || ! empty($ref))
}
}
-include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/*
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 4bf8616e721..08d2bdd7a8b 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -122,7 +122,7 @@ if (! empty($socid))
print '';
print '';
- print ''.$langs->trans('CustomerCode').' global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
+ print ''.$langs->trans('CustomerCode').' global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
print $object->code_client;
if ($object->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode");
print '';
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index d37310ab269..fff130629be 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -74,7 +74,7 @@ if ($id > 0 || ! empty($ref))
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php';
+include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/*
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 8da096519d0..7a25b6454c0 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -959,7 +959,7 @@ else
print '';
// Name, firstname
- print '';
+ print ' ';
if ($object->particulier || $private)
{
print ''.$langs->trans('LastName','name').' ';
@@ -1934,7 +1934,7 @@ else
print '';
// Prospect/Customer
- print ''.$langs->trans('ProspectCustomer').' ';
+ print ' '.$langs->trans('ProspectCustomer').' ';
print $object->getLibCustProspStatut();
print ' ';
// Lastname
- print ''.$langs->trans("Lastname").' '.$langs->trans("Lastname").' ';
if (! empty($ldap_lastname))
{
@@ -1097,7 +1097,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
print $langs->trans("Note");
print ' ';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor=new DolEditor('note','','',180,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_4,90);
+ $doleditor=new DolEditor('note','','',120,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_3,90);
$doleditor->Create();
print " \n";
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index b8152f33a85..36338f03e10 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -105,7 +105,7 @@ $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if (empty($reshook)) {
- include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_pre_headers.tpl.php';
+ include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
}
/*