diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 0270b0327dd75..b6e11a6406504 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -2783,7 +2783,6 @@ function load_state_board() * Update value of extrafields on the proposal * * @param User $user Object user that modify - * @param double $remise Amount discount * @return int <0 if ko, >0 if ok */ function update_extrafields($user) diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php index 4b621b705a2fe..3865cfe8f66e4 100755 --- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php +++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php @@ -175,6 +175,7 @@ function getSqlArrayForStats() * For example if this selector is used to extract 500 different * emails from a text file, this function must return 500. * + * @param string $sql SQL request to get recipitien * @param int $filter Filter * @param string $option Option * @return int Number of recipients diff --git a/htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php index 34cd23a0a7f93..912c9fd25ad97 100644 --- a/htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php @@ -209,7 +209,7 @@ function get_substitutionarray_project_file($file,$outputlangs) function get_substitutionarray_project_reference($refdetail,$outputlangs) { global $conf; - + return array( 'projref_type'=>$refdetail['type'], 'projref_ref'=>$refdetail['ref'], @@ -220,7 +220,7 @@ function get_substitutionarray_project_reference($refdetail,$outputlangs) 'projref_status'=>$refdetail['status'] ); } - + /** * Define array with couple substitution key => substitution value * @@ -242,7 +242,7 @@ function get_substitutionarray_tasksressource($taskressource,$outputlangs) 'taskressource_email'=>$taskressource['email'] ); } - + /** * Define array with couple substitution key => substitution value * @@ -254,7 +254,7 @@ function get_substitutionarray_taskstime($tasktime,$outputlangs) { global $conf; - return array( + return array( 'tasktime_rowid'=>$tasktime['rowid'], 'tasktime_task_date'=>dol_print_date($tasktime['task_date'],'day'), 'tasktime_task_duration'=>convertSecondToTime($tasktime['task_duration'],'all'), @@ -265,7 +265,7 @@ function get_substitutionarray_taskstime($tasktime,$outputlangs) 'tasktime_fullcivname'=>$tasktime['fullcivname'] ); } - + /** * Define array with couple substitution key => substitution value * @@ -276,7 +276,7 @@ function get_substitutionarray_taskstime($tasktime,$outputlangs) function get_substitutionarray_task_file($file,$outputlangs) { global $conf; - + return array( 'tasksfile_name'=>$file['name'], 'tasksfile_date'=>dol_print_date($file['date'],'day'), @@ -384,6 +384,14 @@ function write_file($object,$outputlangs,$srctemplatepath) return -1; } + // Add odtgeneration hook + if (! is_object($hookmanager)) + { + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; + $hookmanager=new HookManager($this->db); + } + $hookmanager->initHooks(array('odtgeneration')); + global $action; if (! is_object($outputlangs)) $outputlangs=$langs; $sav_charset_output=$outputlangs->charset_output; $outputlangs->charset_output='UTF-8'; @@ -534,6 +542,9 @@ function write_file($object,$outputlangs,$srctemplatepath) // Replace tags of object + external modules $tmparray=$this->get_substitutionarray_object($object,$outputlangs); complete_substitutions_array($tmparray, $outputlangs, $object); + // Call the ODTSubstitution hook + $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray); + $reshook=$hookmanager->executeHooks('ODTSubstitution',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks foreach($tmparray as $key=>$value) { try { @@ -564,7 +575,7 @@ function write_file($object,$outputlangs,$srctemplatepath) if (!empty($object->fk_soc)) $socid = $object->fk_soc; $tasksarray=$taskstatic->getTasksArray(0, 0, $object->id, $socid, 0); - + foreach ($tasksarray as $task) @@ -584,10 +595,10 @@ function write_file($object,$outputlangs,$srctemplatepath) { } } - + $taskobj=new Task($this->db); $taskobj->fetch($task->id); - + // Replace tags of lines for contacts task $sourcearray=array('internal','external'); $contact_arrray=array(); @@ -601,7 +612,7 @@ function write_file($object,$outputlangs,$srctemplatepath) if ((is_array($contact_arrray) && count($contact_arrray) > 0)) { $listlinestaskres = $listlines->__get('tasksressources'); - + foreach ($contact_arrray as $contact) { if ($contact['source']=='internal') { @@ -611,15 +622,15 @@ function write_file($object,$outputlangs,$srctemplatepath) } elseif ($contact['source']=='external') { $objectdetail=new Contact($this->db); $objectdetail->fetch($contact['id']); - + $soc=new Societe($this->db); $soc->fetch($contact['socid']); $contact['socname']=$soc->name; } $contact['fullname']=$objectdetail->getFullName($outputlangs,1); - + $tmparray=$this->get_substitutionarray_tasksressource($contact,$outputlangs); - + foreach($tmparray as $key => $val) { try @@ -645,7 +656,7 @@ function write_file($object,$outputlangs,$srctemplatepath) $sql .= " WHERE t.fk_task =".$task->id; $sql .= " AND t.fk_user = u.rowid"; $sql .= " ORDER BY t.task_date DESC"; - + $resql = $this->db->query($sql); if ($resql) { @@ -663,9 +674,9 @@ function write_file($object,$outputlangs,$srctemplatepath) } else { $row['fullcivname']=''; } - + $tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs); - + foreach($tmparray as $key => $val) { try @@ -684,15 +695,15 @@ function write_file($object,$outputlangs,$srctemplatepath) } $this->db->free($resql); } - - + + // Replace tags of project files $listtasksfiles = $listlines->__get('tasksfiles'); - + $upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref).'/'.dol_sanitizeFileName($task->ref); $filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$','name',SORT_ASC,1); - - + + foreach ($filearray as $filedetail) { $tmparray=$this->get_substitutionarray_task_file($filedetail,$outputlangs); @@ -731,7 +742,7 @@ function write_file($object,$outputlangs,$srctemplatepath) $upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref); $filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$','name',SORT_ASC,1); - + foreach ($filearray as $filedetail) { //dol_syslog(get_class($this).'::main $filedetail'.var_export($filedetail,true)); @@ -891,27 +902,27 @@ function write_file($object,$outputlangs,$srctemplatepath) { $ref_array=array(); $ref_array['type']=$langs->trans($classname); - + $element = new $classname($this->db); $element->fetch($elementarray[$i]); $element->fetch_thirdparty(); - + //Ref object $ref_array['ref']=$element->ref; - + //Date object $dateref=$element->date; if (empty($dateref)) $dateref=$element->datep; if (empty($dateref)) $dateref=$element->date_contrat; $ref_array['date']=$dateref; - + //Soc object if (is_object($element->thirdparty)) { $ref_array['socname']=$element->thirdparty->name; } else { $ref_array['socname']=''; } - + //Amount object if (empty($valueref['disableamount'])) { if (!empty($element->total_ht)) { @@ -925,9 +936,9 @@ function write_file($object,$outputlangs,$srctemplatepath) $ref_array['amountht']=''; $ref_array['amountttc']=''; } - + $ref_array['status']=html_entity_decode($element->getLibStatut(0)); - + $tmparray=$this->get_substitutionarray_project_reference($ref_array,$outputlangs); foreach($tmparray as $key => $val) @@ -945,7 +956,7 @@ function write_file($object,$outputlangs,$srctemplatepath) } $listlines->merge(); } - + } } $odfHandler->mergeSegment($listlines); @@ -958,6 +969,11 @@ function write_file($object,$outputlangs,$srctemplatepath) return -1; } + // Call the beforeODTSave hook + $parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs); + $reshook=$hookmanager->executeHooks('beforeODTSave',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks + + // Write new file $odfHandler->saveToDisk($file); diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 09843191692b6..d310943bbed52 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -146,6 +146,7 @@ function remove_product_fournisseur_price($rowid) * @param string $charges costs affering to product * @param float $remise_percent Discount regarding qty (percent) * @param float $remise Discount regarding qty (amount) + * @param float $newnpr new infobit tva npr * @return int <0 if KO, >=0 if OK */ function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges=0, $remise_percent=0, $remise=0, $newnpr=0) diff --git a/htdocs/opensurvey/adminstuds_preview.php b/htdocs/opensurvey/adminstuds_preview.php index 7e7bb6a696720..bbb5f8b09ac87 100755 --- a/htdocs/opensurvey/adminstuds_preview.php +++ b/htdocs/opensurvey/adminstuds_preview.php @@ -202,7 +202,7 @@ //on rajoute la valeur dans les valeurs $datesbase = explode(",",$object->sujet); - $taillebase = sizeof($datesbase); + $taillebase = count($datesbase); //recherche de l'endroit de l'insertion de la nouvelle date dans les dates deja entrées dans le tableau if ($nouvelledate < $datesbase[0]) { diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php index 6068ca965f1e6..a1375e15f0a97 100755 --- a/htdocs/opensurvey/fonctions.php +++ b/htdocs/opensurvey/fonctions.php @@ -120,7 +120,7 @@ function get_server_name() /** * is_error * - * @param unknown_type $cerr + * @param unknown_type $cerr error number * @return boolean */ function is_error($cerr) diff --git a/htdocs/opensurvey/public/choix_date.php b/htdocs/opensurvey/public/choix_date.php index 72a24357436a3..faf6713794281 100755 --- a/htdocs/opensurvey/public/choix_date.php +++ b/htdocs/opensurvey/public/choix_date.php @@ -257,9 +257,9 @@ // Si le test est passé, alors on insere la valeur dans la variable de session qui contient les dates if ($journeuf && issetAndNoEmpty('choixjourajout') === true) { - array_push ($_SESSION["totalchoixjour"],mktime (0,0,0, $_SESSION["mois"], $_POST["choixjourajout"][0], $_SESSION["annee"])); - sort ($_SESSION["totalchoixjour"]); - $cle=array_search (mktime (0,0,0, $_SESSION["mois"], $_POST["choixjourajout"][0], $_SESSION["annee"]), $_SESSION["totalchoixjour"]); + array_push($_SESSION["totalchoixjour"],mktime (0,0,0, $_SESSION["mois"], $_POST["choixjourajout"][0], $_SESSION["annee"])); + sort($_SESSION["totalchoixjour"]); + $cle=array_search(mktime (0,0,0, $_SESSION["mois"], $_POST["choixjourajout"][0], $_SESSION["annee"]), $_SESSION["totalchoixjour"]); //On sauvegarde les heures deja entrées for ($i = 0; $i < $cle; $i++) { diff --git a/htdocs/opensurvey/public/create_survey.php b/htdocs/opensurvey/public/create_survey.php index c5af8db0cabc6..f94898ac6929b 100755 --- a/htdocs/opensurvey/public/create_survey.php +++ b/htdocs/opensurvey/public/create_survey.php @@ -162,7 +162,7 @@ print '
'."\n"; -#affichage du cochage par défaut +//affichage du cochage par défaut $cocheplus=''; if ($_SESSION["canedit"]) $cocheplus="checked"; diff --git a/htdocs/opensurvey/public/exportcsv.php b/htdocs/opensurvey/public/exportcsv.php index b2ee0cc1eea9c..a6d0b0216a417 100755 --- a/htdocs/opensurvey/public/exportcsv.php +++ b/htdocs/opensurvey/public/exportcsv.php @@ -64,7 +64,7 @@ $nbcolonnes=substr_count($object->sujet,',')+1; $toutsujet=explode(",",$object->sujet); -#$toutsujet=str_replace("°","'",$toutsujet); +//$toutsujet=str_replace("°","'",$toutsujet); // affichage des sujets du sondage $input.=$langs->trans("Name").";"; @@ -139,15 +139,15 @@ else dol_print_error($db); -$filesize = strlen( $input ); +$filesize = strlen($input); $filename=$numsondage."_".dol_print_date($now,'%Y%m%d%H%M').".csv"; -header( 'Content-Type: text/csv; charset=utf-8' ); -header( 'Content-Length: '.$filesize ); -header( 'Content-Disposition: attachment; filename="'.$filename.'"' ); -header( 'Cache-Control: max-age=10' ); +header('Content-Type: text/csv; charset=utf-8'); +header('Content-Length: '.$filesize); +header('Content-Disposition: attachment; filename="'.$filename.'"'); +header('Cache-Control: max-age=10'); echo $input; exit; diff --git a/htdocs/public/paybox/paymentko.php b/htdocs/public/paybox/paymentko.php index 4db0684005bf0..b2c3954c1e92d 100644 --- a/htdocs/public/paybox/paymentko.php +++ b/htdocs/public/paybox/paymentko.php @@ -73,8 +73,7 @@ 'New subscription payed', $sendto, $from, - 'New subscription payed '.$fulltag - ); + 'New subscription payed '.$fulltag); $result=$mailfile->sendfile(); if ($result) diff --git a/htdocs/public/paybox/paymentok.php b/htdocs/public/paybox/paymentok.php index ebd3c834d09e2..0c25e2e3039de 100644 --- a/htdocs/public/paybox/paymentok.php +++ b/htdocs/public/paybox/paymentok.php @@ -103,8 +103,7 @@ 'New subscription payed', $sendto, $from, - 'New subscription payed '.$fulltag - ); + 'New subscription payed '.$fulltag); $result=$mailfile->sendfile(); if ($result) diff --git a/htdocs/public/paypal/paymentko.php b/htdocs/public/paypal/paymentko.php index c6fe53ac7b06d..ff83d6d831a9d 100755 --- a/htdocs/public/paypal/paymentko.php +++ b/htdocs/public/paypal/paymentko.php @@ -81,8 +81,7 @@ 'New subscription payed', $sendto, $from, - 'New subscription payed '.$fulltag - ); + 'New subscription payed '.$fulltag); $result=$mailfile->sendfile(); if ($result) diff --git a/htdocs/public/paypal/paymentok.php b/htdocs/public/paypal/paymentok.php index ca11bcb54226d..0b425ea8cead6 100755 --- a/htdocs/public/paypal/paymentok.php +++ b/htdocs/public/paypal/paymentok.php @@ -140,8 +140,7 @@ 'New subscription payed', $sendto, $from, - 'New subscription payed '.$fulltag - ); + 'New subscription payed '.$fulltag); $result=$mailfile->sendfile(); if ($result)