diff --git a/ChangeLog b/ChangeLog
index 1a123336552..25688ef0ccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,7 +29,7 @@ The following changes may create regressions for some external modules, but were
* Use of dol_eval with parameter $returnvalue=0 is deprecated.
* The signature for all ->delete() method has been modified to match the modulebuilder template (so first paramis now always $user), except
the delete for thirdparty (still accept the id of thirdparty to delete as first parameter). Will probably be modified into another version.
-
+* Route for API /thirdparties/gateways has been renamed into /thirdparties/accounts
***** ChangeLog for 19.0.1 compared to 19.0.0 *****
diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt
index 5ddee3b9244..94c67e08f75 100644
--- a/dev/tools/codespell/codespell-lines-ignore.txt
+++ b/dev/tools/codespell/codespell-lines-ignore.txt
@@ -56,7 +56,7 @@
$this->datea = $this->db->jdate($obj->datea);
$this->datee = $this->db->jdate($obj->datee);
$this->periode = $this->db->jdate($obj->period);
- $tmp = array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses);
+ $tmp = array('id_users' => $obj->id_users, 'nom' => $obj->name, 'reponses' => $obj->reponses);
$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0, true); // Disable hook for the moment
//si les reponses ne concerne pas la colonne effacée, on concatenate
GETPOST("mouvement", 'alpha'),
@@ -73,6 +73,8 @@
$datee = dol_get_last_day(GETPOSTINT('yeartoexport'), GETPOSTINT('monthtoexport') ? GETPOSTINT('monthtoexport') : 12);
$datesubscription = dol_mktime(12, 0, 0, GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"));
$ensemblereponses = $obj->reponses;
+ $field = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:).*$/', '', $tmpcrit); // the name of the field
+ $newcrit = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '', $tmpcrit);
$object->datee = $datee;
$object->periode = $dateperiod;
$return .= ''.$langs->trans("Payement").' : '.$this->type_payment.' ';
@@ -97,16 +99,19 @@
$taskstatic->datee = $db->jdate($obj->date_end);
$this->category->childs = array();
$this->datea = dol_now();
+ $tmpcrit = preg_replace('/^.*(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '\1', $tmpcrit); // the condition after the name of the field
'datee' => $date_end,
// mise a jour des reponses utilisateurs dans la base
if (!empty($arrayfields['t.datee']['checked'])) {
if ($user->hasRight('stock', 'mouvement', 'lire')) {
if (empty($reyear) || empty($remonth) || empty($reday)) {
jQuery("#mouvement").change(function() {
+ preg_match('/:([!<>=\s]+|in|notin|like|notlike):/', $tmpcrit, $reg);
print $form->selectDate($object->periode, 'period', 0, 0, 0, 'charge', 1);
print ''.$langs->trans("TransferStock").' ';
print ''.$langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers")).' ';
print ''.dol_print_date($db->jdate($obj->periode), 'day').' ';
+ print ''.$langs->trans("AddIn").' ';
print dol_print_date($object->periode, "day");
$TWeek[$week_number] = $week_number;
$action = 'transfert';
@@ -174,6 +179,8 @@
if (in_array('01', $TWeek) && in_array('52', $TWeek) && $weekNb == '01') {
print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
print $object->datee ? dol_print_date($object->datee, 'daytext') : ' ';
+ print ' '.$langs->trans("AddIn").' ';
print ' '.$langs->trans("Datee").' ';
print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", '', $param, '', $sortfield, $sortorder, 'center ');
* @param string $datee End date (ex 23:59:59)
@@ -189,6 +196,8 @@
$datepaye = dol_mktime(GETPOSTINT("rehour"), GETPOSTINT("remin"), GETPOSTINT("resec"), GETPOSTINT("remonth"), GETPOSTINT("reday"), GETPOSTINT("reyear"), 'tzuserrel');
$ensemblereponses = $obj->reponses;
$head[$h][1] = $langs->trans('Referers');
+ $inj += preg_match('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)[a-z]*\s*=/i', $tmpval);
+ $inj += preg_match('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)[a-z]*\s*=/i', $val);
$morewherefilterarray[] = " t.datee <= '".$db->idate($search_date_end_end)."'";
$morewherefilterarray[] = " t.datee >= '".$db->idate($search_date_end_start)."'";
$opensurveysondage->mail_admin = $_SESSION['adresse'];
@@ -221,7 +230,8 @@
$sql2 .= " s.logo, s.email, s.entity, p.fk_user_creat, p.public, p.fk_statut, p.fk_opp_status, p.opp_percent, p.opp_amount, p.dateo, p.datee";
$title = $langs->trans('Batch')." ".$shortlabel." - ".$langs->trans('Referers');
$totalforvisibletasks = projectLinesPerMonth($j, $firstdaytoshow, $usertoprocess, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restrictviewformytask, $isavailable, 0, $TWeek);
- 'cs.periode' =>array('label'=>"PeriodEndDate", 'checked'=>1, 'position'=>50),
+ $value = preg_replace('/([a-z\.]+)\s*([!<>=]+|in|notin|like|notlike)\s*/', '\1:\2:', $value); // Clean string 'x < 10' into 'x:<:10' so we can then explode on space to get all AND tests to do
+ 'cs.periode' => array('label' => "PeriodEndDate", 'checked' => 1, 'position' => 50),
't.datee'=>array('label'=>"Deadline", 'checked'=>1, 'position'=>101),
't.datee'=>array('label'=>"Deadline", 'checked'=>1, 'position'=>5),
// Ligne de la periode d'analyse du rapport
@@ -233,6 +243,7 @@
foreach ($TWeek as $week_number) {
if (!empty($arrayfields['t.datee']['checked'])) {
if ($action == "transfert") {
+ if ($object->id > 0 && $action == 'addin') {
if (GETPOST('reday')) {
if (GETPOSTINT("reyear") && GETPOSTINT("remonth") && GETPOSTINT("reday")) {
print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
@@ -240,6 +251,7 @@
print '';
print ''.$langs->trans("Referers").' ';
print ''.$langs->trans("NbOfMembers").' ('.$langs->trans("AllTime").') ';
+ print ''.$langs->trans("AddIn").' ';
print ' '.$langs->trans("Period")." ".dol_print_date($charge->periode, 'day')." ';
print '' . $langs->trans('AmountHT') . ' ';
- print '' . price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->multicurrency_total_ht, '', $langs, 1, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_ht, 0, $langs, 1, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
print '';
print '' . $langs->trans('AmountVAT') . ' ';
- print '' . price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_tva, 0, $langs, 1, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->multicurrency_total_tva, '', $langs, 1, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_tva, 0, $langs, 1, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
print '';
print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' ';
- print '' . price($object->total_localtax1, '', $langs, 1, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->total_localtax1, '', $langs, 1, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->total_localtax1, 0, $langs, 1, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
print '';
print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ';
- print '' . price($object->total_localtax2, '', $langs, 1, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->total_localtax2, '', $langs, 1, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->total_localtax2, 0, $langs, 1, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
}
@@ -2920,9 +2920,9 @@ if ($action == 'create') {
print '';
print '' . $langs->trans('AmountTTC') . ' ';
- print '' . price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->multicurrency_total_ttc, '', $langs, 1, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_ttc, 0, $langs, 1, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 39c01663d93..868a16ed304 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -409,8 +409,6 @@ class Propal extends CommonObject
*/
public function __construct($db, $socid = 0, $propalid = 0)
{
- global $conf, $langs;
-
$this->db = $db;
$this->socid = $socid;
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 0a03d0cc1cd..2bc33b37f3f 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -2256,14 +2256,14 @@ if ($search_date_signature_endyear) {
}
// Total margin rate
if (!empty($arrayfields['total_margin_rate']['checked'])) {
- print ''.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').' ';
+ print ''.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2).'%').' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Total mark rate
if (!empty($arrayfields['total_mark_rate']['checked'])) {
- print ''.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').' ';
+ print ''.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2).'%').' ';
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 92621cdfcac..9722ca53344 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -933,8 +933,8 @@ if (empty($reshook)) {
}
//If text set in desc is the same as product descpription (as now it's preloaded) we add it only one time
- if ($product_desc==$desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
- $product_desc='';
+ if ($product_desc == $desc && getDolGlobalString('PRODUIT_AUTOFILL_DESC')) {
+ $product_desc = '';
}
if (!empty($product_desc) && getDolGlobalString('MAIN_NO_CONCAT_DESCRIPTION')) {
@@ -1523,7 +1523,7 @@ if (empty($reshook)) {
if ($action == 'import_lines_from_object'
&& $usercancreate
&& $object->statut == Commande::STATUS_DRAFT
- ) {
+ ) {
$fromElement = GETPOST('fromelement');
$fromElementid = GETPOST('fromelementid');
$importLines = GETPOST('line_checkbox');
@@ -2782,19 +2782,19 @@ if ($action == 'create' && $usercancreate) {
print '';
print '' . $langs->trans('AmountHT') . ' ';
- print '' . price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount HT
- print '' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
print '';
print '' . $langs->trans('AmountVAT') . ' ';
- print '' . price($object->total_tva, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount VAT
- print '' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
@@ -2802,9 +2802,9 @@ if ($action == 'create' && $usercancreate) {
if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
print '';
print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' ';
- print '' . price($object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
@@ -2812,9 +2812,9 @@ if ($action == 'create' && $usercancreate) {
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
print '';
print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ';
- print '' . price($object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
}
@@ -2963,7 +2963,7 @@ if ($action == 'create' && $usercancreate) {
$arrayforbutaction = array();
// Create a purchase order
- $arrayforbutaction[] = array('lang'=>'orders', 'enabled'=>(isModEnabled("supplier_order") && $object->statut > Commande::STATUS_DRAFT && $object->getNbOfServicesLines() > 0), 'perm'=>$usercancreatepurchaseorder, 'label'=>'AddPurchaseOrder', 'url'=>'/fourn/commande/card.php?action=create&origin='.$object->element.'&originid='.$object->id);
+ $arrayforbutaction[] = array('lang' => 'orders', 'enabled' => (isModEnabled("supplier_order") && $object->statut > Commande::STATUS_DRAFT && $object->getNbOfServicesLines() > 0), 'perm' => $usercancreatepurchaseorder, 'label' => 'AddPurchaseOrder', 'url' => '/fourn/commande/card.php?action=create&origin='.$object->element.'&originid='.$object->id);
/*if (isModEnabled("supplier_order") && $object->statut > Commande::STATUS_DRAFT && $object->getNbOfServicesLines() > 0) {
if ($usercancreatepurchaseorder) {
print dolGetButtonAction('', $langs->trans('AddPurchaseOrder'), 'default', DOL_URL_ROOT.'/fourn/commande/card.php?action=create&origin='.$object->element.'&originid='.$object->id, '');
@@ -2971,7 +2971,7 @@ if ($action == 'create' && $usercancreate) {
}*/
// Create intervention
- $arrayforbutaction[] = array('lang'=>'interventions', 'enabled'=>(isModEnabled("intervention") && $object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0), 'perm'=>$user->hasRight('ficheinter', 'creer'), 'label'=>'AddIntervention', 'url'=>'/fichinter/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid);
+ $arrayforbutaction[] = array('lang' => 'interventions', 'enabled' => (isModEnabled("intervention") && $object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0), 'perm' => $user->hasRight('ficheinter', 'creer'), 'label' => 'AddIntervention', 'url' => '/fichinter/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid);
/*if (isModEnabled('ficheinter')) {
$langs->load("interventions");
@@ -2985,7 +2985,7 @@ if ($action == 'create' && $usercancreate) {
}*/
// Create contract
- $arrayforbutaction[] = array('lang'=>'contracts', 'enabled'=>(isModEnabled("contract") && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)), 'perm'=>$user->hasRight('contrat', 'creer'), 'label'=>'AddContract', 'url'=>'/contrat/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid);
+ $arrayforbutaction[] = array('lang' => 'contracts', 'enabled' => (isModEnabled("contract") && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)), 'perm' => $user->hasRight('contrat', 'creer'), 'label' => 'AddContract', 'url' => '/contrat/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid);
/*if (isModEnabled('contrat') && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)) {
$langs->load("contracts");
@@ -3002,7 +3002,7 @@ if ($action == 'create' && $usercancreate) {
// Create shipment
if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES'))) {
if ((getDolGlobalInt('MAIN_SUBMODULE_EXPEDITION') && $user->hasRight('expedition', 'creer')) || (getDolGlobalInt('MAIN_SUBMODULE_DELIVERY') && $user->hasRight('expedition', 'delivery', 'creer'))) {
- $arrayforbutaction[] = array('lang'=>'sendings', 'enabled'=>(isModEnabled("delivery_note") && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))), 'perm'=>$user->hasRight('expedition', 'creer'), 'label'=>'CreateShipment', 'url'=>'/expedition/shipment.php?id='.$object->id);
+ $arrayforbutaction[] = array('lang' => 'sendings', 'enabled' => (isModEnabled("delivery_note") && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')))), 'perm' => $user->hasRight('expedition', 'creer'), 'label' => 'CreateShipment', 'url' => '/expedition/shipment.php?id='.$object->id);
/*
if ($user->hasRight('expedition', 'creer')) {
print dolGetButtonAction('', $langs->trans('CreateShipment'), 'default', DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id, '');
@@ -3017,11 +3017,11 @@ if ($action == 'create' && $usercancreate) {
// Create bill
$arrayforbutaction[] = array(
- 'lang'=>'bills',
- 'enabled'=>(isModEnabled('invoice') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0),
- 'perm'=>($user->hasRight('facture', 'creer') && !getDolGlobalInt('WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER')),
- 'label'=>'CreateBill',
- 'url'=>'/compta/facture/card.php?action=create&token='.newToken().'&origin='.urlencode($object->element).'&originid='.$object->id.'&socid='.$object->socid
+ 'lang' => 'bills',
+ 'enabled' => (isModEnabled('invoice') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0),
+ 'perm' => ($user->hasRight('facture', 'creer') && !getDolGlobalInt('WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER')),
+ 'label' => 'CreateBill',
+ 'url' => '/compta/facture/card.php?action=create&token='.newToken().'&origin='.urlencode($object->element).'&originid='.$object->id.'&socid='.$object->socid
);
/*
if (isModEnabled('facture') && $object->statut > Commande::STATUS_DRAFT && !$object->billed && $object->total_ttc >= 0) {
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ea017fbef3b..b84de3413f5 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -2554,7 +2554,7 @@ while ($i < $imaxinloop) {
// Total margin rate
if (!empty($arrayfields['total_margin_rate']['checked'])) {
- print ''.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').' ';
+ print ''.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2).'%').' ';
if (!$i) {
$totalarray['nbfield']++;
}
@@ -2562,7 +2562,7 @@ while ($i < $imaxinloop) {
// Total mark rate
if (!empty($arrayfields['total_mark_rate']['checked'])) {
- print ''.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').' ';
+ print ''.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2).'%').' ';
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index 3c0f25f74ac..0eec5b4bb58 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -1997,14 +1997,14 @@ if ($resql) {
}
// Total margin rate
if (!empty($arrayfields['total_margin_rate']['checked'])) {
- print ''.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').' ';
+ print ''.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2).'%').' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Total mark rate
if (!empty($arrayfields['total_mark_rate']['checked'])) {
- print ''.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').' ';
+ print ''.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2).'%').' ';
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 97e855217a6..56eb4e93a6c 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -387,7 +387,7 @@ if (empty($numref)) {
$balancestart[$objp->numr] = $obj->amount;
$db->free($resql);
}
- print ''.price($balancestart[$objp->numr], '', $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).' '.price($balancestart[$objp->numr], 0, $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).' '.price(($balancestart[$objp->numr] + $content[$objp->numr]), '', $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).' '.price(($balancestart[$objp->numr] + $content[$objp->numr]), 0, $langs, 1, -1, -1, empty($object->currency_code) ? $conf->currency : $object->currency_code).' ';
if ($user->hasRight('banque', 'consolidate') && $action != 'editbankreceipt') {
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index ab544c4ff70..954b0eb3077 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1129,7 +1129,7 @@ if ($action == 'create') {
// Frequency + unit
print ' '.$form->textwithpicto($langs->trans("Frequency"), $langs->transnoentitiesnoconv('toolTipFrequency'))." ";
print " ".$langs->trans("StatusOfAutoGeneratedInvoices")." ";
- $select = array('0'=>$langs->trans('BillStatusDraft'), '1'=>$langs->trans('BillStatusValidated'));
+ $select = array('0' => $langs->trans('BillStatusDraft'), '1' => $langs->trans('BillStatusValidated'));
print $form->selectarray('auto_validate', $select, GETPOST('auto_validate'));
print " ".$langs->trans("StatusOfGeneratedDocuments")." ";
- $select = array('0'=>$langs->trans('DoNotGenerateDoc'), '1'=>$langs->trans('AutoGenerateDoc'));
+ $select = array('0' => $langs->trans('DoNotGenerateDoc'), '1' => $langs->trans('AutoGenerateDoc'));
print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
print " '.$langs->trans("AmountHT").' ';
- print ''.price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency).' ';
+ print ''.price($object->total_ht, 0, $langs, 1, -1, -1, $conf->currency).' ';
print ''.$langs->trans("AmountVAT").' '.price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency).' ';
+ print ''.$langs->trans("AmountVAT").' '.price($object->total_tva, 0, $langs, 1, -1, -1, $conf->currency).' ';
print ''.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).' '.$langs->trans("AmountTTC").' '.price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency).' ';
+ print ''.$langs->trans("AmountTTC").' '.price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency).' ';
print ''.$langs->trans('CurrentOutstandingBill').': ';
- print ''.price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency).' ';
+ print ''.price($outstandingBills, 0, $langs, 0, 0, -1, $conf->currency).' ';
if ($soc->outstanding_limit != '') {
if ($outstandingBills > $soc->outstanding_limit) {
print img_warning($langs->trans("OutstandingBillReached"));
}
- print ' / '.price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
+ print ' / '.price($soc->outstanding_limit, 0, $langs, 0, 0, -1, $conf->currency);
}
print '';
print ''."\n";
@@ -4987,20 +4987,20 @@ if ($action == 'create') {
print '';
// Amount HT
print '' . $langs->trans('AmountHT') . ' ';
- print '' . price($sign * $object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($sign * $object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount HT
- print '' . price($sign * $object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($sign * $object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
print '';
// Amount VAT
print '' . $langs->trans('AmountVAT') . ' ';
- print '' . price($sign * $object->total_tva, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($sign * $object->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount VAT
- print '' . price($sign * $object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($sign * $object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
@@ -5008,18 +5008,18 @@ if ($action == 'create') {
if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) {
print '';
print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' ';
- print '' . price($sign * $object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($sign * $object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($sign * $object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($sign * $object->total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) {
print '';
print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ';
- print '' . price($sign * $object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($sign * $object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($sign * $object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($sign * $object->total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
}
@@ -5082,10 +5082,10 @@ if ($action == 'create') {
print '';
// Amount TTC
print '' . $langs->trans('AmountTTC') . ' ';
- print '' . price($sign * $object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($sign * $object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount TTC
- print '' . price($sign * $object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($sign * $object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 6155dfd9c8a..e897ebd198b 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -2614,14 +2614,14 @@ if ($num > 0) {
}
// Total margin rate
if (!empty($arrayfields['total_margin_rate']['checked'])) {
- print ''.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').' ';
+ print ''.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2).'%').' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
// Total mark rate
if (!empty($arrayfields['total_mark_rate']['checked'])) {
- print ''.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').' ';
+ print ''.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2).'%').' ';
if (!$i) {
$totalarray['nbfield']++;
$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 7912337feeb..33ec278f646 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -640,17 +640,17 @@ if ($object->id > 0) {
if (isModEnabled('multicurrency') && ($object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount HT
print ''.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).' ';
- print ''.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
+ print ''.price($object->multicurrency_total_ht, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
print ''.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).' ';
- print ''.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
+ print ''.price($object->multicurrency_total_tva, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
print ''.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).' ';
- print ''.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
+ print ''.price($object->multicurrency_total_ttc, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
print ''.$langs->trans('Amount').' '.price($object->amount, '', $langs, 0, -1, -1, $conf->currency).' '.$langs->trans('Amount').' '.price($object->amount, 0, $langs, 0, -1, -1, $conf->currency).' '.$invoice->getLibStatut(5, $alreadypayed).' ';
- $parameters = array('fk_paiement'=> (int) $object->id);
+ $parameters = array('fk_paiement' => (int) $object->id);
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook
print "\n";
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index 8848d70c325..9b42490727d 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -113,7 +113,7 @@ if (isModEnabled('salaries')) {
print ''.$langs->trans("Total").' ';
print '';
-print price($totaltoshow, '', '', 1, -1, -1, 'auto');
+print price($totaltoshow, 0, '', 1, -1, -1, 'auto');
print ' '.$langs->trans("SalaryInvoiceWaitingWithdraw").' ('.$numRow.') ';
if ($numRow) {
- while ($j < $numRow && $j<10) {
+ while ($j < $numRow && $j < 10) {
$objSalary = $db->fetch_object($resql2);
$user->fetch($objSalary->fk_user);
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 9b3b16b60fc..abda85280a0 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -92,7 +92,7 @@ class BonPrelevement extends CommonObject
*/
public $file;
- /*
+ /**
* @var string filename
*/
public $filename;
@@ -146,21 +146,21 @@ class BonPrelevement extends CommonObject
/**
* @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
- public $fields=array(
- 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>0,),
- 'ref' => array('type'=>'varchar(12)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflowmax150', 'showoncombobox'=>'1',),
- 'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>25, 'notnull'=>0, 'visible'=>-1,),
- 'amount' => array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>-1,),
- 'statut' => array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>'1', 'position'=>500, 'notnull'=>0, 'visible'=>-1, 'arrayofkeyval'=>array(0=>'Wait', 1=>'Transfered', 2=>'Credited')),
- 'credite' => array('type'=>'smallint(6)', 'label'=>'Credite', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>-1,),
- 'note' => array('type'=>'text', 'label'=>'Note', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>-1,),
- 'date_trans' => array('type'=>'datetime', 'label'=>'Datetrans', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
- 'method_trans' => array('type'=>'smallint(6)', 'label'=>'Methodtrans', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1,),
- 'fk_user_trans' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fkusertrans', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>-1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150',),
- 'date_credit' => array('type'=>'datetime', 'label'=>'Datecredit', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>-1,),
- 'fk_user_credit' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fkusercredit', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>-1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150',),
- 'type' => array('type'=>'varchar(16)', 'label'=>'Type', 'enabled'=>'1', 'position'=>75, 'notnull'=>0, 'visible'=>-1,),
- 'fk_bank_account' => array('type'=>'integer', 'label'=>'Fkbankaccount', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>-1, 'css'=>'maxwidth500 widthcentpercentminusxx',),
+ public $fields = array(
+ 'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 0,),
+ 'ref' => array('type' => 'varchar(12)', 'label' => 'Ref', 'enabled' => '1', 'position' => 15, 'notnull' => 0, 'visible' => -1, 'csslist' => 'tdoverflowmax150', 'showoncombobox' => '1',),
+ 'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 25, 'notnull' => 0, 'visible' => -1,),
+ 'amount' => array('type' => 'double(24,8)', 'label' => 'Amount', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => -1,),
+ 'statut' => array('type' => 'smallint(6)', 'label' => 'Statut', 'enabled' => '1', 'position' => 500, 'notnull' => 0, 'visible' => -1, 'arrayofkeyval' => array(0 => 'Wait', 1 => 'Transfered', 2 => 'Credited')),
+ 'credite' => array('type' => 'smallint(6)', 'label' => 'Credite', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => -1,),
+ 'note' => array('type' => 'text', 'label' => 'Note', 'enabled' => '1', 'position' => 45, 'notnull' => 0, 'visible' => -1,),
+ 'date_trans' => array('type' => 'datetime', 'label' => 'Datetrans', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => -1,),
+ 'method_trans' => array('type' => 'smallint(6)', 'label' => 'Methodtrans', 'enabled' => '1', 'position' => 55, 'notnull' => 0, 'visible' => -1,),
+ 'fk_user_trans' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fkusertrans', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
+ 'date_credit' => array('type' => 'datetime', 'label' => 'Datecredit', 'enabled' => '1', 'position' => 65, 'notnull' => 0, 'visible' => -1,),
+ 'fk_user_credit' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'Fkusercredit', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150',),
+ 'type' => array('type' => 'varchar(16)', 'label' => 'Type', 'enabled' => '1', 'position' => 75, 'notnull' => 0, 'visible' => -1,),
+ 'fk_bank_account' => array('type' => 'integer', 'label' => 'Fkbankaccount', 'enabled' => '1', 'position' => 80, 'notnull' => 0, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx',),
);
public $rowid;
public $ref;
@@ -1565,7 +1565,7 @@ class BonPrelevement extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('banktransferdao'));
- $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $parameters = array('id' => $this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index b8c75847372..e123c7692f6 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -93,7 +93,7 @@ print '';
print ''.$langs->trans("AmountToWithdraw").' ';
print '';
-print price($bprev->SommeAPrelever('direct-debit'), '', '', 1, -1, -1, 'auto');
+print price($bprev->SommeAPrelever('direct-debit'), 0, '', 1, -1, -1, 'auto');
print ' ' . price($marginInfo['pa_products']) . ' ';
print '' . price($marginInfo['margin_on_products']) . ' ';
if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
- print '' . (($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, 2) . '%') . ' ';
+ print '' . (($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], 0, null, null, null, 2) . '%') . ' ';
}
if (getDolGlobalString('DISPLAY_MARK_RATES')) {
- print '' . (($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, 2) . '%') . ' ';
+ print '' . (($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], 0, null, null, null, 2) . '%') . ' ';
}
print '';
}
@@ -287,10 +287,10 @@ class FormMargin
print '' . price($marginInfo['pa_services']) . ' ';
print '' . price($marginInfo['margin_on_services']) . ' ';
if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
- print '' . (($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, 2) . '%') . ' ';
+ print '' . (($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], 0, null, null, null, 2) . '%') . ' ';
}
if (getDolGlobalString('DISPLAY_MARK_RATES')) {
- print '' . (($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, 2) . '%') . ' ';
+ print '' . (($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], 0, null, null, null, 2) . '%') . ' ';
}
print '';
}
@@ -302,10 +302,10 @@ class FormMargin
print '' . price($marginInfo['pa_total']) . ' ';
print '' . price($marginInfo['total_margin']) . ' ';
if (getDolGlobalString('DISPLAY_MARGIN_RATES')) {
- print '' . (($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2) . '%') . ' ';
+ print '' . (($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], 0, null, null, null, 2) . '%') . ' ';
}
if (getDolGlobalString('DISPLAY_MARK_RATES')) {
- print '' . (($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2) . '%') . ' ';
+ print '' . (($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], 0, null, null, null, 2) . '%') . ' ';
}
print '';
}
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index d8ae597f9d3..c16cc2d3007 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -503,13 +503,13 @@ class RssParser
// Add record to result array
$this->_rssarray[$i] = array(
- 'link'=>$itemLink,
- 'title'=>$itemTitle,
- 'description'=>$itemDescription,
- 'pubDate'=>$itemPubDate,
- 'category'=>$itemCategory,
- 'id'=>$itemId,
- 'author'=>$itemAuthor
+ 'link' => $itemLink,
+ 'title' => $itemTitle,
+ 'description' => $itemDescription,
+ 'pubDate' => $itemPubDate,
+ 'category' => $itemCategory,
+ 'id' => $itemId,
+ 'author' => $itemAuthor
);
//var_dump($this->_rssarray);
@@ -812,7 +812,7 @@ class RssParser
}
}
-
+// @phan-suppress PhanPluginPHPDocInWrongComment
/*
* A method for the xml_set_external_entity_ref_handler()
*
diff --git a/htdocs/core/class/timespent.class.php b/htdocs/core/class/timespent.class.php
index 23544f73edd..a4327d55ae9 100644
--- a/htdocs/core/class/timespent.class.php
+++ b/htdocs/core/class/timespent.class.php
@@ -113,25 +113,25 @@ class TimeSpent extends CommonObject
/**
* @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
- public $fields=array(
- 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
- 'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>17, 'notnull'=>0, 'visible'=>-2,),
- 'import_key' => array('type'=>'varchar(14)', 'label'=>'import_key', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>-1,),
- 'fk_element' => array('type'=>'integer', 'label'=>'fk_element', 'enabled'=>'1', 'position'=>2, 'notnull'=>1, 'visible'=>-1,),
- 'elementtype' => array('type'=>'varchar(32)', 'label'=>'elementtype', 'enabled'=>'1', 'position'=>3, 'notnull'=>1, 'visible'=>-1,),
- 'element_date' => array('type'=>'date', 'label'=>'element_date', 'enabled'=>'1', 'position'=>4, 'notnull'=>0, 'visible'=>-1,),
- 'element_datehour' => array('type'=>'datetime', 'label'=>'element_datehour', 'enabled'=>'1', 'position'=>5, 'notnull'=>0, 'visible'=>-1,),
- 'element_date_withhour' => array('type'=>'integer', 'label'=>'element_date_withhour', 'enabled'=>'1', 'position'=>6, 'notnull'=>0, 'visible'=>-1,),
- 'element_duration' => array('type'=>'double', 'label'=>'element_duration', 'enabled'=>'1', 'position'=>7, 'notnull'=>0, 'visible'=>-1,),
- 'fk_product' => array('type'=>'integer', 'label'=>'fk_product', 'enabled'=>'1', 'position'=>8, 'notnull'=>0, 'visible'=>-1,),
- 'fk_user' => array('type'=>'integer', 'label'=>'fk_user', 'enabled'=>'1', 'position'=>9, 'notnull'=>0, 'visible'=>-1,),
- 'thm' => array('type'=>'double(24,8)', 'label'=>'thm', 'enabled'=>'1', 'position'=>10, 'notnull'=>0, 'visible'=>-1,),
- 'invoice_id' => array('type'=>'integer', 'label'=>'invoice_id', 'enabled'=>'1', 'position'=>11, 'notnull'=>0, 'visible'=>-1, 'default'=>'NULL',),
- 'invoice_line_id' => array('type'=>'integer', 'label'=>'invoice_line_id', 'enabled'=>'1', 'position'=>12, 'notnull'=>0, 'visible'=>-1, 'default'=>'NULL',),
- 'intervention_id' => array('type'=>'integer', 'label'=>'intervention_id', 'enabled'=>'1', 'position'=>13, 'notnull'=>0, 'visible'=>-1, 'default'=>'NULL',),
- 'intervention_line_id' => array('type'=>'integer', 'label'=>'intervention_line_id', 'enabled'=>'1', 'position'=>14, 'notnull'=>0, 'visible'=>-1, 'default'=>'NULL',),
- 'datec' => array('type'=>'datetime', 'label'=>'datec', 'enabled'=>'1', 'position'=>16, 'notnull'=>0, 'visible'=>-1,),
- 'note' => array('type'=>'text', 'label'=>'note', 'enabled'=>'1', 'position'=>18, 'notnull'=>0, 'visible'=>-1,),
+ public $fields = array(
+ 'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'comment' => "Id"),
+ 'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 17, 'notnull' => 0, 'visible' => -2,),
+ 'import_key' => array('type' => 'varchar(14)', 'label' => 'import_key', 'enabled' => '1', 'position' => 15, 'notnull' => 0, 'visible' => -1,),
+ 'fk_element' => array('type' => 'integer', 'label' => 'fk_element', 'enabled' => '1', 'position' => 2, 'notnull' => 1, 'visible' => -1,),
+ 'elementtype' => array('type' => 'varchar(32)', 'label' => 'elementtype', 'enabled' => '1', 'position' => 3, 'notnull' => 1, 'visible' => -1,),
+ 'element_date' => array('type' => 'date', 'label' => 'element_date', 'enabled' => '1', 'position' => 4, 'notnull' => 0, 'visible' => -1,),
+ 'element_datehour' => array('type' => 'datetime', 'label' => 'element_datehour', 'enabled' => '1', 'position' => 5, 'notnull' => 0, 'visible' => -1,),
+ 'element_date_withhour' => array('type' => 'integer', 'label' => 'element_date_withhour', 'enabled' => '1', 'position' => 6, 'notnull' => 0, 'visible' => -1,),
+ 'element_duration' => array('type' => 'double', 'label' => 'element_duration', 'enabled' => '1', 'position' => 7, 'notnull' => 0, 'visible' => -1,),
+ 'fk_product' => array('type' => 'integer', 'label' => 'fk_product', 'enabled' => '1', 'position' => 8, 'notnull' => 0, 'visible' => -1,),
+ 'fk_user' => array('type' => 'integer', 'label' => 'fk_user', 'enabled' => '1', 'position' => 9, 'notnull' => 0, 'visible' => -1,),
+ 'thm' => array('type' => 'double(24,8)', 'label' => 'thm', 'enabled' => '1', 'position' => 10, 'notnull' => 0, 'visible' => -1,),
+ 'invoice_id' => array('type' => 'integer', 'label' => 'invoice_id', 'enabled' => '1', 'position' => 11, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
+ 'invoice_line_id' => array('type' => 'integer', 'label' => 'invoice_line_id', 'enabled' => '1', 'position' => 12, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
+ 'intervention_id' => array('type' => 'integer', 'label' => 'intervention_id', 'enabled' => '1', 'position' => 13, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
+ 'intervention_line_id' => array('type' => 'integer', 'label' => 'intervention_line_id', 'enabled' => '1', 'position' => 14, 'notnull' => 0, 'visible' => -1, 'default' => 'NULL',),
+ 'datec' => array('type' => 'datetime', 'label' => 'datec', 'enabled' => '1', 'position' => 16, 'notnull' => 0, 'visible' => -1,),
+ 'note' => array('type' => 'text', 'label' => 'note', 'enabled' => '1', 'position' => 18, 'notnull' => 0, 'visible' => -1,),
);
public $rowid;
public $import_key;
@@ -352,7 +352,7 @@ class TimeSpent extends CommonObject
$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
if ($errormessage) {
$this->errors[] = $errormessage;
- dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
return -1;
}
@@ -772,7 +772,7 @@ class TimeSpent extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array($this->element.'dao'));
- $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $parameters = array('id' => $this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 7fca6289c95..7caa6533194 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -197,9 +197,6 @@ function societe_prepare_head(Societe $object)
$title = $langs->trans("PaymentModes");
if (isModEnabled('stripe')) {
- //$langs->load("stripe");
- //$title = $langs->trans("BankAccountsAndGateways");
-
$servicestatus = 0;
if (getDolGlobalString('STRIPE_LIVE') && !GETPOST('forcesandbox', 'alpha')) {
$servicestatus = 1;
@@ -1001,7 +998,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
$sortorder = GETPOST('sortorder', 'aZ09comma');
$page = GETPOSTISSET('pageplusone') ? (GETPOSTINT('pageplusone') - 1) : GETPOSTINT("page");
- $search_status = GETPOSTINT("search_status");
+ $search_status = GETPOST("search_status", "intcomma");
if ($search_status == '') {
$search_status = 1; // always display active customer first
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d2d4a4558f8..7e3823d2ac5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4272,6 +4272,7 @@ function isValidEmail($address, $acceptsupervisorkey = 0, $acceptuserkey = 0)
* @param string $domain Domain name (Ex: "yahoo.com", "yhaoo.com", "dolibarr.fr")
* @return int -1 if error (function not available), 0=Not valid, 1=Valid
* @see isValidEmail()
+ * @suppress PhanDeprecatedFunctionInternal Error in Phan plugins incorrectly tags some functions here
*/
function isValidMXRecord($domain)
{
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index b5a53c7f888..15f54b75f97 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -267,7 +267,7 @@ function dol_json_decode($json, $assoc = false)
} else {
$out .= $json[$i];
}
- if ($i > 0 && $json[$i] == '"' && $json[($i - 1)] != "\\") {
+ if ($i >= 1 && $json[$i] == '"' && $json[$i - 1] != "\\") {
$comment = !$comment;
}
}
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index d925aa68368..06546f208d1 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -453,12 +453,12 @@ if ($action == 'create') {
$arrayoutstandingbills = $soc->getOutstandingBills();
$outstandingBills = $arrayoutstandingbills['opened'];
print ' ('.$langs->trans('CurrentOutstandingBill').': ';
- print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
+ print price($outstandingBills, 0, $langs, 0, 0, -1, $conf->currency);
if ($soc->outstanding_limit != '') {
if ($outstandingBills > $soc->outstanding_limit) {
print img_warning($langs->trans("OutstandingBillReached"));
}
- print ' / '.price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
+ print ' / '.price($soc->outstanding_limit, 0, $langs, 0, 0, -1, $conf->currency);
}
print ')';
print '';
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 97497ced70a..0ff0e06936f 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -114,22 +114,22 @@ class ConferenceOrBooth extends ActionComm
* @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
public $fields = array(
- 'id' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'csslist'=>'left', 'comment'=>"Id"),
- 'ref' => array('type'=>'integer', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'csslist'=>'left', 'comment'=>"Id"),
- 'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax150', 'help'=>"OrganizationEvenLabelName", 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
- 'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:(t.usage_organize_event:=:1)', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'position'=>52, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'project', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax100'),
- 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'csslist'=>'tdoverflowmax100', 'css'=>'maxwidth500'),
- 'note' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3),
- 'fk_action' => array('type'=>"sellist:c_actioncomm:libelle:id::(module:LIKE:'%@eventorganization')", 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width100', 'csslist'=>'tdoverflowmax100'),
- 'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),
- 'datep2' => array('type'=>'datetime', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'3',),
- 'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2, 'csslist'=>'nowraponall'),
- 'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2, 'csslist'=>'nowraponall'),
- 'fk_user_author' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax100'),
- 'fk_user_mod' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2, 'csslist'=>'tdoverflowmax100'),
- 'num_vote' => array('type'=>'smallint', 'label'=>'NbVotes', 'enabled'=>'1', 'position'=>800, 'notnull'=>-1, 'visible'=>5, 'default'=>'0', 'index'=>0),
- 'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
- 'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'EvntOrgDraft', '1'=>'EvntOrgSuggested', '2'=> 'EvntOrgConfirmed', '3' =>'EvntOrgNotQualified', '4' =>'EvntOrgDone', '9'=>'EvntOrgCancelled'),),
+ 'id' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'csslist' => 'left', 'comment' => "Id"),
+ 'ref' => array('type' => 'integer', 'label' => 'Ref', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 2, 'noteditable' => '1', 'index' => 1, 'css' => 'left', 'csslist' => 'left', 'comment' => "Id"),
+ 'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'csslist' => 'tdoverflowmax150', 'help' => "OrganizationEvenLabelName", 'showoncombobox' => '1', 'autofocusoncreate' => 1),
+ 'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1:(t.usage_organize_event:=:1)', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'position' => 52, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'picto' => 'project', 'css' => 'maxwidth500', 'csslist' => 'tdoverflowmax100'),
+ 'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'enabled' => '$conf->societe->enabled', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1, 'help' => "OrganizationEventLinkToThirdParty", 'picto' => 'company', 'csslist' => 'tdoverflowmax100', 'css' => 'maxwidth500'),
+ 'note' => array('type' => 'html', 'label' => 'Description', 'enabled' => '1', 'position' => 60, 'notnull' => 0, 'visible' => 3),
+ 'fk_action' => array('type' => "sellist:c_actioncomm:libelle:id::(module:LIKE:'%@eventorganization')", 'label' => 'Format', 'enabled' => '1', 'position' => 60, 'notnull' => 1, 'visible' => 1, 'css' => 'width100', 'csslist' => 'tdoverflowmax100'),
+ 'datep' => array('type' => 'datetime', 'label' => 'DateStart', 'enabled' => '1', 'position' => 70, 'notnull' => 0, 'visible' => 1, 'showoncombobox' => '2',),
+ 'datep2' => array('type' => 'datetime', 'label' => 'DateEnd', 'enabled' => '1', 'position' => 71, 'notnull' => 0, 'visible' => 1, 'showoncombobox' => '3',),
+ 'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2, 'csslist' => 'nowraponall'),
+ 'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2, 'csslist' => 'nowraponall'),
+ 'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid', 'csslist' => 'tdoverflowmax100'),
+ 'fk_user_mod' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2, 'csslist' => 'tdoverflowmax100'),
+ 'num_vote' => array('type' => 'smallint', 'label' => 'NbVotes', 'enabled' => '1', 'position' => 800, 'notnull' => -1, 'visible' => 5, 'default' => '0', 'index' => 0),
+ 'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+ 'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'visible' => 1, 'default' => '0', 'index' => 1, 'arrayofkeyval' => array('0' => 'EvntOrgDraft', '1' => 'EvntOrgSuggested', '2' => 'EvntOrgConfirmed', '3' => 'EvntOrgNotQualified', '4' => 'EvntOrgDone', '9' => 'EvntOrgCancelled'),),
);
public $rowid;
public $id;
@@ -306,7 +306,7 @@ class ConferenceOrBooth extends ActionComm
$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
if ($errormessage) {
$this->errors[] = $errormessage;
- dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
return -1;
}
@@ -603,7 +603,7 @@ class ConferenceOrBooth extends ActionComm
global $action, $hookmanager;
$hookmanager->initHooks(array('conferenceorboothdao'));
- $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $parameters = array('id' => $this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index ea292e437d2..29f7fb8eafa 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -431,7 +431,7 @@ class ConferenceOrBoothAttendee extends CommonObject
$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
if ($errormessage) {
$this->errors[] = $errormessage;
- dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
return -1;
}
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 06fb0af4299..77ee9b6abd5 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -273,7 +273,7 @@ if (!empty($withproject)) {
// Budget
print ''.$langs->trans("Budget").' ';
if (strcmp($projectstatic->budget_amount, '')) {
- print ''.price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency).' ';
+ print ''.price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).' ';
}
print ' '.$langs->trans("Budget").' ';
if (strcmp($projectstatic->budget_amount, '')) {
- print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
}
print ' '.$langs->trans("Budget").' ';
if (strcmp($projectstatic->budget_amount, '')) {
- print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
}
print ' '.$langs->trans("Budget").' ';
if (strcmp($project->budget_amount, '')) {
- print ''.price($project->budget_amount, '', $langs, 1, 0, 0, $conf->currency).' ';
+ print ''.price($project->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).' ';
}
print ' '.$langs->trans("Budget").' ';
if (strcmp($projectstatic->budget_amount, '')) {
- print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
}
print ' '.$langs->trans("Budget").' ';
if (strcmp($projectstatic->budget_amount, '')) {
- print ''.price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency).' ';
+ print ''.price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).' ';
}
print ' '.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).' ';
- print ''.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
+ print ''.price($object->multicurrency_total_ht, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
print ''.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).' ';
- print ''.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
+ print ''.price($object->multicurrency_total_tva, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
print ''.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).' ';
- print ''.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
+ print ''.price($object->multicurrency_total_ttc, 0, $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' ';
print '';
- if ($type == 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES')|| getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
+ if ($type == 0 || getDolGlobalString('STOCK_SUPPORTS_SERVICES') || getDolGlobalString('SHIPMENT_SUPPORTS_SERVICES')) {
$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
$toBeShippedTotal += $toBeShipped[$objp->fk_product];
print $toBeShipped[$objp->fk_product];
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 5998b330c14..ce869f06617 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -236,7 +236,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
if (!$notrigger) {
// Call triggers
- $result=$this->call_trigger('LINERECEPTION_CREATE', $user);
+ $result = $this->call_trigger('LINERECEPTION_CREATE', $user);
if ($result < 0) {
$error++;
}
@@ -703,7 +703,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
if ($errormessage) {
$this->errors[] = $errormessage;
- dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
return -1;
}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 0171b5d597d..85de2e7fb6f 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2340,20 +2340,20 @@ if ($action == 'create') {
print ' ';
// Amount HT
print '' . $langs->trans('AmountHT') . ' ';
- print '' . price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount HT
- print '' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
print '';
// Amount VAT
print '' . $langs->trans('AmountVAT') . ' ';
- print '' . price($object->total_tva, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount VAT
- print '' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
@@ -2361,18 +2361,18 @@ if ($action == 'create') {
if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
print '';
print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' ';
- print '' . price($object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
print '';
print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ';
- print '' . price($object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
}
@@ -2386,10 +2386,10 @@ if ($action == 'create') {
print '';
// Amount TTC
print '' . $langs->trans('AmountTTC') . ' ';
- print '' . price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . $alert . ' ';
+ print '' . price($object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . $alert . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount TTC
- print '' . price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
index d4581c706b3..c3d748e81d1 100644
--- a/htdocs/fourn/facture/card-rec.php
+++ b/htdocs/fourn/facture/card-rec.php
@@ -1205,10 +1205,10 @@ if ($action == 'create') {
print '';
print '' . $langs->trans('AmountHT') . ' ';
- print '' . price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . ' ';
print '' . $langs->trans("AmountVAT") . ' ' . price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency) . ' ';
+ print '' . $langs->trans("AmountVAT") . ' ' . price($object->total_tva, 0, $langs, 1, -1, -1, $conf->currency) . ' ';
print '' . price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency) . ' ';
}
- print '' . $langs->trans("AmountTTC") . ' ' . price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency) . ' ';
+ print '' . $langs->trans("AmountTTC") . ' ' . price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency) . ' ';
print '';
print '' . $langs->trans('AmountHT') . ' ';
- print '' . price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
@@ -3568,7 +3568,7 @@ if ($action == 'create') {
print price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency);
print '';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print '';
@@ -3587,9 +3587,9 @@ if ($action == 'create') {
print '';
print '' . $langs->trans('AmountTTC') . ' ';
- print '' . price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 0987ec11c6f..966cde2511b 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -221,7 +221,7 @@ if ($result > 0) {
// Amount
print ''.$langs->trans('Amount').' ';
- print ''.price($object->amount, '', $langs, 0, 0, -1, $conf->currency).' '.price($object->amount, 0, $langs, 0, 0, -1, $conf->currency).' ';
- print($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : '').''.price($unitline, '', '', 0, 0, -1, $conf->currency)).' ';
+ print($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : '').''.price($unitline, 0, '', 0, 0, -1, $conf->currency)).' ';
print ' ';
// Best selling price
@@ -460,7 +460,7 @@ if ($id > 0 || !empty($ref)) {
print '';
print($notdefined ? '' : ($value['nb'] > 1 ? $value['nb'].'x ' : ''));
if (is_numeric($pricesell)) {
- print ''.price($pricesell, '', '', 0, 0, -1, $conf->currency).' ';
+ print ''.price($pricesell, 0, '', 0, 0, -1, $conf->currency).' ';
} else {
print ''.$langs->trans($pricesell).' ';
}
@@ -567,7 +567,7 @@ if ($id > 0 || !empty($ref)) {
if ($atleastonenotdefined) {
print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')';
}
- print($atleastonenotdefined ? '' : price($total, '', '', 0, 0, -1, $conf->currency));
+ print($atleastonenotdefined ? '' : price($total, 0, '', 0, 0, -1, $conf->currency));
print ' ';
// Minimum selling price
@@ -579,7 +579,7 @@ if ($id > 0 || !empty($ref)) {
if ($atleastonenotdefined) {
print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')';
}
- print($atleastonenotdefined ? '' : price($totalsell, '', '', 0, 0, -1, $conf->currency));
+ print($atleastonenotdefined ? '' : price($totalsell, 0, '', 0, 0, -1, $conf->currency));
print '';
// Stock
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 28af89a6246..9abf9bd5326 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
-$type = GETPOSTINT("type");
+$type = GETPOST("type", 'intcomma');
if ($type == '' && !$user->hasRight('produit', 'lire') && $user->hasRight('service', 'lire')) {
$type = '1'; // Force global page on service page only
}
@@ -69,15 +69,15 @@ if ($type == '0') {
$transAreaType = $langs->trans("ProductsAndServicesArea");
$helpurl = '';
-if (!isset($_GET["type"])) {
+if (!GETPOSTISSET("type")) {
$transAreaType = $langs->trans("ProductsAndServicesArea");
$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos';
}
-if ((isset($_GET["type"]) && $_GET["type"] == 0) || !isModEnabled("service")) {
+if ((GETPOSTISSET("type") && GETPOST("type") == '0') || !isModEnabled("service")) {
$transAreaType = $langs->trans("ProductsArea");
$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos';
}
-if ((isset($_GET["type"]) && $_GET["type"] == 1) || !isModEnabled("product")) {
+if ((GETPOSTISSET("type") && GETPOST("type") == '1') || !isModEnabled("product")) {
$transAreaType = $langs->trans("ServicesArea");
$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios';
}
@@ -310,10 +310,10 @@ if ((isModEnabled("product") || isModEnabled("service")) && ($user->hasRight("pr
if ($num > 0) {
$transRecordedType = $langs->trans("LastModifiedProductsAndServices", $max);
- if (isset($_GET["type"]) && $_GET["type"] == 0) {
+ if (GETPOSTISSET("type") && GETPOST("type") == '0') {
$transRecordedType = $langs->trans("LastRecordedProducts", $max);
}
- if (isset($_GET["type"]) && $_GET["type"] == 1) {
+ if (GETPOSTISSET("type") && GETPOST("type") == '1') {
$transRecordedType = $langs->trans("LastRecordedServices", $max);
}
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index ca5bcb5fded..787cc14f779 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -52,7 +52,7 @@ $mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
$search_ref = GETPOST("sref", "alpha") ? GETPOST("sref", "alpha") : GETPOST("search_ref", "alpha");
$search_label = GETPOST("snom", "alpha") ? GETPOST("snom", "alpha") : GETPOST("search_label", "alpha");
-$search_status = GETPOSTINT("search_status");
+$search_status = GETPOST("search_status", "intcomma");
$search_category_list = array();
if (isModEnabled('category')) {
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 4d1111f1d84..7ba9d0105dc 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -125,32 +125,32 @@ class StockTransfer extends CommonObject
/**
* @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
- public $fields=array(
- 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
- 'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'1', 'position'=>1, 'default'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
- 'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
- 'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'css'=>'minwidth100', 'csslist'=>'tdoverflowmax125', 'autofocusoncreate'=>1),
- 'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>3,),
- 'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>32, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax125'),
- 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1/*, 'help'=>"LinkToThirdparty"*/, 'picto'=>'company', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax125'),
- 'fk_warehouse_source' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt source', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'help'=>'HelpWarehouseStockTransferSource', 'picto'=>'stock', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
- 'fk_warehouse_destination' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt de destination', 'enabled'=>'1', 'position'=>51, 'notnull'=>0, 'visible'=>1, 'help'=>'HelpWarehouseStockTransferDestination', 'picto'=>'stock', 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
- 'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
- 'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
- 'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
- 'date_prevue_depart' => array('type'=>'date', 'label'=>'DatePrevueDepart', 'enabled'=>'1', 'position'=>100, 'notnull'=>0, 'visible'=>1,),
- 'date_reelle_depart' => array('type'=>'date', 'label'=>'DateReelleDepart', 'enabled'=>'1', 'position'=>101, 'notnull'=>0, 'visible'=>5,),
- 'date_prevue_arrivee' => array('type'=>'date', 'label'=>'DatePrevueArrivee', 'enabled'=>'1', 'position'=>102, 'notnull'=>0, 'visible'=>1,),
- 'date_reelle_arrivee' => array('type'=>'date', 'label'=>'DateReelleArrivee', 'enabled'=>'1', 'position'=>103, 'notnull'=>0, 'visible'=>5,),
- 'lead_time_for_warning' => array('type'=>'integer', 'label'=>'LeadTimeForWarning', 'enabled'=>'1', 'position'=>200, 'default'=>0, 'notnull'=>0, 'visible'=>1),
- 'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
- 'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
- 'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'ChangedBy', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
- 'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
- 'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
- 'fk_incoterms' => array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-2, 'position'=>220),
- 'location_incoterms' => array('type'=>'varchar(255)', 'label'=>'IncotermLabel', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-2, 'position'=>225),
- 'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>5, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '2'=>'StockStransferDecremented', '3'=>'StockStransferIncremented'),),
+ public $fields = array(
+ 'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
+ 'entity' => array('type' => 'integer', 'label' => 'Entity', 'enabled' => '1', 'position' => 1, 'default' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
+ 'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => '1', 'position' => 10, 'notnull' => 1, 'visible' => 4, 'noteditable' => '1', 'default' => '(PROV)', 'index' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'comment' => "Reference of object"),
+ 'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => '1', 'position' => 30, 'notnull' => 0, 'visible' => 1, 'searchall' => 1, 'showoncombobox' => '1', 'css' => 'minwidth100', 'csslist' => 'tdoverflowmax125', 'autofocusoncreate' => 1),
+ 'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => '1', 'position' => 31, 'notnull' => 0, 'visible' => 3,),
+ 'fk_project' => array('type' => 'integer:Project:projet/class/project.class.php:1', 'label' => 'Project', 'enabled' => '$conf->project->enabled', 'position' => 32, 'notnull' => -1, 'visible' => -1, 'index' => 1, 'picto' => 'project', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax125'),
+ 'fk_soc' => array('type' => 'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label' => 'ThirdParty', 'enabled' => '1', 'position' => 50, 'notnull' => -1, 'visible' => 1, 'index' => 1/*, 'help'=>"LinkToThirdparty"*/, 'picto' => 'company', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax125'),
+ 'fk_warehouse_source' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt source', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 1, 'help' => 'HelpWarehouseStockTransferSource', 'picto' => 'stock', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+ 'fk_warehouse_destination' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt de destination', 'enabled' => '1', 'position' => 51, 'notnull' => 0, 'visible' => 1, 'help' => 'HelpWarehouseStockTransferDestination', 'picto' => 'stock', 'css' => 'maxwidth500 widthcentpercentminusxx', 'csslist' => 'tdoverflowmax150'),
+ 'note_public' => array('type' => 'html', 'label' => 'NotePublic', 'enabled' => '1', 'position' => 61, 'notnull' => 0, 'visible' => 0,),
+ 'note_private' => array('type' => 'html', 'label' => 'NotePrivate', 'enabled' => '1', 'position' => 62, 'notnull' => 0, 'visible' => 0,),
+ 'date_creation' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => '1', 'position' => 500, 'notnull' => 1, 'visible' => -2,),
+ 'date_prevue_depart' => array('type' => 'date', 'label' => 'DatePrevueDepart', 'enabled' => '1', 'position' => 100, 'notnull' => 0, 'visible' => 1,),
+ 'date_reelle_depart' => array('type' => 'date', 'label' => 'DateReelleDepart', 'enabled' => '1', 'position' => 101, 'notnull' => 0, 'visible' => 5,),
+ 'date_prevue_arrivee' => array('type' => 'date', 'label' => 'DatePrevueArrivee', 'enabled' => '1', 'position' => 102, 'notnull' => 0, 'visible' => 1,),
+ 'date_reelle_arrivee' => array('type' => 'date', 'label' => 'DateReelleArrivee', 'enabled' => '1', 'position' => 103, 'notnull' => 0, 'visible' => 5,),
+ 'lead_time_for_warning' => array('type' => 'integer', 'label' => 'LeadTimeForWarning', 'enabled' => '1', 'position' => 200, 'default' => 0, 'notnull' => 0, 'visible' => 1),
+ 'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => -2,),
+ 'fk_user_creat' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => '1', 'position' => 510, 'notnull' => 1, 'visible' => -2, 'foreignkey' => 'user.rowid',),
+ 'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'ChangedBy', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => -2,),
+ 'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => -2,),
+ 'model_pdf' => array('type' => 'varchar(255)', 'label' => 'Model pdf', 'enabled' => '1', 'position' => 1010, 'notnull' => -1, 'visible' => 0,),
+ 'fk_incoterms' => array('type' => 'integer', 'label' => 'IncotermCode', 'enabled' => '$conf->incoterm->enabled', 'visible' => -2, 'position' => 220),
+ 'location_incoterms' => array('type' => 'varchar(255)', 'label' => 'IncotermLabel', 'enabled' => '$conf->incoterm->enabled', 'visible' => -2, 'position' => 225),
+ 'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => '1', 'position' => 1000, 'notnull' => 1, 'visible' => 5, 'index' => 1, 'arrayofkeyval' => array('0' => 'Draft', '1' => 'Validated', '2' => 'StockStransferDecremented', '3' => 'StockStransferIncremented'),),
);
public $rowid;
public $ref;
@@ -397,7 +397,7 @@ class StockTransfer extends CommonObject
}
if (!empty($this->lines)) {
foreach ($this->lines as $l) {
- $total_pmp+= ($l->pmp * $l->qty);
+ $total_pmp += ($l->pmp * $l->qty);
}
}
@@ -436,7 +436,7 @@ class StockTransfer extends CommonObject
$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
if ($errormessage) {
$this->errors[] = $errormessage;
- dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
return -1;
}
@@ -830,7 +830,7 @@ class StockTransfer extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('stocktransferdao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id' => $this->id, 'getnomurl' => $result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
index dbd2db3bce4..8eb2c92c8cb 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -95,17 +95,17 @@ class StockTransferLine extends CommonObjectLine
/**
* @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
- public $fields=array(
- 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
- 'amount' => array('type'=>'price', 'label'=>'Amount', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'default'=>'null', 'isameasure'=>'1', 'help'=>"Help text for amount",),
- 'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'help'=>"Help text for quantity",),
- 'fk_warehouse_destination' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt de destination', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
- 'fk_warehouse_source' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt source', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
- 'fk_stocktransfer' => array('type'=>'integer:StockTransfer:stocktransfer/stock/class/stocktransfer.class.php', 'label'=>'StockTransfer', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>0,),
- 'fk_product' => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
- 'batch' => array('type'=>'varchar(128)', 'label'=>'Batch', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>1,),
- 'pmp' => array('type'=>'double'/*, 'help'=>'THMEstimatedHelp'*/, 'label'=>'PMP', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1,),
- 'rang' => array('type'=>'integer', 'label'=>'Qty', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>0, 'default'=>'0', 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'help'=>"Help text for quantity",),
+ public $fields = array(
+ 'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => '1', 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => '1', 'index' => 1, 'comment' => "Id"),
+ 'amount' => array('type' => 'price', 'label' => 'Amount', 'enabled' => '1', 'position' => 40, 'notnull' => 0, 'visible' => 1, 'default' => 'null', 'isameasure' => '1', 'help' => "Help text for amount",),
+ 'qty' => array('type' => 'real', 'label' => 'Qty', 'enabled' => '1', 'position' => 45, 'notnull' => 0, 'visible' => 1, 'default' => '0', 'isameasure' => '1', 'css' => 'maxwidth75imp', 'help' => "Help text for quantity",),
+ 'fk_warehouse_destination' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt de destination', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 1,),
+ 'fk_warehouse_source' => array('type' => 'integer:Entrepot:product/stock/class/entrepot.class.php', 'label' => 'Entrepôt source', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 1,),
+ 'fk_stocktransfer' => array('type' => 'integer:StockTransfer:stocktransfer/stock/class/stocktransfer.class.php', 'label' => 'StockTransfer', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 0,),
+ 'fk_product' => array('type' => 'integer:Product:product/class/product.class.php', 'label' => 'Product', 'enabled' => '1', 'position' => 50, 'notnull' => 1, 'visible' => 1,),
+ 'batch' => array('type' => 'varchar(128)', 'label' => 'Batch', 'enabled' => '1', 'position' => 1000, 'notnull' => -1, 'visible' => 1,),
+ 'pmp' => array('type' => 'double'/*, 'help'=>'THMEstimatedHelp'*/, 'label' => 'PMP', 'enabled' => '1', 'position' => 50, 'notnull' => 0, 'visible' => 1,),
+ 'rang' => array('type' => 'integer', 'label' => 'Qty', 'enabled' => '1', 'position' => 45, 'notnull' => 0, 'visible' => 0, 'default' => '0', 'isameasure' => '1', 'css' => 'maxwidth75imp', 'help' => "Help text for quantity",),
);
public $rowid;
public $amount;
@@ -328,7 +328,7 @@ class StockTransferLine extends CommonObjectLine
$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
if ($errormessage) {
$this->errors[] = $errormessage;
- dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
return -1;
}
@@ -817,7 +817,7 @@ class StockTransferLine extends CommonObjectLine
global $action, $hookmanager;
$hookmanager->initHooks(array('stocktransferlinedao'));
- $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $parameters = array('id' => $this->id, 'getnomurl' => $result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index 48803930572..299b15c12fa 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -143,7 +143,7 @@ print '';
// Budget
print ''.$langs->trans("Budget").' ';
if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
- print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
}
print ' '.$langs->trans("OpportunityProbability").' ';
if (!is_null($object->opp_percent) && strcmp($object->opp_percent, '')) {
- print price($object->opp_percent, '', $langs, 1, 0).' %';
+ print price($object->opp_percent, 0, $langs, 1, 0).' %';
}
print ' '.$langs->trans("OpportunityAmount").' ';
if (!is_null($object->opp_amount) && strcmp($object->opp_amount, '')) {
- print ''.price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency).' ';
+ print ''.price($object->opp_amount, 0, $langs, 1, 0, 0, $conf->currency).' ';
if (strcmp($object->opp_percent, '')) {
print ' '.$langs->trans("Weighted").' : '.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).' '.$langs->trans("Budget").' ';
if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
- print ''.price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency).' ';
+ print ''.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).' ';
}
print ' '.$langs->trans("Budget").' ';
if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
- print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
}
print ' '.$langs->trans("Budget").' ';
if (!is_null($object->budget_amount) && strcmp($object->budget_amount, '')) {
- print ''.price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency).' ';
+ print ''.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).' ';
}
print ' '.$langs->trans("Budget").' ';
if (strcmp($projectstatic->budget_amount, '')) {
- print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
}
print ' '.$langs->trans("Budget").' ';
if (isset($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
- print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
}
print ' '.$langs->trans("Budget").' ';
if (isset($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
- print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
}
print ' '.$langs->trans("Budget").' ';
if (isset($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
- print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+ print price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
}
print ' '.$langs->trans("Budget").' ';
if (isset($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
- print ''.price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency).' ';
+ print ''.price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).' ';
}
print ' ' . $langs->trans("Budget") . ' ';
if (!is_null($projectstatic->budget_amount) && strcmp($projectstatic->budget_amount, '')) {
- print '' . price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency) . ' ';
+ print '' . price($projectstatic->budget_amount, 0, $langs, 1, 0, 0, $conf->currency) . ' ';
}
print ' '.$form->editfieldkey('Status', 'status', '', $object, 0).' ';
- print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
+ print $form->selectarray('status', array('0' => $langs->trans('ActivityCeased'), '1' => $langs->trans('InActivity')), 1, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
print ' '.$form->editfieldkey('Status', 'status', '', $object, 0).' ';
- print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
+ print $form->selectarray('status', array('0' => $langs->trans('ActivityCeased'), '1' => $langs->trans('InActivity')), $object->status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1);
print ' '.$langs->trans('Capital').' ';
if ($object->capital) {
if (isModEnabled("multicurrency") && !empty($object->multicurrency_code)) {
- print price($object->capital, '', $langs, 0, -1, -1, $object->multicurrency_code);
+ print price($object->capital, 0, $langs, 0, -1, -1, $object->multicurrency_code);
} else {
- print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
+ print price($object->capital, 0, $langs, 0, -1, -1, $conf->currency);
}
} else {
print ' ';
@@ -3048,7 +3049,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
}
// Other attributes
- $parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
+ $parameters = array('socid' => $socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
// Parent company
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 0f88fefbd2c..612c9c7852c 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -1371,7 +1371,7 @@ class Thirdparties extends DolibarrApi
}
/**
- * Get a specific gateway attached to a thirdparty (by specifying the site key)
+ * Get a specific account attached to a thirdparty (by specifying the site key)
*
* @param int $id ID of thirdparty
* @param string $site Site key
@@ -1380,7 +1380,7 @@ class Thirdparties extends DolibarrApi
* @throws RestException 401 Unauthorized: User does not have permission to read thirdparties
* @throws RestException 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
*
- * @url GET {id}/gateways/
+ * @url GET {id}/accounts/
*/
public function getSocieteAccounts($id, $site = null)
{
@@ -1404,7 +1404,7 @@ class Thirdparties extends DolibarrApi
$result = $this->db->query($sql);
if ($result && $this->db->num_rows($result) == 0) {
- throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
+ throw new RestException(404, 'This thirdparty does not have any account attached or does not exist.');
}
$i = 0;
@@ -1440,7 +1440,7 @@ class Thirdparties extends DolibarrApi
}
/**
- * Create and attach a new gateway to an existing thirdparty
+ * Create and attach a new account to an existing thirdparty
*
* Possible fields for request_data (request body) are specified in llx_societe_account table.Table llx_societe_account wiki page for more informationMUST pass all values to keep (otherwise, they will be deleted) !PATCH /thirdparties/{id}/gateways/{site} endpoint.PATCH /thirdparties/{id}/accounts/{site} endpoint.SocieteAccount entity does not exist for the id and site
* supplied, a new one will be created. In that case fk_soc and site members form
* request body payload will be ignored and id and site query strings parameters
@@ -1520,7 +1520,7 @@ class Thirdparties extends DolibarrApi
* @throws RestException 422 Unprocessable Entity: You must pass the site attribute in your request data !
* @throws RestException 500 Internal Server Error: Error updating SocieteAccount entity
*
- * @url PUT {id}/gateways/{site}
+ * @url PUT {id}/accounts/{site}
*/
public function putSocieteAccount($id, $site, $request_data = null)
{
@@ -1564,7 +1564,7 @@ class Thirdparties extends DolibarrApi
$result = $this->db->query($sql);
if ($result && $this->db->num_rows($result) !== 0) {
- throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site']." but another SocieteAccount entity already exists with this site key.");
+ throw new RestException(409, "You are trying to update this thirdparty Account for $site to ".$request_data['site']." but another Account already exists with this site key.");
}
}
@@ -1601,7 +1601,7 @@ class Thirdparties extends DolibarrApi
}
/**
- * Update specified values of a specific gateway attached to a thirdparty
+ * Update specified values of a specific account attached to a thirdparty
*
* @param int $id Id of thirdparty
* @param string $site Site key
@@ -1614,7 +1614,7 @@ class Thirdparties extends DolibarrApi
* @throws RestException 409 Conflict: Another SocieteAccount entity already exists for this thirdparty with this site key.
* @throws RestException 500 Internal Server Error: Error updating SocieteAccount entity
*
- * @url PATCH {id}/gateways/{site}
+ * @url PATCH {id}/accounts/{site}
*/
public function patchSocieteAccount($id, $site, $request_data = null)
{
@@ -1626,7 +1626,7 @@ class Thirdparties extends DolibarrApi
$result = $this->db->query($sql);
if ($result && $this->db->num_rows($result) == 0) {
- throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist.");
+ throw new RestException(404, "This thirdparty does not have $site account attached or does not exist.");
} else {
// If the user tries to edit the site member, we check first if
if (isset($request_data['site']) && $request_data['site'] !== $site) {
@@ -1634,7 +1634,7 @@ class Thirdparties extends DolibarrApi
$result = $this->db->query($sql);
if ($result && $this->db->num_rows($result) !== 0) {
- throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from ".$site." to ".$request_data['site']." but another SocieteAccount entity already exists for this thirdparty with this site key.");
+ throw new RestException(409, "You are trying to update this thirdparty Account for ".$site." to ".$request_data['site']." but another Account already exists for this thirdparty with this site key.");
}
}
@@ -1663,17 +1663,17 @@ class Thirdparties extends DolibarrApi
}
/**
- * Delete a specific site gateway attached to a thirdparty (by gateway id)
+ * Delete a specific site account attached to a thirdparty (by account id)
*
* @param int $id ID of thirdparty
* @param int $site Site key
*
* @return void
- * @throws RestException 401 Unauthorized: User does not have permission to delete thirdparties gateways
+ * @throws RestException 401 Unauthorized: User does not have permission to delete thirdparties accounts
* @throws RestException 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
* @throws RestException 500 Internal Server Error: Error deleting SocieteAccount entity
*
- * @url DELETE {id}/gateways/{site}
+ * @url DELETE {id}/accounts/{site}
*/
public function deleteSocieteAccount($id, $site)
{
@@ -1692,22 +1692,22 @@ class Thirdparties extends DolibarrApi
$account->fetch($obj->rowid);
if ($account->delete(DolibarrApiAccess::$user) < 0) {
- throw new RestException(500, "Error while deleting $site gateway attached to this third party");
+ throw new RestException(500, "Error while deleting $site account attached to this third party");
}
}
}
/**
- * Delete all gateways attached to a thirdparty
+ * Delete all accounts attached to a thirdparty
*
* @param int $id ID of thirdparty
*
* @return void
- * @throws RestException 401 Unauthorized: User does not have permission to delete thirdparties gateways
+ * @throws RestException 401 Unauthorized: User does not have permission to delete thirdparties accounts
* @throws RestException 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
* @throws RestException 500 Internal Server Error: Error deleting SocieteAccount entity
*
- * @url DELETE {id}/gateways
+ * @url DELETE {id}/accounts
*/
public function deleteSocieteAccounts($id)
{
@@ -1725,7 +1725,7 @@ class Thirdparties extends DolibarrApi
$result = $this->db->query($sql);
if ($result && $this->db->num_rows($result) == 0) {
- throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
+ throw new RestException(404, 'This third party does not have any account attached or does not exist.');
} else {
$i = 0;
@@ -1736,7 +1736,7 @@ class Thirdparties extends DolibarrApi
$account->fetch($obj->rowid);
if ($account->delete(DolibarrApiAccess::$user) < 0) {
- throw new RestException(500, 'Error while deleting gateways attached to this third party');
+ throw new RestException(500, 'Error while deleting account attached to this third party');
}
$i++;
}
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 19e620f7b8a..c0baeb41882 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -120,7 +120,7 @@ $search_country = GETPOST("search_country", 'intcomma');
$search_type_thirdparty = GETPOSTINT("search_type_thirdparty");
$search_price_level = GETPOSTINT('search_price_level');
$search_staff = GETPOSTINT("search_staff");
-$search_status = GETPOSTINT("search_status");
+$search_status = GETPOST("search_status", 'intcomma');
$search_type = GETPOST('search_type', 'alpha');
$search_level = GETPOST("search_level", "array:alpha");
$search_stcomm = GETPOST('search_stcomm', "array:int");
@@ -446,6 +446,8 @@ if (empty($reshook)) {
$search_level = '';
$search_parent_name = '';
$search_import_key = '';
+
+ $search_all = '';
$toselect = array();
$search_array_options = array();
}
@@ -472,8 +474,8 @@ if (empty($reshook)) {
}
}
-if ($search_status == '') {
- $search_status = 1; // always display active thirdparty first
+if ($search_status == '' && empty($search_all)) {
+ $search_status = 1; // display active thirdparty only by default
}
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index e8fc5bf25d1..f072cf540c4 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1825,20 +1825,20 @@ if ($action == 'create') {
print ' ';
// Amount HT
print '' . $langs->trans('AmountHT') . ' ';
- print '' . price($object->total_ht, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount HT
- print '' . price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
print '';
// Amount VAT
print '' . $langs->trans('AmountVAT') . ' ';
- print '' . price($object->total_tva, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_tva, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount VAT
- print '' . price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
@@ -1846,18 +1846,18 @@ if ($action == 'create') {
if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
print '';
print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' ';
- print '' . price($object->total_localtax1, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->total_localtax1, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->total_localtax1, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
print '';
print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' ';
- print '' . price($object->total_localtax2, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
- print '' . price($object->total_localtax2, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->total_localtax2, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
}
@@ -1866,10 +1866,10 @@ if ($action == 'create') {
print '';
// Amount TTC
print '' . $langs->trans('AmountTTC') . ' ';
- print '' . price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . ' ';
+ print '' . price($object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . ' ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount TTC
- print '' . price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
+ print '' . price($object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code) . ' ';
}
print ' ';
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index f852ca9b717..1bc4f15c5bf 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -99,18 +99,18 @@ class CTicketCategory extends CommonObject
/**
* @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
*/
- public $fields=array(
- 'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
- 'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'position'=>15, 'index'=>1),
- 'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
- 'pos' =>array('type'=>'integer', 'label'=>'Pos', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
- 'label' =>array('type'=>'varchar(128)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>30, 'showoncombobox'=>1),
- 'active' =>array('type'=>'integer', 'label'=>'Active', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
- 'use_default' =>array('type'=>'integer', 'label'=>'Usedefault', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
- 'description' =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
- 'fk_parent' =>array('type'=>'integer', 'label'=>'Fkparent', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>50),
- 'force_severity' =>array('type'=>'varchar(32)', 'label'=>'Forceseverity', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
- 'public' =>array('type'=>'integer', 'label'=>'Public', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
+ public $fields = array(
+ 'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10),
+ 'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'position' => 15, 'index' => 1),
+ 'code' => array('type' => 'varchar(32)', 'label' => 'Code', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 20),
+ 'pos' => array('type' => 'integer', 'label' => 'Pos', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 25),
+ 'label' => array('type' => 'varchar(128)', 'label' => 'Label', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 30, 'showoncombobox' => 1),
+ 'active' => array('type' => 'integer', 'label' => 'Active', 'enabled' => 1, 'visible' => -1, 'position' => 35),
+ 'use_default' => array('type' => 'integer', 'label' => 'Usedefault', 'enabled' => 1, 'visible' => -1, 'position' => 40),
+ 'description' => array('type' => 'varchar(255)', 'label' => 'Description', 'enabled' => 1, 'visible' => -1, 'position' => 45),
+ 'fk_parent' => array('type' => 'integer', 'label' => 'Fkparent', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 50),
+ 'force_severity' => array('type' => 'varchar(32)', 'label' => 'Forceseverity', 'enabled' => 1, 'visible' => -1, 'position' => 55),
+ 'public' => array('type' => 'integer', 'label' => 'Public', 'enabled' => 1, 'visible' => -1, 'position' => 60),
);
/**
@@ -389,7 +389,7 @@ class CTicketCategory extends CommonObject
$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
if ($errormessage) {
$this->errors[] = $errormessage;
- dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+ dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
return -1;
}
@@ -542,7 +542,7 @@ class CTicketCategory extends CommonObject
global $action, $hookmanager;
$hookmanager->initHooks(array('cticketcategorydao'));
- $parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+ $parameters = array('id' => $this->id, 'getnomurl' => &$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) {
$result = $hookmanager->resPrint;
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 535452175f1..20fa770194a 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -441,7 +441,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
// Salary
print ''.$langs->trans("Salary").' ';
print '';
- print($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').''.price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '').' ';
+ print($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').''.price($object->salary, 0, $langs, 1, -1, -1, $conf->currency) : '').' ';
print ' ';
print "';
- print($object->thm != '' ? price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
+ print($object->thm != '' ? price($object->thm, 0, $langs, 1, -1, -1, $conf->currency) : '');
print ' ';
print "\n";
@@ -461,7 +461,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classtjm');
print '';
print '';
- print($object->tjm != '' ? price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
+ print($object->tjm != '' ? price($object->tjm, 0, $langs, 1, -1, -1, $conf->currency) : '');
print ' ';
print "\n";
}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 94447146dbf..984bed16d5c 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1657,7 +1657,7 @@ if ($action == 'create' || $action == 'adduserldap') {
// Salary
print ''.$langs->trans("Salary").' ';
print '';
- print($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').''.price($object->salary, '', $langs, 1, -1, -1, $conf->currency) : '').' ';
+ print($object->salary != '' ? img_picto('', 'salary', 'class="pictofixedwidth paddingright"').''.price($object->salary, 0, $langs, 1, -1, -1, $conf->currency) : '').' ';
print ' ';
print "';
- print($object->thm != '' ? price($object->thm, '', $langs, 1, -1, -1, $conf->currency) : '');
+ print($object->thm != '' ? price($object->thm, 0, $langs, 1, -1, -1, $conf->currency) : '');
print ' ';
print "\n";
@@ -1677,7 +1677,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classtjm');
print '';
print '';
- print($object->tjm != '' ? price($object->tjm, '', $langs, 1, -1, -1, $conf->currency) : '');
+ print($object->tjm != '' ? price($object->tjm, 0, $langs, 1, -1, -1, $conf->currency) : '');
print ' ';
print "\n";
}
@@ -2861,7 +2861,7 @@ if ($action == 'create' || $action == 'adduserldap') {
if ($caneditfield) {
print '
* Copyright (C) 2023-2024 Lionel Vessiller
* Copyright (C) 2023-2024 Patrice Andreani
+ * Copyright (C) 2024 MDW
*
* 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
@@ -707,44 +708,44 @@ class FormWebPortal extends Form
$out = $this->inputType('number', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam);
break;
- case 'text' :
- case 'html' :
+ case 'text':
+ case 'html':
$moreparam .= ($size > 0 ? ' maxlength="' . $size . '"' : '');
$out = $this->inputType('text', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam);
break;
- case 'email' :
+ case 'email':
$out = $this->inputType('email', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam);
break;
- case 'tel' :
+ case 'tel':
$out = $this->inputType('tel', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam);
break;
- case 'url' :
+ case 'url':
$out = $this->inputType('url', $htmlName, dol_escape_htmltag($value), $htmlId, $morecss, $moreparam);
break;
- case 'price' :
+ case 'price':
if (!empty($value)) {
$value = price($value); // $value in memory is a php numeric, we format it into user number format.
}
$addInputLabel = ' ' . $langs->getCurrencySymbol($conf->currency);
- $out = $this->inputType('text', $htmlName, $value, $htmlId, $morecss, $moreparam, $addInputLabel);
+ $out = $this->inputType('text', $htmlName, $value, $htmlId, $morecss, $moreparam, '', $addInputLabel);
break;
- case 'double' :
+ case 'double':
if (!empty($value)) {
$value = price($value); // $value in memory is a php numeric, we format it into user number format.
}
$out = $this->inputType('text', $htmlName, $value, $htmlId, $morecss, $moreparam);
break;
- case 'password' :
+ case 'password':
$out = $this->inputType('password', $htmlName, $value, $htmlId, $morecss, $moreparam);
break;
- case 'radio' :
+ case 'radio':
foreach ($param['options'] as $keyopt => $valopt) {
$htmlId = $htmlName . '_' . $keyopt;
$htmlMoreParam = $moreparam . ($value == $keyopt ? ' checked' : '');
@@ -752,7 +753,7 @@ class FormWebPortal extends Form
}
break;
- case 'select' :
+ case 'select':
$out = '';
if ($default == '' || $notNull != 1) {
$out .= ' ';
@@ -771,7 +772,7 @@ class FormWebPortal extends Form
}
$out .= ' ';
break;
- case 'sellist' :
+ case 'sellist':
$out = '';
$param_list = array_keys($param['options']);
@@ -923,7 +924,7 @@ class FormWebPortal extends Form
$out .= ' ';
break;
- case 'link' :
+ case 'link':
$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath[:AddCreateButtonOrNot[:Filter[:Sortfield]]]'
$showempty = (($required && $default != '') ? 0 : 1);
@@ -931,7 +932,7 @@ class FormWebPortal extends Form
break;
- default :
+ default:
if (!empty($hidden)) {
$out = $this->inputType('hidden', $htmlName, $value, $htmlId);
}
@@ -947,7 +948,7 @@ class FormWebPortal extends Form
* @param CommonObject $object Common object
* @param array $val Array of properties of field to show
* @param string $key Key of attribute
- * @param string $value Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+ * @param string|string[] $value Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
* @param string $moreparam To add more parameters on html input tag
* @param string $keysuffix Prefix string to add into name and id of field (can be used to avoid duplicate names)
* @param string $keyprefix Suffix string to add into name and id of field (can be used to avoid duplicate names)
@@ -1025,6 +1026,9 @@ class FormWebPortal extends Form
}
// Format output value differently according to properties of field
+ //
+ // First the cases that do not use $value from the arguments:
+ //
if (in_array($key, array('rowid', 'ref'))) {
if (property_exists($object, 'ref')) {
$value = $object->ref;
@@ -1035,6 +1039,20 @@ class FormWebPortal extends Form
}
} elseif ($key == 'status' && method_exists($object, 'getLibStatut')) {
$value = $object->getLibStatut(3);
+ //
+ // Then the cases where $value is an array
+ //
+ } elseif (is_array($value)) {
+ // Handle array early to get type identification solve for static
+ // analysis
+ if ($type == 'array') {
+ $value = implode('