@@ -141,7 +141,7 @@ |
||
| 141 | 141 | $price_options[$i] = $langs->trans('SellingPrice').' '.$i; |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | -$genPriceOptions = function ($level) use ($price_options) { |
|
| 144 | +$genPriceOptions = function($level) use ($price_options) { |
|
| 145 | 145 | |
| 146 | 146 | $return = array(); |
| 147 | 147 | |
@@ -82,7 +82,7 @@ |
||
| 82 | 82 | |
| 83 | 83 | |
| 84 | 84 | // Authentication callback function |
| 85 | -$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $password) { |
|
| 85 | +$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function($username, $password) { |
|
| 86 | 86 | global $user; |
| 87 | 87 | global $conf; |
| 88 | 88 | global $dolibarr_main_authentication, $dolibarr_auto_user; |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | |
| 45 | 45 | require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php'; |
| 46 | 46 | |
| 47 | -call_user_func(function () { |
|
| 47 | +call_user_func(function() { |
|
| 48 | 48 | $loader = Luracast\Restler\AutoLoader::instance(); |
| 49 | 49 | spl_autoload_register($loader); |
| 50 | 50 | return $loader; |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | |
| 19 | 19 | // Create the autoloader for Luracast |
| 20 | 20 | require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php'; |
| 21 | -call_user_func(function () { |
|
| 21 | +call_user_func(function() { |
|
| 22 | 22 | $loader = Luracast\Restler\AutoLoader::instance(); |
| 23 | 23 | spl_autoload_register($loader); |
| 24 | 24 | return $loader; |
@@ -159,7 +159,7 @@ |
||
| 159 | 159 | * @param string $start the starting index |
| 160 | 160 | * @return array array of diff |
| 161 | 161 | */ |
| 162 | - private static function generatePartialDiff($table, $sequence1, $sequence2, $start) |
|
| 162 | + private static function generatePartialDiff($table, $sequence1, $sequence2, $start) |
|
| 163 | 163 | { |
| 164 | 164 | // initialise the diff |
| 165 | 165 | $diff = array(); |
@@ -61,8 +61,8 @@ |
||
| 61 | 61 | $triggername = $reg[1]; |
| 62 | 62 | $constvalue = GETPOST($key, 'alpha'); |
| 63 | 63 | $consttype = 'emailtemplate:xxx'; |
| 64 | - $tmparray=explode(':', $constvalue); |
|
| 65 | - if (! empty($tmparray[0]) && ! empty($tmparray[1])) { |
|
| 64 | + $tmparray = explode(':', $constvalue); |
|
| 65 | + if (!empty($tmparray[0]) && !empty($tmparray[1])) { |
|
| 66 | 66 | $constvalue = $tmparray[0]; |
| 67 | 67 | $consttype = 'emailtemplate:'.$tmparray[1]; |
| 68 | 68 | //var_dump($constvalue); |
@@ -122,7 +122,7 @@ |
||
| 122 | 122 | if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLE', $conf->entity); |
| 123 | 123 | else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLE', $val, 'chaine', 0, '', $conf->entity); |
| 124 | 124 | |
| 125 | - $val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLELINK'), array())))); |
|
| 125 | + $val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLELINK'), array())))); |
|
| 126 | 126 | if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLELINK', $conf->entity); |
| 127 | 127 | else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLELINK', $val, 'chaine', 0, '', $conf->entity); |
| 128 | 128 | |
@@ -248,30 +248,30 @@ |
||
| 248 | 248 | if ($search_service) $sql .= " AND (p.ref LIKE '%".$db->escape($search_service)."%' OR p.description LIKE '%".$db->escape($search_service)."%' OR cd.description LIKE '%".$db->escape($search_service)."%')"; |
| 249 | 249 | if ($socid > 0) $sql .= " AND s.rowid = ".$socid; |
| 250 | 250 | |
| 251 | -$filter_dateouvertureprevue_start=dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear); |
|
| 252 | -$filter_dateouvertureprevue_end=dol_mktime(23, 59, 59, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear); |
|
| 251 | +$filter_dateouvertureprevue_start = dol_mktime(0, 0, 0, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear); |
|
| 252 | +$filter_dateouvertureprevue_end = dol_mktime(23, 59, 59, $opouvertureprevuemonth, $opouvertureprevueday, $opouvertureprevueyear); |
|
| 253 | 253 | if ($filter_dateouvertureprevue_start != '' && $filter_opouvertureprevue == -1) $filter_opouvertureprevue = ' BETWEEN '; |
| 254 | 254 | |
| 255 | -$filter_date1_start =dol_mktime(0, 0, 0, $op1month, $op1day, $op1year); |
|
| 256 | -$filter_date1_end =dol_mktime(23, 59, 59, $op1month, $op1day, $op1year); |
|
| 255 | +$filter_date1_start = dol_mktime(0, 0, 0, $op1month, $op1day, $op1year); |
|
| 256 | +$filter_date1_end = dol_mktime(23, 59, 59, $op1month, $op1day, $op1year); |
|
| 257 | 257 | if ($filter_date1_start != '' && $filter_op1 == -1) $filter_op1 = ' BETWEEN '; |
| 258 | 258 | |
| 259 | -$filter_date2_start=dol_mktime(0, 0, 0, $op2month, $op2day, $op2year); |
|
| 260 | -$filter_date2_end=dol_mktime(23, 59, 59, $op2month, $op2day, $op2year); |
|
| 259 | +$filter_date2_start = dol_mktime(0, 0, 0, $op2month, $op2day, $op2year); |
|
| 260 | +$filter_date2_end = dol_mktime(23, 59, 59, $op2month, $op2day, $op2year); |
|
| 261 | 261 | if ($filter_date2_start != '' && $filter_op2 == -1) $filter_op2 = ' BETWEEN '; |
| 262 | 262 | |
| 263 | -$filter_datecloture_start=dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear); |
|
| 264 | -$filter_datecloture_end=dol_mktime(23, 59, 59, $opcloturemonth, $opclotureday, $opclotureyear); |
|
| 263 | +$filter_datecloture_start = dol_mktime(0, 0, 0, $opcloturemonth, $opclotureday, $opclotureyear); |
|
| 264 | +$filter_datecloture_end = dol_mktime(23, 59, 59, $opcloturemonth, $opclotureday, $opclotureyear); |
|
| 265 | 265 | if ($filter_datecloture_start != '' && $filter_opcloture == -1) $filter_opcloture = ' BETWEEN '; |
| 266 | 266 | |
| 267 | -if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_opouvertureprevue != ' BETWEEN ' && $filter_dateouvertureprevue_start != '') $sql.= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue_start)."'"; |
|
| 268 | -if (! empty($filter_opouvertureprevue) && $filter_opouvertureprevue == ' BETWEEN ') $sql.= " AND '".$db->idate($filter_dateouvertureprevue_end)."'"; |
|
| 269 | -if (! empty($filter_op1) && $filter_op1 != -1 && $filter_op1 != ' BETWEEN ' && $filter_date1_start != '') $sql.= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1_start)."'"; |
|
| 270 | -if (! empty($filter_op1) && $filter_op1==' BETWEEN ') $sql.= " AND '".$db->idate($filter_date1_end)."'"; |
|
| 271 | -if (! empty($filter_op2) && $filter_op2 != -1 && $filter_op2 != ' BETWEEN ' && $filter_date2_start != '') $sql.= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2_start)."'"; |
|
| 272 | -if (! empty($filter_op2) && $filter_op2==' BETWEEN ') $sql.= " AND '".$db->idate($filter_date2_end)."'"; |
|
| 273 | -if (! empty($filter_opcloture) && $filter_opcloture != ' BETWEEN ' && $filter_opcloture != -1 && $filter_datecloture_start != '') $sql.= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture_start)."'"; |
|
| 274 | -if (! empty($filter_opcloture) && $filter_opcloture==' BETWEEN ') $sql.= " AND '".$db->idate($filter_datecloture_end)."'"; |
|
| 267 | +if (!empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $filter_opouvertureprevue != ' BETWEEN ' && $filter_dateouvertureprevue_start != '') $sql .= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue_start)."'"; |
|
| 268 | +if (!empty($filter_opouvertureprevue) && $filter_opouvertureprevue == ' BETWEEN ') $sql .= " AND '".$db->idate($filter_dateouvertureprevue_end)."'"; |
|
| 269 | +if (!empty($filter_op1) && $filter_op1 != -1 && $filter_op1 != ' BETWEEN ' && $filter_date1_start != '') $sql .= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1_start)."'"; |
|
| 270 | +if (!empty($filter_op1) && $filter_op1 == ' BETWEEN ') $sql .= " AND '".$db->idate($filter_date1_end)."'"; |
|
| 271 | +if (!empty($filter_op2) && $filter_op2 != -1 && $filter_op2 != ' BETWEEN ' && $filter_date2_start != '') $sql .= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2_start)."'"; |
|
| 272 | +if (!empty($filter_op2) && $filter_op2 == ' BETWEEN ') $sql .= " AND '".$db->idate($filter_date2_end)."'"; |
|
| 273 | +if (!empty($filter_opcloture) && $filter_opcloture != ' BETWEEN ' && $filter_opcloture != -1 && $filter_datecloture_start != '') $sql .= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture_start)."'"; |
|
| 274 | +if (!empty($filter_opcloture) && $filter_opcloture == ' BETWEEN ') $sql .= " AND '".$db->idate($filter_datecloture_end)."'"; |
|
| 275 | 275 | // Add where from extra fields |
| 276 | 276 | include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php'; |
| 277 | 277 | $sql .= $db->order($sortfield, $sortorder); |
@@ -420,31 +420,31 @@ discard block |
||
| 420 | 420 | |
| 421 | 421 | switch ($notifcode) { |
| 422 | 422 | case 'BILL_VALIDATE': |
| 423 | - $link = '<a href="' . $urlwithroot . '/compta/facture/card.php?facid=' . $object->id . '">' . $newref . '</a>'; |
|
| 423 | + $link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'">'.$newref.'</a>'; |
|
| 424 | 424 | $dir_output = $conf->facture->dir_output; |
| 425 | 425 | $object_type = 'facture'; |
| 426 | 426 | $mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceValidated", $link); |
| 427 | 427 | break; |
| 428 | 428 | case 'BILL_PAYED': |
| 429 | - $link ='<a href="' . $urlwithroot . '/compta/facture/card.php?facid='.$object->id . '">' . $newref . '</a>'; |
|
| 429 | + $link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'">'.$newref.'</a>'; |
|
| 430 | 430 | $dir_output = $conf->facture->dir_output; |
| 431 | 431 | $object_type = 'facture'; |
| 432 | 432 | $mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoicePayed", $link); |
| 433 | 433 | break; |
| 434 | 434 | case 'ORDER_VALIDATE': |
| 435 | - $link = '<a href="' . $urlwithroot . '/commande/card.php?id='.$object->id . '">' . $newref . '</a>'; |
|
| 435 | + $link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'">'.$newref.'</a>'; |
|
| 436 | 436 | $dir_output = $conf->commande->dir_output; |
| 437 | 437 | $object_type = 'order'; |
| 438 | 438 | $mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderValidated", $link); |
| 439 | 439 | break; |
| 440 | 440 | case 'PROPAL_VALIDATE': |
| 441 | - $link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>'; |
|
| 441 | + $link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'">'.$newref.'</a>'; |
|
| 442 | 442 | $dir_output = $conf->propal->multidir_output[$object->entity]; |
| 443 | 443 | $object_type = 'propal'; |
| 444 | 444 | $mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalValidated", $link); |
| 445 | 445 | break; |
| 446 | 446 | case 'PROPAL_CLOSE_SIGNED': |
| 447 | - $link = '<a href="' . $urlwithroot . '/comm/propal/card.php?id='.$object->id . '">' . $newref . '</a>'; |
|
| 447 | + $link = '<a href="'.$urlwithroot.'/comm/propal/card.php?id='.$object->id.'">'.$newref.'</a>'; |
|
| 448 | 448 | $dir_output = $conf->propal->multidir_output[$object->entity]; |
| 449 | 449 | $object_type = 'propal'; |
| 450 | 450 | $mesg = $outputlangs->transnoentitiesnoconv("EMailTextProposalClosedSigned", $link); |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | $mesg .= "\n\n".$outputlangs->transnoentitiesnoconv("Sincerely").".\n\n"; |
| 479 | 479 | break; |
| 480 | 480 | case 'ORDER_SUPPLIER_REFUSE': |
| 481 | - $link = '<a href="' . $urlwithroot . '/fourn/commande/card.php?id='.$object->id . '">' . $newref . '</a>'; |
|
| 481 | + $link = '<a href="'.$urlwithroot.'/fourn/commande/card.php?id='.$object->id.'">'.$newref.'</a>'; |
|
| 482 | 482 | $dir_output = $conf->fournisseur->commande->dir_output; |
| 483 | 483 | $object_type = 'order_supplier'; |
| 484 | 484 | $mesg = $outputlangs->transnoentitiesnoconv("Hello").",\n\n"; |