' . $langs->trans("EndProcessing") . '
';
- //} else {
- // setEventMessages($langs->trans("NoRecordSelected"), null, 'warnings');
}
}
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 77a97b86322..1ec89dfc9cc 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -161,8 +161,6 @@ if ($massaction == 'ventil') {
}
$msg.='';
$msg.= '' . $langs->trans("EndProcessing") . '
';
- //} else {
- // setEventMessages($langs->trans("NoRecordSelected"), null, 'warnings');
}
}
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 6e709835f42..7063f7fd53e 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -996,7 +996,7 @@ if (empty($action) || $action == 'view') {
if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
|| ($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
- print '' . $langs->trans("EndProcessing") . '
';
- //} else {
- // setEventMessages($langs->trans("NoRecordSelected"), null, 'warnings');
}
}
diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
index 87190bef2fe..9c6f657d5e0 100644
--- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
+++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php
@@ -26,17 +26,12 @@ if (empty($conf) || ! is_object($conf))
$contact = $GLOBALS['objcanvas']->control->object;
-?>
+echo "\n";
+echo $this->control->tpl['showhead'];
-
-control->tpl['showhead']; ?>
-
-control->tpl['error'], $this->control->tpl['errors']);
-?>
-
-control->tpl['action_create_user'])) echo $this->control->tpl['action_create_user']; ?>
-control->tpl['action_delete'])) echo $this->control->tpl['action_delete']; ?>
+if (! empty($this->control->tpl['action_create_user'])) echo $this->control->tpl['action_create_user'];
+if (! empty($this->control->tpl['action_delete'])) echo $this->control->tpl['action_delete']; ?>
+if (empty($user->societe_id)) {
+ echo '
-
';
+}
echo $this->control->tpl['actionstodo'];
echo $this->control->tpl['actionsdone'];
-?>
-
+echo "\n";
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 06053127c9a..0f2cfc52840 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -866,18 +866,18 @@ else
$object->country_code=$tmparray['code'];
$object->country=$tmparray['label'];
}
-
- if (!empty($socid)) {
-$object = new Societe($db);
-if ($socid > 0) $object->fetch($socid);
-if (! ($object->id > 0))
-{
- $langs->load("errors");
- print($langs->trans('ErrorRecordNotFound'));
- exit;
-}
- }
+ if (!empty($socid)) {
+ $object = new Societe($db);
+ if ($socid > 0) $object->fetch($socid);
+
+ if (! ($object->id > 0))
+ {
+ $langs->load("errors");
+ print($langs->trans('ErrorRecordNotFound'));
+ exit;
+ }
+ }
$adht = new AdherentType($db);
@@ -1679,14 +1679,14 @@ if (! ($object->id > 0))
else
{
if ($object->need_subscription == 0)
- {
- print $langs->trans("SubscriptionNotNeeded");
+ {
+ print $langs->trans("SubscriptionNotNeeded");
}
- elseif (! $adht->subscription)
+ elseif (! $adht->subscription)
{
print $langs->trans("SubscriptionNotRecorded");
if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
- }
+ }
else
{
print $langs->trans("SubscriptionNotReceived");
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index e9bd50de0ff..fbc62083b97 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -2471,7 +2471,7 @@ class Adherent extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
- /**
+ /**
* Initialise tableau info (tableau des attributs LDAP)
*
* @return array Tableau info des attributs
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 94df4b10ba0..b4bdb119b29 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -88,8 +88,8 @@ class AdherentType extends CommonObject
/** @var array Array of members */
public $members=array();
-
- public $multilangs=array();
+
+ public $multilangs=array();
/**
@@ -129,9 +129,9 @@ class AdherentType extends CommonObject
$this->description = $obj->description;
$this->email = $obj->email;
}
- $this->multilangs["$obj->lang"]["label"] = $obj->label;
- $this->multilangs["$obj->lang"]["description"] = $obj->description;
- $this->multilangs["$obj->lang"]["email"] = $obj->email;
+ $this->multilangs["$obj->lang"]["label"] = $obj->label;
+ $this->multilangs["$obj->lang"]["description"] = $obj->description;
+ $this->multilangs["$obj->lang"]["email"] = $obj->email;
}
return 1;
}
@@ -141,7 +141,7 @@ class AdherentType extends CommonObject
return -1;
}
}
-
+
/**
* Update or add a translation for a product
*
@@ -248,7 +248,7 @@ class AdherentType extends CommonObject
return 1;
}
-
+
/**
* Delete a language for this product
*
@@ -361,7 +361,7 @@ class AdherentType extends CommonObject
*/
public function update($user, $notrigger = 0)
{
- global $langs, $conf, $hookmanager;
+ global $langs, $conf, $hookmanager;
$error=0;
@@ -383,16 +383,16 @@ class AdherentType extends CommonObject
$result = $this->db->query($sql);
if ($result)
{
- $this->description = $this->db->escape($this->note);
+ $this->description = $this->db->escape($this->note);
- // Multilangs
- if (! empty($conf->global->MAIN_MULTILANGS)) {
- if ($this->setMultiLangs($user) < 0) {
- $this->error=$langs->trans("Error")." : ".$this->db->error()." - ".$sql;
- return -2;
- }
+ // Multilangs
+ if (! empty($conf->global->MAIN_MULTILANGS)) {
+ if ($this->setMultiLangs($user) < 0) {
+ $this->error=$langs->trans("Error")." : ".$this->db->error()." - ".$sql;
+ return -2;
}
-
+ }
+
$action='update';
// Actions on extra fields
@@ -474,8 +474,8 @@ class AdherentType extends CommonObject
*/
public function fetch($rowid)
{
- global $langs, $conf;
-
+ global $langs, $conf;
+
$sql = "SELECT d.rowid, d.libelle as label, d.morphy, d.statut, d.subscription, d.mail_valid, d.note, d.vote";
$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
$sql .= " WHERE d.rowid = ".(int) $rowid;
@@ -498,11 +498,11 @@ class AdherentType extends CommonObject
$this->mail_valid = $obj->mail_valid;
$this->note = $obj->note;
$this->vote = $obj->vote;
-
- // multilangs
- if (! empty($conf->global->MAIN_MULTILANGS)) {
- $this->getMultiLangs();
- }
+
+ // multilangs
+ if (! empty($conf->global->MAIN_MULTILANGS)) {
+ $this->getMultiLangs();
+ }
}
return 1;
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 8e2ec3ba730..accf7de07b6 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -24,11 +24,7 @@ if (empty($conf) || ! is_object($conf))
exit;
}
-?>
-
-
-
-\n";
global $user;
@@ -39,22 +35,20 @@ $langs->load("members");
$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
{
-?>
-
- trans("Subscription"); ?>
- getNomUrl(1); ?>
- dateh, 'day'); ?>
- ';
+ echo ' '.$langs->trans("Subscription").' ';
+ echo ''.$objectlink->getNomUrl(1).' ';
+ echo ''.dol_print_date($objectlink->dateh, 'day').' ';
+ echo '';
if ($user->rights->adherent->lire) {
$total = $total + $objectlink->amount;
echo price($objectlink->amount);
- } ?>
- ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
-';
+ echo '
';
+ echo '
'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').' ';
+ echo '';
}
-?>
-
+echo "\n";
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 2848ed4119e..94978e7f8a9 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -523,14 +523,14 @@ if ($rowid > 0)
{
$sql.= natural_search("d.email", $search_email);
}
- if ($filter == 'uptodate')
- {
- $sql.=" AND (datefin >= '".$db->idate($now)."') OR t.subscription = 0)";
- }
- if ($filter == 'outofdate')
- {
- $sql.=" AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
- }
+ if ($filter == 'uptodate')
+ {
+ $sql.=" AND (datefin >= '".$db->idate($now)."') OR t.subscription = 0)";
+ }
+ if ($filter == 'outofdate')
+ {
+ $sql.=" AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
+ }
$sql.= " ".$db->order($sortfield, $sortorder);
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 5122bebcecf..ac9a269bf29 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -295,7 +295,7 @@ if ($action == 'add' && $user->rights->adherent->configurer)
print '
';
print ''.$langs->trans('Language').' ';
- print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
+ print $formadmin->select_language('', 'forcelangprod', 0, $object->multilangs, 1);
print ' '.$langs->trans('Label').' '.$langs->trans('Description').' ';
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 3caa3418af5..beccc9e9d5a 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -268,17 +268,17 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
// Active
if (in_array($name, $def))
{
- print ' '."\n";
- if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name")
- {
- print 'scandir.'&label='.urlencode($module->name).'&type=action">';
- print img_picto($langs->trans("Enabled"), 'switch_on');
- print ' ';
- }
- else
- {
- print img_picto($langs->trans("Enabled"), 'switch_on');
- }
+ print ' '."\n";
+ if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name")
+ {
+ print 'scandir.'&label='.urlencode($module->name).'&type=action">';
+ print img_picto($langs->trans("Enabled"), 'switch_on');
+ print ' ';
+ }
+ else
+ {
+ print img_picto($langs->trans("Enabled"), 'switch_on');
+ }
print " ";
}
else
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index b6c9a5dec9a..57031a9822f 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -96,29 +96,29 @@ elseif ($action == 'updateengine')
$resql=$db->query($sql);
if ($resql)
{
- $num = $db->num_rows($resql);
- $i = 0;
+ $num = $db->num_rows($resql);
+ $i = 0;
- while ($i < $num)
- {
- $obj = $db->fetch_object($resql);
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($resql);
- if (GETPOST('coder'.$obj->rowid, 'alpha'))
- {
- $coder = GETPOST('coder'.$obj->rowid, 'alpha');
- $code_id = $obj->rowid;
+ if (GETPOST('coder'.$obj->rowid, 'alpha'))
+ {
+ $coder = GETPOST('coder'.$obj->rowid, 'alpha');
+ $code_id = $obj->rowid;
- $sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
- $sqlp.= " SET coder = '" . $coder."'";
- $sqlp.= " WHERE rowid = ". $code_id;
- $sqlp.= " AND entity = ".$conf->entity;
+ $sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
+ $sqlp.= " SET coder = '" . $coder."'";
+ $sqlp.= " WHERE rowid = ". $code_id;
+ $sqlp.= " AND entity = ".$conf->entity;
- $upsql=$db->query($sqlp);
- if (! $upsql) dol_print_error($db);
- }
+ $upsql=$db->query($sqlp);
+ if (! $upsql) dol_print_error($db);
+ }
- $i++;
- }
+ $i++;
+ }
}
}
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 5bf01de1053..26ea1b12a29 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -430,7 +430,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
}
print '';
- // Info
+ // Info
$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
$htmltooltip.='
-
-
-
+ ';
+ print '';
- ';
- print '
';
+ print '';
+ print '
';
- ?>
+ ?>
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index db9efb0e5c7..a0f817a40c1 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -467,7 +467,7 @@ foreach ($dirmodels as $reldir)
}
print '';
- // Info
+ // Info
$htmltooltip = $langs->trans("Name").': '.$module->name;
$htmltooltip.=''.$langs->trans("DoTestSend").' ';
+ print ''.$langs->trans("DoTestSend").' ';
}
else
{
- print ''.$langs->trans("DoTestSend").' ';
+ print ''.$langs->trans("DoTestSend").' ';
}
print ' ';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index 42daea12861..51bf959bb72 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -113,12 +113,12 @@ print ''.$langs->trans("DeStockOnBill").' ';
print '';
if (! empty($conf->facture->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_BILL');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_BILL);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_BILL');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_BILL);
+ }
}
else
{
@@ -133,12 +133,12 @@ print ' '.$langs->trans("DeStockOnValidateOrder").' ';
print '';
if (! empty($conf->commande->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_VALIDATE_ORDER');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_VALIDATE_ORDER');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER);
+ }
}
else
{
@@ -155,12 +155,12 @@ print ' '.$langs->trans("DeStockOnShipment").' ';
print '';
if (! empty($conf->expedition->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT);
+ }
}
else
{
@@ -175,12 +175,12 @@ print ' '.$langs->trans("DeStockOnShipmentOnClosing").' ';
print '';
if (! empty($conf->expedition->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT_CLOSE');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_SHIPMENT_CLOSE');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_SHIPMENT_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE);
+ }
}
else
{
@@ -215,12 +215,12 @@ print ' '.$langs->trans("ReStockOnBill").' ';
print '';
if (! empty($conf->fournisseur->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_BILL');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_BILL');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_BILL", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL);
+ }
}
else
{
@@ -236,12 +236,12 @@ print ' '.$langs->trans("ReStockOnValidateOrder").' ';
print '';
if (! empty($conf->fournisseur->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER);
+ }
}
else
{
@@ -254,29 +254,29 @@ if (!empty($conf->reception->enabled))
{
print ' ';
print ''.$langs->trans("StockOnReception").' ';
- print '';
+ print ' ';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_RECEPTION", $arrval, $conf->global->STOCK_CALCULATE_ON_RECEPTION);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_RECEPTION", $arrval, $conf->global->STOCK_CALCULATE_ON_RECEPTION);
+ }
print " \n \n";
$found++;
-print '';
+ print ' ';
print ''.$langs->trans("StockOnReceptionOnClosing").' ';
- print '';
+ print ' ';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION_CLOSE');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_RECEPTION_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_RECEPTION_CLOSE');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_RECEPTION_CLOSE", $arrval, $conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE);
+ }
print " \n \n";
$found++;
}
@@ -284,15 +284,15 @@ else
{
print '';
print ''.$langs->trans("ReStockOnDispatchOrder").' ';
- print '';
+ print ' ';
if (! empty($conf->fournisseur->enabled))
{
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER);
-}
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER", $arrval, $conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER);
+ }
}
else
{
@@ -338,28 +338,28 @@ if($conf->invoice->enabled)
{
print ' ';
print ''.$langs->trans("StockMustBeEnoughForInvoice").' ';
- print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_INVOICE');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_INVOICE", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE);
-}
- print " \n";
- print " \n";
+ print '';
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_INVOICE');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_INVOICE", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_INVOICE);
+ }
+ print " \n";
+ print "\n";
}
if($conf->order->enabled)
{
print '';
print ''.$langs->trans("StockMustBeEnoughForOrder").' ';
- print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_ORDER');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_ORDER", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER);
-}
+ print ' ';
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_ORDER');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_ORDER", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER);
+ }
print " \n";
print " \n";
}
@@ -368,13 +368,13 @@ if($conf->expedition->enabled)
{
print '';
print ''.$langs->trans("StockMustBeEnoughForShipment").' ';
- print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT);
-}
+ print ' ';
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT", $arrval, $conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT);
+ }
print " \n";
print " \n";
}
@@ -383,27 +383,30 @@ print '
';
print '
';
$virtualdiffersfromphysical=0;
-if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
- || ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)
- ) $virtualdiffersfromphysical=1; // According to increase/decrease stock options, virtual and physical stock may differs.
+if (
+ ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
+ || ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)
+) {
+ $virtualdiffersfromphysical=1; // According to increase/decrease stock options, virtual and physical stock may differs.
+}
if ($virtualdiffersfromphysical)
{
-print '
';
-print '';
+ print '';
+ print '';
print "".$langs->trans("RuleForStockReplenishment")." ".img_help('help', $langs->trans("VirtualDiffersFromPhysical"))." \n";
- print ''.$langs->trans("Status").' '."\n";
+ print ''.$langs->trans("Status").' '."\n";
print ' '."\n";
print '';
print ''.$langs->trans("UseVirtualStockByDefault").' ';
- print '';
-if ($conf->use_javascript_ajax) {
- print ajax_constantonoff('STOCK_USE_VIRTUAL_STOCK');
-} else {
- $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
- print $form->selectarray("STOCK_USE_VIRTUAL_STOCK", $arrval, $conf->global->STOCK_USE_VIRTUAL_STOCK);
-}
+ print ' ';
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('STOCK_USE_VIRTUAL_STOCK');
+ } else {
+ $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+ print $form->selectarray("STOCK_USE_VIRTUAL_STOCK", $arrval, $conf->global->STOCK_USE_VIRTUAL_STOCK);
+ }
print " \n";
print " \n";
print '
';
@@ -504,7 +507,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
print $form->selectarray("INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT", $arrval, $conf->global->INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT);
}
print ' ';
-
print '
';
}
@@ -512,8 +514,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
If not used by a module, I still need to understand in which case user may need this now we can set rule on product page.
if ($conf->global->PRODUIT_SOUSPRODUITS)
{
-
-
print '
';
print ''.$langs->trans("IndependantSubProductStock").' ';
print '';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 6369efb1361..c2a7a5d4077 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -413,8 +413,8 @@ foreach ($dirmodels as $reldir)
print " \n";
require_once $dir.$file;
$module = new $classname($db, $specimenthirdparty);
- if (method_exists($module, 'info')) print $module->info($langs);
- else print $module->description;
+ if (method_exists($module, 'info')) print $module->info($langs);
+ else print $module->description;
print " \n";
// Active
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index bd2cb10a3ad..30a85f2af3b 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -433,7 +433,7 @@ foreach ($dirmodels as $reldir)
}
print '';
- // Info
+ // Info
$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
$htmltooltip.='';
- print '
';
+ print '';
+ print '
';
print '';
print ''.$langs->trans("TableName").' ';
print ''.$langs->trans("NbOfRecord").' ';
diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php
index d08eb564f17..928b193b1ee 100644
--- a/htdocs/admin/system/index.php
+++ b/htdocs/admin/system/index.php
@@ -94,10 +94,10 @@ if ($db->type == 'pgsql')
{
// Check option standard_conforming_strings is on
$paramarray=$db->getServerParametersValues('standard_conforming_strings');
-// if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
-// {
-// $langs->load("errors");
-// }
+ // if ($paramarray['standard_conforming_strings'] != 'on' && $paramarray['standard_conforming_strings'] != 1)
+ // {
+ // $langs->load("errors");
+ // }
}
print ' ';
print '';
-?>
-
-
-
-
- trans("FileNameToGenerate"); ?> '.$langs->trans("FileNameToGenerate").' ';
+print ''.$val['label'].' ';
}
- else // Disabled export format
+ else
{
+ // Disabled export format
print ''.$val['label'].' ';
print ' ('.$langs->trans("NotAvailable").')';
@@ -451,20 +468,18 @@ foreach($compression as $key => $val)
print '';
print "\n";
-?>
+print " \n";
+print '';
+print '
';
+print '
';
+print '
';
+print '
';
-
-
- '.$langs->trans("RunCommandSummary").': '.$langs->trans("RunCommandSummary").':
+print "
';
-
-?>
-
-
-
+print '
';
+print '
';
-admin->dir_output.'/backup', 'files', 0, '', '', $sortfield, (strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC), 1);
$result=$formfile->list_of_documents($filearray, null, 'systemtools', '', 1, 'backup/', 1, 0, $langs->trans("NoBackupFileAvailable"), 0, $langs->trans("PreviousDumpFiles"));
print '
';
+print '
';
+print '';
+print '';
-
-
MySQL (mysql)
-
+ ?>
PostgreSQL Restore (pg_restore or psql)
- trans("RestoreDesc3", $dolibarr_main_db_name).'
- trans('RestoreMySQL') ?>
- ';
+ print ' ';
}
elseif (in_array($type, array('pgsql')))
{
-?>
-
- Restore PostgreSQL
-
+print '';
-
-
+print '
';
+print '';
-close();
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 7db64a8a3ed..1fedf9e40de 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -37,8 +37,8 @@ $confirm=GETPOST('confirm', 'alpha');
// Security check
if ($user->societe_id > 0)
{
- $action = '';
- $socid = $user->societe_id;
+ $action = '';
+ $socid = $user->societe_id;
}
$sortfield = GETPOST("sortfield", 'alpha');
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index 3c99e3e10b8..f991bb5752e 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -97,9 +97,9 @@ if (! empty($conf->syslog->enabled))
$filelogparam=$filelog;
if ($user->admin && preg_match('/^dolibarr.*\.log$/', basename($filelog)))
{
- $filelogparam ='
'.$filelog.' ';
+ $filelogparam ='
'.$filelog.' ';
}
print '> '.$langs->trans("PurgeDeleteLogFile", $filelogparam);
print '
';
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index ba6c3660bcd..1b4c59505db 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -288,9 +288,9 @@ foreach ($dirmodels as $reldir)
}
print '';
- // Info
- $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
- $htmltooltip.='
'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
+ // Info
+ $htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+ $htmltooltip.= '
'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
if ($module->type == 'pdf')
{
$htmltooltip.='
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 190391b462b..bd8ae3d5e92 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -235,7 +235,7 @@ foreach ($dirmodels as $reldir)
}
print '';
- // Info
+ // Info
$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
$htmltooltip.='
'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown"));
if ($module->type == 'pdf')
diff --git a/htdocs/api/admin/explorer.php b/htdocs/api/admin/explorer.php
index 0f541b93708..0fd34788adf 100644
--- a/htdocs/api/admin/explorer.php
+++ b/htdocs/api/admin/explorer.php
@@ -148,7 +148,7 @@ foreach ($modulesdir as $dir)
}*/
//$listofapis[]=array('classname'=>$classname, 'fullpath'=>$file_searched);
- /* }
+ /* }
}*/
}
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index c0e81bc77cb..7660144f7ca 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -262,9 +262,9 @@ class DolibarrApi
if ($tmp[$i]==')') $counter--;
if ($counter < 0)
{
- $error="Bad sqlfilters=".$sqlfilters;
- dol_syslog($error, LOG_WARNING);
- return false;
+ $error="Bad sqlfilters=".$sqlfilters;
+ dol_syslog($error, LOG_WARNING);
+ return false;
}
$i++;
}
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 1d4bb6a8cb7..60f5a54eeba 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -383,7 +383,7 @@ class Setup extends DolibarrApi
return $list;
}
-
+
/**
* Get the list of contacts types.
*
@@ -533,13 +533,15 @@ class Setup extends DolibarrApi
if (!empty($multicurrency)) $sql.= " , cr.date_sync, cr.rate ";
$sql.= " FROM ".MAIN_DB_PREFIX."c_currencies as t";
if (!empty($multicurrency)) {
- $sql.= " JOIN ".MAIN_DB_PREFIX."multicurrency as m ON m.code=t.code_iso";
- $sql.= " JOIN ".MAIN_DB_PREFIX."multicurrency_rate as cr ON (m.rowid = cr.fk_multicurrency)";
+ $sql.= " JOIN ".MAIN_DB_PREFIX."multicurrency as m ON m.code=t.code_iso";
+ $sql.= " JOIN ".MAIN_DB_PREFIX."multicurrency_rate as cr ON (m.rowid = cr.fk_multicurrency)";
}
$sql.= " WHERE t.active = ".$active;
if (!empty($multicurrency)) {
- $sql.= " AND m.entity IN (".getEntity('multicurrency').")";
- if (!empty($multicurrency) && $multicurrency != 2) $sql.= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX."multicurrency_rate AS cr2 WHERE cr2.fk_multicurrency = m.rowid)";
+ $sql.= " AND m.entity IN (".getEntity('multicurrency').")";
+ if (!empty($multicurrency) && $multicurrency != 2) {
+ $sql.= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX."multicurrency_rate AS cr2 WHERE cr2.fk_multicurrency = m.rowid)";
+ }
}
// Add sql filters
@@ -924,7 +926,7 @@ class Setup extends DolibarrApi
$sql = "SELECT rowid, code, pos, label, use_default, description";
$sql.= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
- $sql.= " WHERE t.active = ".$active;
+ $sql.= " WHERE t.active = ".$active;
// Add sql filters
if ($sqlfilters)
{
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 1f0c82e780b..6ce788a5790 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -574,7 +574,7 @@ jQuery(document).ready(function () {
if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL))
{
-?>
+ ?>
-thirdparty as $key=>$value)
{
if (in_array($key, $arrayoffieldstoexclude)) continue; // Discard some properties
- if (! in_array($key, array(
+ if (! in_array($key, array(
'name','name_alias','ref_ext','address','zip','town','state_code','country_code','idprof1','idprof2','idprof3','idprof4','idprof5','idprof6','phone','fax','email','barcode',
'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur'
))) continue; // Discard if not into a dedicated list
@@ -592,7 +592,7 @@ class BlockedLog
foreach($tmpobject as $key=>$value)
{
if (in_array($key, $arrayoffieldstoexclude)) continue; // Discard some properties
- if (! in_array($key, array(
+ if (! in_array($key, array(
'ref','ref_client','ref_supplier','date','datef','type','total_ht','total_tva','total_ttc','localtax1','localtax2','revenuestamp','datepointoftax','note_public'
))) continue; // Discard if not into a dedicated list
if (!is_object($value))
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index b7eb1608e9e..cd654c7a596 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -47,22 +47,20 @@ $colspan = 3; // Columns: total ht + col edit + col delete
// Lines for extrafield
$objectline = new BOMLine($this->db);
-?>
-
-\n";
+
$nolinesbefore=(count($this->lines) == 0 || $forcetoshowtitlelines);
if ($nolinesbefore) {
-?>
-
- global->MAIN_VIEW_LINE_NUMBER)) { ?>
-
-
trans('AddNewLine'); ?> trans("FreeZone"); ?>
-
- trans('Qty'); ?>
- ';
+ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+ print '';
+ print '
'.$langs->trans('AddNewLine').' ';
+ // echo $langs->trans("FreeZone");
+ print ' ';
+ print ''.$langs->trans('Qty').' ';
if ($conf->global->PRODUCT_USE_UNITS)
{
print '';
@@ -70,76 +68,68 @@ if ($nolinesbefore) {
print $langs->trans('Unit');
print ' ';
}
- ?>
- textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')); ?>
-
-
-'.$form->textwithpicto($langs->trans('ManufacturingEfficiency'), $langs->trans('ValueOfMeansLoss')).'';
+ print '
';
+ print '';
}
-?>
-
-global->MAIN_VIEW_LINE_NUMBER)) {
- $coldisplay++;
- echo ' ';
+$coldisplay=0;
+// Adds a line numbering column
+if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
$coldisplay++;
- ?>
-
+ echo ' ';
+
+// Predefined product/service
+if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+{
+ if ($forceall >= 0 && $freelines) echo '';
+ $filtertype='';
+ if (! empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $filtertype='1';
+
+ $statustoshow = -1;
+ if (! empty($conf->global->ENTREPOT_EXTRA_STATUS))
{
- if ($forceall >= 0 && $freelines) echo '';
- $filtertype='';
- if (! empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $filtertype='1';
-
- $statustoshow = -1;
- if (! empty($conf->global->ENTREPOT_EXTRA_STATUS))
- {
- // hide products in closed warehouse, but show products for internal transfer
- $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
- }
- else
- {
- $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
- }
-
- echo ' ';
+ // hide products in closed warehouse, but show products for internal transfer
+ $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array'));
+ }
+ else
+ {
+ $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
}
- $coldisplay++;
- ?>
- ';
- print $form->selectUnits($line->fk_unit, "units");
- print ' ';
- }
+ echo '';
+}
- $coldisplay++;
- ?>
- ';
+ print $form->selectUnits($line->fk_unit, "units");
+ print ' ';
+}
- $coldisplay+=$colspan;
- ?>
-
-
-
+$coldisplay++;
+
+print '
';
+print ' ';
+
+
+$coldisplay += $colspan;
+print '
';
+print ' ';
+print '';
-showOptionals($extrafields, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
}
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 05b9094d10e..d887b9ab68d 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -49,22 +49,19 @@ $colspan = 3; // Columns: total ht + col edit + col delete
// Lines for extrafield
$objectline = new BOMLine($this->db);
-?>
-
+print "\n";
-
-
- global->MAIN_VIEW_LINE_NUMBER)) { ?>
- '.($i+1).' ';
$coldisplay++;
- ?>
+}
+
+$coldisplay++;
+?>
@@ -74,72 +71,66 @@ $coldisplay=0;
-
- element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines
- {
- $coldisplay++;
- ?>
-
- info_bits & 2) != 2) {
- // I comment this because it shows info even when not required
- // for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
- // must also not be output for most entities (proposal, intervention, ...)
- //if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
- print '
-
- global->PRODUCT_USE_UNITS)
- {
- $coldisplay++;
- print '';
- print $form->selectUnits($line->fk_unit, "units");
- print ' ';
- }
-
- $coldisplay++;
- ?>
-
-
-
-
fk_product > 0) {
+ $tmpproduct = new Product($object->db);
+ $tmpproduct->fetch($line->fk_product);
+ print $tmpproduct->getNomUrl(1);
+}
+
+if (is_object($hookmanager))
+{
+ $fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
+ $parameters=array('line'=>$line,'fk_parent_line'=>$fk_parent_line,'var'=>$var,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer);
+ $reshook=$hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
+}
+
+print '';
+
+/*if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines
+{
+ $coldisplay++;
+?>
+
+';
+if (($line->info_bits & 2) != 2) {
+ // I comment this because it shows info even when not required
+ // for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
+ // must also not be output for most entities (proposal, intervention, ...)
+ //if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
+ print '
';
+}
+print '';
+
+if ($conf->global->PRODUCT_USE_UNITS)
+{
+ $coldisplay++;
+ print '
';
+ print $form->selectUnits($line->fk_unit, "units");
+ print ' ';
+}
+
+$coldisplay++;
+print '
';
+print ' ';
+
+$coldisplay+=$colspan;
+print '
';
+$coldisplay+=$colspan;
+print ' ';
+print '';
+
if (is_object($objectline)) {
print $objectline->showOptionals($extrafields, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
}
-?>
-
+print "\n";
diff --git a/htdocs/bom/tpl/objectline_title.tpl.php b/htdocs/bom/tpl/objectline_title.tpl.php
index 26010a70eb8..721cc5b501f 100644
--- a/htdocs/bom/tpl/objectline_title.tpl.php
+++ b/htdocs/bom/tpl/objectline_title.tpl.php
@@ -39,9 +39,7 @@ if (empty($object) || ! is_object($object))
print "Error, template page can't be called as URL";
exit;
}
-?>
-
-\n";
// Title line
print "
\n";
@@ -79,6 +77,5 @@ if ($action == 'selectlines')
print "\n";
print " \n";
-?>
-
+print "\n";
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index 9582e69f967..f569516e535 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -59,100 +59,93 @@ $domData .= ' data-product_type="'.$line->product_type.'"';
// Lines for extrafield
$objectline = new BOMLine($object->db);
-?>
-
-
-
>
- global->MAIN_VIEW_LINE_NUMBER)) { ?>
-
- db);
- $tmpproduct->fetch($line->fk_product);
- print $tmpproduct->getNomUrl(1);
- ?>
-
- qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
- ?>
-
+$coldisplay=0;
+print "\n";
+print ' ';
+if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+ print ''.($i+1).' ';
+ $coldisplay++;
+}
+print '';
+print '
';
+$coldisplay++;
+$tmpproduct = new Product($object->db);
+$tmpproduct->fetch($line->fk_product);
+print $tmpproduct->getNomUrl(1);
+print ' ';
+print '';
+$coldisplay++;
+echo price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
+print ' ';
- global->PRODUCT_USE_UNITS)
- {
- print '';
- $label = $line->getLabelOfUnit('short');
- if ($label !== '') {
- print $langs->trans($label);
+if($conf->global->PRODUCT_USE_UNITS)
+{
+ print ' ';
+ $label = $line->getLabelOfUnit('short');
+ if ($label !== '') {
+ print $langs->trans($label);
+ }
+ print ' ';
+}
+print '';
+$coldisplay++;
+echo $line->efficiency;
+print ' ';
+
+if ($this->statut == 0 && ($object_rights->write) && $action != 'selectlines' ) {
+ print '';
+ $coldisplay++;
+ if (($line->info_bits & 2) == 2 || ! empty($disableedit)) {
+ } else {
+ print 'id.'#line_'.$line->id.'">'.img_edit().' ';
+ }
+ print ' ';
+
+ print '';
+ $coldisplay++;
+ if (($line->fk_prev_id == null ) && empty($disableremove)) {
+ //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
+ print 'id . '">';
+ print img_delete();
+ print ' ';
+ }
+ print ' ';
+
+ if ($num > 1 && $conf->browser->layout != 'phone' && empty($disablemove)) {
+ print '';
+ $coldisplay++;
+ if ($i > 0) {
+ print 'id.'">';
+ echo img_up('default', 0, 'imgupforline');
+ print ' ';
+ }
+ if ($i < $num-1) {
+ print 'id.'">';
+ echo img_down('default', 0, 'imgdownforline');
+ print ' ';
}
print ' ';
+ } else {
+ print 'browser->layout != 'phone' && empty($disablemove)) ?' class="linecolmove tdlineupdown center"':' class="linecolmove center"').'> ';
+ $coldisplay++;
}
- ?>
-
- efficiency;
- ?>
-
- ';
+ $coldisplay=$coldisplay+3;
+}
- if ($this->statut == 0 && ($object_rights->write) && $action != 'selectlines' ) { ?>
-
- info_bits & 2) == 2 || ! empty($disableedit)) { ?>
-
- id.'#line_'.$line->id; ?>">
-
-
-
-
+if ($action == 'selectlines') {
+ print '';
+ print ' ';
+}
-
- fk_prev_id == null ) && empty($disableremove)) { //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
- print 'id . '">';
- print img_delete();
- print ' ';
- }
- ?>
-
+print ' ';
- 1 && $conf->browser->layout != 'phone' && empty($disablemove)) { ?>
-
- 0) { ?>
- id; ?>">
-
-
-
-
- id; ?>">
-
-
-
-
-
-
browser->layout != 'phone' && empty($disablemove)) ?' class="linecolmove tdlineupdown center"':' class="linecolmove center"'); ?>>
-
-
-
-
-
-
-
-
-
-showOptionals($extrafields, 'view', array('style'=>'class="drag drop oddeven"','colspan'=>$coldisplay), '', '', empty($conf->global->MAIN_EXTRAFIELDS_IN_ONE_TD)?0:1);
}
-?>
-
+print "\n";
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 8128815ef3b..8a26b12f15b 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -24,16 +24,11 @@
/**
* Add area with bookmarks in menu
*
- * @param DoliDb $aDb Database handler
- * @param Translate $aLangs Object lang
* @return string
*/
-function printBookmarksList($aDb, $aLangs)
+function printBookmarksList()
{
- global $conf, $user;
-
- $db = $aDb;
- $langs = $aLangs;
+ global $conf, $user, $db, $langs;
$ret = ''."\n";
@@ -155,16 +150,11 @@ function printBookmarksList($aDb, $aLangs)
/**
* Add area with bookmarks in top menu
*
- * @param DoliDb $aDb Database handler
- * @param Translate $aLangs Object lang
* @return string
*/
-function printDropdownBookmarksList($aDb, $aLangs)
+function printDropdownBookmarksList()
{
- global $conf, $user;
-
- $db = $aDb;
- $langs = $aLangs;
+ global $conf, $user, $db, $langs;
require_once DOL_DOCUMENT_ROOT.'/bookmarks/class/bookmark.class.php';
if (! isset($conf->global->BOOKMARKS_SHOW_IN_MENU)) $conf->global->BOOKMARKS_SHOW_IN_MENU=5;
@@ -271,7 +261,7 @@ function printDropdownBookmarksList($aDb, $aLangs)
var filter = $(this).val(), count = 0;
$("#dropdown-bookmarks-list .bookmark-item").each(function () {
-
+
if ($(this).text().search(new RegExp(filter, "i")) < 0) {
$(this).addClass("hidden-search-result");
} else {
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index cd3885b77b1..d60b3251f0d 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1835,13 +1835,13 @@ class Categorie extends CommonObject
}
}
- // Call trigger
- $result = $this->call_trigger('CATEGORY_SET_MULTILANGS', $user);
- if ($result < 0) {
- $this->error = $this->db->lasterror();
- return -1;
- }
- // End call triggers
+ // Call trigger
+ $result = $this->call_trigger('CATEGORY_SET_MULTILANGS', $user);
+ if ($result < 0) {
+ $this->error = $this->db->lasterror();
+ return -1;
+ }
+ // End call triggers
return 1;
}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 6fdd1e36feb..3854c51e29d 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -44,8 +44,9 @@ require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/order.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-if (! empty($conf->propal->enabled))
+if (! empty($conf->propal->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
+}
if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
@@ -757,8 +758,8 @@ if (empty($reshook))
$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) // using this option is a bug. kept for backward compatibility
{
- if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
- if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+ if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
+ if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
}
}
// If price per customer
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index fb044b1fafa..2559510dea8 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -437,7 +437,7 @@ class Orders extends DolibarrApi
return $this->commande;
}
- /**
+ /**
* Delete a contact type of given order
*
* @param int $id Id of order to update
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 6fe2104556b..4cc922a8cbf 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1995,9 +1995,9 @@ class Commande extends CommonOrder
// multilangs
if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($objp->fk_product) && ! empty($loadalsotranslation)) {
- $line = new Product($this->db);
- $line->fetch($objp->fk_product);
- $line->getMultiLangs();
+ $line = new Product($this->db);
+ $line->fetch($objp->fk_product);
+ $line->getMultiLangs();
}
$this->lines[$i] = $line;
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index 82d24ad3646..57e37f9f903 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -164,20 +164,21 @@ if ($id > 0 || ! empty($ref))
$morehtmlref.='
'.$langs->trans('Project') . ' ';
if ($user->rights->commande->creer)
{
- if ($action != 'classify')
+ if ($action != 'classify') {
//$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref.=' : ';
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.='
';
- } else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
- }
+ $morehtmlref.=' : ';
+ }
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='
';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
} else {
if (! empty($object->fk_project)) {
$proj = new Project($db);
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 515e14095bd..fa825086c4a 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -127,20 +127,21 @@ if ($id > 0 || ! empty($ref))
$morehtmlref.='
'.$langs->trans('Project') . ' ';
if ($user->rights->commande->creer)
{
- if ($action != 'classify')
+ if ($action != 'classify') {
//$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref.=' : ';
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.='
';
- } else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
- }
+ $morehtmlref.=' : ';
+ }
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='
';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
} else {
if (! empty($object->fk_project)) {
$proj = new Project($db);
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index f42a9fc5b60..7d8e319c5ae 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -84,20 +84,21 @@ if (! empty($conf->projet->enabled))
$morehtmlref.='
'.$langs->trans('Project') . ' ';
if ($user->rights->commande->creer)
{
- if ($action != 'classify')
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ if ($action != 'classify') {
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref.=' : ';
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.='
';
- } else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
- }
+ }
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='
';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
} else {
if (! empty($object->fk_project)) {
$proj = new Project($db);
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 0931067f155..2cb69bd698b 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -97,20 +97,21 @@ if ($id > 0 || ! empty($ref))
$morehtmlref.='
'.$langs->trans('Project') . ' ';
if ($user->rights->commande->creer)
{
- if ($action != 'classify')
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref.=' : ';
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.='
';
- } else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
- }
+ if ($action != 'classify') {
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref.=' : ';
+ }
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref.='
';
+ } else {
+ $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
} else {
if (! empty($object->fk_project)) {
$proj = new Project($db);
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 86f98f4f0e9..459940dcc64 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -18,17 +18,12 @@
*/
// Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
-{
+if (empty($conf) || ! is_object($conf)) {
print "Error, template page can't be called as URL";
exit;
}
-?>
-
-
-
-\n";
global $user;
global $noMoreLinkedObjectBlockAfter;
@@ -41,54 +36,48 @@ $langs->load("orders");
$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
-$total=0; $ilink=0;
+$total=0;
+$ilink=0;
foreach($linkedObjectBlock as $key => $objectlink)
{
$ilink++;
$trclass='oddeven';
if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
-?>
-
- trans("CustomerOrder"); ?>
- global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) print '
- getNomUrl(1); ?>
- ref_client; ?>
- date, 'day'); ?>
- rights->commande->lire) {
- $total = $total + $objectlink->total_ht;
- echo price($objectlink->total_ht);
- } ?>
- getLibStatut(3); ?>
-
- element != 'shipping') {
- ?>
- ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
-
-
-
-';
+ echo '
'.$langs->trans("CustomerOrder");
+ if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+ print ' '.$objectlink->getNomUrl(1).' ';
+ echo '
'.$objectlink->ref_client.' ';
+ echo '
'.dol_print_date($objectlink->date, 'day').' ';
+ echo '
';
+ if ($user->rights->commande->lire) {
+ $total = $total + $objectlink->total_ht;
+ echo price($objectlink->total_ht);
+ }
+ echo ' ';
+ echo '
'.$objectlink->getLibStatut(3).' ';
+ echo '
';
+ // For now, shipments must stay linked to order, so link is not deletable
+ if($object->element != 'shipping') {
+ echo ''.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').' ';
+ }
+ echo ' ';
+ echo "\n";
}
-if (count($linkedObjectBlock) > 1)
-{
- ?>
-
- trans("Total"); ?>
-
- 1) {
+ echo '
';
+ echo ''.$langs->trans("Total").' ';
+ echo ''.price($total).' ';
+ echo ' \n";
}
-?>
-
+echo "\n";
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index f1f42266735..d6a2ba77f05 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -155,8 +155,8 @@ $type='directory';
// This test if file exists should be useless. We keep it to find bug more easily
if (! dol_is_dir($upload_dir))
{
-// dol_mkdir($upload_dir);
-/* $langs->load("install");
+ //dol_mkdir($upload_dir);
+ /*$langs->load("install");
dol_print_error(0,$langs->trans("ErrorDirDoesNotExists",$upload_dir));
exit;*/
}
diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index d37374e45a5..200c6208896 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -73,7 +73,7 @@ if ($boxorder && $zone != '' && $userid > 0)
$langs->load("boxes");
if (! GETPOST('closing'))
{
- setEventMessages($langs->trans("BoxAdded"), null);
+ setEventMessages($langs->trans("BoxAdded"), null);
}
}
}
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index a66b775155c..23c4cc368cf 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -144,7 +144,8 @@ class box_produits extends ModeleBoxes
'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
'text' => $objp->label,
);
-
+ $price = '';
+ $price_base_type = '';
if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
$price_base_type=$langs->trans($objp->price_base_type);
$price=($objp->price_base_type == 'HT')?price($objp->price):$price=price($objp->price_ttc);
diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php
index 42fec36ef6a..0277630ae78 100644
--- a/htdocs/core/class/html.formcron.class.php
+++ b/htdocs/core/class/html.formcron.class.php
@@ -77,23 +77,23 @@ class FormCron extends Form
$out.='';
}
} else {
- $out='
';
+ $out='
';
- if ($selected=='command') {
- $selected_attr=' selected ';
- } else {
- $selected_attr='';
- }
- $out.= '
'.$langs->trans('CronType_command').' ';
+ if ($selected=='command') {
+ $selected_attr=' selected ';
+ } else {
+ $selected_attr='';
+ }
+ $out.= '
'.$langs->trans('CronType_command').' ';
- if ($selected=='method') {
- $selected_attr=' selected ';
- } else {
- $selected_attr='';
- }
- $out.= '
'.$langs->trans('CronType_method').' ';
+ if ($selected=='method') {
+ $selected_attr=' selected ';
+ } else {
+ $selected_attr='';
+ }
+ $out.= '
'.$langs->trans('CronType_method').' ';
- $out.='';
+ $out.='';
}
return $out;
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index 9e26e1583a6..2f6dbf16943 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -318,7 +318,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
else
{
//issue the CKEditor Callback
-SendCKEditorResults(
+ SendCKEditorResults(
$CKEcallback,
$sFileUrl,
($sErrorNumber != 0 ? 'Error '. $sErrorNumber. ' upload failed.' : 'Upload Successful')
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 17f847b9a37..b66f2abcd8b 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -401,11 +401,11 @@ EOF;
*/
function SendCKEditorResults($callback, $sFileUrl, $customMsg = '')
{
- echo '';
+ echo '';
}
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index c35318dc7ae..54c0f02abde 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -1039,16 +1039,16 @@ function price2numjs(amount) {
if (amount == '') return '';
transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
- $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
- }
- if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
- $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
- }
- if ($thousand == 'Space') $thousand=' ';
- print "var dec='" . dol_escape_js($dec) . "'; var thousand='" . dol_escape_js($thousand) . "';\n"; // Set var in javascript
+ $dec = ',';
+ $thousand = ' ';
+ if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+ $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
+ }
+ if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+ $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
+ }
+ if ($thousand == 'Space') $thousand=' ';
+ print "var dec='" . dol_escape_js($dec) . "'; var thousand='" . dol_escape_js($thousand) . "';\n"; // Set var in javascript
?>
var main_max_dec_shown = global->MAIN_MAX_DECIMALS_SHOWN); ?>;
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index 6c7f3e2c35c..cb8a80bbd78 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -140,5 +140,5 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
time_js_next_test += time_auto_update;
console.log('Updated time_js_next_test. New value is '+time_js_next_test);
}
-id=$obj->id;
print '
'.$staticaction->getNomUrl(1, 34).' ';
- // print '
'.dol_trunc($obj->label,22).' ';
+ // print '
'.dol_trunc($obj->label,22).' ';
print '
';
if ($obj->rowid > 0)
@@ -414,10 +414,10 @@ function agenda_prepare_head()
if ($conf->global->MAIN_FEATURES_LEVEL > 0)
{
- $head[$h][0] = DOL_URL_ROOT."/admin/agenda_reminder.php";
- $head[$h][1] = $langs->trans("Reminders");
- $head[$h][2] = 'reminders';
- $h++;
+ $head[$h][0] = DOL_URL_ROOT."/admin/agenda_reminder.php";
+ $head[$h][1] = $langs->trans("Reminders");
+ $head[$h][2] = 'reminders';
+ $h++;
}
$head[$h][0] = DOL_URL_ROOT."/admin/agenda_xcal.php";
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 2230bfac5a1..91e0b719734 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -47,13 +47,13 @@ function bank_prepare_head(Account $object)
$head[$h][2] = 'journal';
$h++;
-// if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
-// {
+ // if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
+ // {
$head[$h][0] = DOL_URL_ROOT . "/compta/bank/treso.php?account=" . $object->id;
$head[$h][1] = $langs->trans("PlannedTransactions");
$head[$h][2] = 'cash';
$h++;
-// }
+ // }
$head[$h][0] = DOL_URL_ROOT . "/compta/bank/annuel.php?account=" . $object->id;
$head[$h][1] = $langs->trans("IOMonthlyReporting");
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 1730d51383d..f1fd6ed220f 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -624,7 +624,7 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask
if (empty($arrayreplacementisregex))
{
- $content = make_substitutions($content, $arrayreplacement, null);
+ $content = make_substitutions($content, $arrayreplacement, null);
}
else
{
@@ -1044,8 +1044,8 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
$checkvirusarray=dolCheckVirus($src_file);
if (count($checkvirusarray))
{
- dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: errors='.join(',', $checkvirusarray), LOG_WARNING);
- return 'ErrorFileIsInfectedWithAVirus: '.join(',', $checkvirusarray);
+ dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: errors='.join(',', $checkvirusarray), LOG_WARNING);
+ return 'ErrorFileIsInfectedWithAVirus: '.join(',', $checkvirusarray);
}
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8a17b961adb..ecdebb1c27a 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -464,36 +464,36 @@ function GETPOST($paramname, $check = 'none', $method = 0, $filter = null, $opti
$maxloop=20; $loopnb=0; // Protection against infinite loop
while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop)) // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
{
- $loopnb++; $newout = '';
+ $loopnb++; $newout = '';
- if ($reg[1] == 'DAY') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
- elseif ($reg[1] == 'MONTH') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon']; }
- elseif ($reg[1] == 'YEAR') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; }
- elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
- elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
- elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
- elseif ($reg[1] == 'NEXT_DAY') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
- elseif ($reg[1] == 'NEXT_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
- elseif ($reg[1] == 'NEXT_YEAR') { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
- elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
- {
- $newout = $mysoc->country_id;
- }
- elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
- {
- $newout = $user->id;
- }
- elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
- {
- $newout = $user->fk_user;
- }
- elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID')
- {
- $newout = $conf->entity;
- }
- else $newout = ''; // Key not found, we replace with empty string
- //var_dump('__'.$reg[1].'__ -> '.$newout);
- $out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);
+ if ($reg[1] == 'DAY') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mday']; }
+ elseif ($reg[1] == 'MONTH') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['mon']; }
+ elseif ($reg[1] == 'YEAR') { $tmp=dol_getdate(dol_now(), true); $newout = $tmp['year']; }
+ elseif ($reg[1] == 'PREVIOUS_DAY') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
+ elseif ($reg[1] == 'PREVIOUS_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_prev_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
+ elseif ($reg[1] == 'PREVIOUS_YEAR') { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] - 1); }
+ elseif ($reg[1] == 'NEXT_DAY') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_day($tmp['mday'], $tmp['mon'], $tmp['year']); $newout = $tmp2['day']; }
+ elseif ($reg[1] == 'NEXT_MONTH') { $tmp=dol_getdate(dol_now(), true); $tmp2=dol_get_next_month($tmp['mon'], $tmp['year']); $newout = $tmp2['month']; }
+ elseif ($reg[1] == 'NEXT_YEAR') { $tmp=dol_getdate(dol_now(), true); $newout = ($tmp['year'] + 1); }
+ elseif ($reg[1] == 'MYCOMPANY_COUNTRY_ID' || $reg[1] == 'MYCOUNTRY_ID' || $reg[1] == 'MYCOUNTRYID')
+ {
+ $newout = $mysoc->country_id;
+ }
+ elseif ($reg[1] == 'USER_ID' || $reg[1] == 'USERID')
+ {
+ $newout = $user->id;
+ }
+ elseif ($reg[1] == 'USER_SUPERVISOR_ID' || $reg[1] == 'SUPERVISOR_ID' || $reg[1] == 'SUPERVISORID')
+ {
+ $newout = $user->fk_user;
+ }
+ elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID')
+ {
+ $newout = $conf->entity;
+ }
+ else $newout = ''; // Key not found, we replace with empty string
+ //var_dump('__'.$reg[1].'__ -> '.$newout);
+ $out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);
}
}
@@ -876,7 +876,7 @@ function dol_string_unaccent($str)
else
{
// See http://www.ascii-code.com/
-$string = strtr(
+ $string = strtr(
$str,
"\xC0\xC1\xC2\xC3\xC4\xC5\xC7
\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1
@@ -3829,7 +3829,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
if (! empty($conf->modules))
{
- $out.="".$langs->trans("Modules").": ".join(', ', $conf->modules)."".$langs->trans("Modules").": ".join(', ', $conf->modules)." '."\n";
- print '';
- print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
- if ($projectstatic->title)
- {
- print ' - ';
- print $projectstatic->title;
- }
- print ' ';
- print ' ';
- }
-
- if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
-
- print '
'."\n";
-
- // User
- /*
- print '';
- print $fuser->getNomUrl(1, 'withproject', 'time');
- print ' ';
- */
-
- // Project
- print "";
- if ($oldprojectforbreak == -1)
- {
- print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
- print ' ";
-
- // Thirdparty
- print '';
- if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
- print ' ';
-
- // Ref
- print '';
- print '';
- for ($k = 0 ; $k < $level ; $k++) print " ";
- print $taskstatic->getNomUrl(1, 'withproject', 'time');
- // Label task
- print ' \n";
-
- // Date
- print '';
- print dol_print_date($lines[$i]->timespent_datehour, 'day');
- print ' ';
-
- $disabledproject=1;$disabledtask=1;
- //print "x".$lines[$i]->fk_project;
- //var_dump($lines[$i]);
- //var_dump($projectsrole[$lines[$i]->fk_project]);
- // If at least one role for project
- if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
- {
- $disabledproject=0;
- $disabledtask=0;
- }
- // If $restricteditformytask is on and I have no role on task, i disable edit
- if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
- {
- $disabledtask=1;
- }
-
- // Hour
- print '';
- print dol_print_date($lines[$i]->timespent_datehour, 'hour');
- print ' ';
-
- $cssonholiday='';
- if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayallday ';
- elseif (! $isavailable[$preselectedday]['morning']) $cssonholiday.='onholidaymorning ';
- elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
-
- // Duration
- print '';
-
- $dayWorkLoad = $lines[$i]->timespent_duration;
- $totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
-
- $alreadyspent='';
- if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');
-
- print convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');
-
- $modeinput='hours';
-
- print '';
-
- print ' ';
-
- // Note
- print '';
- print '';
- print ' ';
-
- // Warning
- print '';
- /*if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
- else if ($disabledtask)
- {
- $titleassigntask = $langs->trans("AssignTaskToMe");
- if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
-
- print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
- }*/
- print ' ';
-
- print " \n";
}
+
+ if (empty($workloadforid[$projectstatic->id]))
+ {
+ if ($preselectedday)
+ {
+ $projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
+ $workloadforid[$projectstatic->id]=1;
+ }
+ }
+
+ $projectstatic->id=$lines[$i]->fk_project;
+ $projectstatic->ref=$lines[$i]->project_ref;
+ $projectstatic->title=$lines[$i]->project_label;
+ $projectstatic->public=$lines[$i]->public;
+
+ $taskstatic->id=$lines[$i]->task_id;
+ $taskstatic->ref=($lines[$i]->task_ref?$lines[$i]->task_ref:$lines[$i]->task_id);
+ $taskstatic->label=$lines[$i]->task_label;
+ $taskstatic->date_start=$lines[$i]->date_start;
+ $taskstatic->date_end=$lines[$i]->date_end;
+
+ $thirdpartystatic->id=$lines[$i]->socid;
+ $thirdpartystatic->name=$lines[$i]->thirdparty_name;
+ $thirdpartystatic->email=$lines[$i]->thirdparty_email;
+
+ if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
+ {
+ print '
'."\n";
+ print '';
+ print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+ if ($projectstatic->title)
+ {
+ print ' - ';
+ print $projectstatic->title;
+ }
+ print ' ';
+ print ' ';
+ }
+
+ if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+
+ print '
'."\n";
+
+ // User
+ /*
+ print '';
+ print $fuser->getNomUrl(1, 'withproject', 'time');
+ print ' ';
+ */
+
+ // Project
+ print "";
+ if ($oldprojectforbreak == -1)
+ {
+ print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+ print ' ";
+
+ // Thirdparty
+ print '';
+ if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
+ print ' ';
+
+ // Ref
+ print '';
+ print '';
+ for ($k = 0 ; $k < $level ; $k++) print " ";
+ print $taskstatic->getNomUrl(1, 'withproject', 'time');
+ // Label task
+ print ' \n";
+
+ // Date
+ print '';
+ print dol_print_date($lines[$i]->timespent_datehour, 'day');
+ print ' ';
+
+ $disabledproject=1;$disabledtask=1;
+ //print "x".$lines[$i]->fk_project;
+ //var_dump($lines[$i]);
+ //var_dump($projectsrole[$lines[$i]->fk_project]);
+ // If at least one role for project
+ if ($lines[$i]->public || ! empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
+ {
+ $disabledproject=0;
+ $disabledtask=0;
+ }
+ // If $restricteditformytask is on and I have no role on task, i disable edit
+ if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
+ {
+ $disabledtask=1;
+ }
+
+ // Hour
+ print '';
+ print dol_print_date($lines[$i]->timespent_datehour, 'hour');
+ print ' ';
+
+ $cssonholiday='';
+ if (! $isavailable[$preselectedday]['morning'] && ! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayallday ';
+ elseif (! $isavailable[$preselectedday]['morning']) $cssonholiday.='onholidaymorning ';
+ elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
+
+ // Duration
+ print '';
+
+ $dayWorkLoad = $lines[$i]->timespent_duration;
+ $totalforeachline[$preselectedday]+=$lines[$i]->timespent_duration;
+
+ $alreadyspent='';
+ if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');
+
+ print convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');
+
+ $modeinput='hours';
+
+ print '';
+
+ print ' ';
+
+ // Note
+ print '';
+ print '';
+ print ' ';
+
+ // Warning
+ print '';
+ /*if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("UserIsNotContactOfProject"));
+ else if ($disabledtask)
+ {
+ $titleassigntask = $langs->trans("AssignTaskToMe");
+ if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+
+ print $form->textwithpicto('',$langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+ }*/
+ print ' ';
+
+ print " \n";
+ }
//}
//else
//{
diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php
index af27cea4292..15ca4de37e0 100644
--- a/htdocs/core/lib/reception.lib.php
+++ b/htdocs/core/lib/reception.lib.php
@@ -105,18 +105,18 @@ function reception_admin_prepare_head()
if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
{
- $head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
- $head[$h][1] = $langs->trans("ExtraFields");
- $head[$h][2] = 'attributes_reception';
- $h++;
+ $head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
+ $head[$h][1] = $langs->trans("ExtraFields");
+ $head[$h][2] = 'attributes_reception';
+ $h++;
}
if (! empty($conf->global->MAIN_SUBMODULE_RECEPTION))
{
- $head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
- $head[$h][1] = $langs->trans("ExtraFieldsLines");
- $head[$h][2] = 'attributeslines_reception';
- $h++;
+ $head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
+ $head[$h][1] = $langs->trans("ExtraFieldsLines");
+ $head[$h][2] = 'attributeslines_reception';
+ $h++;
}
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index a4ddb68dbd3..b45eaa4b7a9 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -180,7 +180,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
if (! empty($location)) fwrite($calfileh, "LOCATION:".$encoding.$location."\n");
if ($fulldayevent) fwrite($calfileh, "X-FUNAMBOL-ALLDAY:1\n");
-
+
// see https://docs.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-oxcical/0f262da6-c5fd-459e-9f18-145eba86b5d2
if ($fulldayevent) fwrite($calfileh, "X-MICROSOFT-CDO-ALLDAYEVENT:TRUE\n");
@@ -320,7 +320,7 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
fwrite($fichier, $form);
$form='
'."\n".
-// '
fr '."\n".
+ // '
fr '."\n".
'
Dolibarr '."\n".
'
'.$date.' '."\n".
'
Dolibarr '."\n";
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index 6be5e3904ab..93d1b37c690 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -177,13 +177,13 @@ class InterfaceLogevents extends DolibarrTriggers
}
// If not found
-/*
+ /*
else
{
dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.");
return 0;
}
-*/
+ */
// Add more information into desc from the context property
if (! empty($desc) && ! empty($object->context['audit'])) $desc.=' - '.$object->context['audit'];
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 5676bb82cfb..e72da40d6b0 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -251,7 +251,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
}
elseif ($action == 'BILL_UNVALIDATE')
{
- // Load translation files required by the page
+ // Load translation files required by the page
$langs->loadLangs(array("agenda","other","bills"));
if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
@@ -808,9 +808,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
$object->actionmsg=$langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
if ($object->oldcopy->fk_user_assign > 0)
{
- $tmpuser=new User($this->db);
- $tmpuser->fetch($object->oldcopy->fk_user_assign);
- $object->actionmsg.="\n".$langs->transnoentities("OldUser").': '.$tmpuser->getFullName($langs);
+ $tmpuser=new User($this->db);
+ $tmpuser->fetch($object->oldcopy->fk_user_assign);
+ $object->actionmsg.="\n".$langs->transnoentities("OldUser").': '.$tmpuser->getFullName($langs);
}
else
{
diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index 301d565c2ba..b9dbd340d88 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -181,7 +181,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
case 'CONTACT_MODIFY':
case 'CONTACT_DELETE':
case 'CONTACT_ENABLEDISABLE':
-
+ break;
// Products
// case 'PRODUCT_CREATE':
// case 'PRODUCT_MODIFY':
@@ -221,7 +221,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
case 'LINEORDER_INSERT':
case 'LINEORDER_UPDATE':
case 'LINEORDER_DELETE':
-
+ break;
// Supplier orders
// case 'ORDER_SUPPLIER_CREATE':
// case 'ORDER_SUPPLIER_CLONE':
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 527b9062c2e..70fabfcdc29 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -58,12 +58,16 @@ class Don extends CommonObject
public $ismultientitymanaged = 1;
/**
- * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+ * @var string String with name of icon for object don. Must be the part after the 'object_' into object_myobject.png
*/
public $picto = 'generic';
public $date;
public $amount;
+
+ /**
+ * @var string Thirdparty name
+ */
public $societe;
/**
@@ -71,18 +75,29 @@ class Don extends CommonObject
*/
public $address;
+ /**
+ * @var string Zipcode
+ */
public $zip;
+
+ /**
+ * @var string Town
+ */
public $town;
+
+ /**
+ * @var string Email
+ */
public $email;
public $public;
/**
- * @var int ID
+ * @var int project ID
*/
public $fk_project;
/**
- * @var int ID
+ * @var int type payment ID
*/
public $fk_typepayment;
@@ -90,7 +105,14 @@ class Don extends CommonObject
public $date_valid;
public $modepaymentid = 0;
+ /**
+ * @var array Array of status label
+ */
public $labelstatut;
+
+ /**
+ * @var array Array of status label short
+ */
public $labelstatutshort;
/**
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 4fc94feb1f4..f522ad29fa8 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1625,16 +1625,16 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)){
// Add search dropdown
- $toprightmenu.= top_menu_search($user, $langs);
+ $toprightmenu.= top_menu_search();
}
if (!empty($conf->global->MAIN_USE_TOP_MENU_BOOKMARK_DROPDOWN)) {
// Add bookmark dropdown
- $toprightmenu .= top_menu_bookmark($user, $langs);
+ $toprightmenu .= top_menu_bookmark();
}
// Add user dropdown
- $toprightmenu.= top_menu_user($user, $langs);
+ $toprightmenu.= top_menu_user();
$toprightmenu.='