';
print ''.$langs->trans("DeStockOnShipmentOnClosing").' ';
-print '';
+print ' ';
if (! empty($conf->expedition->enabled))
{
if ($conf->use_javascript_ajax) {
@@ -205,14 +205,14 @@ print '';
print '';
print "".$langs->trans("RuleForStockManagementIncrease")." \n";
-print ''.$langs->trans("Status").' '."\n";
+print ''.$langs->trans("Status").' '."\n";
print ' '."\n";
$found=0;
print '';
print ''.$langs->trans("ReStockOnBill").' ';
-print '';
+print ' ';
if (! empty($conf->fournisseur->enabled))
{
if ($conf->use_javascript_ajax) {
@@ -233,7 +233,7 @@ $found++;
print ' ';
print ''.$langs->trans("ReStockOnValidateOrder").' ';
-print '';
+print ' ';
if (! empty($conf->fournisseur->enabled))
{
if ($conf->use_javascript_ajax) {
@@ -253,8 +253,8 @@ $found++;
if (!empty($conf->reception->enabled))
{
print ' ';
- print ''.$langs->trans("StockOnReception").' ';
- print '';
+ print ' '.$langs->trans("StockOnReception").' ';
+ print '';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION');
@@ -268,8 +268,8 @@ if ($conf->use_javascript_ajax) {
print ' ';
- print ''.$langs->trans("StockOnReceptionOnClosing").' ';
- print '';
+ print ' '.$langs->trans("StockOnReceptionOnClosing").' ';
+ print '';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION_CLOSE');
@@ -284,7 +284,7 @@ else
{
print ' ';
print ''.$langs->trans("ReStockOnDispatchOrder").' ';
- print '';
+ print ' ';
if (! empty($conf->fournisseur->enabled))
{
if ($conf->use_javascript_ajax) {
@@ -313,16 +313,17 @@ if ($conf->use_javascript_ajax) {
print '
';
print '';
print '';
print "".$langs->trans("RuleForStockAvailability")." \n";
-print ''.$langs->trans("Status").' '."\n";
+print ''.$langs->trans("Status").' '."\n";
print ' '."\n";
print '';
print ''.$langs->trans("WarehouseAllowNegativeTransfer").' ';
-print '';
+print ' ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_ALLOW_NEGATIVE_TRANSFER');
} else {
@@ -337,7 +338,7 @@ if($conf->invoice->enabled)
{
print ' ';
print ''.$langs->trans("StockMustBeEnoughForInvoice").' ';
- print '';
+ print ' ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_INVOICE');
} else {
@@ -352,7 +353,7 @@ if($conf->order->enabled)
{
print ' ';
print ''.$langs->trans("StockMustBeEnoughForOrder").' ';
- print '';
+ print ' ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_ORDER');
} else {
@@ -367,7 +368,7 @@ if($conf->expedition->enabled)
{
print ' ';
print ''.$langs->trans("StockMustBeEnoughForShipment").' ';
- print '';
+ print ' ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT');
} else {
@@ -391,12 +392,12 @@ if ($virtualdiffersfromphysical)
print '';
print '';
print "".$langs->trans("RuleForStockReplenishment")." ".img_help('help', $langs->trans("VirtualDiffersFromPhysical"))." \n";
- print ''.$langs->trans("Status").' '."\n";
+ print ''.$langs->trans("Status").' '."\n";
print ' '."\n";
print '';
print ''.$langs->trans("UseVirtualStockByDefault").' ';
- print '';
+ print ' ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_USE_VIRTUAL_STOCK');
} else {
@@ -414,12 +415,12 @@ print '';
print '';
print "".$langs->trans("Other")." \n";
-print ''.$langs->trans("Status").' '."\n";
+print ''.$langs->trans("Status").' '."\n";
print ' '."\n";
print '';
print ''.$langs->trans("UserWarehouseAutoCreate").' ';
-print '';
+print ' ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_USERSTOCK_AUTOCREATE');
} else {
@@ -433,7 +434,7 @@ print ' ';
print '';
print $form->textwithpicto($langs->trans("StockSupportServices"), $langs->trans("StockSupportServicesDesc"));
print ' ';
-print '';
+print ' ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_SUPPORTS_SERVICES');
} else {
@@ -445,7 +446,7 @@ print " \n";
print '';
print ''.$langs->trans("AllowAddLimitStockByWarehouse").' ';
-print '';
+print ' ';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE');
} else {
@@ -455,19 +456,6 @@ if ($conf->use_javascript_ajax) {
print " \n";
print " \n";
-if (! empty($conf->fournisseur->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
- print '';
- print ''.$langs->trans("UseDispatchStatus").' ';
- print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("SUPPLIER_ORDER_USE_DISPATCH_STATUS", $arrval, $conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS);
-}
- print " \n \n";
-}
-
print '
';
print '';
print '';
print ''.$langs->trans("Inventory").' '."\n";
- print ''.$langs->trans("Status").' '."\n";
- print ' '."\n";
+ print ''.$langs->trans("Status").' '."\n";
+ print ''."\n";
// Example with a yes / no select
- print '';
+ /*print ' ';
print ''.$langs->trans("INVENTORY_DISABLE_VIRTUAL").' ';
- print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('INVENTORY_DISABLE_VIRTUAL');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("INVENTORY_DISABLE_VIRTUAL", $arrval, $conf->global->INVENTORY_DISABLE_VIRTUAL);
-}
+ print ' ';
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('INVENTORY_DISABLE_VIRTUAL');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("INVENTORY_DISABLE_VIRTUAL", $arrval, $conf->global->INVENTORY_DISABLE_VIRTUAL);
+ }
print ' ';
+ */
// Example with a yes / no select
- print '';
+ /*print ' ';
print ''.$langs->trans("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA").' ';
- print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('INVENTORY_USE_MIN_PA_IF_NO_LAST_PA');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA", $arrval, $conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA);
-}
- print ' ';
+ print '';
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('INVENTORY_USE_MIN_PA_IF_NO_LAST_PA');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("INVENTORY_USE_MIN_PA_IF_NO_LAST_PA", $arrval, $conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA);
+ }
+ print ' ';
+ */
- // Example with a yes / no select
+ // Example with a yes / no select
print '';
- print ''.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT").' ';
- print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT", $arrval, $conf->global->INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT);
-}
+ print ' '.$langs->trans("INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT").' ';
+ print '';
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT", $arrval, $conf->global->INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT);
+ }
print ' ';
print '
';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index e895a0b4005..f1fbbd4b286 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -494,20 +494,16 @@ print ' '.$langs->trans("Parameter").' ';
print ''.$langs->trans("Value").' ';
print ' ';
print " \n";
-$var=false;
-//if ($conf->global->MAIN_FEATURES_LEVEL > 0)
-//{
- print '';
- print $form->textwithpicto($langs->trans("UseDoubleApproval"), $langs->trans("Use3StepsApproval"), 1, 'help').' ';
- print ' ';
- print ' ';
+print $form->textwithpicto($langs->trans("UseDoubleApproval"), $langs->trans("Use3StepsApproval"), 1, 'help').' ';
+print ' ';
+print ' ';
print ' \n";
+// Option to add a quality/validation step, on products, after reception.
+$langs->load("stocks");
+print '';
+print ''.$langs->trans("UseDispatchStatus").' ';
+print '';
+if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('SUPPLIER_ORDER_USE_DISPATCH_STATUS');
+} else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("SUPPLIER_ORDER_USE_DISPATCH_STATUS", $arrval, $conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS);
+}
+print " \n \n";
+
print '
';
print $form->selectDate($datestart, 'datestart', 0, 0, 1, '', 1, 0);
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 9adc0bff336..5b9bf0f9eab 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2500,7 +2500,7 @@ $formquestion = array_merge($formquestion, array(
if ($usercansend) {
print '';
} else
- print '';
+ print '';
}
// Create an order
@@ -2538,7 +2538,14 @@ $formquestion = array_merge($formquestion, array(
$arrayofinvoiceforpropal = $object->getInvoiceArrayList();
if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || empty($conf->global->WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED))
{
- print '';
+ if ($usercanclose)
+ {
+ print '';
+ }
+ else
+ {
+ print '';
+ }
}
}
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index d89eecfed1a..ac4c9c767e8 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -213,9 +213,9 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
$i = 0;
while ($i < $num)
{
- $paiement = '';
$ref = '';
$refcomp = '';
+ $totalpayment = '';
$obj = array_shift($tab_sqlobj);
@@ -236,7 +236,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
$societestatic->name = $obj->name;
$refcomp=$societestatic->getNomUrl(1, '', 24);
- $paiement = -1*$facturefournstatic->getSommePaiement(); // Payment already done
+ $totalpayment = -1*$facturefournstatic->getSommePaiement(); // Payment already done
}
}
if ($obj->family == 'invoice')
@@ -250,9 +250,9 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
$societestatic->name = $obj->name;
$refcomp=$societestatic->getNomUrl(1, '', 24);
- $paiement = $facturestatic->getSommePaiement(); // Payment already done
- $paiement+= $facturestatic->getSumDepositsUsed();
- $paiement+= $facturestatic->getSumCreditNotesUsed();
+ $totalpayment = $facturestatic->getSommePaiement(); // Payment already done
+ $totalpayment+= $facturestatic->getSumDepositsUsed();
+ $totalpayment+= $facturestatic->getSumCreditNotesUsed();
}
if ($obj->family == 'social_contribution')
{
@@ -261,19 +261,19 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
$socialcontribstatic->lib=$obj->type;
$ref = $socialcontribstatic->getNomUrl(1, 24);
- $paiement = -1*$socialcontribstatic->getSommePaiement(); // Payment already done
+ $totalpayment = -1*$socialcontribstatic->getSommePaiement(); // Payment already done
}
- $parameters = array('obj' => $obj);
+ $parameters = array('obj' => $obj, 'ref' => $ref, 'refcomp' => $refcomp, 'totalpayment' => $totalpayment);
$reshook = $hookmanager->executeHooks('moreFamily', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
if(empty($reshook)){
$ref = isset($hookmanager->resArray['ref']) ? $hookmanager->resArray['ref'] : $ref;
$refcomp = isset($hookmanager->resArray['refcomp']) ? $hookmanager->resArray['refcomp'] : $refcomp;
- $paiement = isset($hookmanager->resArray['paiement']) ? $hookmanager->resArray['paiement'] : $paiement;
+ $totalpayment = isset($hookmanager->resArray['totalpayment']) ? $hookmanager->resArray['totalpayment'] : $totalpayment;
}
$total_ttc = $obj->total_ttc;
- if ($paiement) $total_ttc = $obj->total_ttc - $paiement;
+ if ($totalpayment) $total_ttc = $obj->total_ttc - $totalpayment;
$solde += $total_ttc;
// We discard lines with a remainder to pay to 0
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 4bbe5c723e1..54fa04d33a2 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -170,7 +170,7 @@ $amountcust=$langs->trans("AmountHT");
$vatcust=$langs->trans("VATReceived");
$namecust=$langs->trans("Name");
if ($mysoc->tva_assuj) {
- $vatcust.=' ('.$langs->trans("ToPay").')';
+ $vatcust.=' ('.$langs->trans("StatusToPay").')';
}
// Suppliers invoices
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index e0775313dd3..e977b31e5e4 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -185,7 +185,7 @@ $productcust=$langs->trans("Description");
$namerate=$langs->trans("VATRate");
$amountcust=$langs->trans("AmountHT");
if ($mysoc->tva_assuj) {
- $vatcust.=' ('.$langs->trans("ToPay").')';
+ $vatcust.=' ('.$langs->trans("StatusToPay").')';
}
$elementsup=$langs->trans("SuppliersInvoices");
$productsup=$langs->trans("Description");
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index c48bc385c53..26601308ccf 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -173,7 +173,7 @@ $amountcust=$langs->trans("AmountHT");
$vatcust=$langs->trans("VATReceived");
$namecust=$langs->trans("Name");
if ($mysoc->tva_assuj) {
- $vatcust.=' ('.$langs->trans("ToPay").')';
+ $vatcust.=' ('.$langs->trans("VATToPay").')';
}
// Suppliers invoices
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index fad72d69637..b7ecd4b9844 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -87,21 +87,6 @@ class Contact extends CommonObject
public $zip;
public $town;
- /**
- * @deprecated
- * @see $state_id
- */
- public $fk_departement;
- /**
- * @deprecated
- * @see $state_code
- */
- public $departement_code;
- /**
- * @deprecated
- * @see $state
- */
- public $departement;
public $state_id; // Id of department
public $state_code; // Code of department
public $state; // Label of department
@@ -1052,7 +1037,7 @@ class Contact extends CommonObject
// Removed extrafields
if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) {
// For avoid conflicts if trigger used
- $result=$this->deleteExtraFields($this);
+ $result=$this->deleteExtraFields();
if ($result < 0) $error++;
}
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index e86433af85d..9371a9ea835 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -705,7 +705,7 @@ while ($i < min($num, $limit))
print ' ';
if ($obj->cstatut == 0) // If contract is draft, we say line is also draft
{
- print $contractstatic->LibStatut(0, 5, ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now));
+ print $contractstatic->LibStatut(0, 5);
}
else
{
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 5aa7d0575c6..05ab5db50fd 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -156,7 +156,7 @@ class box_factures extends ModeleBoxes
);
$this->info_box_contents[$line][] = array(
- 'td' => '',
+ 'td' => 'class="tdoverflowmax200"',
'text' => $societestatic->getNomUrl(1, '', 40),
'asis' => 1,
);
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index fadd0c02fde..1df572c8a35 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -497,8 +497,16 @@ abstract class CommonDocGenerator
$resarray['object_total_up'] = $totalUp;
$resarray['object_total_up_locale'] = price($resarray['object_total_up'], 0, $outputlangs);
if (method_exists($object, 'getTotalDiscount')) {
- $resarray['object_total_discount'] = round(100 / $totalUp * $object->getTotalDiscount(), 2);
+ $totalDiscount=$object->getTotalDiscount();
+ } else {
+ $totalDiscount=0;
+ }
+ if (!empty($totalUp) && !empty($totalDiscount)) {
+ $resarray['object_total_discount'] = round(100 / $totalUp * $totalDiscount, 2);
$resarray['object_total_discount_locale'] = price($resarray['object_total_discount'], 0, $outputlangs);
+ } else {
+ $resarray['object_total_discount']='';
+ $resarray['object_total_discount_locale']='';
}
}
@@ -766,10 +774,20 @@ abstract class CommonDocGenerator
//Add value to store price with currency
$array_to_fill=array_merge($array_to_fill, array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
}
- elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+ elseif($extrafields->attribute_type[$key] == 'select')
{
$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
}
+ elseif($extrafields->attribute_type[$key] == 'checkbox') {
+ $valArray=explode(',', $object->array_options['options_'.$key]);
+ $output=array();
+ foreach($extrafields->attribute_param[$key]['options'] as $keyopt=>$valopt) {
+ if (in_array($keyopt, $valArray)) {
+ $output[]=$valopt;
+ }
+ }
+ $object->array_options['options_'.$key] = implode(', ', $output);
+ }
elseif($extrafields->attribute_type[$key] == 'date')
{
if (strlen($object->array_options['options_'.$key])>0)
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 37d72a7f65c..a1d01136401 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -5216,7 +5216,7 @@ class Form
* @param datetime $adddateof Add a link "Date of invoice" using the following date.
* @return string|void Nothing or string if nooutput is 1
* @deprecated
- * @see form_date(), select_month(), select_year(), select_dayofweek()
+ * @see selectDate(), form_date(), select_month(), select_year(), select_dayofweek()
*/
public function select_date($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $nooutput = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '')
{
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 283b296b3e3..a5242c597c4 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -355,22 +355,27 @@ class Link extends CommonObject
/**
* Delete a link from database
*
- * @return int <0 if KO, 0 if nothing done, >0 if OK
+ * @param User $user Object suer
+ * @return int <0 if KO, 0 if nothing done, >0 if OK
*/
- public function delete()
+ public function delete($user)
{
- global $user, $langs, $conf;
+ global $langs, $conf;
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$error = 0;
+ $this->db->begin();
+
// Call trigger
$result=$this->call_trigger('LINK_DELETE', $user);
- if ($result < 0) return -1;
+ if ($result < 0)
+ {
+ $this->db->rollback();
+ return -1;
+ }
// End call triggers
- $this->db->begin();
-
// Remove link
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "links";
$sql.= " WHERE rowid = " . $this->id;
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index be220c90487..13596bc26c3 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -316,27 +316,29 @@ class Utils
// TODO Replace with executeCLI function
if ($execmethod == 1)
{
- exec($fullcommandclear, $readt, $retval);
- $result = $retval;
+ $output_arr = array(); $retval = null;
+ exec($fullcommandclear, $output_arr, $retval);
if ($retval != 0)
{
$langs->load("errors");
dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
- $error = 'Error '.$retval;
+ $errormsg = 'Error '.$retval;
$ok=0;
}
else
{
$i=0;
- if (!empty($readt))
- foreach($readt as $key=>$read)
+ if (!empty($output_arr))
{
- $i++; // output line number
- if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
- fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
- if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok=1;
- elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok=1;
+ foreach($output_arr as $key => $read)
+ {
+ $i++; // output line number
+ if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+ fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
+ if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok=1;
+ elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok=1;
+ }
}
}
}
@@ -534,6 +536,7 @@ class Utils
if ($execmethod == 1)
{
+ $retval = null;
exec($command, $output_arr, $retval);
$result = $retval;
if ($retval != 0)
@@ -545,7 +548,6 @@ class Utils
}
if ($execmethod == 2) // With this method, there is no way to get the return code, only output
{
- $ok=0;
$handle = fopen($outputfile, 'w+b');
if ($handle)
{
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 6635220cc23..cf5ab8dc7e0 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1094,6 +1094,8 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
{
global $db, $modules, $conf, $langs;
+ dol_syslog("complete_dictionary_with_modules Search external modules to complete the list of dictionnary tables", LOG_DEBUG, 1);
+
// Search modules
$modulesdir = dolGetModulesDirs();
$i = 0; // is a sequencer of modules found
@@ -1191,6 +1193,8 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
}
}
+ dol_syslog("", LOG_DEBUG, -1);
+
return 1;
}
@@ -1259,7 +1263,7 @@ function activateModulesRequiredByCountry($country_code)
}
/**
- * Add external modules to list of contact element
+ * Search external modules to complete the list of contact element
*
* @param array $elementList elementList
* @return int 1
@@ -1278,6 +1282,8 @@ function complete_elementList_with_modules(&$elementList)
$i = 0; // is a sequencer of modules found
$j = 0; // j is module number. Automatically affected if module number not defined.
+ dol_syslog("complete_elementList_with_modules Search external modules to complete the list of contact element", LOG_DEBUG, 1);
+
$modulesdir = dolGetModulesDirs();
foreach ($modulesdir as $dir)
@@ -1355,6 +1361,8 @@ function complete_elementList_with_modules(&$elementList)
}
}
+ dol_syslog("", LOG_DEBUG, -1);
+
return 1;
}
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index c6bc31956d6..9316dcbfeb6 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -549,15 +549,13 @@ function calendars_prepare_head($param)
$h++;
- $object=new stdClass();
-
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname); to remove a tab
- complete_head_from_modules($conf, $langs, $object, $head, $h, 'agenda');
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda');
- complete_head_from_modules($conf, $langs, $object, $head, $h, 'agenda', 'remove');
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'agenda', 'remove');
return $head;
}
diff --git a/htdocs/core/lib/asset.lib.php b/htdocs/core/lib/asset.lib.php
index b9890533a00..8e8b561ac8e 100644
--- a/htdocs/core/lib/asset.lib.php
+++ b/htdocs/core/lib/asset.lib.php
@@ -48,7 +48,7 @@ function asset_admin_prepare_head()
//$this->tabs = array(
// 'entity:-tabname:Title:@assets:/asset/mypage.php?id=__ID__'
//); // to remove a tab
- complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin');
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'assets_admin');
$head[$h][0] = DOL_URL_ROOT . '/asset/admin/assets_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFields");
@@ -60,7 +60,7 @@ function asset_admin_prepare_head()
$head[$h][2] = 'attributes_type';
$h++;
- complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets_admin', 'remove');
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'assets_admin', 'remove');
return $head;
}
@@ -68,11 +68,12 @@ function asset_admin_prepare_head()
/**
* Prepare admin pages header
*
+ * @param Contrat $object Object related to tabs
* @return array head array with tabs
*/
-function asset_prepare_head()
+function asset_prepare_head(Asset $object)
{
- global $langs, $conf;
+ global $db, $langs, $conf;
$langs->load("assets");
@@ -96,7 +97,7 @@ function asset_prepare_head()
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->assets->dir_output . '/' . get_exdir($filename, 2, 0, 1, $object, 'assets'). '/'. dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->assets->dir_output . '/' . dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
$nbLinks=Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index f117bc24daf..54d1c491878 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -163,7 +163,6 @@ function bank_admin_prepare_head($object)
*/
function various_payment_prepare_head($object)
{
-
global $db, $langs, $conf;
$h = 0;
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index d1a4a07689e..80609f524d4 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -101,7 +101,7 @@ function contract_prepare_head(Contrat $object)
*/
function contract_admin_prepare_head()
{
- global $langs, $conf, $user;
+ global $langs, $conf;
$h = 0;
$head = array();
@@ -127,9 +127,7 @@ function contract_admin_prepare_head()
$head[$h][2] = 'attributeslines';
$h++;
-
-
complete_head_from_modules($conf, $langs, null, $head, $h, 'contract_admin', 'remove');
- return $head;
+ return $head;
}
diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php
index 91c41ffcced..7b78ac96b91 100644
--- a/htdocs/core/lib/donation.lib.php
+++ b/htdocs/core/lib/donation.lib.php
@@ -80,7 +80,7 @@ function donation_prepare_head($object)
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
- $upload_dir = $conf->don->dir_output . '/' . get_exdir($filename, 2, 0, 1, $object, 'donation'). '/'. dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->don->dir_output . '/' . dol_sanitizeFileName($object->ref);
$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
$nbLinks=Link::count($db, $object->element, $object->id);
$head[$h][0] = DOL_URL_ROOT.'/don/document.php?id='.$object->id;
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 5861ad07a72..0c72fe35fab 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1222,9 +1222,12 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
}
}
}
- else dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
- // TODO Failure to remove can be because file was already removed or because of permission
- // If error because it does not exists, we should return true, and we should return false if this is a permission problem
+ else
+ {
+ dol_syslog("Failed to remove file ".$filename, LOG_WARNING);
+ // TODO Failure to remove can be because file was already removed or because of permission
+ // If error because it does not exists, we should return true, and we should return false if this is a permission problem
+ }
}
}
else dol_syslog("No files to delete found", LOG_DEBUG);
@@ -1881,14 +1884,16 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
/**
- * Compress a file
+ * Compress a file.
+ * An error string may be returned into parameters.
*
* @param string $inputfile Source file name
* @param string $outputfile Target file name
* @param string $mode 'gz' or 'bz' or 'zip'
+ * @param string $errorstring Error string
* @return int <0 if KO, >0 if OK
*/
-function dol_compress_file($inputfile, $outputfile, $mode = "gz")
+function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring = null)
{
global $conf;
@@ -1913,8 +1918,12 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz")
$zip = new ZipArchive;
if ($zip->open($outputfile, ZipArchive::CREATE) !== true) {
- $errormsg="Failed to open file ".$outputfile."\n";
- dol_syslog("dol_compress_file failure - ".$errormsg, LOG_ERR);
+ $errorstring="dol_compress_file failure - Failed to open file ".$outputfile."\n";
+ dol_syslog($errorstring, LOG_ERR);
+
+ global $errormsg;
+ $errormsg = $errorstring;
+
return -6;
}
@@ -1958,12 +1967,16 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz")
{
global $errormsg;
$errormsg=$archive->errorInfo(true);
- dol_syslog("dol_compress_file failure - ".$errormsg, LOG_ERR);
+
if ($archive->errorCode() == PCLZIP_ERR_WRITE_OPEN_FAIL)
{
- dol_syslog("dol_compress_file error PCLZIP_ERR_WRITE_OPEN_FAIL", LOG_ERR);
+ $errorstring = "PCLZIP_ERR_WRITE_OPEN_FAIL";
+ dol_syslog("dol_compress_file error - archive->errorCode() = PCLZIP_ERR_WRITE_OPEN_FAIL", LOG_ERR);
return -4;
}
+
+ $errorstring = "dol_compress_file error archive->errorCode = ".$archive->errorCode()." errormsg=".$errormsg;
+ dol_syslog("dol_compress_file failure - ".$errormsg, LOG_ERR);
return -3;
}
else
@@ -1983,7 +1996,11 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz")
}
else
{
- dol_syslog("Try to zip with format ".$mode." with no handler for this format", LOG_ERR);
+ $errorstring = "Try to zip with format ".$mode." with no handler for this format";
+ dol_syslog($errorstring, LOG_ERR);
+
+ global $errormsg;
+ $errormsg = $errorstring;
return -2;
}
}
@@ -1991,8 +2008,10 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz")
{
global $langs, $errormsg;
$langs->load("errors");
- dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
$errormsg=$langs->trans("ErrorFailedToWriteInDir");
+
+ $errorstring = "Failed to open file ".$outputfile;
+ dol_syslog($errorstring, LOG_ERR);
return -1;
}
}
@@ -2063,13 +2082,14 @@ function dol_uncompress($inputfile, $outputdir)
* @param string $inputdir Source dir name
* @param string $outputfile Target file name (output directory must exists and be writable)
* @param string $mode 'zip'
+ * @param string $excludefiles A regex pattern. For example: '/\.log$|\/temp\//'
* @return int <0 if KO, >0 if OK
*/
-function dol_compress_dir($inputdir, $outputfile, $mode = "zip")
+function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles = '')
{
$foundhandler=0;
- dol_syslog("Try to zip dir ".$inputdir." into ".$outputdir." mode=".$mode);
+ dol_syslog("Try to zip dir ".$inputdir." into ".$outputfile." mode=".$mode);
if (! dol_is_dir(dirname($outputfile)) || ! is_writable(dirname($outputfile)))
{
@@ -2096,6 +2116,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip")
return 1;
}
else*/
+ //if (class_exists('ZipArchive') && ! empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))
if (class_exists('ZipArchive'))
{
$foundhandler=1;
@@ -2103,6 +2124,13 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip")
// Initialize archive object
$zip = new ZipArchive();
$result = $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
+ if (! $result)
+ {
+ global $langs, $errormsg;
+ $langs->load("errors");
+ $errormsg=$langs->trans("ErrorFailedToWriteInFile", $outputfile);
+ return -4;
+ }
// Create recursive directory iterator
/** @var SplFileInfo[] $files */
@@ -2119,9 +2147,11 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip")
// Get real and relative path for current file
$filePath = $file->getRealPath();
$relativePath = substr($filePath, strlen($inputdir) + 1);
-
- // Add current file to archive
- $zip->addFile($filePath, $relativePath);
+ if (empty($excludefiles) || ! preg_match($excludefiles, $filePath))
+ {
+ // Add current file to archive
+ $zip->addFile($filePath, $relativePath);
+ }
}
}
diff --git a/htdocs/core/lib/multicurrency.lib.php b/htdocs/core/lib/multicurrency.lib.php
index 339ca2d01bc..e44511fcb97 100644
--- a/htdocs/core/lib/multicurrency.lib.php
+++ b/htdocs/core/lib/multicurrency.lib.php
@@ -40,7 +40,7 @@ function multicurrencyAdminPrepareHead()
$head[$h][2] = 'settings';
$h++;
- complete_head_from_modules($conf, $langs, $object, $head, $h, 'multicurrency');
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'multicurrency');
return $head;
}
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 84be86f4a15..c1d42bf25b7 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -59,7 +59,7 @@ function ticketAdminPrepareHead()
//$this->tabs = array(
// 'entity:-tabname:Title:@ticket:/ticket/mypage.php?id=__ID__'
//); // to remove a tab
- complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticketadmin');
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'ticketadmin');
return $head;
}
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 9a30a063ad3..10e5f9e93c9 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -66,6 +66,7 @@ class mailing_thirdparties extends MailingTargets
$cibles = array();
+ $addDescription= "";
// Select the third parties from category
if (empty($_POST['filter']))
{
@@ -77,6 +78,50 @@ class mailing_thirdparties extends MailingTargets
}
else
{
+ $addFilter ="";
+ if (isset($_POST["filter_client"]) && $_POST["filter_client"] <> '-1')
+ {
+ $addFilter.= " AND s.client=" . $_POST["filter_client"];
+ $addDescription= $langs->trans('ProspectCustomer')."=";
+ if ($_POST["filter_client"] == 0)
+ {
+ $addDescription.= $langs->trans('NorProspectNorCustomer');
+ }
+ elseif ($_POST["filter_client"] == 1)
+ {
+ $addDescription.= $langs->trans('Customer');
+ }
+ elseif ($_POST["filter_client"] == 2)
+ {
+ $addDescription.= $langs->trans('Prospect');
+ }
+ elseif ($_POST["filter_client"] == 3)
+ {
+ $addDescription.= $langs->trans('ProspectCustomer');
+ }
+ else
+ {
+ $addDescription.= "Unknown status ".$_POST["filter_client"];
+ }
+ }
+ if (isset($_POST["filter_status"]))
+ {
+ if (strlen($addDescription) > 0)
+ {
+ $addDescription.= ";";
+ }
+ $addDescription.= $langs->trans("Status")."=";
+ if ($_POST["filter_status"] == '1')
+ {
+ $addFilter.= " AND s.status=1";
+ $addDescription.= $langs->trans("Enabled");
+ }
+ else
+ {
+ $addFilter.= " AND s.status=0";
+ $addDescription.= $langs->trans("Disabled");
+ }
+ }
$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
$sql.= " WHERE s.email <> ''";
@@ -85,6 +130,7 @@ class mailing_thirdparties extends MailingTargets
$sql.= " AND cs.fk_soc = s.rowid";
$sql.= " AND c.rowid = cs.fk_categorie";
$sql.= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
+ $sql.= $addFilter;
$sql.= " UNION ";
$sql.= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_fournisseur as cs, ".MAIN_DB_PREFIX."categorie as c";
@@ -94,51 +140,7 @@ class mailing_thirdparties extends MailingTargets
$sql.= " AND cs.fk_soc = s.rowid";
$sql.= " AND c.rowid = cs.fk_categorie";
$sql.= " AND c.rowid='".$this->db->escape($_POST['filter'])."'";
- }
-
- $addDescription= "";
- if (isset($_POST["filter_client"]) && $_POST["filter_client"] <> '-1')
- {
- $sql.= " AND s.client=" . $_POST["filter_client"];
- $addDescription= $langs->trans('ProspectCustomer')."=";
- if ($_POST["filter_client"] == 0)
- {
- $addDescription.= $langs->trans('NorProspectNorCustomer');
- }
- elseif ($_POST["filter_client"] == 1)
- {
- $addDescription.= $langs->trans('Customer');
- }
- elseif ($_POST["filter_client"] == 2)
- {
- $addDescription.= $langs->trans('Prospect');
- }
- elseif ($_POST["filter_client"] == 3)
- {
- $addDescription.= $langs->trans('ProspectCustomer');
- }
- else
- {
- $addDescription.= "Unknown status ".$_POST["filter_client"];
- }
- }
- if (isset($_POST["filter_status"]))
- {
- if (strlen($addDescription) > 0)
- {
- $addDescription.= ";";
- }
- $addDescription.= $langs->trans("Status")."=";
- if ($_POST["filter_status"] == '1')
- {
- $sql.= " AND s.status=1";
- $addDescription.= $langs->trans("Enabled");
- }
- else
- {
- $sql.= " AND s.status=0";
- $addDescription.= $langs->trans("Disabled");
- }
+ $sql.= $addFilter;
}
$sql.= " ORDER BY email";
diff --git a/htdocs/core/modules/modDebugBar.class.php b/htdocs/core/modules/modDebugBar.class.php
index 8d51a102251..b69406ffb57 100644
--- a/htdocs/core/modules/modDebugBar.class.php
+++ b/htdocs/core/modules/modDebugBar.class.php
@@ -16,7 +16,7 @@
*/
/**
- * \defgroup debugbar Debug bar
+ * \defgroup debugbar Module Debug bar
* \brief debugbar module descriptor.
*
* \file htdocs/core/modules/modDebugBar.class.php
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index e16b6e87fd0..620c1639901 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -19,6 +19,7 @@
/**
* \defgroup ticket Module Ticket
+ * \brief Module for ticket and request management.
* \file core/modules/modTicket.class.php
* \ingroup ticket
* \brief Description and activation file for module Ticket
diff --git a/htdocs/datapolicy/lib/datapolicy.lib.php b/htdocs/datapolicy/lib/datapolicy.lib.php
index b72417d7ff9..1ea83696a1b 100644
--- a/htdocs/datapolicy/lib/datapolicy.lib.php
+++ b/htdocs/datapolicy/lib/datapolicy.lib.php
@@ -48,7 +48,9 @@ function datapolicyAdminPrepareHead()
$h++;
}
- complete_head_from_modules($conf, $langs, $object, $head, $h, 'datapolicy');
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'datapolicy');
+
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'datapolicy', 'remove');
return $head;
}
diff --git a/htdocs/dav/dav.lib.php b/htdocs/dav/dav.lib.php
index 3c213f400c1..058fc635fc7 100644
--- a/htdocs/dav/dav.lib.php
+++ b/htdocs/dav/dav.lib.php
@@ -63,9 +63,9 @@ function dav_admin_prepare_head()
// Entries must be declared in modules descriptor with line
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
// $this->tabs = array('entity:-tabname); to remove a tab
- complete_head_from_modules($conf, $langs, $object, $head, $h, 'admindav');
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'admindav');
- complete_head_from_modules($conf, $langs, $object, $head, $h, 'admindav', 'remove');
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'admindav', 'remove');
return $head;
}
diff --git a/htdocs/emailcollector/lib/emailcollector.lib.php b/htdocs/emailcollector/lib/emailcollector.lib.php
index e7cc3bcb3a0..e9cb3984819 100644
--- a/htdocs/emailcollector/lib/emailcollector.lib.php
+++ b/htdocs/emailcollector/lib/emailcollector.lib.php
@@ -81,5 +81,7 @@ function emailcollectorPrepareHead($object)
//); // to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'emailcollector');
+ complete_head_from_modules($conf, $langs, $object, $head, $h, 'emailcollector', 'remove');
+
return $head;
}
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 9b1a62ed402..32915339297 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2340,7 +2340,7 @@ class ExpenseReport extends CommonObject
{
$response->warning_delay=$conf->expensereport->payment->warning_delay/60/60/24;
$response->label=$langs->trans("ExpenseReportsToPay");
- $response->labelShort=$langs->trans("ToPay");
+ $response->labelShort=$langs->trans("StatusToPay");
$response->url=DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&statut=5';
}
$response->img=img_object('', "trip");
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index eb8e06919d3..9c232cbe710 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -49,6 +49,7 @@ if (empty($keyforcontent) && empty($conf->global->EXTERNALSITE_URL))
llxHeader();
print ''.$langs->trans('ExternalSiteModuleNotComplete').'
';
llxFooter();
+ exit;
}
if (! empty($keyforcontent))
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 2edd86d1c10..c38107b14b4 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1822,10 +1822,9 @@ class CommandeFournisseur extends CommonOrder
$error++;
}
- // Si module stock gere et que incrementation faite depuis un dispatching en stock
+ // If module stock is enabled and the stock increase is done on purchase order dispatching
if (! $error && $entrepot > 0 && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
{
-
$mouv = new MouvementStock($this->db);
if ($product > 0)
{
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index a3e6666f412..ac19cac8a34 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -2203,7 +2203,7 @@ class FactureFournisseur extends CommonInvoice
$response = new WorkboardResponse();
$response->warning_delay=$conf->facture->fournisseur->warning_delay/60/60/24;
$response->label=$langs->trans("SupplierBillsToPay");
- $response->labelShort=$langs->trans("ToPay");
+ $response->labelShort=$langs->trans("StatusToPay");
$response->url=DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1&mainmenu=billing&leftmenu=suppliers_bills';
$response->img=img_object($langs->trans("Bills"), "bill");
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index ff33a42e2a9..66b48164a9e 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2346,7 +2346,7 @@ elseif (! empty($object->id))
}*/
// Modify
- if ($object->statut == 1)
+ if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
{
if ($user->rights->fournisseur->commande->commander)
{
@@ -2355,7 +2355,7 @@ elseif (! empty($object->id))
}
// Approve
- if ($object->statut == 1)
+ if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
{
if ($user->rights->fournisseur->commande->approuver)
{
@@ -2377,7 +2377,7 @@ elseif (! empty($object->id))
// Second approval (if option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set)
if (! empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
{
- if ($object->statut == 1)
+ if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
{
if ($user->rights->fournisseur->commande->approve2)
{
@@ -2398,7 +2398,7 @@ elseif (! empty($object->id))
}
// Refuse
- if ($object->statut == 1)
+ if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
{
if ($user->rights->fournisseur->commande->approuver || $user->rights->fournisseur->commande->approve2)
{
@@ -2411,7 +2411,7 @@ elseif (! empty($object->id))
}
// Send
- if (in_array($object->statut, array(2, 3, 4, 5)))
+ if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED, 3, 4, 5)))
{
if ($user->rights->fournisseur->commande->commander)
{
@@ -2420,7 +2420,7 @@ elseif (! empty($object->id))
}
// Reopen
- if (in_array($object->statut, array(2)))
+ if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED)))
{
$buttonshown=0;
if (! $buttonshown && $user->rights->fournisseur->commande->approuver)
@@ -2462,7 +2462,7 @@ elseif (! empty($object->id))
}
}
- if ($object->statut == 2)
+ if ($object->statut == CommandeFournisseur::STATUS_ACCEPTED)
{
if ($user->rights->fournisseur->commande->commander)
{
@@ -2474,6 +2474,15 @@ elseif (! empty($object->id))
}
}
+ // Classify received (this does not record reception)
+ if ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY)
+ {
+ if ($user->rights->fournisseur->commande->receptionner)
+ {
+ print '';
+ }
+ }
+
// Create bill
//if (! empty($conf->facture->enabled))
//{
@@ -2590,38 +2599,41 @@ elseif (! empty($object->id))
print '';
- if ($user->rights->fournisseur->commande->receptionner && ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY))
+ if ($action == 'classifyreception')
{
- // Set status to received (action=livraison)
- print ''."\n";
- print '
\n";
+ print "
";
+ }
}
// List of actions on element
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index 87305a19fd4..2207148e4ea 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -122,7 +122,7 @@ if ($action == 'create')
elseif ($starthalfday == 'afternoon') $halfday=-1;
elseif ($endhalfday == 'morning') $halfday=1;
- $valideur = GETPOST('valideur');
+ $valideur = GETPOST('valideur', 'int');
$description = trim(GETPOST('description'));
// If no type
@@ -270,8 +270,8 @@ if ($action == 'update' && ! GETPOSTISSET('savevalidator'))
// If this is the requestor or has read/write rights
if ($cancreate)
{
- $valideur = $_POST['valideur'];
- $description = trim($_POST['description']);
+ $valideur = GETPOST('valideur', 'int');
+ $description = trim(GETPOST('description', 'none'));
// If no start date
if (empty($_POST['date_debut_'])) {
@@ -1297,7 +1297,8 @@ else
if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
else
{
- $s=$form->select_dolusers($object->fk_validator, "valideur", (($action == 'editvalidator') ? 0 : 1), ($user->admin ? '' : array($user->id)), 0, $include_users);
+ $arrayofvalidatorstoexclude = (($user->admin || ($user->id != $userRequest->id))? '' : array($user->id)); // Nobody if we are admin or if we are not the user of the leave.
+ $s=$form->select_dolusers($object->fk_validator, "valideur", (($action == 'editvalidator') ? 0 : 1), $arrayofvalidatorstoexclude, 0, $include_users);
print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
}
if ($action == 'editvalidator')
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 66c212ef4c7..d767bcdc691 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -376,7 +376,6 @@ class Holiday extends CommonObject
$obj = $this->db->fetch_object($resql);
$this->id = $obj->rowid;
- $this->rowid = $obj->rowid; // deprecated
$this->ref = ($obj->ref?$obj->ref:$obj->rowid);
$this->fk_user = $obj->fk_user;
$this->date_create = $this->db->jdate($obj->date_create);
diff --git a/htdocs/index.php b/htdocs/index.php
index 4e83f376db3..d50b5248fab 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -366,484 +366,472 @@ if (empty($user->societe_id) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTAT
/*
* Dolibarr Working Board with weather
*/
-$showweather=(empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METEO == 2) ? 1 : 0;
+if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
+ $showweather = (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METEO == 2) ? 1 : 0;
//Array that contains all WorkboardResponse classes to process them
-$dashboardlines=array();
+ $dashboardlines = array();
// Do not include sections without management permission
-require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
+ require_once DOL_DOCUMENT_ROOT . '/core/class/workboardresponse.class.php';
// Number of actions to do (late)
-if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)
-{
- include_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
- $board=new ActionComm($db);
- $dashboardlines[$board->element] = $board->load_board($user);
-}
+ if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read) {
+ include_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
+ $board = new ActionComm($db);
+ $dashboardlines[$board->element] = $board->load_board($user);
+ }
// Number of project opened
-if (! empty($conf->projet->enabled) && $user->rights->projet->lire)
-{
- include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
- $board=new Project($db);
- $dashboardlines[$board->element] = $board->load_board($user);
-}
+ if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
+ include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+ $board = new Project($db);
+ $dashboardlines[$board->element] = $board->load_board($user);
+ }
// Number of tasks to do (late)
-if (! empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire)
-{
- include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
- $board=new Task($db);
- $dashboardlines[$board->element] = $board->load_board($user);
-}
+ if (!empty($conf->projet->enabled) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) {
+ include_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+ $board = new Task($db);
+ $dashboardlines[$board->element] = $board->load_board($user);
+ }
// Number of commercial proposals opened (expired)
-if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
-{
- include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
- $board=new Propal($db);
- $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
- // Number of commercial proposals CLOSED signed (billed)
- $dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");
-}
+ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
+ include_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
+ $board = new Propal($db);
+ $dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened");
+ // Number of commercial proposals CLOSED signed (billed)
+ $dashboardlines[$board->element . '_signed'] = $board->load_board($user, "signed");
+ }
// Number of commercial proposals opened (expired)
-if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
-{
- include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
- $board=new SupplierProposal($db);
- $dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
- // Number of commercial proposals CLOSED signed (billed)
- $dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");
-}
+ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
+ include_once DOL_DOCUMENT_ROOT . '/supplier_proposal/class/supplier_proposal.class.php';
+ $board = new SupplierProposal($db);
+ $dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened");
+ // Number of commercial proposals CLOSED signed (billed)
+ $dashboardlines[$board->element . '_signed'] = $board->load_board($user, "signed");
+ }
// Number of customer orders a deal
-if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
-{
- include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
- $board=new Commande($db);
- $dashboardlines[$board->element] = $board->load_board($user);
-}
+ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+ include_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+ $board = new Commande($db);
+ $dashboardlines[$board->element] = $board->load_board($user);
+ }
// Number of suppliers orders a deal
-if (! empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire)
-{
- include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
- $board=new CommandeFournisseur($db);
- $dashboardlines[$board->element] = $board->load_board($user);
-}
+ if (!empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire) {
+ include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
+ $board = new CommandeFournisseur($db);
+ $dashboardlines[$board->element] = $board->load_board($user);
+ }
// Number of services enabled (delayed)
-if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
-{
- include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
- $board=new Contrat($db);
- $dashboardlines[$board->element.'_inactive'] = $board->load_board($user, "inactive");
- // Number of active services (expired)
- $dashboardlines[$board->element.'_active'] = $board->load_board($user, "active");
-}
+ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
+ include_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+ $board = new Contrat($db);
+ $dashboardlines[$board->element . '_inactive'] = $board->load_board($user, "inactive");
+ // Number of active services (expired)
+ $dashboardlines[$board->element . '_active'] = $board->load_board($user, "active");
+ }
// Number of invoices customers (has paid)
-if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
-{
- include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
- $board=new Facture($db);
- $dashboardlines[$board->element] = $board->load_board($user);
-}
+ if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+ include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+ $board = new Facture($db);
+ $dashboardlines[$board->element] = $board->load_board($user);
+ }
// Number of supplier invoices (has paid)
-if (! empty($conf->supplier_invoice->enabled) && ! empty($user->rights->fournisseur->facture->lire))
-{
- include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
- $board=new FactureFournisseur($db);
- $dashboardlines[$board->element] = $board->load_board($user);
-}
+ if (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->fournisseur->facture->lire)) {
+ include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+ $board = new FactureFournisseur($db);
+ $dashboardlines[$board->element] = $board->load_board($user);
+ }
// Number of transactions to conciliate
-if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->societe_id)
-{
- include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
- $board=new Account($db);
- $nb = $board::countAccountToReconcile(); // Get nb of account to reconciliate
- if ($nb > 0)
- {
- $dashboardlines[$board->element] = $board->load_board($user);
- }
-}
+ if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->societe_id) {
+ include_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
+ $board = new Account($db);
+ $nb = $board::countAccountToReconcile(); // Get nb of account to reconciliate
+ if ($nb > 0) {
+ $dashboardlines[$board->element] = $board->load_board($user);
+ }
+ }
// Number of cheque to send
-if (! empty($conf->banque->enabled) && $user->rights->banque->lire && ! $user->societe_id && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT))
-{
- include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
- $board=new RemiseCheque($db);
- $dashboardlines['RemiseCheque'] = $board->load_board($user);
-}
+ if (!empty($conf->banque->enabled) && $user->rights->banque->lire && !$user->societe_id && empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
+ include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
+ $board = new RemiseCheque($db);
+ $dashboardlines['RemiseCheque'] = $board->load_board($user);
+ }
// Number of foundation members
-if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire && ! $user->societe_id)
-{
- include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
- $board=new Adherent($db);
- $dashboardlines['Adherent'] = $board->load_board($user);
-}
+ if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire && !$user->societe_id) {
+ include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
+ $board = new Adherent($db);
+ $dashboardlines['Adherent'] = $board->load_board($user);
+ }
// Number of expense reports to approve
-if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->approve)
-{
- include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
- $board=new ExpenseReport($db);
- $dashboardlines['ExpenseReport'] = $board->load_board($user, 'toapprove');
-}
+ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->approve) {
+ include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
+ $board = new ExpenseReport($db);
+ $dashboardlines['ExpenseReport'] = $board->load_board($user, 'toapprove');
+ }
// Number of expense reports to pay
-if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid)
-{
- include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
- $board=new ExpenseReport($db);
- $dashboardlines['ExpenseReport'] = $board->load_board($user, 'topay');
-}
+ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->to_paid) {
+ include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
+ $board = new ExpenseReport($db);
+ $dashboardlines['ExpenseReport'] = $board->load_board($user, 'topay');
+ }
// Number of holidays to approve
-if (! empty($conf->holiday->enabled) && $user->rights->holiday->approve)
-{
- include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
- $board=new Holiday($db);
- $dashboardlines['Holiday'] = $board->load_board($user);
-}
+ if (!empty($conf->holiday->enabled) && $user->rights->holiday->approve) {
+ include_once DOL_DOCUMENT_ROOT . '/holiday/class/holiday.class.php';
+ $board = new Holiday($db);
+ $dashboardlines['Holiday'] = $board->load_board($user);
+ }
-$object=new stdClass();
-$parameters=array();
-$action='';
-$reshook=$hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook == 0) {
- $dashboardlines = array_merge($dashboardlines, $hookmanager->resArray);
-}
+ $object = new stdClass();
+ $parameters = array();
+ $action = '';
+ $reshook = $hookmanager->executeHooks('addOpenElementsDashboardLine', $parameters, $object,
+ $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook == 0) {
+ $dashboardlines = array_merge($dashboardlines, $hookmanager->resArray);
+ }
-/* grouping dashboard stats */
-$dashboardgroup = array (
- 'action' =>
- array (
- 'groupName' => 'Agenda',
- 'stats' => array ('action'),
- ),
- 'project' =>
- array (
- 'groupName' => 'Projects',
- 'stats' => array ('project','project_task'),
- ),
- 'propal' =>
- array (
- 'groupName' => 'Proposals',
- 'stats' =>
- array ('propal_opened','propal_signed'),
- ),
- 'commande' =>
- array (
- 'groupName' => 'Orders',
- 'stats' =>
- array ('commande'),
- ),
- 'facture' =>
- array (
- 'groupName' => 'Invoices',
- 'stats' =>
- array ('facture'),
- ),
- 'contrat' =>
- array (
- 'groupName' => 'Contracts',
- 'stats' =>
- array ('contrat_inactive','contrat_active'),
- ),
- 'supplier_proposal' =>
- array (
- 'groupName' => 'SupplierProposals',
- 'stats' =>
- array ('supplier_proposal_opened','supplier_proposal_signed'),
- ),
- 'order_supplier' =>
- array (
- 'groupName' => 'SuppliersOrders',
- 'stats' =>
- array ('order_supplier'),
- ),
- 'invoice_supplier' =>
- array (
- 'groupName' => 'BillsSuppliers',
- 'stats' =>
- array ('invoice_supplier'),
- ),
- 'bank_account' =>
- array (
- 'groupName' => 'BankAccount',
- 'stats' =>
- array ('bank_account','RemiseCheque'),
- ),
- 'Adherent' =>
- array (
- 'groupName' => 'Members',
- 'stats' =>
- array ('Adherent'),
- ),
- 'ExpenseReport' =>
- array (
- 'groupName' => 'ExpenseReport',
- 'stats' =>
- array ('ExpenseReport'),
- ),
- 'Holiday' =>
- array (
- 'groupName' => 'Holidays',
- 'stats' =>
- array ('Holiday'),
- ),
-);
+ /* grouping dashboard stats */
+ $dashboardgroup = array(
+ 'action' =>
+ array(
+ 'groupName' => 'Agenda',
+ 'stats' => array('action'),
+ ),
+ 'project' =>
+ array(
+ 'groupName' => 'Projects',
+ 'stats' => array('project', 'project_task'),
+ ),
+ 'propal' =>
+ array(
+ 'groupName' => 'Proposals',
+ 'stats' =>
+ array('propal_opened', 'propal_signed'),
+ ),
+ 'commande' =>
+ array(
+ 'groupName' => 'Orders',
+ 'stats' =>
+ array('commande'),
+ ),
+ 'facture' =>
+ array(
+ 'groupName' => 'Invoices',
+ 'stats' =>
+ array('facture'),
+ ),
+ 'contrat' =>
+ array(
+ 'groupName' => 'Contracts',
+ 'stats' =>
+ array('contrat_inactive', 'contrat_active'),
+ ),
+ 'supplier_proposal' =>
+ array(
+ 'groupName' => 'SupplierProposals',
+ 'stats' =>
+ array('supplier_proposal_opened', 'supplier_proposal_signed'),
+ ),
+ 'order_supplier' =>
+ array(
+ 'groupName' => 'SuppliersOrders',
+ 'stats' =>
+ array('order_supplier'),
+ ),
+ 'invoice_supplier' =>
+ array(
+ 'groupName' => 'BillsSuppliers',
+ 'stats' =>
+ array('invoice_supplier'),
+ ),
+ 'bank_account' =>
+ array(
+ 'groupName' => 'BankAccount',
+ 'stats' =>
+ array('bank_account', 'RemiseCheque'),
+ ),
+ 'Adherent' =>
+ array(
+ 'groupName' => 'Members',
+ 'stats' =>
+ array('Adherent'),
+ ),
+ 'ExpenseReport' =>
+ array(
+ 'groupName' => 'ExpenseReport',
+ 'stats' =>
+ array('ExpenseReport'),
+ ),
+ 'Holiday' =>
+ array(
+ 'groupName' => 'Holidays',
+ 'stats' =>
+ array('Holiday'),
+ ),
+ );
-$object=new stdClass();
-$parameters=array(
- 'dashboardgroup' => $dashboardgroup
-);
-$reshook=$hookmanager->executeHooks('addOpenElementsDashboardGroup', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook == 0) {
- $dashboardgroup = array_merge($dashboardgroup, $hookmanager->resArray);
-}
+ $object = new stdClass();
+ $parameters = array(
+ 'dashboardgroup' => $dashboardgroup
+ );
+ $reshook = $hookmanager->executeHooks('addOpenElementsDashboardGroup', $parameters, $object,
+ $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook == 0) {
+ $dashboardgroup = array_merge($dashboardgroup, $hookmanager->resArray);
+ }
// Calculate total nb of late
-$totallate=$totaltodo=0;
+ $totallate = $totaltodo = 0;
//Remove any invalid response
//load_board can return an integer if failed or WorkboardResponse if OK
-$valid_dashboardlines=array();
-foreach($dashboardlines as $infoKey => $tmp)
-{
- if ($tmp instanceof WorkboardResponse) $valid_dashboardlines[$infoKey] = $tmp;
-}
+ $valid_dashboardlines = array();
+ foreach ($dashboardlines as $infoKey => $tmp) {
+ if ($tmp instanceof WorkboardResponse) {
+ $valid_dashboardlines[$infoKey] = $tmp;
+ }
+ }
// We calculate $totallate. Must be defined before start of next loop because it is show in first fetch on next loop
-foreach($valid_dashboardlines as $board)
-{
- if ($board->nbtodolate > 0) {
- $totaltodo += $board->nbtodo;
- $totallate += $board->nbtodolate;
+ foreach ($valid_dashboardlines as $board) {
+ if ($board->nbtodolate > 0) {
+ $totaltodo += $board->nbtodo;
+ $totallate += $board->nbtodolate;
+ }
}
-}
-$openedDashBoardSize = 'info-box-sm'; // use sm by default
-foreach ($dashboardgroup as $dashbordelement){
- if (is_array($dashbordelement['stats']) && count($dashbordelement['stats'])>2){
- $openedDashBoardSize = ''; // use default info box size : big
- break;
+ $openedDashBoardSize = 'info-box-sm'; // use sm by default
+ foreach ($dashboardgroup as $dashbordelement) {
+ if (is_array($dashbordelement['stats']) && count($dashbordelement['stats']) > 2) {
+ $openedDashBoardSize = ''; // use default info box size : big
+ break;
+ }
}
-}
-$totalLateNumber = $totallate;
-$totallatePercentage = ((! empty($totaltodo)) ? round($totallate / $totaltodo * 100, 2) : 0);
-if(! empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $totallate = $totallatePercentage;
+ $totalLateNumber = $totallate;
+ $totallatePercentage = ((!empty($totaltodo)) ? round($totallate / $totaltodo * 100, 2) : 0);
+ if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+ $totallate = $totallatePercentage;
+ }
-$boxwork='';
-$boxwork.='
';
-$boxwork.='
'."\n";
-$boxwork.='';
-$boxwork.=''.$langs->trans("DolibarrWorkBoard").'
';
-if ($showweather)
-{
- if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
- else $text=$langs->transnoentitiesnoconv("NoItemLate");
- $text.='. '.$langs->transnoentitiesnoconv("LateDesc");
- //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
- $options='height="24px" style="float: right"';
- $boxwork.=showWeather($totallate, $text, $options, 'inline-block valignmiddle');
-}
-$boxwork.=' '."\n";
+ $boxwork = '';
+ $boxwork .= '';
+ $boxwork .= '
' . "\n";
+ $boxwork .= '';
+ $boxwork .= '' . $langs->trans("DolibarrWorkBoard") . '
';
+ if ($showweather) {
+ if ($totallate > 0) {
+ $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate") . ' (' . $langs->transnoentitiesnoconv("NActionsLate",
+ $totallate . (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')) . ')';
+ } else {
+ $text = $langs->transnoentitiesnoconv("NoItemLate");
+ }
+ $text .= '. ' . $langs->transnoentitiesnoconv("LateDesc");
+ //$text.=$form->textwithpicto('',$langs->trans("LateDesc"));
+ $options = 'height="24px" style="float: right"';
+ $boxwork .= showWeather($totallate, $text, $options, 'inline-block valignmiddle');
+ }
+ $boxwork .= ' ' . "\n";
// Show dashboard
-$nbworkboardempty=0;
-$isIntopOpenedDashBoard = array();
-if (!empty($valid_dashboardlines))
-{
- $openedDashBoard = '';
+ $nbworkboardempty = 0;
+ $isIntopOpenedDashBoard = array();
+ if (!empty($valid_dashboardlines)) {
+ $openedDashBoard = '';
- $boxwork.='';
+ $boxwork .= '
';
- foreach($dashboardgroup as $groupKey => $groupElement) {
- $boards = array();
+ foreach ($dashboardgroup as $groupKey => $groupElement) {
+ $boards = array();
- if(!empty($conf->global->MAIN_DISPLAY_NEW_OPENED_DASH_BOARD) || !empty($conf->global->MAIN_FEATURES_LEVEL))
- {
- foreach ($groupElement['stats'] as $infoKey)
- {
- if(!empty($valid_dashboardlines[$infoKey]))
- {
- $boards[] = $valid_dashboardlines[$infoKey];
- $isIntopOpenedDashBoard[]=$infoKey;
- }
- }
- }
+ if (!empty($conf->global->MAIN_DISPLAY_NEW_OPENED_DASH_BOARD) || !empty($conf->global->MAIN_FEATURES_LEVEL)) {
+ foreach ($groupElement['stats'] as $infoKey) {
+ if (!empty($valid_dashboardlines[$infoKey])) {
+ $boards[] = $valid_dashboardlines[$infoKey];
+ $isIntopOpenedDashBoard[] = $infoKey;
+ }
+ }
+ }
- if(!empty($boards))
- {
- $groupName = $langs->trans($groupElement['groupName']);
- $groupKeyLowerCase = strtolower($groupKey);
+ if (!empty($boards)) {
+ $groupName = $langs->trans($groupElement['groupName']);
+ $groupKeyLowerCase = strtolower($groupKey);
- $openedDashBoard.= '
'."\n";
- $openedDashBoard.= '
'."\n";
- $openedDashBoard.= '
'."\n";
- $openedDashBoard.= '
'."\n";
- $openedDashBoard .= '
'.$groupName.' ' . "\n";
+ $openedDashBoard .= '
' . "\n";
+ $openedDashBoard .= '
' . "\n";
+ $openedDashBoard .= '
' . "\n";
+ $openedDashBoard .= '
' . "\n";
+ $openedDashBoard .= '
' . $groupName . ' ' . "\n";
- foreach($boards as $board) {
- if(!empty($board->labelShort)){
- $infoName = '
'.$board->labelShort.' ';
- }
- else{
- $infoName = $board->label ;
- }
+ foreach ($boards as $board) {
+ if (!empty($board->labelShort)) {
+ $infoName = '
' . $board->labelShort . ' ';
+ } else {
+ $infoName = $board->label;
+ }
- $textLateTitle = $langs->trans("NActionsLate", $board->nbtodolate);
- $textLateTitle.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
+ $textLateTitle = $langs->trans("NActionsLate", $board->nbtodolate);
+ $textLateTitle .= ' (' . $langs->trans("Late") . ' = ' . $langs->trans("DateReference") . ' > ' . $langs->trans("DateToday") . ' ' . (ceil($board->warning_delay) >= 0 ? '+' : '') . ceil($board->warning_delay) . ' ' . $langs->trans("days") . ')';
- $textLate = '';
- if($board->nbtodolate>0)
- {
- $textLate .= '
';
- $textLate .= ' ';
- }
+ $textLate = '';
+ if ($board->nbtodolate > 0) {
+ $textLate .= '
';
+ $textLate .= ' ';
+ }
- $nbtodClass = '';
- if($board->nbtodo>0){
- $nbtodClass = 'badge badge-info';
- }
+ $nbtodClass = '';
+ if ($board->nbtodo > 0) {
+ $nbtodClass = 'badge badge-info';
+ }
- $openedDashBoard .= '
'.$infoName.' : '.$board->nbtodo.' '.$textLate.' ' . "\n";
+ $openedDashBoard .= '
' . $infoName . ' : ' . $board->nbtodo . ' ' . $textLate . ' ' . "\n";
- if ($board->total > 0 && ! empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)){
- $openedDashBoard .= '
'.$langs->trans('Total').' : '.price($board->total) .' ';
- }
- }
+ if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
+ $openedDashBoard .= '
' . $langs->trans('Total') . ' : ' . price($board->total) . ' ';
+ }
+ }
- $openedDashBoard.= '
'."\n";
- $openedDashBoard.= '
'."\n";
- $openedDashBoard.= '
'."\n";
- $openedDashBoard.="\n";
- }
- }
-
- if ($showweather && !empty($isIntopOpenedDashBoard))
- {
- $appendClass = $conf->global->MAIN_DISABLE_METEO == 2 ?' hideonsmartphone' : '';
- $weather = getWeatherStatus($totallate);
-
- $text='';
- if ($totallate > 0) $text=$langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate").' ('.$langs->transnoentitiesnoconv("NActionsLate", $totallate.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')).')';
- else $text=$langs->transnoentitiesnoconv("NoItemLate");
- $text.='. '.$langs->transnoentitiesnoconv("LateDesc");
-
- $weatherDashBoard= '
'."\n";
- $weatherDashBoard.= '
'."\n";
- $weatherDashBoard.= '
';
- $weatherDashBoard.= img_weather('', $weather->level, '', 0, 'valignmiddle width50');
- $weatherDashBoard.= ' '."\n";
- $weatherDashBoard.= '
'."\n";
- $weatherDashBoard.= ' '.$langs->trans('GlobalOpenedElemView').' ' . "\n";
-
- if($totallatePercentage>0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
- $weatherDashBoard.= ' '.$langs->transnoentitiesnoconv("NActionsLate", price($totallatePercentage).'%').' ' . "\n";
- $weatherDashBoard.= ' '.$langs->trans('NActionsLate', $totalLateNumber).' ' . "\n";
- }
- else{
- $weatherDashBoard.= ' '.$langs->transnoentitiesnoconv("NActionsLate", $totalLateNumber).' ' . "\n";
- if($totallatePercentage>0) {
- $weatherDashBoard.= ' '.$langs->trans('NActionsLate', price($totallatePercentage).'%').' ' . "\n";
- }
- }
-
- $weatherDashBoard.= '
'."\n";
- $weatherDashBoard.= '
'."\n";
- $weatherDashBoard.= '
'."\n";
- $weatherDashBoard.="\n";
-
- $openedDashBoard=$weatherDashBoard.$openedDashBoard;
- }
-
- if(!empty($isIntopOpenedDashBoard))
- {
- for ($i = 1; $i <= 10; $i++) {
- $openedDashBoard .= '
';
- }
- }
-
- $nbworkboardcount=0;
- foreach($valid_dashboardlines as $infoKey => $board)
- {
- if(in_array($infoKey, $isIntopOpenedDashBoard)) {
- // skip if info is present on top
- continue;
- }
-
- if (empty($board->nbtodo)) $nbworkboardempty++;
- $nbworkboardcount++;
-
-
- $textlate = $langs->trans("NActionsLate", $board->nbtodolate);
- $textlate.= ' ('.$langs->trans("Late").' = '.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($board->warning_delay) >= 0 ? '+' : '').ceil($board->warning_delay).' '.$langs->trans("days").')';
-
-
- $boxwork .='
';
- $boxwork .= '
';
- $boxwork .= '
'.$board->img.' '.$board->label.' ';
- $boxwork .= '
'.$board->nbtodo.' ';
- if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX))
- {
- $boxwork .= ' /
'.price($board->total) .' ';
+ $openedDashBoard .= '
' . "\n";
+ $openedDashBoard .= '
' . "\n";
+ $openedDashBoard .= '
' . "\n";
+ $openedDashBoard .= "\n";
+ }
}
- $boxwork .= '
';
- if ($board->nbtodolate > 0)
- {
- $boxwork .= '
';
- $boxwork .= '
';
- //$boxwork .= img_picto($textlate, "warning_white", 'class="valigntextbottom"').'';
- $boxwork .= img_picto($textlate, "warning_white", 'class="inline-block hideonsmartphone valigntextbottom"').'';
- $boxwork .= '';
- $boxwork .= $board->nbtodolate;
- $boxwork .= ' ';
- $boxwork .= ' ';
+
+ if ($showweather && !empty($isIntopOpenedDashBoard)) {
+ $appendClass = $conf->global->MAIN_DISABLE_METEO == 2 ? ' hideonsmartphone' : '';
+ $weather = getWeatherStatus($totallate);
+
+ $text = '';
+ if ($totallate > 0) {
+ $text = $langs->transnoentitiesnoconv("WarningYouHaveAtLeastOneTaskLate") . ' (' . $langs->transnoentitiesnoconv("NActionsLate",
+ $totallate . (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? '%' : '')) . ')';
+ } else {
+ $text = $langs->transnoentitiesnoconv("NoItemLate");
+ }
+ $text .= '. ' . $langs->transnoentitiesnoconv("LateDesc");
+
+ $weatherDashBoard = '
' . "\n";
+ $weatherDashBoard .= '
' . "\n";
+ $weatherDashBoard .= '
';
+ $weatherDashBoard .= img_weather('', $weather->level, '', 0, 'valignmiddle width50');
+ $weatherDashBoard .= ' ' . "\n";
+ $weatherDashBoard .= '
' . "\n";
+ $weatherDashBoard .= ' ' . $langs->trans('GlobalOpenedElemView') . ' ' . "\n";
+
+ if ($totallatePercentage > 0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) {
+ $weatherDashBoard .= ' ' . $langs->transnoentitiesnoconv("NActionsLate",
+ price($totallatePercentage) . '%') . ' ' . "\n";
+ $weatherDashBoard .= ' ' . $langs->trans('NActionsLate',
+ $totalLateNumber) . ' ' . "\n";
+ } else {
+ $weatherDashBoard .= ' ' . $langs->transnoentitiesnoconv("NActionsLate",
+ $totalLateNumber) . ' ' . "\n";
+ if ($totallatePercentage > 0) {
+ $weatherDashBoard .= ' ' . $langs->trans('NActionsLate',
+ price($totallatePercentage) . '%') . ' ' . "\n";
+ }
+ }
+
+ $weatherDashBoard .= '
' . "\n";
+ $weatherDashBoard .= '
' . "\n";
+ $weatherDashBoard .= '
' . "\n";
+ $weatherDashBoard .= "\n";
+
+ $openedDashBoard = $weatherDashBoard . $openedDashBoard;
+ }
+
+ if (!empty($isIntopOpenedDashBoard)) {
+ for ($i = 1; $i <= 10; $i++) {
+ $openedDashBoard .= '
';
+ }
+ }
+
+ $nbworkboardcount = 0;
+ foreach ($valid_dashboardlines as $infoKey => $board) {
+ if (in_array($infoKey, $isIntopOpenedDashBoard)) {
+ // skip if info is present on top
+ continue;
+ }
+
+ if (empty($board->nbtodo)) {
+ $nbworkboardempty++;
+ }
+ $nbworkboardcount++;
+
+
+ $textlate = $langs->trans("NActionsLate", $board->nbtodolate);
+ $textlate .= ' (' . $langs->trans("Late") . ' = ' . $langs->trans("DateReference") . ' > ' . $langs->trans("DateToday") . ' ' . (ceil($board->warning_delay) >= 0 ? '+' : '') . ceil($board->warning_delay) . ' ' . $langs->trans("days") . ')';
+
+
+ $boxwork .= '
';
+ $boxwork .= '
';
+ $boxwork .= '
' . $board->img . ' ' . $board->label . ' ';
+ $boxwork .= '
' . $board->nbtodo . ' ';
+ if ($board->total > 0 && !empty($conf->global->MAIN_WORKBOARD_SHOW_TOTAL_WO_TAX)) {
+ $boxwork .= ' /
' . price($board->total) . ' ';
+ }
$boxwork .= '
';
+ if ($board->nbtodolate > 0) {
+ $boxwork .= '
';
+ }
+ $boxwork .= '
';
+ $boxwork .= "\n";
}
- $boxwork.='
';
- $boxwork .="\n";
+
+ $boxwork .= '
';
+ $boxwork .= '
';
+ $boxwork .= '
';
+ $boxwork .= '
';
+
+ $boxwork .= '
';
+ $boxwork .= '
';
+ } else {
+ $boxwork .= '
';
+ $boxwork .= '';
+ $boxwork .= $langs->trans("NoOpenedElementToProcess");
+ $boxwork .= ' ';
+ $boxwork .= ' ';
}
- $boxwork .='
';
- $boxwork .='
';
- $boxwork .='
';
- $boxwork .='
';
+ $boxwork .= '
';
- $boxwork.='';
- $boxwork.=$langs->trans("NoOpenedElementToProcess");
- $boxwork.=' ';
- $boxwork.=' ';
+ $boxwork .= '
'; // End table array of working board
+ $boxwork .= '
'; // End table array of working board
-$boxwork.='
';
-
-
-if(!empty($isIntopOpenedDashBoard)) {
- print '
';
-}
print '
';
diff --git a/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql b/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
new file mode 100644
index 00000000000..5b6f4bf3f0c
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
@@ -0,0 +1,43 @@
+-- Copyright (C) 2001-2004 Rodolphe Quiedeville
+-- Copyright (C) 2003 Jean-Louis Bergamo
+-- Copyright (C) 2004-2010 Laurent Destailleur
+-- Copyright (C) 2004 Benoit Mortier
+-- Copyright (C) 2004 Guillaume Delecourt
+-- Copyright (C) 2005-2012 Regis Houssin
+-- Copyright (C) 2007 Patrick Raguin
+-- Copyright (C) 2019 Markus Welters
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see DOL_DATA_ROOT/ecm/yourdirectoryname ..odt or .ods .
FollowingSubstitutionKeysCanBeUsed=%s est activé
Module20Name=Propales
Module30Name=Factures
-Module600Name=Notifications on business event
Target=Objectif
-ListOfNotificationsPerUser=List of automatic notifications per user*
-ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
-ListOfFixedNotifications=List of automatic fixed notifications
OperationParamDesc=Define values to use for action, or how to extract values. For example:%s . Pour que ce répertoire soit traité par Dolibarr, vous devez configurer votre conf / conf.php pour ajouter les 2 lignes de directive: $ dolibarr_main_url_root_alt = '/ custom'; $ dolibarr_main_document_root_alt = '%s / custom';
HighlightLinesOnMouseHover=Mettez en surbrillance les lignes de table lorsque déplacement de la souris passe au-dessus
PressF5AfterChangingThis=Appuyez sur CTRL + F5 sur le clavier ou effacez votre cache de navigateur après avoir changé cette valeur pour l'avoir efficace
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
index d8dc0f4bd1a..f0875b5400f 100644
--- a/htdocs/langs/fr_CA/withdrawals.lang
+++ b/htdocs/langs/fr_CA/withdrawals.lang
@@ -53,7 +53,6 @@ DoStandingOrdersBeforePayments=Cet onglet vous permet de demander une commande d
WithdrawalFile=Fichier de retrait
SetToStatusSent=Définir le statut "Fichier envoyé"
StatisticsByLineStatus=Statistiques par état des lignes
-RUM=Unique Mandate Reference (UMR)
RUMLong=Référence de mandat unique
WithdrawMode=Mode de débit direct (FRST ou RECUR)
WithdrawRequestAmount=Montant de la demande de débit direct:
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 7407396835b..20cdc9175d6 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -462,7 +462,9 @@ EnableAndSetupModuleCron=Si vous voulez avoir cette facture récurrente génér
ModuleCompanyCodeCustomerAquarium=%s suivi d'un code client tiers pour un code comptable client
ModuleCompanyCodeSupplierAquarium=%s suivi du code fournisseur tiers pour le code comptable fournisseur
ModuleCompanyCodePanicum=Retourne un code comptable vide
-ModuleCompanyCodeDigitaria=Renvoie un code comptable composé suivant le code tiers. Le code est composé du caractère 'C' en première position suivi des 5 premiers caractères du code tiers.
+ModuleCompanyCodeDigitaria=Renvoie un code de comptabilisation composé en fonction du nom du tiers. Le code consiste en un préfixe pouvant être défini dans la première position, suivi d'un nombre de caractères défini dans le code tiers.
+ModuleCompanyCodeCustomerDigitaria=%s suivi du nom de client tronqué du nombre de caractères: %s pour le code comptable client.
+ModuleCompanyCodeSupplierDigitaria=%s suivi du nom du fournisseur tronqué du nombre de caractères: %s pour le code comptable fournisseur.
Use3StepsApproval=Par défaut, les commandes fournisseurs nécessitent d'être créées et approuvées par 2 utilisateurs différents (une étape/utilisateur pour créer et une étape/utilisateur pour approuver. Notez que si un utilisateur à les deux permissions, ces deux actions sont effectuées en une seule fois). Cette option ajoute la nécessité d'une approbation par une troisième étape/utilisateur, si le montant de la commande est supérieur au montant d'une valeur définie (soit 3 étapes nécessaire: 1 =Validation, 2=Première approbation et 3=seconde approbation si le montant l'exige).Accueil - Outils administration - Travaux planifiées " pour voir la listes des travaux programmées et les modifier.
+UseMenuModuleToolsToAddCronJobs=Aller à la page "Accueil - Outils administration - Travaux planifiées " pour voir la listes des travaux programmés et les modifier.
JobDisabled=Travail désactivé
MakeLocalDatabaseDumpShort=Sauvegarde locale de base
MakeLocalDatabaseDump=Créez un fichier dump de base local. Les paramètres sont: compression ('gz' ou 'bz' ou 'none'), type de sauvegarde ('mysql', 'pgsql', 'auto'), 1, 'auto' ou nom du fichier à générer, nombre de fichiers de sauvegarde à garder
diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang
index ac8d667c6e3..8da0543e2c2 100644
--- a/htdocs/langs/fr_FR/dict.lang
+++ b/htdocs/langs/fr_FR/dict.lang
@@ -332,27 +332,27 @@ PaperFormatCAP6=Format P6 Canadien
ExpAutoCat=Voiture
ExpCycloCat=2 roues
ExpMotoCat=Moto
-ExpAuto3CV=3 cv
+ExpAuto3CV=3 CV
ExpAuto4CV=4 CV
-ExpAuto5CV=5 cv
+ExpAuto5CV=5 CV
ExpAuto6CV=6 CV
-ExpAuto7CV=7 cv
-ExpAuto8CV=8 cv
+ExpAuto7CV=7 CV
+ExpAuto8CV=8 CV
ExpAuto9CV=9 CV
-ExpAuto10CV=10 cv
-ExpAuto11CV=11 cv
-ExpAuto12CV=12 cv
-ExpAuto3PCV=3 cv et plus
+ExpAuto10CV=10 CV
+ExpAuto11CV=11 CV
+ExpAuto12CV=12 CV
+ExpAuto3PCV=3 CV et plus
ExpAuto4PCV=4 CV et plus
-ExpAuto5PCV=5 cv et plus
-ExpAuto6PCV=6 cv et plus
-ExpAuto7PCV=7 cv et plus
-ExpAuto8PCV=8 cv et plus
-ExpAuto9PCV=9 cv et plus
-ExpAuto10PCV=10 cv et plus
-ExpAuto11PCV=11 cv et plus
-ExpAuto12PCV=12 cv et plus
-ExpAuto13PCV=13 cv et plus
+ExpAuto5PCV=5 CV et plus
+ExpAuto6PCV=6 CV et plus
+ExpAuto7PCV=7 CV et plus
+ExpAuto8PCV=8 CV et plus
+ExpAuto9PCV=9 CV et plus
+ExpAuto10PCV=10 CV et plus
+ExpAuto11PCV=11 CV et plus
+ExpAuto12PCV=12 CV et plus
+ExpAuto13PCV=13 CV et plus
ExpCyclo=Capacité inférieure à 50 cm3
ExpMoto12CV=2 roues 1 ou 2 cv
ExpMoto345CV=2 roues 3, 4 ou 5 cv
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 1dd59973aea..dfc6e33299a 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -18,6 +18,7 @@ ValidatorCP=Approbateur
ListeCP=Liste des demandes de congés
LeaveId=ID demande de congès
ReviewedByCP=Sera approuvé par
+UserID=ID Utilisateur
UserForApprovalID=ID de l'utilisateur d'approbation
UserForApprovalFirstname=Prénom de l'utilisateur d'approbation
UserForApprovalLastname=Nom de l'utilisateur d'approbation
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index ec5d8a471df..b375a3e16e0 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -348,8 +348,6 @@ PriceUTTC=P.U TTC
Amount=Montant
AmountInvoice=Montant facture
AmountInvoiced=Montant facturé
-AmountInvoicedHT=Montant HT facturé
-AmountInvoicedTTC=Montant TTC facturé
AmountPayment=Montant paiement
AmountHTShort=Montant HT
AmountTTCShort=Montant TTC
@@ -414,6 +412,7 @@ DefaultTaxRate=Taux de taxe par défaut
Average=Moyenne
Sum=Somme
Delta=Écart
+StatusToPay=A payer
RemainToPay=Reste à payer
Module=Module/Application
Modules=Modules/Applications
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index 8aad310a172..5efb048a4a2 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -105,6 +105,7 @@ InitStructureFromExistingTable=Construire la chaîne du tableau de structure d'u
UseAboutPage=Désactiver la page "à propos de"
UseDocFolder=Désactiver le dossier de la documentation
UseSpecificReadme=Utiliser un fichier ReadMe spécifique
+ContentOfREADMECustomized=Remarque: le contenu du fichier README.md a été remplacé par la valeur spécifique définie dans la configuration de ModuleBuilder.
RealPathOfModule=Chemin réel du dossier du module
ContentCantBeEmpty=Le contenu du fichier ne peut pas être vide
WidgetDesc=Vous pouvez générer et éditer ici les widgets qui seront intégrés à votre module.
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index a4a8827ca05..bbbeb2638e8 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -154,5 +154,5 @@ CreateOrders=Créer commandes
ToBillSeveralOrderSelectCustomer=Pour créer une facture pour plusieurs commandes, cliquez d'abord sur le client, puis choisir "%s".
OptionToSetOrderBilledNotEnabled=L'option (issue du module Workflow) pour définir automatiquement les commandes à 'Facturé' que une facture est validée, est désactivée, aussi vous devrez donc définir le statut de la commande sur 'Facturé' manuellement.
IfValidateInvoiceIsNoOrderStayUnbilled=Si la validation de facture est à "Non", la commande restera au statut "Non facturé" jusqu'à ce que la facture soit validée.
-CloseReceivedSupplierOrdersAutomatically=Fermer la commande "%s" automatiquement si tous les produits ont été reçus.
+CloseReceivedSupplierOrdersAutomatically=Fermer la commande au statut "%s" automatiquement si tous les produits ont été reçus.
SetShippingMode=Définir la méthode d'expédition
diff --git a/htdocs/langs/fr_FR/paybox.lang b/htdocs/langs/fr_FR/paybox.lang
index 2f0891171a5..6a79a2196a6 100644
--- a/htdocs/langs/fr_FR/paybox.lang
+++ b/htdocs/langs/fr_FR/paybox.lang
@@ -11,7 +11,6 @@ YourEMail=Email de confirmation du paiement
Creditor=Bénéficiaire
PaymentCode=Code de paiement
PayBoxDoPayment=Payer avec PayBox
-ToPay=Saisir règlement
YouWillBeRedirectedOnPayBox=Vous serez redirigé vers la page sécurisée Paybox de saisie de votre carte bancaire
Continue=Continuer
ToOfferALinkForOnlinePayment=URL de paiement %s
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index a1dc8e412a6..a0473ad8c76 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -29,10 +29,14 @@ ProductOrService=Produit ou Service
ProductsAndServices=Produits et Services
ProductsOrServices=Produits ou Services
ProductsPipeServices=Produits | Services
+ProductsOnSale=Produits en vente
+ProductsOnPurchase=Produits en achat
ProductsOnSaleOnly=Produits en vente uniquement
ProductsOnPurchaseOnly=Produits seulement en achat
ProductsNotOnSell=Produits hors vente et hors achat
ProductsOnSellAndOnBuy=Produits en vente et en achat
+ServicesOnSale=Services en vente
+ServicesOnPurchase=Services en achat
ServicesOnSaleOnly=Services en vente uniquement
ServicesOnPurchaseOnly=Services en achat uniquement
ServicesNotOnSell=Services hors vente et hors achat
@@ -340,4 +344,4 @@ ErrorCopyProductCombinations=Une erreur s'est produite lors de la copie des vari
ErrorDestinationProductNotFound=Produit destination non trouvé
ErrorProductCombinationNotFound=Variante du produit non trouvé
ActionAvailableOnVariantProductOnly=Action disponible uniquement sur la variante du produit
-ProductsPricePerCustomer=Prix produit par clients
\ No newline at end of file
+ProductsPricePerCustomer=Prix produit par clients
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 0858738f1fb..608da399e3a 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -114,3 +114,7 @@ CSSContentTooltipHelp=Entrez ici le contenu CSS. Pour éviter tout conflit avec
LinkAndScriptsHereAreNotLoadedInEditor=Avertissement: Ce contenu est affiché uniquement lorsque le site est accessible depuis un serveur. Il n'est pas utilisé en mode édition. Par conséquent, si vous devez charger des fichiers javascript également en mode édition, ajoutez simplement la balise 'script src=...' dans la page.
Dynamiccontent=Exemple de page à contenu dynamique
ImportSite=Importer modèle de site web
+EditInLineOnOff=Mode 'Modifier en ligne' est %s
+ShowSubContainersOnOff=Mode 'exécution dynamique' est %s
+GlobalCSSorJS=Fichier CSS/JS/Header global du site Web
+BackToHomePage=Retour à la page d'accueil...
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2e91298f570..5ce7dfcebf1 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1766,7 +1766,7 @@ function top_menu_user(User $user, Translate $langs)
$dropdownBody.= ''.$langs->trans("Session").' ';
- $dropdownBody.= ''.$langs->trans("IPAddress").' : '.$_SERVER["REMOTE_ADDR"];
+ $dropdownBody.= ''.$langs->trans("IPAddress").' : '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);
if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody.= ''.$langs->trans("ConnectedOnMultiCompany").': '.$conf->entity.' (user entity '.$user->entity.')';
$dropdownBody.= ''.$langs->trans("AuthenticationMode").': '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)');
$dropdownBody.= ''.$langs->trans("ConnectedSince").': '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser');
@@ -1775,7 +1775,7 @@ function top_menu_user(User $user, Translate $langs)
$dropdownBody.= ''.$langs->trans("CurrentMenuManager").': '.$menumanager->name;
$langFlag=picto_from_langcode($langs->getDefaultLang());
$dropdownBody.= ''.$langs->trans("CurrentUserLanguage").': '.($langFlag?$langFlag.' ':'').$langs->getDefaultLang();
- $dropdownBody.= ''.$langs->trans("Browser").': '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')';
+ $dropdownBody.= ''.$langs->trans("Browser").': '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';
$dropdownBody.= ''.$langs->trans("Layout").': '.$conf->browser->layout;
$dropdownBody.= ''.$langs->trans("Screen").': '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
if ($conf->browser->layout == 'phone') $dropdownBody.= ''.$langs->trans("Phone").': '.$langs->trans("Yes");
diff --git a/htdocs/modulebuilder/template/lib/mymodule_myobject.lib.php b/htdocs/modulebuilder/template/lib/mymodule_myobject.lib.php
index e1af0259062..d9ea2f110cd 100644
--- a/htdocs/modulebuilder/template/lib/mymodule_myobject.lib.php
+++ b/htdocs/modulebuilder/template/lib/mymodule_myobject.lib.php
@@ -79,5 +79,7 @@ function myobjectPrepareHead($object)
//); // to remove a tab
complete_head_from_modules($conf, $langs, $object, $head, $h, 'myobject@mymodule');
+ complete_head_from_modules($conf, $langs, $object, $head, $h, 'myobject@mymodule', 'remove');
+
return $head;
}
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 4b1e5232abb..22077747b95 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -223,7 +223,7 @@ class Productbatch extends CommonObject
$sql.= " batch=".(isset($this->batch)?"'".$this->db->escape($this->batch)."'":"null").",";
$sql.= " qty=".(isset($this->qty)?$this->qty:"null").",";
$sql.= " import_key=".(isset($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null")."";
- $sql.= " WHERE rowid=".$this->id." AND tms='".$this->db->idate($this->tms)."'";
+ $sql.= " WHERE rowid=".$this->id;
$this->db->begin();
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 62cfc476ba8..85b174ea725 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -59,7 +59,7 @@ class Inventory extends CommonObject
* 'type' if the field format.
* 'label' the translation key.
* 'enabled' is a condition when the field must be managed.
- * 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
+ * 'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing)
* 'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
* 'index' if we want an index in database.
* 'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
@@ -96,7 +96,7 @@ class Inventory extends CommonObject
//'fk_user_valid' =>array('type'=>'integer', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>512),
'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
- 'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'default'=>0, 'arrayofkeyval'=>array(0=>'Todo', 1=>'Done', -1=>'Cancel')),
+ 'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>4, 'enabled'=>1, 'position'=>1000, 'default'=>0, 'arrayofkeyval'=>array(0=>'ToDo', 1=>'Done', -1=>'Cancel')),
);
/**
diff --git a/htdocs/product/inventory/lib/inventory.lib.php b/htdocs/product/inventory/lib/inventory.lib.php
index 175c772cb61..ad2e8193449 100644
--- a/htdocs/product/inventory/lib/inventory.lib.php
+++ b/htdocs/product/inventory/lib/inventory.lib.php
@@ -50,7 +50,7 @@ function inventoryAdminPrepareHead()
//$this->tabs = array(
// 'entity:-tabname:Title:@inventory:/inventory/mypage.php?id=__ID__'
//); // to remove a tab
- complete_head_from_modules($conf, $langs, $object, $head, $h, 'inventory');
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'inventory');
return $head;
}
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 54726aefc83..11bb1520ff0 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -95,20 +95,32 @@ if (empty($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY))
exit;
}
-// Check exportkey
-if (empty($_GET["exportkey"]) || $conf->global->MAIN_AGENDA_XCAL_EXPORTKEY != $_GET["exportkey"])
-{
- $user->getrights();
-
- llxHeaderVierge();
- print 'Bad value for key.
';
- llxFooterVierge();
- exit;
-}
-
// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
$hookmanager->initHooks(array('agendaexport'));
+$reshook = $hookmanager->executeHooks('doActions', $filters); // Note that $action and $object may have been modified by some
+if ($reshook < 0){
+ llxHeaderVierge();
+ if(!empty($hookmanager->errors) && is_array($hookmanager->errors)){
+ print ''.implode('
';
+ }else{
+ print ''.$hookmanager->error.'
';
+ }
+ llxFooterVierge();
+}
+elseif(empty($reshook)) {
+ // Check exportkey
+ if (empty($_GET["exportkey"]) || $conf->global->MAIN_AGENDA_XCAL_EXPORTKEY != $_GET["exportkey"]) {
+ $user->getrights();
+
+ llxHeaderVierge();
+ print 'Bad value for key.
';
+ llxFooterVierge();
+ exit;
+ }
+}
+
+
// Define filename with prefix on filters predica (each predica set must have on cache file)
$shortfilename='dolibarrcalendar';
$filename=$shortfilename;
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 2153d8a53c7..1dbac0117fa 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -11,7 +11,7 @@
* Copyright (C) 2015 Claudio Aschieri
* Copyright (C) 2016 Ferran Marcet
* Copyright (C) 2016 Yasser Carreón
- * Copyright (C) 2018 Quentin Vial-Gouteyron
+ * Copyright (C) 2018 Quentin Vial-Gouteyron
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -56,7 +56,7 @@ if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
}
-$langs->loadLangs(array("receptions","companies","bills",'deliveries','orders','stocks','other','propal'));
+$langs->loadLangs(array("receptions","companies","bills",'deliveries','orders','stocks','other','propal','sendings'));
if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
if (! empty($conf->productbatch->enabled)) $langs->load('productbatch');
@@ -780,9 +780,10 @@ if ($action == 'create')
}
print ' ';
print " \n";
+
// Ref client
print '';
- if ($origin == 'supplier_order') print $langs->trans('RefSupplierOrder');
+ if ($origin == 'supplier_order') print $langs->trans('SupplierOrder');
else print $langs->trans('RefSupplier');
print ' ';
print ' ';
//print dol_print_date($object->date_livraison,"day"); // date_livraison come from order and will be stored into date_delivery planed.
$date_delivery = ($date_delivery?$date_delivery:$object->date_livraison); // $date_delivery comes from GETPOST
- print $form->select_date($date_delivery?$date_delivery:-1, 'date_delivery', 1, 1, 1);
+ print $form->selectDate($date_delivery?$date_delivery:-1, 'date_delivery', 1, 1, 1);
print " \n";
print '';
- print $form->select_date($dispatchLines[$indiceAsked]['DLC'], 'dlc' . $indiceAsked, '', '', 1, "");
+ print $form->selectDate($dispatchLines[$indiceAsked]['DLC'], 'dlc' . $indiceAsked, '', '', 1, "");
print ' ';
print '';
- print $form->select_date($dispatchLines[$indiceAsked]['DLUO'], 'dluo' . $indiceAsked, '', '', 1, "");
+ print $form->selectDate($dispatchLines[$indiceAsked]['DLUO'], 'dluo' . $indiceAsked, '', '', 1, "");
print ' ';
}
else {
@@ -1398,7 +1399,7 @@ elseif ($id || $ref)
if ($typeobject == 'CommandeFournisseur' && $object->$typeobject->id && ! empty($conf->propal->enabled))
{
print '';
- print $langs->trans("RefSupplierOrder").' ';
+ print $langs->trans("SupplierOrder").'';
print '';
print $objectsrc->getNomUrl(1, 'reception');
print " \n";
@@ -1424,7 +1425,7 @@ elseif ($id || $ref)
print '';
}
@@ -1887,9 +1888,9 @@ elseif ($id || $ref)
{
print ' ';
}
print '';
- print $form->select_date('', '', '', '', '', '', 1, 1);
+ print $form->selectDate('', '', '', '', '', '', 1, 1);
print ' ';
print '';
print '';
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 2e9029a45ab..c7083efc455 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
-$langs->loadLangs(array("companies", "commercial", "bills", "cashdesk"));
+$langs->loadLangs(array("companies", "commercial", "bills", "cashdesk", "stocks"));
$id = GETPOST('id', 'int');
$action = GETPOST('action', 'alpha');
diff --git a/htdocs/takepos/lib/takepos.lib.php b/htdocs/takepos/lib/takepos.lib.php
index 691f118d2cb..024e1fb9ae5 100644
--- a/htdocs/takepos/lib/takepos.lib.php
+++ b/htdocs/takepos/lib/takepos.lib.php
@@ -52,7 +52,9 @@ function takeposAdminPrepareHead()
//$this->tabs = array(
// 'entity:-tabname:Title:@takepos:/takepos/mypage.php?id=__ID__'
//); // to remove a tab
- complete_head_from_modules($conf, $langs, $object, $head, $h, 'takepos');
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos');
+
+ complete_head_from_modules($conf, $langs, null, $head, $h, 'takepos', 'remove');
return $head;
}
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index 46cbdd595d9..97355d7c0e2 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -47,6 +47,8 @@ if ($setterminal>0)
$_SESSION["takeposterminal"]=$setterminal;
}
+$_SESSION["urlfrom"]='/takepos/takepos.php';
+
$langs->loadLangs(array("bills","orders","commercial","cashdesk","receiptprinter"));
$categorie = new Categorie($db);
@@ -156,7 +158,7 @@ if(localStorage.hasKeyboard) {
function ClearSearch() {
console.log("ClearSearch");
$("#search").val('');
- browser->layer == 'classic') { ?>
+ browser->layout == 'classic') { ?>
setFocusOnSearchField();
}
@@ -356,6 +358,7 @@ function deleteline() {
$("#poslines").load("invoice.php?action=deleteline&place="+place+"&idline="+selectedline, function() {
//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
});
+ ClearSearch();
}
function Customer() {
@@ -405,6 +408,7 @@ function New() {
$("#poslines").load("invoice.php?action=delete&place="+place, function() {
//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
});
+ ClearSearch();
}
}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 6817039e7a1..86b4fa82c12 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2242,6 +2242,9 @@ img.toolbarbutton {
height: 30px;
}
+li.expanded > a.fmdirlia.jqft.ecmjqft {
+ font-weight: bold !important;
+}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index d46fe752cb7..205ed21bdcf 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2361,6 +2361,9 @@ img.toolbarbutton {
height: 30px;
}
+li.expanded > a.fmdirlia.jqft.ecmjqft {
+ font-weight: bold !important;
+}
/* ============================================================================== */
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 2a4195cb07b..26b9756006c 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2013-2018 Jean-François FERRY
* Copyright (C) 2016 Christophe Battarel
* Copyright (C) 2018 Regis Houssin
+ * Copyright (C) 2019 Juanjo Menent
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -210,6 +211,11 @@ $sql.= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
$sql.= " WHERE t.entity IN (".getEntity($object->element).")";
+if ($socid > 0)
+{
+ $sql.= " AND t.fk_soc = ".$socid;
+}
+
foreach($search as $key => $val)
{
if ($key == 'fk_statut')
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index ae3fbfcbf8f..7c1a81b594c 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -80,6 +80,7 @@ if (session_status() === PHP_SESSION_ACTIVE)
// Not sure this is required
unset($_SESSION['dol_login']);
unset($_SESSION['dol_entity']);
+unset($_SESSION['urlfrom']);
if (GETPOST('noredirect')) return;
header("Location: ".$url); // Default behaviour is redirect to index.php page
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 1fd5939b4ac..38af5be87e4 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -3080,7 +3080,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
print '';
print $langs->trans('DateCreation');
print ' ';
- print $form->select_date($pagedatecreation, 'datecreation', 1, 1, 0, '', 1, 1);
+ print $form->selectDate($pagedatecreation, 'datecreation', 1, 1, 0, '', 1, 1);
//print dol_print_date($pagedatecreation, 'dayhour');
print '