| '.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").' | ';
print '';
- if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO))
+ if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO))
{
print $conf->global->MAIN_MAIL_AUTOCOPY_TO;
- if (! isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
+ if (!isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
}
else
{
@@ -732,7 +732,7 @@ else
print ''.$langs->trans("Modify").'';
- if ($conf->global->MAIN_MAIL_SENDMODE != 'mail' || ! $linuxlike)
+ if ($conf->global->MAIN_MAIL_SENDMODE != 'mail' || !$linuxlike)
{
if (function_exists('fsockopen') && $port && $server)
{
@@ -746,7 +746,7 @@ else
print ''.$langs->trans("DoTestSend").'';
- if (! empty($conf->fckeditor->enabled))
+ if (!empty($conf->fckeditor->enabled))
{
print ''.$langs->trans("DoTestSendHTML").'';
}
@@ -770,17 +770,17 @@ else
print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
}
- if (! in_array($action, array('testconnect', 'test', 'testhtml')))
+ if (!in_array($action, array('testconnect', 'test', 'testhtml')))
{
$text = '';
if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
{
- $text.= $langs->trans("WarningPHPMail");
+ $text .= $langs->trans("WarningPHPMail");
}
//$conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS='1.2.3.4';
- if (! empty($conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS))
+ if (!empty($conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS))
{
- $text.= ($text?'
':'').$langs->trans("WarningPHPMail2", $conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS);
+ $text .= ($text ? '
' : '').$langs->trans("WarningPHPMail2", $conf->global->MAIN_EXTERNAL_SMTP_CLIENT_IP_ADDRESS);
}
if ($text) print info_admin($text);
}
@@ -792,7 +792,7 @@ else
include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mail = new CMailFile('', '', '', '');
- $result=$mail->check_server_port($server, $port);
+ $result = $mail->check_server_port($server, $port);
if ($result) print ''.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).' ';
else
{
@@ -811,45 +811,45 @@ else
if ($action == 'test' || $action == 'testhtml')
{
print '';
- print load_fiche_titre($action == 'testhtml'?$langs->trans("DoTestSendHTML"):$langs->trans("DoTestSend"));
+ print load_fiche_titre($action == 'testhtml' ? $langs->trans("DoTestSendHTML") : $langs->trans("DoTestSend"));
dol_fiche_head('');
// Cree l'objet formulaire mail
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
- $formmail->trackid=(($action == 'testhtml')?"testhtml":"test");
- $formmail->fromname = (isset($_POST['fromname'])?$_POST['fromname']:$conf->global->MAIN_MAIL_EMAIL_FROM);
- $formmail->frommail = (isset($_POST['frommail'])?$_POST['frommail']:$conf->global->MAIN_MAIL_EMAIL_FROM);
- $formmail->fromid=$user->id;
- $formmail->fromalsorobot=1;
- $formmail->fromtype=(GETPOSTISSET('fromtype')?GETPOST('fromtype', 'aZ09'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
- $formmail->withfromreadonly=1;
- $formmail->withsubstit=1;
- $formmail->withfrom=1;
- $formmail->witherrorsto=1;
- $formmail->withto=(! empty($_POST['sendto'])?$_POST['sendto']:($user->email?$user->email:1));
- $formmail->withtocc=(! empty($_POST['sendtocc'])?$_POST['sendtocc']:1); // ! empty to keep field if empty
- $formmail->withtoccc=(! empty($_POST['sendtoccc'])?$_POST['sendtoccc']:1); // ! empty to keep field if empty
- $formmail->withtopic=(isset($_POST['subject'])?$_POST['subject']:$langs->trans("Test"));
- $formmail->withtopicreadonly=0;
- $formmail->withfile=2;
- $formmail->withbody=(isset($_POST['message'])?$_POST['message']:($action == 'testhtml'?$langs->transnoentities("PredefinedMailTestHtml"):$langs->transnoentities("PredefinedMailTest")));
- $formmail->withbodyreadonly=0;
- $formmail->withcancel=1;
- $formmail->withdeliveryreceipt=1;
- $formmail->withfckeditor=($action == 'testhtml'?1:0);
- $formmail->ckeditortoolbar='dolibarr_mailings';
+ $formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
+ $formmail->fromname = (isset($_POST['fromname']) ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+ $formmail->frommail = (isset($_POST['frommail']) ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+ $formmail->fromid = $user->id;
+ $formmail->fromalsorobot = 1;
+ $formmail->fromtype = (GETPOSTISSET('fromtype') ?GETPOST('fromtype', 'aZ09') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
+ $formmail->withfromreadonly = 1;
+ $formmail->withsubstit = 1;
+ $formmail->withfrom = 1;
+ $formmail->witherrorsto = 1;
+ $formmail->withto = (!empty($_POST['sendto']) ? $_POST['sendto'] : ($user->email ? $user->email : 1));
+ $formmail->withtocc = (!empty($_POST['sendtocc']) ? $_POST['sendtocc'] : 1); // ! empty to keep field if empty
+ $formmail->withtoccc = (!empty($_POST['sendtoccc']) ? $_POST['sendtoccc'] : 1); // ! empty to keep field if empty
+ $formmail->withtopic = (isset($_POST['subject']) ? $_POST['subject'] : $langs->trans("Test"));
+ $formmail->withtopicreadonly = 0;
+ $formmail->withfile = 2;
+ $formmail->withbody = (isset($_POST['message']) ? $_POST['message'] : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest")));
+ $formmail->withbodyreadonly = 0;
+ $formmail->withcancel = 1;
+ $formmail->withdeliveryreceipt = 1;
+ $formmail->withfckeditor = ($action == 'testhtml' ? 1 : 0);
+ $formmail->ckeditortoolbar = 'dolibarr_mailings';
// Tableau des substitutions
- $formmail->substit=$substitutionarrayfortest;
+ $formmail->substit = $substitutionarrayfortest;
// Tableau des parametres complementaires du post
- $formmail->param["action"]="send";
- $formmail->param["models"]="body";
- $formmail->param["mailid"]=0;
- $formmail->param["returnurl"]=$_SERVER["PHP_SELF"];
+ $formmail->param["action"] = "send";
+ $formmail->param["models"] = "body";
+ $formmail->param["mailid"] = 0;
+ $formmail->param["returnurl"] = $_SERVER["PHP_SELF"];
// Init list of files
- if (GETPOST("mode", "aZ09")=='init')
+ if (GETPOST("mode", "aZ09") == 'init')
{
$formmail->clear_attached_files();
}
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index 8e0afc77d0a..af41824fa08 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -32,32 +32,32 @@ require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
// Load translation files required by the page
-$langs->loadLangs(array("mrp","other"));
+$langs->loadLangs(array("mrp", "other"));
// Get parameters
-$id = GETPOST('id', 'int');
+$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
$cancel = GETPOST('cancel', 'aZ09');
$backtopage = GETPOST('backtopage', 'alpha');
if (GETPOST('actioncode', 'array'))
{
- $actioncode=GETPOST('actioncode', 'array', 3);
- if (! count($actioncode)) $actioncode='0';
+ $actioncode = GETPOST('actioncode', 'array', 3);
+ if (!count($actioncode)) $actioncode = '0';
}
else
{
- $actioncode=GETPOST("actioncode", "alpha", 3)?GETPOST("actioncode", "alpha", 3):(GETPOST("actioncode")=='0'?'0':(empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT)?'':$conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+ $actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
}
-$search_agenda_label=GETPOST('search_agenda_label');
+$search_agenda_label = GETPOST('search_agenda_label');
// Security check - Protection if external user
//if ($user->socid > 0) accessforbidden();
//if ($user->socid > 0) $socid = $user->socid;
//$result = restrictedArea($user, 'bom', $id);
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOST("page", 'int');
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 252caa8da10..75f87067a4e 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -625,28 +625,28 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Close / Cancel
if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED)
{
- print '' . $langs->trans("Disable") . '';
+ print ''.$langs->trans("Disable").'';
}
// Re-open
if ($permissiontoadd && $object->status == $object::STATUS_CANCELED)
{
- print '' . $langs->trans("ReOpen") . '';
+ print ''.$langs->trans("ReOpen").'';
}
// Create MO
if ($conf->mrp->enabled)
{
- if ($object->status == $object::STATUS_VALIDATED && ! empty($user->rights->mrp->write))
+ if ($object->status == $object::STATUS_VALIDATED && !empty($user->rights->mrp->write))
{
- print '' . $langs->trans("CreateMO") . '';
+ print ''.$langs->trans("CreateMO").'';
}
}
// Clone
if ($permissiontoadd)
{
- print '' . $langs->trans("ToClone") . '';
+ print ''.$langs->trans("ToClone").'';
}
/*
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 47a31f11a72..68be93f7ed1 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -745,7 +745,7 @@ if ($socid > 0)
$sql .= " , ".MAIN_DB_PREFIX."facturedet as fc";
$sql .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
- $sql .= " WHERE rc.fk_soc =". $object->id;
+ $sql .= " WHERE rc.fk_soc =".$object->id;
$sql .= " AND rc.fk_facture_line = fc.rowid";
$sql .= " AND fc.fk_facture = f.rowid";
$sql .= " AND rc.fk_user = u.rowid";
@@ -763,7 +763,7 @@ if ($socid > 0)
$sql2 .= " , ".MAIN_DB_PREFIX."user as u";
$sql2 .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fa ON rc.fk_facture_source = fa.rowid";
- $sql2 .= " WHERE rc.fk_soc =". $object->id;
+ $sql2 .= " WHERE rc.fk_soc =".$object->id;
$sql2 .= " AND rc.fk_facture = f.rowid";
$sql2 .= " AND rc.fk_user = u.rowid";
$sql2 .= " AND rc.discount_type = 0"; // Eliminate supplier discounts
@@ -920,7 +920,7 @@ if ($socid > 0)
$sql .= " , ".MAIN_DB_PREFIX."facture_fourn_det as fc";
$sql .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
- $sql .= " WHERE rc.fk_soc =". $object->id;
+ $sql .= " WHERE rc.fk_soc =".$object->id;
$sql .= " AND rc.fk_invoice_supplier_line = fc.rowid";
$sql .= " AND fc.fk_facture_fourn = f.rowid";
$sql .= " AND rc.fk_user = u.rowid";
@@ -938,7 +938,7 @@ if ($socid > 0)
$sql2 .= " , ".MAIN_DB_PREFIX."user as u";
$sql2 .= " , ".MAIN_DB_PREFIX."societe_remise_except as rc";
$sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as fa ON rc.fk_invoice_supplier_source = fa.rowid";
- $sql2 .= " WHERE rc.fk_soc =". $object->id;
+ $sql2 .= " WHERE rc.fk_soc =".$object->id;
$sql2 .= " AND rc.fk_invoice_supplier = f.rowid";
$sql2 .= " AND rc.fk_user = u.rowid";
$sql2 .= " AND rc.discount_type = 1"; // Eliminate customer discounts
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 0f0c3d11386..fbcd06a51bc 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -31,22 +31,22 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
// Load translation files required by the page
$langs->loadLangs(array('banks', 'categories'));
-$WIDTH=DolGraph::getDefaultGraphSizeForStats('width', 768);
-$HEIGHT=DolGraph::getDefaultGraphSizeForStats('height', 200);
+$WIDTH = DolGraph::getDefaultGraphSizeForStats('width', 768);
+$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height', 200);
// Security check
if (isset($_GET["account"]) || isset($_GET["ref"]))
{
- $id = isset($_GET["account"])?$_GET["account"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+ $id = isset($_GET["account"]) ? $_GET["account"] : (isset($_GET["ref"]) ? $_GET["ref"] : '');
}
-$fieldid = isset($_GET["ref"])?'ref':'rowid';
-if ($user->socid) $socid=$user->socid;
-$result=restrictedArea($user, 'banque', $id, 'bank_account&bank_account', '', '', $fieldid);
+$fieldid = isset($_GET["ref"]) ? 'ref' : 'rowid';
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'banque', $id, 'bank_account&bank_account', '', '', $fieldid);
-$account=GETPOST("account");
-$mode='standard';
-if (GETPOST("mode") == 'showalltime') $mode='showalltime';
-$error=0;
+$account = GETPOST("account");
+$mode = 'standard';
+if (GETPOST("mode") == 'showalltime') $mode = 'showalltime';
+$error = 0;
/*
@@ -63,22 +63,22 @@ $datetime = dol_now();
$year = dol_print_date($datetime, "%Y");
$month = dol_print_date($datetime, "%m");
$day = dol_print_date($datetime, "%d");
-if (GETPOST("year")) $year=sprintf("%04d", GETPOST("year"));
-if (GETPOST("month")) $month=sprintf("%02d", GETPOST("month"));
+if (GETPOST("year")) $year = sprintf("%04d", GETPOST("year"));
+if (GETPOST("month")) $month = sprintf("%02d", GETPOST("month"));
$object = new Account($db);
-if ($_GET["account"] && ! preg_match('/,/', $_GET["account"])) // if for a particular account and not a list
+if ($_GET["account"] && !preg_match('/,/', $_GET["account"])) // if for a particular account and not a list
{
- $result=$object->fetch(GETPOST("account", "int"));
+ $result = $object->fetch(GETPOST("account", "int"));
}
if ($_GET["ref"])
{
- $result=$object->fetch(0, GETPOST("ref"));
- $account=$object->id;
+ $result = $object->fetch(0, GETPOST("ref"));
+ $account = $object->id;
}
-$result=dol_mkdir($conf->bank->dir_temp);
+$result = dol_mkdir($conf->bank->dir_temp);
if ($result < 0)
{
$langs->load("errors");
@@ -89,11 +89,11 @@ else
{
// Calcul $min and $max
$sql = "SELECT MIN(b.datev) as min, MAX(b.datev) as max";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
- $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= " WHERE b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= " WHERE b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
$resql = $db->query($sql);
if ($resql)
@@ -109,7 +109,7 @@ else
}
if (empty($min)) $min = dol_now() - 3600 * 24;
- $log="graph.php: min=".$min." max=".$max;
+ $log = "graph.php: min=".$min." max=".$max;
dol_syslog($log);
@@ -120,24 +120,24 @@ else
// Loading table $amounts
$amounts = array();
- $monthnext = $month+1;
+ $monthnext = $month + 1;
$yearnext = $year;
if ($monthnext > 12)
{
- $monthnext=1;
+ $monthnext = 1;
$yearnext++;
}
$sql = "SELECT date_format(b.datev,'%Y%m%d')";
- $sql.= ", SUM(b.amount)";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
- $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= " WHERE b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- $sql.= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
- $sql.= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
- if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
- $sql.= " GROUP BY date_format(b.datev,'%Y%m%d')";
+ $sql .= ", SUM(b.amount)";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= " WHERE b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ $sql .= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
+ $sql .= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
+ if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
$resql = $db->query($sql);
if ($resql)
@@ -161,12 +161,12 @@ else
$solde = 0;
$sql = "SELECT SUM(b.amount)";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
- $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= " WHERE b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- $sql.= " AND b.datev < '".$year."-".sprintf("%02s", $month)."-01'";
- if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= " WHERE b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ $sql .= " AND b.datev < '".$year."-".sprintf("%02s", $month)."-01'";
+ if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
$resql = $db->query($sql);
if ($resql)
@@ -225,36 +225,36 @@ else
//exit;
// Fabrication tableau 1
- $file= $conf->bank->dir_temp."/balance".$account."-".$year.$month.".png";
- $fileurl=DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/balance".$account."-".$year.$month.".png";
- $title=$langs->transnoentities("Balance").' - '.$langs->transnoentities("Month").': '.$month.' '.$langs->transnoentities("Year").': '.$year;
- $graph_datas=array();
- foreach($datas as $i => $val)
+ $file = $conf->bank->dir_temp."/balance".$account."-".$year.$month.".png";
+ $fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/balance".$account."-".$year.$month.".png";
+ $title = $langs->transnoentities("Balance").' - '.$langs->transnoentities("Month").': '.$month.' '.$langs->transnoentities("Year").': '.$year;
+ $graph_datas = array();
+ foreach ($datas as $i => $val)
{
- $graph_datas[$i]=array(isset($labels[$i])?$labels[$i]:'',$datas[$i]);
+ $graph_datas[$i] = array(isset($labels[$i]) ? $labels[$i] : '', $datas[$i]);
if ($object->min_desired) array_push($graph_datas[$i], $datamin[$i]);
if ($object->min_allowed) array_push($graph_datas[$i], $dataall[$i]);
}
$px1 = new DolGraph();
$px1->SetData($graph_datas);
- $arraylegends=array($langs->transnoentities("Balance"));
+ $arraylegends = array($langs->transnoentities("Balance"));
if ($object->min_desired) array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
if ($object->min_allowed) array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
$px1->SetLegend($arraylegends);
$px1->SetLegendWidthMin(180);
- $px1->SetMaxValue($px1->GetCeilMaxValue()<0?0:$px1->GetCeilMaxValue());
- $px1->SetMinValue($px1->GetFloorMinValue()>0?0:$px1->GetFloorMinValue());
+ $px1->SetMaxValue($px1->GetCeilMaxValue() < 0 ? 0 : $px1->GetCeilMaxValue());
+ $px1->SetMinValue($px1->GetFloorMinValue() > 0 ? 0 : $px1->GetFloorMinValue());
$px1->SetTitle($title);
$px1->SetWidth($WIDTH);
$px1->SetHeight($HEIGHT);
- $px1->SetType(array('lines','lines','lines'));
+ $px1->SetType(array('lines', 'lines', 'lines'));
$px1->setBgColor('onglet');
- $px1->setBgColorGrid(array(255,255,255));
+ $px1->setBgColorGrid(array(255, 255, 255));
$px1->SetHorizTickIncrement(1);
$px1->draw($file, $fileurl);
- $show1=$px1->show();
+ $show1 = $px1->show();
unset($graph_datas);
unset($px1);
unset($datas);
@@ -271,14 +271,14 @@ else
// Loading table $amounts
$amounts = array();
$sql = "SELECT date_format(b.datev,'%Y%m%d')";
- $sql.= ", SUM(b.amount)";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
- $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= " WHERE b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- $sql.= " AND b.datev >= '".$year."-01-01 00:00:00'";
- $sql.= " AND b.datev <= '".$year."-12-31 23:59:59'";
- if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
+ $sql .= ", SUM(b.amount)";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= " WHERE b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ $sql .= " AND b.datev >= '".$year."-01-01 00:00:00'";
+ $sql .= " AND b.datev <= '".$year."-12-31 23:59:59'";
+ if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
$resql = $db->query($sql);
@@ -303,12 +303,12 @@ else
$solde = 0;
$sql = "SELECT SUM(b.amount)";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
- $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= " WHERE b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- $sql.= " AND b.datev < '".$year."-01-01'";
- if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= " WHERE b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ $sql .= " AND b.datev < '".$year."-01-01'";
+ if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
$resql = $db->query($sql);
if ($resql)
@@ -361,36 +361,36 @@ else
}
// Fabrication tableau 2
- $file= $conf->bank->dir_temp."/balance".$account."-".$year.".png";
- $fileurl=DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/balance".$account."-".$year.".png";
- $title=$langs->transnoentities("Balance").' - '.$langs->transnoentities("Year").': '.$year;
- $graph_datas=array();
- foreach($datas as $i => $val)
+ $file = $conf->bank->dir_temp."/balance".$account."-".$year.".png";
+ $fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/balance".$account."-".$year.".png";
+ $title = $langs->transnoentities("Balance").' - '.$langs->transnoentities("Year").': '.$year;
+ $graph_datas = array();
+ foreach ($datas as $i => $val)
{
- $graph_datas[$i]=array(isset($labels[$i])?$labels[$i]:'',$datas[$i]);
+ $graph_datas[$i] = array(isset($labels[$i]) ? $labels[$i] : '', $datas[$i]);
if ($object->min_desired) array_push($graph_datas[$i], $datamin[$i]);
if ($object->min_allowed) array_push($graph_datas[$i], $dataall[$i]);
}
$px2 = new DolGraph();
$px2->SetData($graph_datas);
- $arraylegends=array($langs->transnoentities("Balance"));
+ $arraylegends = array($langs->transnoentities("Balance"));
if ($object->min_desired) array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
if ($object->min_allowed) array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
$px2->SetLegend($arraylegends);
$px2->SetLegendWidthMin(180);
- $px2->SetMaxValue($px2->GetCeilMaxValue()<0?0:$px2->GetCeilMaxValue());
- $px2->SetMinValue($px2->GetFloorMinValue()>0?0:$px2->GetFloorMinValue());
+ $px2->SetMaxValue($px2->GetCeilMaxValue() < 0 ? 0 : $px2->GetCeilMaxValue());
+ $px2->SetMinValue($px2->GetFloorMinValue() > 0 ? 0 : $px2->GetFloorMinValue());
$px2->SetTitle($title);
$px2->SetWidth($WIDTH);
$px2->SetHeight($HEIGHT);
- $px2->SetType(array('linesnopoint','linesnopoint','linesnopoint'));
+ $px2->SetType(array('linesnopoint', 'linesnopoint', 'linesnopoint'));
$px2->setBgColor('onglet');
- $px2->setBgColorGrid(array(255,255,255));
+ $px2->setBgColorGrid(array(255, 255, 255));
$px2->SetHideXGrid(true);
//$px2->SetHorizTickIncrement(30.41); // 30.41 jours/mois en moyenne
$px2->draw($file, $fileurl);
- $show2=$px2->show();
+ $show2 = $px2->show();
unset($px2);
unset($graph_datas);
@@ -409,13 +409,13 @@ else
$amounts = array();
$sql = "SELECT date_format(b.datev,'%Y%m%d')";
- $sql.= ", SUM(b.amount)";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
- $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= " WHERE b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
- $sql.= " GROUP BY date_format(b.datev,'%Y%m%d')";
+ $sql .= ", SUM(b.amount)";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= " WHERE b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
$resql = $db->query($sql);
if ($resql)
@@ -447,20 +447,20 @@ else
$subtotal = 0;
$day = $min;
- $textdate=strftime("%Y%m%d", $day);
+ $textdate = strftime("%Y%m%d", $day);
//print "x".$textdate;
$i = 0;
- while ($day <= ($max+86400)) // On va au dela du dernier jour
+ while ($day <= ($max + 86400)) // On va au dela du dernier jour
{
$subtotal = $subtotal + (isset($amounts[$textdate]) ? $amounts[$textdate] : 0);
//print strftime ("%e %d %m %y",$day)." ".$subtotal."\n
";
- if ($day > ($max+86400))
+ if ($day > ($max + 86400))
{
$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
}
else
{
- $datas[$i] = '' + $solde + $subtotal;
+ $datas[$i] = '' +$solde + $subtotal;
}
$datamin[$i] = $object->min_desired;
$dataall[$i] = $object->min_allowed;
@@ -470,40 +470,40 @@ else
}
$day += 86400;
- $textdate=strftime("%Y%m%d", $day);
+ $textdate = strftime("%Y%m%d", $day);
$i++;
}
// Fabrication tableau 3
- $file= $conf->bank->dir_temp."/balance".$account.".png";
- $fileurl=DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/balance".$account.".png";
- $title=$langs->transnoentities("Balance")." - ".$langs->transnoentities("AllTime");
- $graph_datas=array();
- foreach($datas as $i => $val)
+ $file = $conf->bank->dir_temp."/balance".$account.".png";
+ $fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/balance".$account.".png";
+ $title = $langs->transnoentities("Balance")." - ".$langs->transnoentities("AllTime");
+ $graph_datas = array();
+ foreach ($datas as $i => $val)
{
- $graph_datas[$i]=array(isset($labels[$i])?$labels[$i]:'',$datas[$i]);
+ $graph_datas[$i] = array(isset($labels[$i]) ? $labels[$i] : '', $datas[$i]);
if ($object->min_desired) array_push($graph_datas[$i], $datamin[$i]);
if ($object->min_allowed) array_push($graph_datas[$i], $dataall[$i]);
}
$px3 = new DolGraph();
$px3->SetData($graph_datas);
- $arraylegends=array($langs->transnoentities("Balance"));
+ $arraylegends = array($langs->transnoentities("Balance"));
if ($object->min_desired) array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
if ($object->min_allowed) array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
$px3->SetLegend($arraylegends);
$px3->SetLegendWidthMin(180);
- $px3->SetMaxValue($px3->GetCeilMaxValue()<0?0:$px3->GetCeilMaxValue());
- $px3->SetMinValue($px3->GetFloorMinValue()>0?0:$px3->GetFloorMinValue());
+ $px3->SetMaxValue($px3->GetCeilMaxValue() < 0 ? 0 : $px3->GetCeilMaxValue());
+ $px3->SetMinValue($px3->GetFloorMinValue() > 0 ? 0 : $px3->GetFloorMinValue());
$px3->SetTitle($title);
$px3->SetWidth($WIDTH);
$px3->SetHeight($HEIGHT);
- $px3->SetType(array('linesnopoint','linesnopoint','linesnopoint'));
+ $px3->SetType(array('linesnopoint', 'linesnopoint', 'linesnopoint'));
$px3->setBgColor('onglet');
- $px3->setBgColorGrid(array(255,255,255));
+ $px3->setBgColorGrid(array(255, 255, 255));
$px3->draw($file, $fileurl);
- $show3=$px3->show();
+ $show3 = $px3->show();
unset($px3);
unset($graph_datas);
@@ -522,25 +522,25 @@ else
$credits = array();
$debits = array();
- $monthnext = $month+1;
+ $monthnext = $month + 1;
$yearnext = $year;
if ($monthnext > 12)
{
- $monthnext=1;
+ $monthnext = 1;
$yearnext++;
}
$sql = "SELECT date_format(b.datev,'%d')";
- $sql.= ", SUM(b.amount)";
+ $sql .= ", SUM(b.amount)";
$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
- $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= " WHERE b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- $sql.= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
- $sql.= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
- $sql.= " AND b.amount > 0";
- if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
- $sql.= " GROUP BY date_format(b.datev,'%d')";
+ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= " WHERE b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ $sql .= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
+ $sql .= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
+ $sql .= " AND b.amount > 0";
+ if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " GROUP BY date_format(b.datev,'%d')";
$resql = $db->query($sql);
if ($resql)
@@ -560,24 +560,24 @@ else
dol_print_error($db);
}
- $monthnext = $month+1;
+ $monthnext = $month + 1;
$yearnext = $year;
if ($monthnext > 12)
{
- $monthnext=1;
+ $monthnext = 1;
$yearnext++;
}
$sql = "SELECT date_format(b.datev,'%d')";
- $sql.= ", SUM(b.amount)";
+ $sql .= ", SUM(b.amount)";
$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
- $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= " WHERE b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- $sql.= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
- $sql.= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
- $sql.= " AND b.amount < 0";
- if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
+ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= " WHERE b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ $sql .= " AND b.datev >= '".$year."-".$month."-01 00:00:00'";
+ $sql .= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'";
+ $sql .= " AND b.amount < 0";
+ if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
$sql .= " GROUP BY date_format(b.datev,'%d')";
$resql = $db->query($sql);
@@ -599,40 +599,40 @@ else
$labels = array();
$data_credit = array();
$data_debit = array();
- for ($i = 0 ; $i < 31 ; $i++)
+ for ($i = 0; $i < 31; $i++)
{
- $data_credit[$i] = isset($credits[substr("0".($i+1), -2)]) ? $credits[substr("0".($i+1), -2)] : 0;
- $data_debit[$i] = isset($debits[substr("0".($i+1), -2)]) ? $debits[substr("0".($i+1), -2)] : 0;
- $labels[$i] = sprintf("%02d", $i+1);
+ $data_credit[$i] = isset($credits[substr("0".($i + 1), -2)]) ? $credits[substr("0".($i + 1), -2)] : 0;
+ $data_debit[$i] = isset($debits[substr("0".($i + 1), -2)]) ? $debits[substr("0".($i + 1), -2)] : 0;
+ $labels[$i] = sprintf("%02d", $i + 1);
$datamin[$i] = $object->min_desired;
}
// Fabrication tableau 4a
- $file= $conf->bank->dir_temp."/movement".$account."-".$year.$month.".png";
- $fileurl=DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/movement".$account."-".$year.$month.".png";
- $title=$langs->transnoentities("BankMovements").' - '.$langs->transnoentities("Month").': '.$month.' '.$langs->transnoentities("Year").': '.$year;
- $graph_datas=array();
- foreach($data_credit as $i => $val)
+ $file = $conf->bank->dir_temp."/movement".$account."-".$year.$month.".png";
+ $fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/movement".$account."-".$year.$month.".png";
+ $title = $langs->transnoentities("BankMovements").' - '.$langs->transnoentities("Month").': '.$month.' '.$langs->transnoentities("Year").': '.$year;
+ $graph_datas = array();
+ foreach ($data_credit as $i => $val)
{
- $graph_datas[$i]=array($labels[$i],$data_credit[$i],$data_debit[$i]);
+ $graph_datas[$i] = array($labels[$i], $data_credit[$i], $data_debit[$i]);
}
$px4 = new DolGraph();
$px4->SetData($graph_datas);
- $px4->SetLegend(array($langs->transnoentities("Credit"),$langs->transnoentities("Debit")));
+ $px4->SetLegend(array($langs->transnoentities("Credit"), $langs->transnoentities("Debit")));
$px4->SetLegendWidthMin(180);
- $px4->SetMaxValue($px4->GetCeilMaxValue()<0?0:$px4->GetCeilMaxValue());
- $px4->SetMinValue($px4->GetFloorMinValue()>0?0:$px4->GetFloorMinValue());
+ $px4->SetMaxValue($px4->GetCeilMaxValue() < 0 ? 0 : $px4->GetCeilMaxValue());
+ $px4->SetMinValue($px4->GetFloorMinValue() > 0 ? 0 : $px4->GetFloorMinValue());
$px4->SetTitle($title);
$px4->SetWidth($WIDTH);
$px4->SetHeight($HEIGHT);
- $px4->SetType(array('bars','bars'));
+ $px4->SetType(array('bars', 'bars'));
$px4->SetShading(3);
$px4->setBgColor('onglet');
- $px4->setBgColorGrid(array(255,255,255));
+ $px4->setBgColorGrid(array(255, 255, 255));
$px4->SetHorizTickIncrement(1);
$px4->draw($file, $fileurl);
- $show4=$px4->show();
+ $show4 = $px4->show();
unset($graph_datas);
unset($px4);
@@ -648,15 +648,15 @@ else
$credits = array();
$debits = array();
$sql = "SELECT date_format(b.datev,'%m')";
- $sql.= ", SUM(b.amount)";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
- $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= " WHERE b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- $sql.= " AND b.datev >= '".$year."-01-01 00:00:00'";
- $sql.= " AND b.datev <= '".$year."-12-31 23:59:59'";
- $sql.= " AND b.amount > 0";
- if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
+ $sql .= ", SUM(b.amount)";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= " WHERE b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ $sql .= " AND b.datev >= '".$year."-01-01 00:00:00'";
+ $sql .= " AND b.datev <= '".$year."-12-31 23:59:59'";
+ $sql .= " AND b.amount > 0";
+ if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
$sql .= " GROUP BY date_format(b.datev,'%m');";
$resql = $db->query($sql);
@@ -677,15 +677,15 @@ else
dol_print_error($db);
}
$sql = "SELECT date_format(b.datev,'%m')";
- $sql.= ", SUM(b.amount)";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
- $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= " WHERE b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- $sql.= " AND b.datev >= '".$year."-01-01 00:00:00'";
- $sql.= " AND b.datev <= '".$year."-12-31 23:59:59'";
- $sql.= " AND b.amount < 0";
- if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")";
+ $sql .= ", SUM(b.amount)";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= " WHERE b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ $sql .= " AND b.datev >= '".$year."-01-01 00:00:00'";
+ $sql .= " AND b.datev <= '".$year."-12-31 23:59:59'";
+ $sql .= " AND b.amount < 0";
+ if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
$sql .= " GROUP BY date_format(b.datev,'%m')";
$resql = $db->query($sql);
@@ -707,40 +707,40 @@ else
$labels = array();
$data_credit = array();
$data_debit = array();
- for ($i = 0 ; $i < 12 ; $i++)
+ for ($i = 0; $i < 12; $i++)
{
- $data_credit[$i] = isset($credits[substr("0".($i+1), -2)]) ? $credits[substr("0".($i+1), -2)] : 0;
- $data_debit[$i] = isset($debits[substr("0".($i+1), -2)]) ? $debits[substr("0".($i+1), -2)] : 0;
- $labels[$i] = dol_print_date(dol_mktime(12, 0, 0, $i+1, 1, 2000), "%b");
+ $data_credit[$i] = isset($credits[substr("0".($i + 1), -2)]) ? $credits[substr("0".($i + 1), -2)] : 0;
+ $data_debit[$i] = isset($debits[substr("0".($i + 1), -2)]) ? $debits[substr("0".($i + 1), -2)] : 0;
+ $labels[$i] = dol_print_date(dol_mktime(12, 0, 0, $i + 1, 1, 2000), "%b");
$datamin[$i] = $object->min_desired;
}
// Fabrication tableau 4b
- $file= $conf->bank->dir_temp."/movement".$account."-".$year.".png";
- $fileurl=DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/movement".$account."-".$year.".png";
- $title=$langs->transnoentities("BankMovements").' - '.$langs->transnoentities("Year").': '.$year;
- $graph_datas=array();
- foreach($data_credit as $i => $val)
+ $file = $conf->bank->dir_temp."/movement".$account."-".$year.".png";
+ $fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/movement".$account."-".$year.".png";
+ $title = $langs->transnoentities("BankMovements").' - '.$langs->transnoentities("Year").': '.$year;
+ $graph_datas = array();
+ foreach ($data_credit as $i => $val)
{
- $graph_datas[$i]=array($labels[$i],$data_credit[$i],$data_debit[$i]);
+ $graph_datas[$i] = array($labels[$i], $data_credit[$i], $data_debit[$i]);
}
$px5 = new DolGraph();
$px5->SetData($graph_datas);
- $px5->SetLegend(array($langs->transnoentities("Credit"),$langs->transnoentities("Debit")));
+ $px5->SetLegend(array($langs->transnoentities("Credit"), $langs->transnoentities("Debit")));
$px5->SetLegendWidthMin(180);
- $px5->SetMaxValue($px5->GetCeilMaxValue()<0?0:$px5->GetCeilMaxValue());
- $px5->SetMinValue($px5->GetFloorMinValue()>0?0:$px5->GetFloorMinValue());
+ $px5->SetMaxValue($px5->GetCeilMaxValue() < 0 ? 0 : $px5->GetCeilMaxValue());
+ $px5->SetMinValue($px5->GetFloorMinValue() > 0 ? 0 : $px5->GetFloorMinValue());
$px5->SetTitle($title);
$px5->SetWidth($WIDTH);
$px5->SetHeight($HEIGHT);
- $px5->SetType(array('bars','bars'));
+ $px5->SetType(array('bars', 'bars'));
$px5->SetShading(3);
$px5->setBgColor('onglet');
- $px5->setBgColorGrid(array(255,255,255));
+ $px5->setBgColorGrid(array(255, 255, 255));
$px5->SetHorizTickIncrement(1);
$px5->draw($file, $fileurl);
- $show5=$px5->show();
+ $show5 = $px5->show();
unset($graph_datas);
unset($px5);
@@ -751,7 +751,7 @@ else
// Onglets
-$head=bank_prepare_head($object);
+$head = bank_prepare_head($object);
dol_fiche_head($head, 'graph', $langs->trans("FinancialAccount"), 0, 'account');
@@ -759,32 +759,32 @@ $linkback = ''.$langs->trans("ShowAllAccounts").'';
+ $morehtml = ''.$langs->trans("ShowAllAccounts").'';
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '', $moreparam, 0, '', '', 1);
}
else
{
- $morehtml=''.$langs->trans("BackToAccount").'';
+ $morehtml = ''.$langs->trans("BackToAccount").'';
print $langs->trans("AllAccounts");
//print $morehtml;
}
}
else
{
- $bankaccount=new Account($db);
- $listid=explode(',', $account);
- foreach($listid as $key => $id)
+ $bankaccount = new Account($db);
+ $listid = explode(',', $account);
+ foreach ($listid as $key => $id)
{
$bankaccount->fetch($id);
- $bankaccount->label=$bankaccount->ref;
+ $bankaccount->label = $bankaccount->ref;
print $bankaccount->getNomUrl(1);
- if ($key < (count($listid)-1)) print ', ';
+ if ($key < (count($listid) - 1)) print ', ';
}
}
}
@@ -818,13 +818,13 @@ print '
|
';
// Graphs
if ($mode == 'standard')
{
- $prevyear=$year; $nextyear=$year;
- $prevmonth=$month-1;$nextmonth=$month+1;
- if ($prevmonth < 1) { $prevmonth=12; $prevyear--; }
- if ($nextmonth > 12) { $nextmonth=1; $nextyear++; }
+ $prevyear = $year; $nextyear = $year;
+ $prevmonth = $month - 1; $nextmonth = $month + 1;
+ if ($prevmonth < 1) { $prevmonth = 12; $prevyear--; }
+ if ($nextmonth > 12) { $nextmonth = 1; $nextyear++; }
// For month
- $link="| ';
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index 957c738ad22..3b07b5bbd68 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -32,9 +32,9 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
*/
class box_shipments extends ModeleBoxes
{
- public $boxcode="lastcustomershipments";
- public $boximg="sending";
- public $boxlabel="BoxLastCustomerShipments";
+ public $boxcode = "lastcustomershipments";
+ public $boximg = "sending";
+ public $boxlabel = "BoxLastCustomerShipments";
public $depends = array("expedition");
/**
@@ -58,9 +58,9 @@ class box_shipments extends ModeleBoxes
{
global $user;
- $this->db=$db;
+ $this->db = $db;
- $this->hidden=! ($user->rights->expedition->lire);
+ $this->hidden = !($user->rights->expedition->lire);
}
/**
@@ -88,26 +88,26 @@ class box_shipments extends ModeleBoxes
if ($user->rights->expedition->lire)
{
$sql = "SELECT s.nom as name";
- $sql.= ", s.rowid as socid";
- $sql.= ", s.code_client";
- $sql.= ", s.logo, s.email";
- $sql.= ", e.ref, e.tms";
- $sql.= ", e.rowid";
- $sql.= ", e.ref_customer";
- $sql.= ", e.fk_statut";
- $sql.= ", e.fk_user_valid";
- $sql.= ", c.ref as commande_ref";
- $sql.= ", c.rowid as commande_id";
- $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
- $sql.= " WHERE e.entity = ".$conf->entity;
- if (! empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) $sql.=" AND e.fk_statut = 1";
- if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND sc.fk_user = " .$user->id;
- else $sql.= " ORDER BY e.date_delivery, e.ref DESC ";
- $sql.= $this->db->plimit($max, 0);
+ $sql .= ", s.rowid as socid";
+ $sql .= ", s.code_client";
+ $sql .= ", s.logo, s.email";
+ $sql .= ", e.ref, e.tms";
+ $sql .= ", e.rowid";
+ $sql .= ", e.ref_customer";
+ $sql .= ", e.fk_statut";
+ $sql .= ", e.fk_user_valid";
+ $sql .= ", c.ref as commande_ref";
+ $sql .= ", c.rowid as commande_id";
+ $sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
+ if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+ $sql .= " WHERE e.entity = ".$conf->entity;
+ if (!empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) $sql .= " AND e.fk_statut = 1";
+ if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= " AND sc.fk_user = ".$user->id;
+ else $sql .= " ORDER BY e.date_delivery, e.ref DESC ";
+ $sql .= $this->db->plimit($max, 0);
$result = $this->db->query($sql);
if ($result) {
@@ -122,8 +122,8 @@ class box_shipments extends ModeleBoxes
$shipmentstatic->ref = $objp->ref;
$shipmentstatic->ref_customer = $objp->ref_customer;
- $orderstatic->id= $objp->commande_id;
- $orderstatic->ref=$objp->commande_ref;
+ $orderstatic->id = $objp->commande_id;
+ $orderstatic->ref = $objp->commande_ref;
$societestatic->id = $objp->socid;
$societestatic->name = $objp->name;
@@ -157,7 +157,7 @@ class box_shipments extends ModeleBoxes
$line++;
}
- if ($num==0) $this->info_box_contents[$line][0] = array('td' => 'class="center"','text'=>$langs->trans("NoRecordedShipments"));
+ if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center"', 'text'=>$langs->trans("NoRecordedShipments"));
$this->db->free($result);
} else {
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 41a0d485ce0..9fbf98fc19c 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -26,7 +26,7 @@
*/
// Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
@@ -84,7 +84,7 @@ class EmailSenderProfile 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(
+ public $fields = array(
'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>-1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>1),
@@ -167,8 +167,8 @@ class EmailSenderProfile extends CommonObject
$this->db = $db;
- if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
- if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
+ if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
+ if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled'] = 0;
}
/**
@@ -244,7 +244,7 @@ class EmailSenderProfile extends CommonObject
public function fetch($id, $ref = null)
{
$result = $this->fetchCommon($id, $ref);
- if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+ if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
return $result;
}
@@ -255,11 +255,11 @@ class EmailSenderProfile extends CommonObject
*/
public function fetchLines()
{
- $this->lines=array();
+ $this->lines = array();
// Load lines with object EmailSenderProfileLine
- return count($this->lines)?1:0;
+ return count($this->lines) ? 1 : 0;
}
/**
@@ -301,19 +301,19 @@ class EmailSenderProfile extends CommonObject
$result = '';
$companylink = '';
- $label=$this->label;
+ $label = $this->label;
- $url='';
+ $url = '';
//$url = dol_buildpath('/monmodule/emailsenderprofile_card.php',1).'?id='.$this->id;
$linkstart = '';
- $linkend='';
+ $linkend = '';
if ($withpicto) {
- $result.=($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
- if ($withpicto != 2) $result.=' ';
+ $result .= ($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
+ if ($withpicto != 2) $result .= ' ';
}
- $result.= $linkstart . $this->label . $linkend;
+ $result .= $linkstart.$this->label.$linkend;
return $result;
}
@@ -381,10 +381,10 @@ class EmailSenderProfile extends CommonObject
public function info($id)
{
$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
- $sql.= ' fk_user_creat, fk_user_modif';
- $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
- $sql.= ' WHERE t.rowid = '.$id;
- $result=$this->db->query($sql);
+ $sql .= ' fk_user_creat, fk_user_modif';
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+ $sql .= ' WHERE t.rowid = '.$id;
+ $result = $this->db->query($sql);
if ($result)
{
if ($this->db->num_rows($result))
@@ -395,7 +395,7 @@ class EmailSenderProfile extends CommonObject
{
$cuser = new User($this->db);
$cuser->fetch($obj->fk_user_author);
- $this->user_creation = $cuser;
+ $this->user_creation = $cuser;
}
if ($obj->fk_user_valid)
@@ -409,7 +409,7 @@ class EmailSenderProfile extends CommonObject
{
$cluser = new User($this->db);
$cluser->fetch($obj->fk_user_cloture);
- $this->user_cloture = $cluser;
+ $this->user_cloture = $cluser;
}
$this->date_creation = $this->db->jdate($obj->datec);
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index f6537bf6528..c32fe1d77f2 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -31,12 +31,12 @@ class Events // extends CommonObject
/**
* @var string ID to identify managed object
*/
- public $element='events';
+ public $element = 'events';
/**
* @var string Name of table without prefix where object is stored
*/
- public $table_element='events';
+ public $table_element = 'events';
/**
* @var int ID
@@ -51,7 +51,7 @@ class Events // extends CommonObject
/**
* @var string Error code (or message)
*/
- public $error='';
+ public $error = '';
/**
* @var int timestamp
@@ -91,18 +91,18 @@ class Events // extends CommonObject
public $prefix_session;
// List of all Audit/Security events supported by triggers
- public $eventstolog=array(
- array('id'=>'USER_LOGIN', 'test'=>1),
- array('id'=>'USER_LOGIN_FAILED', 'test'=>1),
- array('id'=>'USER_LOGOUT', 'test'=>1),
- array('id'=>'USER_CREATE', 'test'=>1),
- array('id'=>'USER_MODIFY', 'test'=>1),
- array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
- array('id'=>'USER_ENABLEDISABLE', 'test'=>1),
- array('id'=>'USER_DELETE', 'test'=>1),
- array('id'=>'GROUP_CREATE', 'test'=>1),
- array('id'=>'GROUP_MODIFY', 'test'=>1),
- array('id'=>'GROUP_DELETE', 'test'=>1),
+ public $eventstolog = array(
+ array('id'=>'USER_LOGIN', 'test'=>1),
+ array('id'=>'USER_LOGIN_FAILED', 'test'=>1),
+ array('id'=>'USER_LOGOUT', 'test'=>1),
+ array('id'=>'USER_CREATE', 'test'=>1),
+ array('id'=>'USER_MODIFY', 'test'=>1),
+ array('id'=>'USER_NEW_PASSWORD', 'test'=>1),
+ array('id'=>'USER_ENABLEDISABLE', 'test'=>1),
+ array('id'=>'USER_DELETE', 'test'=>1),
+ array('id'=>'GROUP_CREATE', 'test'=>1),
+ array('id'=>'GROUP_MODIFY', 'test'=>1),
+ array('id'=>'GROUP_DELETE', 'test'=>1),
);
@@ -110,11 +110,11 @@ class Events // 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'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
- 'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>20),
- 'prefix_session'=>array('type'=>'varchar(255)', 'label'=>'PrefixSession', 'enabled'=>1, 'visible'=>-1, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
- 'user_agent' =>array('type'=>'varchar(255)', 'label'=>'UserAgent', 'enabled'=>1, 'visible'=>-1, 'notnull'=> 1, 'default'=>0, 'index'=>1, 'position'=>1000),
+ public $fields = array(
+ 'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+ 'entity' =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>20),
+ 'prefix_session'=>array('type'=>'varchar(255)', 'label'=>'PrefixSession', 'enabled'=>1, 'visible'=>-1, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
+ 'user_agent' =>array('type'=>'varchar(255)', 'label'=>'UserAgent', 'enabled'=>1, 'visible'=>-1, 'notnull'=> 1, 'default'=>0, 'index'=>1, 'position'=>1000),
);
@@ -140,35 +140,35 @@ class Events // extends CommonObject
global $conf;
// Clean parameters
- $this->description=trim($this->description);
- if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+ $this->description = trim($this->description);
+ if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent = $_SERVER['HTTP_USER_AGENT'];
// Check parameters
- if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
+ if (empty($this->description)) { $this->error = 'ErrorBadValueForParameterCreateEventDesc'; return -1; }
// Insert request
$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
- $sql.= "type,";
- $sql.= "entity,";
- $sql.= "ip,";
- $sql.= "user_agent,";
- $sql.= "dateevent,";
- $sql.= "fk_user,";
- $sql.= "description,";
- $sql.= "prefix_session";
- $sql.= ") VALUES (";
- $sql.= " '".$this->db->escape($this->type)."',";
- $sql.= " ".$conf->entity.",";
- $sql.= " '".$this->db->escape(getUserRemoteIP())."',";
- $sql.= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent, 250))."'" : 'NULL').",";
- $sql.= " '".$this->db->idate($this->dateevent)."',";
- $sql.= " ".($user->id?"'".$this->db->escape($user->id)."'":'NULL').",";
- $sql.= " '".$this->db->escape(dol_trunc($this->description, 250))."',";
- $sql.= " '".$this->db->escape(dol_getprefix())."'";
- $sql.= ")";
+ $sql .= "type,";
+ $sql .= "entity,";
+ $sql .= "ip,";
+ $sql .= "user_agent,";
+ $sql .= "dateevent,";
+ $sql .= "fk_user,";
+ $sql .= "description,";
+ $sql .= "prefix_session";
+ $sql .= ") VALUES (";
+ $sql .= " '".$this->db->escape($this->type)."',";
+ $sql .= " ".$conf->entity.",";
+ $sql .= " '".$this->db->escape(getUserRemoteIP())."',";
+ $sql .= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent, 250))."'" : 'NULL').",";
+ $sql .= " '".$this->db->idate($this->dateevent)."',";
+ $sql .= " ".($user->id ? "'".$this->db->escape($user->id)."'" : 'NULL').",";
+ $sql .= " '".$this->db->escape(dol_trunc($this->description, 250))."',";
+ $sql .= " '".$this->db->escape(dol_getprefix())."'";
+ $sql .= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
@@ -176,7 +176,7 @@ class Events // extends CommonObject
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
return -1;
}
}
@@ -193,24 +193,24 @@ class Events // extends CommonObject
{
// Clean parameters
$this->id = (int) $this->id;
- $this->type=trim($this->type);
- $this->description=trim($this->description);
+ $this->type = trim($this->type);
+ $this->description = trim($this->description);
// Check parameters
// Put here code to add control on parameters values
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."events SET";
- $sql.= " type='".$this->db->escape($this->type)."',";
- $sql.= " dateevent='".$this->db->idate($this->dateevent)."',";
- $sql.= " description='".$this->db->escape($this->description)."'";
- $sql.= " WHERE rowid=".$this->id;
+ $sql .= " type='".$this->db->escape($this->type)."',";
+ $sql .= " dateevent='".$this->db->idate($this->dateevent)."',";
+ $sql .= " description='".$this->db->escape($this->description)."'";
+ $sql .= " WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (! $resql)
+ if (!$resql)
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
return -1;
}
return 1;
@@ -227,20 +227,20 @@ class Events // extends CommonObject
public function fetch($id, $user = null)
{
$sql = "SELECT";
- $sql.= " t.rowid,";
- $sql.= " t.tms,";
- $sql.= " t.type,";
- $sql.= " t.entity,";
- $sql.= " t.dateevent,";
- $sql.= " t.description,";
- $sql.= " t.ip,";
- $sql.= " t.user_agent,";
- $sql.= " t.prefix_session";
- $sql.= " FROM ".MAIN_DB_PREFIX."events as t";
- $sql.= " WHERE t.rowid = ".$id;
+ $sql .= " t.rowid,";
+ $sql .= " t.tms,";
+ $sql .= " t.type,";
+ $sql .= " t.entity,";
+ $sql .= " t.dateevent,";
+ $sql .= " t.description,";
+ $sql .= " t.ip,";
+ $sql .= " t.user_agent,";
+ $sql .= " t.prefix_session";
+ $sql .= " FROM ".MAIN_DB_PREFIX."events as t";
+ $sql .= " WHERE t.rowid = ".$id;
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
@@ -263,7 +263,7 @@ class Events // extends CommonObject
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
return -1;
}
}
@@ -278,13 +278,13 @@ class Events // extends CommonObject
public function delete($user)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."events";
- $sql.= " WHERE rowid=".$this->id;
+ $sql .= " WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (! $resql)
+ if (!$resql)
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
return -1;
}
@@ -301,12 +301,12 @@ class Events // extends CommonObject
*/
public function initAsSpecimen()
{
- $this->id=0;
+ $this->id = 0;
- $this->tms=time();
- $this->type='';
- $this->dateevent=time();
- $this->description='This is a specimen event';
+ $this->tms = time();
+ $this->type = '';
+ $this->dateevent = time();
+ $this->description = 'This is a specimen event';
$this->ip = '1.2.3.4';
$this->user_agent = 'Mozilla specimen User Agent X.Y';
$this->prefix_session = dol_getprefix();
diff --git a/htdocs/core/class/html.formcron.class.php b/htdocs/core/class/html.formcron.class.php
index 2a2a6c97078..2701d126331 100644
--- a/htdocs/core/class/html.formcron.class.php
+++ b/htdocs/core/class/html.formcron.class.php
@@ -36,7 +36,7 @@ class FormCron extends Form
/**
* @var string Error code (or message)
*/
- public $error='';
+ public $error = '';
/**
* Constructor
@@ -66,35 +66,35 @@ class FormCron extends Form
$langs->load('cron@cron');
$out = '';
if (!empty($readonly)) {
- if ($selected=='command') {
- $out= $langs->trans('CronType_command');
- $out.='';
- $out.= '';
- $out.='';
- } elseif ($selected=='method') {
- $out= $langs->trans('CronType_method');
- $out.='';
- $out.= '';
- $out.='';
+ if ($selected == 'command') {
+ $out = $langs->trans('CronType_command');
+ $out .= '';
+ $out .= '';
+ $out .= '';
+ } elseif ($selected == 'method') {
+ $out = $langs->trans('CronType_method');
+ $out .= '';
+ $out .= '';
+ $out .= '';
}
} else {
- $out='';
+ $out = '';
- if ($selected=='command') {
- $selected_attr=' selected ';
+ if ($selected == 'command') {
+ $selected_attr = ' selected ';
} else {
- $selected_attr='';
+ $selected_attr = '';
}
- $out.= '';
+ $out .= '';
- if ($selected=='method') {
- $selected_attr=' selected ';
+ if ($selected == 'method') {
+ $selected_attr = ' selected ';
} else {
- $selected_attr='';
+ $selected_attr = '';
}
- $out.= '';
+ $out .= '';
- $out.='';
+ $out .= '';
}
return $out;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0d614198d1e..9c5b92a47a0 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6061,49 +6061,49 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
if (is_object($object) && $object->element == 'societe')
{
- $substitutionarray['__THIRDPARTY_ID__'] = (is_object($object)?$object->id:'');
- $substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object)?$object->name:'');
- $substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = (is_object($object)?$object->name_alias:'');
- $substitutionarray['__THIRDPARTY_CODE_CLIENT__'] = (is_object($object)?$object->code_client:'');
- $substitutionarray['__THIRDPARTY_CODE_FOURNISSEUR__'] = (is_object($object)?$object->code_fournisseur:'');
- $substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object)?$object->email:'');
- $substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object)?$object->phone:'');
- $substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object)?$object->fax:'');
- $substitutionarray['__THIRDPARTY_ADDRESS__'] = (is_object($object)?$object->address:'');
- $substitutionarray['__THIRDPARTY_ZIP__'] = (is_object($object)?$object->zip:'');
- $substitutionarray['__THIRDPARTY_TOWN__'] = (is_object($object)?$object->town:'');
- $substitutionarray['__THIRDPARTY_IDPROF1__'] = (is_object($object)?$object->idprof1:'');
- $substitutionarray['__THIRDPARTY_IDPROF2__'] = (is_object($object)?$object->idprof2:'');
- $substitutionarray['__THIRDPARTY_IDPROF3__'] = (is_object($object)?$object->idprof3:'');
- $substitutionarray['__THIRDPARTY_IDPROF4__'] = (is_object($object)?$object->idprof4:'');
- $substitutionarray['__THIRDPARTY_IDPROF5__'] = (is_object($object)?$object->idprof5:'');
- $substitutionarray['__THIRDPARTY_IDPROF6__'] = (is_object($object)?$object->idprof6:'');
- $substitutionarray['__THIRDPARTY_TVAINTRA__'] = (is_object($object)?$object->tva_intra:'');
- $substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object)?dol_htmlentitiesbr($object->note_public):'');
- $substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object)?dol_htmlentitiesbr($object->note_private):'');
+ $substitutionarray['__THIRDPARTY_ID__'] = (is_object($object) ? $object->id : '');
+ $substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object) ? $object->name : '');
+ $substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = (is_object($object) ? $object->name_alias : '');
+ $substitutionarray['__THIRDPARTY_CODE_CLIENT__'] = (is_object($object) ? $object->code_client : '');
+ $substitutionarray['__THIRDPARTY_CODE_FOURNISSEUR__'] = (is_object($object) ? $object->code_fournisseur : '');
+ $substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object) ? $object->email : '');
+ $substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object) ? $object->phone : '');
+ $substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object) ? $object->fax : '');
+ $substitutionarray['__THIRDPARTY_ADDRESS__'] = (is_object($object) ? $object->address : '');
+ $substitutionarray['__THIRDPARTY_ZIP__'] = (is_object($object) ? $object->zip : '');
+ $substitutionarray['__THIRDPARTY_TOWN__'] = (is_object($object) ? $object->town : '');
+ $substitutionarray['__THIRDPARTY_IDPROF1__'] = (is_object($object) ? $object->idprof1 : '');
+ $substitutionarray['__THIRDPARTY_IDPROF2__'] = (is_object($object) ? $object->idprof2 : '');
+ $substitutionarray['__THIRDPARTY_IDPROF3__'] = (is_object($object) ? $object->idprof3 : '');
+ $substitutionarray['__THIRDPARTY_IDPROF4__'] = (is_object($object) ? $object->idprof4 : '');
+ $substitutionarray['__THIRDPARTY_IDPROF5__'] = (is_object($object) ? $object->idprof5 : '');
+ $substitutionarray['__THIRDPARTY_IDPROF6__'] = (is_object($object) ? $object->idprof6 : '');
+ $substitutionarray['__THIRDPARTY_TVAINTRA__'] = (is_object($object) ? $object->tva_intra : '');
+ $substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object) ?dol_htmlentitiesbr($object->note_public) : '');
+ $substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object) ?dol_htmlentitiesbr($object->note_private) : '');
}
elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0)
{
- $substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
- $substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
- $substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = (is_object($object->thirdparty)?$object->thirdparty->name_alias:'');
- $substitutionarray['__THIRDPARTY_CODE_CLIENT__'] = (is_object($object->thirdparty)?$object->thirdparty->code_client:'');
- $substitutionarray['__THIRDPARTY_CODE_FOURNISSEUR__'] = (is_object($object->thirdparty)?$object->thirdparty->code_fournisseur:'');
- $substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object->thirdparty)?$object->thirdparty->email:'');
- $substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object->thirdparty)?$object->thirdparty->phone:'');
- $substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object->thirdparty)?$object->thirdparty->fax:'');
- $substitutionarray['__THIRDPARTY_ADDRESS__'] = (is_object($object->thirdparty)?$object->thirdparty->address:'');
- $substitutionarray['__THIRDPARTY_ZIP__'] = (is_object($object->thirdparty)?$object->thirdparty->zip:'');
- $substitutionarray['__THIRDPARTY_TOWN__'] = (is_object($object->thirdparty)?$object->thirdparty->town:'');
- $substitutionarray['__THIRDPARTY_IDPROF1__'] = (is_object($object->thirdparty)?$object->thirdparty->idprof1:'');
- $substitutionarray['__THIRDPARTY_IDPROF2__'] = (is_object($object->thirdparty)?$object->thirdparty->idprof2:'');
- $substitutionarray['__THIRDPARTY_IDPROF3__'] = (is_object($object->thirdparty)?$object->thirdparty->idprof3:'');
- $substitutionarray['__THIRDPARTY_IDPROF4__'] = (is_object($object->thirdparty)?$object->thirdparty->idprof4:'');
- $substitutionarray['__THIRDPARTY_IDPROF5__'] = (is_object($object->thirdparty)?$object->thirdparty->idprof5:'');
- $substitutionarray['__THIRDPARTY_IDPROF6__'] = (is_object($object->thirdparty)?$object->thirdparty->idprof6:'');
- $substitutionarray['__THIRDPARTY_TVAINTRA__'] = (is_object($object->thirdparty)?$object->thirdparty->tva_intra:'');
- $substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object->thirdparty)?dol_htmlentitiesbr($object->thirdparty->note_public):'');
- $substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object->thirdparty)?dol_htmlentitiesbr($object->thirdparty->note_private):'');
+ $substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty) ? $object->thirdparty->id : '');
+ $substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty) ? $object->thirdparty->name : '');
+ $substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = (is_object($object->thirdparty) ? $object->thirdparty->name_alias : '');
+ $substitutionarray['__THIRDPARTY_CODE_CLIENT__'] = (is_object($object->thirdparty) ? $object->thirdparty->code_client : '');
+ $substitutionarray['__THIRDPARTY_CODE_FOURNISSEUR__'] = (is_object($object->thirdparty) ? $object->thirdparty->code_fournisseur : '');
+ $substitutionarray['__THIRDPARTY_EMAIL__'] = (is_object($object->thirdparty) ? $object->thirdparty->email : '');
+ $substitutionarray['__THIRDPARTY_PHONE__'] = (is_object($object->thirdparty) ? $object->thirdparty->phone : '');
+ $substitutionarray['__THIRDPARTY_FAX__'] = (is_object($object->thirdparty) ? $object->thirdparty->fax : '');
+ $substitutionarray['__THIRDPARTY_ADDRESS__'] = (is_object($object->thirdparty) ? $object->thirdparty->address : '');
+ $substitutionarray['__THIRDPARTY_ZIP__'] = (is_object($object->thirdparty) ? $object->thirdparty->zip : '');
+ $substitutionarray['__THIRDPARTY_TOWN__'] = (is_object($object->thirdparty) ? $object->thirdparty->town : '');
+ $substitutionarray['__THIRDPARTY_IDPROF1__'] = (is_object($object->thirdparty) ? $object->thirdparty->idprof1 : '');
+ $substitutionarray['__THIRDPARTY_IDPROF2__'] = (is_object($object->thirdparty) ? $object->thirdparty->idprof2 : '');
+ $substitutionarray['__THIRDPARTY_IDPROF3__'] = (is_object($object->thirdparty) ? $object->thirdparty->idprof3 : '');
+ $substitutionarray['__THIRDPARTY_IDPROF4__'] = (is_object($object->thirdparty) ? $object->thirdparty->idprof4 : '');
+ $substitutionarray['__THIRDPARTY_IDPROF5__'] = (is_object($object->thirdparty) ? $object->thirdparty->idprof5 : '');
+ $substitutionarray['__THIRDPARTY_IDPROF6__'] = (is_object($object->thirdparty) ? $object->thirdparty->idprof6 : '');
+ $substitutionarray['__THIRDPARTY_TVAINTRA__'] = (is_object($object->thirdparty) ? $object->thirdparty->tva_intra : '');
+ $substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = (is_object($object->thirdparty) ?dol_htmlentitiesbr($object->thirdparty->note_public) : '');
+ $substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = (is_object($object->thirdparty) ?dol_htmlentitiesbr($object->thirdparty->note_private) : '');
}
if (is_object($object->project) && $object->project->id > 0)
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index 8f99dcc59a1..96d3d3f45a5 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -27,7 +27,7 @@
* \brief Fichier de description et activation du module Expedition
*/
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
/**
@@ -76,11 +76,11 @@ class modExpedition extends DolibarrModules
$this->depends = array("modCommande");
$this->requiredby = array();
$this->conflictwith = array();
- $this->langfiles = array('deliveries','sendings');
+ $this->langfiles = array('deliveries', 'sendings');
// Constants
$this->const = array();
- $r=0;
+ $r = 0;
$this->const[$r][0] = "EXPEDITION_ADDON_PDF";
$this->const[$r][1] = "chaine";
@@ -133,13 +133,13 @@ class modExpedition extends DolibarrModules
// Boxes
$this->boxes = array(
- 0=>array('file'=>'box_shipments.php','enabledbydefaulton'=>'Home'),
+ 0=>array('file'=>'box_shipments.php', 'enabledbydefaulton'=>'Home'),
);
// Permissions
$this->rights = array();
$this->rights_class = 'expedition';
- $r=0;
+ $r = 0;
$r++;
$this->rights[$r][0] = 101;
@@ -221,92 +221,92 @@ class modExpedition extends DolibarrModules
// Menus
//-------
- $this->menu = 1; // This module add menu entries. They are coded into menu manager.
+ $this->menu = 1; // This module add menu entries. They are coded into menu manager.
// Exports
//--------
- $r=0;
+ $r = 0;
include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
- $shipment=new Commande($this->db);
- $contact_arrays=$shipment->liste_type_contact('external', '', 0, 0, '');
- if (is_array($contact_arrays) && count($contact_arrays)>0){
- $idcontacts=join(',', array_keys($shipment->liste_type_contact('external', '', 0, 0, '')));
+ $shipment = new Commande($this->db);
+ $contact_arrays = $shipment->liste_type_contact('external', '', 0, 0, '');
+ if (is_array($contact_arrays) && count($contact_arrays) > 0) {
+ $idcontacts = join(',', array_keys($shipment->liste_type_contact('external', '', 0, 0, '')));
} else {
- $idcontacts=0;
+ $idcontacts = 0;
}
$r++;
- $this->export_code[$r]=$this->rights_class.'_'.$r;
- $this->export_label[$r]='Shipments'; // Translation key (used only if key ExportDataset_xxx_z not found)
- $this->export_permission[$r]=array(array("expedition","shipment","export"));
- $this->export_fields_array[$r]=array(
- 's.rowid'=>"IdCompany",'s.nom'=>'ThirdParty','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','d.nom'=>'State','co.label'=>'Country',
- 'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5',
- 's.idprof6'=>'ProfId6','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_customer'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",
- 'c.date_delivery'=>"DateDeliveryPlanned",'c.tracking_number'=>"TrackingNumber",'c.height'=>"Height",'c.width'=>"Width",'c.size'=>"Depth",
- 'c.size_units'=>'SizeUnits','c.weight'=>"Weight",'c.weight_units'=>"WeightUnits",'c.fk_statut'=>'Status','c.note_public'=>"NotePublic",
- 'ed.rowid'=>'LineId','cd.description'=>'Description','ed.qty'=>"Qty",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel',
- 'p.weight'=>'ProductWeight','p.weight_units'=>'WeightUnits','p.volume'=>'ProductVolume','p.volume_units'=>'VolumeUnits'
+ $this->export_code[$r] = $this->rights_class.'_'.$r;
+ $this->export_label[$r] = 'Shipments'; // Translation key (used only if key ExportDataset_xxx_z not found)
+ $this->export_permission[$r] = array(array("expedition", "shipment", "export"));
+ $this->export_fields_array[$r] = array(
+ 's.rowid'=>"IdCompany", 's.nom'=>'ThirdParty', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'd.nom'=>'State', 'co.label'=>'Country',
+ 'co.code'=>'CountryCode', 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.idprof5'=>'ProfId5',
+ 's.idprof6'=>'ProfId6', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_customer'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation",
+ 'c.date_delivery'=>"DateDeliveryPlanned", 'c.tracking_number'=>"TrackingNumber", 'c.height'=>"Height", 'c.width'=>"Width", 'c.size'=>"Depth",
+ 'c.size_units'=>'SizeUnits', 'c.weight'=>"Weight", 'c.weight_units'=>"WeightUnits", 'c.fk_statut'=>'Status', 'c.note_public'=>"NotePublic",
+ 'ed.rowid'=>'LineId', 'cd.description'=>'Description', 'ed.qty'=>"Qty", 'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel',
+ 'p.weight'=>'ProductWeight', 'p.weight_units'=>'WeightUnits', 'p.volume'=>'ProductVolume', 'p.volume_units'=>'VolumeUnits'
);
- if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r]+=array('sp.rowid'=>'IdContact','sp.lastname'=>'Lastname','sp.firstname'=>'Firstname','sp.note_public'=>'NotePublic');
+ if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r] += array('sp.rowid'=>'IdContact', 'sp.lastname'=>'Lastname', 'sp.firstname'=>'Firstname', 'sp.note_public'=>'NotePublic');
//$this->export_TypeFields_array[$r]=array(
// 's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label',
// 'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",
// 'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",
// 'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text"
//);
- $this->export_TypeFields_array[$r]=array(
- 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text',
- 's.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_customer'=>"Text",'c.date_creation'=>"Date",
- 'c.date_delivery'=>"Date",'c.tracking_number'=>"Numeric",'c.height'=>"Numeric",'c.width'=>"Numeric",'c.weight'=>"Numeric",'c.fk_statut'=>'Status',
- 'c.note_public'=>"Text",'ed.qty'=>"Numeric",'d.nom'=>'Text'
+ $this->export_TypeFields_array[$r] = array(
+ 's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.label'=>'List:c_country:label:label', 'co.code'=>'Text', 's.phone'=>'Text',
+ 's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 'c.ref'=>"Text", 'c.ref_customer'=>"Text", 'c.date_creation'=>"Date",
+ 'c.date_delivery'=>"Date", 'c.tracking_number'=>"Numeric", 'c.height'=>"Numeric", 'c.width'=>"Numeric", 'c.weight'=>"Numeric", 'c.fk_statut'=>'Status',
+ 'c.note_public'=>"Text", 'ed.qty'=>"Numeric", 'd.nom'=>'Text'
);
- $this->export_entities_array[$r]=array(
- 's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','d.nom'=>'company','co.label'=>'company',
- 'co.code'=>'company','s.fk_pays'=>'company','s.phone'=>'company','s.siren'=>'company','s.ape'=>'company','s.siret'=>'company','s.idprof4'=>'company',
- 's.idprof5'=>'company','s.idprof6'=>'company','c.rowid'=>"shipment",'c.ref'=>"shipment",'c.ref_customer'=>"shipment",'c.fk_soc'=>"shipment",
- 'c.date_creation'=>"shipment",'c.date_delivery'=>"shipment",'c.tracking_number'=>'shipment','c.height'=>"shipment",'c.width'=>"shipment",
- 'c.size'=>'shipment','c.size_units'=>'shipment','c.weight'=>"shipment",'c.weight_units'=>'shipment','c.fk_statut'=>"shipment",'c.note_public'=>"shipment",
- 'ed.rowid'=>'shipment_line','cd.description'=>'shipment_line','ed.qty'=>"shipment_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product',
- 'p.weight'=>'product','p.weight_units'=>'product','p.volume'=>'product','p.volume_units'=>'product'
+ $this->export_entities_array[$r] = array(
+ 's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'd.nom'=>'company', 'co.label'=>'company',
+ 'co.code'=>'company', 's.fk_pays'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.ape'=>'company', 's.siret'=>'company', 's.idprof4'=>'company',
+ 's.idprof5'=>'company', 's.idprof6'=>'company', 'c.rowid'=>"shipment", 'c.ref'=>"shipment", 'c.ref_customer'=>"shipment", 'c.fk_soc'=>"shipment",
+ 'c.date_creation'=>"shipment", 'c.date_delivery'=>"shipment", 'c.tracking_number'=>'shipment', 'c.height'=>"shipment", 'c.width'=>"shipment",
+ 'c.size'=>'shipment', 'c.size_units'=>'shipment', 'c.weight'=>"shipment", 'c.weight_units'=>'shipment', 'c.fk_statut'=>"shipment", 'c.note_public'=>"shipment",
+ 'ed.rowid'=>'shipment_line', 'cd.description'=>'shipment_line', 'ed.qty'=>"shipment_line", 'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product',
+ 'p.weight'=>'product', 'p.weight_units'=>'product', 'p.volume'=>'product', 'p.volume_units'=>'product'
);
- if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_entities_array[$r]+=array('sp.rowid'=>'contact','sp.lastname'=>'contact','sp.firstname'=>'contact','sp.note_public'=>'contact');
- $this->export_dependencies_array[$r]=array('shipment_line'=>'ed.rowid','product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
- if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
+ if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_entities_array[$r] += array('sp.rowid'=>'contact', 'sp.lastname'=>'contact', 'sp.firstname'=>'contact', 'sp.note_public'=>'contact');
+ $this->export_dependencies_array[$r] = array('shipment_line'=>'ed.rowid', 'product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+ if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
{
- $keyforselect='socpeople'; $keyforelement='contact'; $keyforaliasextra='extra3';
+ $keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra3';
include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
}
- $keyforselect='expedition'; $keyforelement='shipment'; $keyforaliasextra='extra';
+ $keyforselect = 'expedition'; $keyforelement = 'shipment'; $keyforaliasextra = 'extra';
include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
- $keyforselect='expeditiondet'; $keyforelement='shipment_line'; $keyforaliasextra='extra2';
+ $keyforselect = 'expeditiondet'; $keyforelement = 'shipment_line'; $keyforaliasextra = 'extra2';
include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
- $keyforselect='product'; $keyforelement='product'; $keyforaliasextra='extraprod';
+ $keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extraprod';
include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
- $this->export_sql_start[$r]='SELECT DISTINCT ';
- $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'expedition as c';
- $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'expedition_extrafields as extra ON c.rowid = extra.fk_object,';
- $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s';
- if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
- $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
- $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
- $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'expeditiondet as ed';
- $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'expeditiondet_extrafields as extra2 ON ed.rowid = extra2.fk_object';
- $this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'commandedet as cd';
- $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
- $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extraprod ON p.rowid = extraprod.fk_object';
- if ($idcontacts && ! empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
- $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
- $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
- $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
+ $this->export_sql_start[$r] = 'SELECT DISTINCT ';
+ $this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'expedition as c';
+ $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expedition_extrafields as extra ON c.rowid = extra.fk_object,';
+ $this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
+ if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+ $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
+ $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
+ $this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'expeditiondet as ed';
+ $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expeditiondet_extrafields as extra2 ON ed.rowid = extra2.fk_object';
+ $this->export_sql_end[$r] .= ' , '.MAIN_DB_PREFIX.'commandedet as cd';
+ $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on cd.fk_product = p.rowid';
+ $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extraprod ON p.rowid = extraprod.fk_object';
+ if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
+ $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'element_contact as ee ON ee.element_id = cd.fk_commande AND ee.fk_c_type_contact IN ('.$idcontacts.')';
+ $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp ON sp.rowid = ee.fk_socpeople';
+ $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra3 ON sp.rowid = extra3.fk_object';
}
- $this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
- $this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('expedition').')';
- if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+ $this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
+ $this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('expedition').')';
+ if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
}
@@ -320,25 +320,25 @@ class modExpedition extends DolibarrModules
*/
public function init($options = '')
{
- global $conf,$langs;
+ global $conf, $langs;
// Permissions
$this->remove($options);
//ODT template
- $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/shipment/template_shipment.odt';
- $dirodt=DOL_DATA_ROOT.'/doctemplates/shipment';
- $dest=$dirodt.'/template_shipment.odt';
+ $src = DOL_DOCUMENT_ROOT.'/install/doctemplates/shipment/template_shipment.odt';
+ $dirodt = DOL_DATA_ROOT.'/doctemplates/shipment';
+ $dest = $dirodt.'/template_shipment.odt';
- if (file_exists($src) && ! file_exists($dest))
+ if (file_exists($src) && !file_exists($dest))
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
dol_mkdir($dirodt);
- $result=dol_copy($src, $dest, 0, 0);
+ $result = dol_copy($src, $dest, 0, 0);
if ($result < 0)
{
$langs->load("errors");
- $this->error=$langs->trans('ErrorFailToCopyFile', $src, $dest);
+ $this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
return 0;
}
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 938f4411b57..1b538b016df 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -880,7 +880,7 @@ if (!defined('NOLOGIN'))
if (GETPOST('theme', 'alpha'))
{
$conf->theme = GETPOST('theme', 'alpha', 1);
- $conf->css = "/theme/".$conf->theme."/style.css.php";
+ $conf->css = "/theme/".$conf->theme."/style.css.php";
}
@@ -926,7 +926,7 @@ if (!empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax = 1;
if (!empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea', 'cameleo', 'amarok')))
{
$conf->theme = 'eldy';
- $conf->css = "/theme/".$conf->theme."/style.css.php";
+ $conf->css = "/theme/".$conf->theme."/style.css.php";
}
if (!defined('NOREQUIRETRAN'))
@@ -1361,93 +1361,93 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
}
// Output standard javascript links
- if (! defined('DISABLE_JQUERY') && ! $disablejs && ! empty($conf->use_javascript_ajax))
+ if (!defined('DISABLE_JQUERY') && !$disablejs && !empty($conf->use_javascript_ajax))
{
// JQuery. Must be before other includes
print ''."\n";
- if (defined('JS_JQUERY') && constant('JS_JQUERY')) print ''."\n";
- else print ''."\n";
+ if (defined('JS_JQUERY') && constant('JS_JQUERY')) print ''."\n";
+ else print ''."\n";
/*if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
{
if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print ''."\n";
else print ''."\n";
}*/
- if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print ''."\n";
- else print ''."\n";
- if (! defined('DISABLE_JQUERY_TABLEDND')) print ''."\n";
+ if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print ''."\n";
+ else print ''."\n";
+ if (!defined('DISABLE_JQUERY_TABLEDND')) print ''."\n";
// jQuery jnotify
- if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY'))
+ if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY'))
{
- print ''."\n";
+ print ''."\n";
}
// Flot
- if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && ! defined('DISABLE_JQUERY_FLOT'))
+ if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT) && !defined('DISABLE_JQUERY_FLOT'))
{
if (constant('JS_JQUERY_FLOT'))
{
- print ''."\n";
- print ''."\n";
- print ''."\n";
+ print ''."\n";
+ print ''."\n";
+ print ''."\n";
}
else
{
- print ''."\n";
- print ''."\n";
- print ''."\n";
+ print ''."\n";
+ print ''."\n";
+ print ''."\n";
}
}
// jQuery jeditable
- if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! defined('DISABLE_JQUERY_JEDITABLE'))
+ if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !defined('DISABLE_JQUERY_JEDITABLE'))
{
print ''."\n";
- print ''."\n";
- print ''."\n";
- print ''."\n";
+ print ''."\n";
+ print ''."\n";
+ print ''."\n";
print ''."\n";
- print ''."\n";
- print ''."\n";
+ print ''."\n";
+ print ''."\n";
}
// jQuery Timepicker
- if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
+ if (!empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER'))
{
- print ''."\n";
- print ''."\n";
+ print ''."\n";
+ print ''."\n";
}
- if (! defined('DISABLE_SELECT2') && (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) // jQuery plugin "mutiselect", "multiple-select", "select2", ...
+ if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) // jQuery plugin "mutiselect", "multiple-select", "select2", ...
{
- $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT;
- print ''."\n"; // We include full because we need the support of containerCssClass
+ $tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
+ print ''."\n"; // We include full because we need the support of containerCssClass
}
}
- if (! $disablejs && ! empty($conf->use_javascript_ajax))
+ if (!$disablejs && !empty($conf->use_javascript_ajax))
{
// CKEditor
- if (! empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && ! defined('DISABLE_CKEDITOR'))
+ if (!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR'))
{
print ''."\n";
- $pathckeditor = DOL_URL_ROOT . '/includes/ckeditor/ckeditor/';
- $jsckeditor='ckeditor.js';
+ $pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
+ $jsckeditor = 'ckeditor.js';
if (constant('JS_CKEDITOR')) // To use external ckeditor 4 js lib
{
- $pathckeditor=constant('JS_CKEDITOR');
+ $pathckeditor = constant('JS_CKEDITOR');
}
print ''."\n";
- print ''."\n";
+ print ''."\n";
print ' |