';
@@ -379,7 +379,7 @@ if ($resql)
print '';
// Expected to pay
- if($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED ){
+ if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
print '';
$mc->getInfo($objp->entity);
print $mc->label;
@@ -427,7 +427,7 @@ else
print '';
-if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
+if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
{
if ($user->socid == 0 && $object->statut == 0 && $_GET['action'] == '')
{
@@ -442,7 +442,7 @@ if ($user->socid == 0 && $action == '')
{
if ($user->rights->facture->paiement)
{
- if (! $disable_delete)
+ if (!$disable_delete)
{
print '
'.$langs->trans('Delete').' ';
}
diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php
index 691707cf188..3da6a95a1e8 100644
--- a/htdocs/compta/paiement/info.php
+++ b/htdocs/compta/paiement/info.php
@@ -31,10 +31,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
// Load translation files required by the page
$langs->loadLangs(array('bills', 'companies'));
-$id=GETPOST('id');
-$ref=GETPOST('ref', 'alpha');
-$action=GETPOST('action', 'alpha');
-$confirm=GETPOST('confirm', 'alpha');
+$id = GETPOST('id');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
/*
* Actions
@@ -58,7 +58,7 @@ $head = payment_prepare_head($object);
dol_fiche_head($head, 'info', $langs->trans("PaymentCustomerInvoice"), -1, 'payment');
-$linkback = '
' . $langs->trans("BackToList") . ' ';
+$linkback = '
'.$langs->trans("BackToList").' ';
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '');
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 88faf188d17..128e43b335a 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -32,19 +32,19 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
// Load translation files required by the page
-$langs->loadLangs(array('compta','bills','donation','salaries'));
+$langs->loadLangs(array('compta', 'bills', 'donation', 'salaries'));
-$date_startmonth=GETPOST('date_startmonth', 'int');
-$date_startday=GETPOST('date_startday', 'int');
-$date_startyear=GETPOST('date_startyear', 'int');
-$date_endmonth=GETPOST('date_endmonth', 'int');
-$date_endday=GETPOST('date_endday', 'int');
-$date_endyear=GETPOST('date_endyear', 'int');
+$date_startmonth = GETPOST('date_startmonth', 'int');
+$date_startday = GETPOST('date_startday', 'int');
+$date_startyear = GETPOST('date_startyear', 'int');
+$date_endmonth = GETPOST('date_endmonth', 'int');
+$date_endday = GETPOST('date_endday', 'int');
+$date_endyear = GETPOST('date_endyear', 'int');
-$nbofyear=4;
+$nbofyear = 4;
// Date range
-$year=GETPOST('year', 'int');
+$year = GETPOST('year', 'int');
if (empty($year))
{
$year_current = strftime("%Y", dol_now());
@@ -55,42 +55,42 @@ if (empty($year))
$month_current = strftime("%m", dol_now());
$year_start = $year - ($nbofyear - 1);
}
-$date_start=dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
-$date_end=dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
// We define date_start and date_end
if (empty($date_start) || empty($date_end)) // We define date_start and date_end
{
- $q=GETPOST("q")?GETPOST("q"):0;
- if ($q==0)
+ $q = GETPOST("q") ?GETPOST("q") : 0;
+ if ($q == 0)
{
// We define date_start and date_end
- $year_end=$year_start + ($nbofyear - 1);
- $month_start=GETPOST("month")?GETPOST("month"):($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
- if (! GETPOST('month'))
+ $year_end = $year_start + ($nbofyear - 1);
+ $month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+ if (!GETPOST('month'))
{
- if (! GETPOST("year") && $month_start > $month_current)
+ if (!GETPOST("year") && $month_start > $month_current)
{
$year_start--;
$year_end--;
}
- $month_end=$month_start-1;
- if ($month_end < 1) $month_end=12;
+ $month_end = $month_start - 1;
+ if ($month_end < 1) $month_end = 12;
else $year_end++;
}
- else $month_end=$month_start;
- $date_start=dol_get_first_day($year_start, $month_start, false); $date_end=dol_get_last_day($year_end, $month_end, false);
+ else $month_end = $month_start;
+ $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
}
- if ($q==1) { $date_start=dol_get_first_day($year_start, 1, false); $date_end=dol_get_last_day($year_start, 3, false); }
- if ($q==2) { $date_start=dol_get_first_day($year_start, 4, false); $date_end=dol_get_last_day($year_start, 6, false); }
- if ($q==3) { $date_start=dol_get_first_day($year_start, 7, false); $date_end=dol_get_last_day($year_start, 9, false); }
- if ($q==4) { $date_start=dol_get_first_day($year_start, 10, false); $date_end=dol_get_last_day($year_start, 12, false); }
+ if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
+ if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
+ if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
+ if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
}
// $date_start and $date_end are defined. We force $year_start and $nbofyear
-$tmps=dol_getdate($date_start);
+$tmps = dol_getdate($date_start);
$year_start = $tmps['year'];
-$tmpe=dol_getdate($date_end);
+$tmpe = dol_getdate($date_end);
$year_end = $tmpe['year'];
$nbofyear = ($year_end - $year_start) + 1;
//var_dump("year_start=".$year_start." year_end=".$year_end." nbofyear=".$nbofyear." date_start=".dol_print_date($date_start, 'dayhour')." date_end=".dol_print_date($date_end, 'dayhour'));
@@ -99,13 +99,13 @@ $nbofyear = ($year_end - $year_start) + 1;
// Security check
$socid = GETPOST('socid', 'int');
if ($user->socid > 0) $socid = $user->socid;
-if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user, 'compta', '', '', 'resultat');
-if (! empty($conf->accounting->enabled)) $result=restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
+if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
$modecompta = $conf->global->ACCOUNTING_MODE;
-if (! empty($conf->accounting->enabled)) $modecompta='BOOKKEEPING';
-if (GETPOST("modecompta", 'alpha')) $modecompta=GETPOST("modecompta", 'alpha');
+if (!empty($conf->accounting->enabled)) $modecompta = 'BOOKKEEPING';
+if (GETPOST("modecompta", 'alpha')) $modecompta = GETPOST("modecompta", 'alpha');
/*
@@ -114,57 +114,57 @@ if (GETPOST("modecompta", 'alpha')) $modecompta=GETPOST("modecompta", 'alpha');
llxHeader();
-$form=new Form($db);
+$form = new Form($db);
-$exportlink='';
+$exportlink = '';
// Affiche en-tete du rapport
if ($modecompta == 'CREANCES-DETTES')
{
$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
- $calcmode=$langs->trans("CalcModeDebt");
- $calcmode.='
('.$langs->trans("SeeReportInInputOutputMode", '
', ' ').')';
- if (! empty($conf->accounting->enabled)) $calcmode.='
('.$langs->trans("SeeReportInBookkeepingMode", '
', ' ').')';
- $period=$form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
- $periodlink=($year_start?"
".img_previous()." ".img_next()." ":"");
- $description=$langs->trans("RulesAmountWithTaxIncluded");
- $description.='
'.$langs->trans("RulesResultDue");
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.="
".$langs->trans("DepositsAreNotIncluded");
- else $description.="
".$langs->trans("DepositsAreIncluded");
- $builddate=dol_now();
+ $calcmode = $langs->trans("CalcModeDebt");
+ $calcmode .= '
('.$langs->trans("SeeReportInInputOutputMode", '
', ' ').')';
+ if (!empty($conf->accounting->enabled)) $calcmode .= '
('.$langs->trans("SeeReportInBookkeepingMode", '
', ' ').')';
+ $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+ $periodlink = ($year_start ? "
".img_previous()." ".img_next()." " : "");
+ $description = $langs->trans("RulesAmountWithTaxIncluded");
+ $description .= '
'.$langs->trans("RulesResultDue");
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= "
".$langs->trans("DepositsAreNotIncluded");
+ else $description .= "
".$langs->trans("DepositsAreIncluded");
+ $builddate = dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
-elseif ($modecompta=="RECETTES-DEPENSES") {
+elseif ($modecompta == "RECETTES-DEPENSES") {
$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
- $calcmode=$langs->trans("CalcModeEngagement");
- $calcmode.='
('.$langs->trans("SeeReportInDueDebtMode", '
', ' ').')';
- if (! empty($conf->accounting->enabled)) $calcmode.='
('.$langs->trans("SeeReportInBookkeepingMode", '
', ' ').')';
- $period=$form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
- $periodlink=($year_start?"
".img_previous()." ".img_next()." ":"");
- $description=$langs->trans("RulesAmountWithTaxIncluded");
- $description.='
'.$langs->trans("RulesResultInOut");
- $builddate=dol_now();
+ $calcmode = $langs->trans("CalcModeEngagement");
+ $calcmode .= '
('.$langs->trans("SeeReportInDueDebtMode", '
', ' ').')';
+ if (!empty($conf->accounting->enabled)) $calcmode .= '
('.$langs->trans("SeeReportInBookkeepingMode", '
', ' ').')';
+ $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+ $periodlink = ($year_start ? "
".img_previous()." ".img_next()." " : "");
+ $description = $langs->trans("RulesAmountWithTaxIncluded");
+ $description .= '
'.$langs->trans("RulesResultInOut");
+ $builddate = dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
-elseif ($modecompta=="BOOKKEEPING")
+elseif ($modecompta == "BOOKKEEPING")
{
$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
- $calcmode=$langs->trans("CalcModeBookkeeping");
- $calcmode.='
('.$langs->trans("SeeReportInInputOutputMode", '
', ' ').')';
- $calcmode.='
('.$langs->trans("SeeReportInDueDebtMode", '
', ' ').')';
- $period=$form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
- $periodlink=($year_start?"
".img_previous()." ".img_next()." ":"");
- $description=$langs->trans("RulesAmountOnInOutBookkeepingRecord");
- $description.=' ('.$langs->trans("SeePageForSetup", DOL_URL_ROOT.'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', $langs->transnoentitiesnoconv("Accountancy").' / '.$langs->transnoentitiesnoconv("Setup").' / '.$langs->trans("Chartofaccounts")).')';
- $builddate=dol_now();
+ $calcmode = $langs->trans("CalcModeBookkeeping");
+ $calcmode .= '
('.$langs->trans("SeeReportInInputOutputMode", '
', ' ').')';
+ $calcmode .= '
('.$langs->trans("SeeReportInDueDebtMode", '
', ' ').')';
+ $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+ $periodlink = ($year_start ? "
".img_previous()." ".img_next()." " : "");
+ $description = $langs->trans("RulesAmountOnInOutBookkeepingRecord");
+ $description .= ' ('.$langs->trans("SeePageForSetup", DOL_URL_ROOT.'/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin', $langs->transnoentitiesnoconv("Accountancy").' / '.$langs->transnoentitiesnoconv("Setup").' / '.$langs->trans("Chartofaccounts")).')';
+ $builddate = dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
-$hselected='report';
+$hselected = 'report';
report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array('modecompta'=>$modecompta), $calcmode);
-if (! empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
{
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
}
@@ -177,44 +177,44 @@ if (! empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
$subtotal_ht = 0;
$subtotal_ttc = 0;
-if (! empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta=="RECETTES-DEPENSES"))
+if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{
if ($modecompta == 'CREANCES-DETTES')
{
- $sql = "SELECT sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
- $sql.= ", ".MAIN_DB_PREFIX."facture as f";
- $sql.= " WHERE f.fk_soc = s.rowid";
- $sql.= " AND f.fk_statut IN (1,2)";
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql = "SELECT sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql .= ", ".MAIN_DB_PREFIX."facture as f";
+ $sql .= " WHERE f.fk_soc = s.rowid";
+ $sql .= " AND f.fk_statut IN (1,2)";
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+ else $sql .= " AND f.type IN (0,1,2,3,5)";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
}
- elseif ($modecompta=="RECETTES-DEPENSES")
+ elseif ($modecompta == "RECETTES-DEPENSES")
{
/*
* Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
* vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
*/
- $sql = "SELECT sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
- $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
- $sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
- $sql.= ", ".MAIN_DB_PREFIX."paiement as p";
- $sql.= " WHERE p.rowid = pf.fk_paiement";
- $sql.= " AND pf.fk_facture = f.rowid";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+ $sql = "SELECT sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+ $sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
+ $sql .= ", ".MAIN_DB_PREFIX."paiement as p";
+ $sql .= " WHERE p.rowid = pf.fk_paiement";
+ $sql .= " AND pf.fk_facture = f.rowid";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
}
- $sql.= " AND f.entity IN (".getEntity('invoice').")";
- if ($socid) $sql.= " AND f.fk_soc = $socid";
- $sql.= " GROUP BY dm";
- $sql.= " ORDER BY dm";
+ $sql .= " AND f.entity IN (".getEntity('invoice').")";
+ if ($socid) $sql .= " AND f.fk_soc = $socid";
+ $sql .= " GROUP BY dm";
+ $sql .= " ORDER BY dm";
//print $sql;
dol_syslog("get customers invoices", LOG_DEBUG);
- $result=$db->query($sql);
+ $result = $db->query($sql);
if ($result)
{
$num = $db->num_rows($result);
@@ -222,7 +222,7 @@ if (! empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
while ($i < $num)
{
$row = $db->fetch_object($result);
- $encaiss[$row->dm] = (isset($row->amount_ht)?$row->amount_ht:0);
+ $encaiss[$row->dm] = (isset($row->amount_ht) ? $row->amount_ht : 0);
$encaiss_ttc[$row->dm] = $row->amount_ttc;
$i++;
}
@@ -232,29 +232,29 @@ if (! empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
dol_print_error($db);
}
}
-elseif ($modecompta=="BOOKKEEPING")
+elseif ($modecompta == "BOOKKEEPING")
{
// Nothing from this table
}
-if (! empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta=="RECETTES-DEPENSES"))
+if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{
// On ajoute les paiements clients anciennes version, non lies par paiement_facture
if ($modecompta != 'CREANCES-DETTES')
{
$sql = "SELECT sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
- $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= ", ".MAIN_DB_PREFIX."paiement as p";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
- $sql.= " WHERE pf.rowid IS NULL";
- $sql.= " AND p.fk_bank = b.rowid";
- $sql.= " AND b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
- $sql.= " GROUP BY dm";
- $sql.= " ORDER BY dm";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= ", ".MAIN_DB_PREFIX."paiement as p";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+ $sql .= " WHERE pf.rowid IS NULL";
+ $sql .= " AND p.fk_bank = b.rowid";
+ $sql .= " AND b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+ $sql .= " GROUP BY dm";
+ $sql .= " ORDER BY dm";
dol_syslog("get old customers payments not linked to invoices", LOG_DEBUG);
$result = $db->query($sql);
@@ -265,10 +265,10 @@ if (! empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
{
$row = $db->fetch_object($result);
- if (! isset($encaiss[$row->dm])) $encaiss[$row->dm]=0;
- $encaiss[$row->dm] += (isset($row->amount_ht)?$row->amount_ht:0);
+ if (!isset($encaiss[$row->dm])) $encaiss[$row->dm] = 0;
+ $encaiss[$row->dm] += (isset($row->amount_ht) ? $row->amount_ht : 0);
- if (! isset($encaiss_ttc[$row->dm])) $encaiss_ttc[$row->dm]=0;
+ if (!isset($encaiss_ttc[$row->dm])) $encaiss_ttc[$row->dm] = 0;
$encaiss_ttc[$row->dm] += $row->amount_ttc;
$i++;
@@ -278,12 +278,12 @@ if (! empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
dol_print_error($db);
}
}
- elseif ($modecompta=="RECETTES-DEPENSES")
+ elseif ($modecompta == "RECETTES-DEPENSES")
{
// Nothing from this table
}
}
-elseif ($modecompta=="BOOKKEEPING")
+elseif ($modecompta == "BOOKKEEPING")
{
// Nothing from this table
}
@@ -295,36 +295,36 @@ elseif ($modecompta=="BOOKKEEPING")
$subtotal_ht = 0;
$subtotal_ttc = 0;
-if (! empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta=="RECETTES-DEPENSES"))
+if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{
if ($modecompta == 'CREANCES-DETTES')
{
- $sql = "SELECT sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
- $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
- $sql.= " WHERE f.fk_statut IN (1,2)";
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
- else $sql.= " AND f.type IN (0,1,2,3)";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql = "SELECT sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+ $sql .= " WHERE f.fk_statut IN (1,2)";
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2)";
+ else $sql .= " AND f.type IN (0,1,2,3)";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
}
- elseif ($modecompta=="RECETTES-DEPENSES")
+ elseif ($modecompta == "RECETTES-DEPENSES")
{
$sql = "SELECT sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
- $sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
- $sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
- $sql.= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
- $sql.= " WHERE f.rowid = pf.fk_facturefourn";
- $sql.= " AND p.rowid = pf.fk_paiementfourn";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+ $sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
+ $sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
+ $sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
+ $sql .= " WHERE f.rowid = pf.fk_facturefourn";
+ $sql .= " AND p.rowid = pf.fk_paiementfourn";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
}
- $sql.= " AND f.entity = ".$conf->entity;
- if ($socid) $sql.= " AND f.fk_soc = ".$socid;
- $sql.= " GROUP BY dm";
+ $sql .= " AND f.entity = ".$conf->entity;
+ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " GROUP BY dm";
dol_syslog("get suppliers invoices", LOG_DEBUG);
- $result=$db->query($sql);
+ $result = $db->query($sql);
if ($result)
{
$num = $db->num_rows($result);
@@ -333,10 +333,10 @@ if (! empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
{
$row = $db->fetch_object($result);
- if (! isset($decaiss[$row->dm])) $decaiss[$row->dm]=0;
- $decaiss[$row->dm] = (isset($row->amount_ht)?$row->amount_ht:0);
+ if (!isset($decaiss[$row->dm])) $decaiss[$row->dm] = 0;
+ $decaiss[$row->dm] = (isset($row->amount_ht) ? $row->amount_ht : 0);
- if (! isset($decaiss_ttc[$row->dm])) $decaiss_ttc[$row->dm]=0;
+ if (!isset($decaiss_ttc[$row->dm])) $decaiss_ttc[$row->dm] = 0;
$decaiss_ttc[$row->dm] = $row->amount_ttc;
$i++;
@@ -347,7 +347,7 @@ if (! empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
dol_print_error($db);
}
}
-elseif ($modecompta=="BOOKKEEPING")
+elseif ($modecompta == "BOOKKEEPING")
{
// Nothing from this table
}
@@ -360,23 +360,23 @@ elseif ($modecompta=="BOOKKEEPING")
$subtotal_ht = 0;
$subtotal_ttc = 0;
-if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta=="RECETTES-DEPENSES"))
+if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{
if ($modecompta == 'CREANCES-DETTES')
{
// TVA a payer
$sql = "SELECT sum(f.tva) as amount, date_format(f.datef,'%Y-%m') as dm";
- $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
- $sql.= " WHERE f.fk_statut IN (1,2)";
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.entity IN (".getEntity('invoice').")";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
- $sql.= " GROUP BY dm";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+ $sql .= " WHERE f.fk_statut IN (1,2)";
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+ else $sql .= " AND f.type IN (0,1,2,3,5)";
+ $sql .= " AND f.entity IN (".getEntity('invoice').")";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql .= " GROUP BY dm";
dol_syslog("get vat to pay", LOG_DEBUG);
- $result=$db->query($sql);
+ $result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$i = 0;
@@ -384,10 +384,10 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
while ($i < $num) {
$obj = $db->fetch_object($result);
- if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
+ if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;
$decaiss[$obj->dm] += $obj->amount;
- if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
+ if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
$decaiss_ttc[$obj->dm] += $obj->amount;
$i++;
@@ -398,17 +398,17 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
}
// TVA a recuperer
$sql = "SELECT sum(f.total_tva) as amount, date_format(f.datef,'%Y-%m') as dm";
- $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
- $sql.= " WHERE f.fk_statut IN (1,2)";
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2)";
- else $sql.= " AND f.type IN (0,1,2,3)";
- $sql.= " AND f.entity = ".$conf->entity;
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
- $sql.= " GROUP BY dm";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+ $sql .= " WHERE f.fk_statut IN (1,2)";
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2)";
+ else $sql .= " AND f.type IN (0,1,2,3)";
+ $sql .= " AND f.entity = ".$conf->entity;
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ $sql .= " GROUP BY dm";
dol_syslog("get vat to receive back", LOG_DEBUG);
- $result=$db->query($sql);
+ $result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$i = 0;
@@ -416,10 +416,10 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
while ($i < $num) {
$obj = $db->fetch_object($result);
- if (! isset($encaiss[$obj->dm])) $encaiss[$obj->dm]=0;
+ if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
$encaiss[$obj->dm] += $obj->amount;
- if (! isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm]=0;
+ if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
$encaiss_ttc[$obj->dm] += $obj->amount;
$i++;
@@ -429,19 +429,19 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
dol_print_error($db);
}
}
- elseif ($modecompta=="RECETTES-DEPENSES")
+ elseif ($modecompta == "RECETTES-DEPENSES")
{
// TVA reellement deja payee
$sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
- $sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
- $sql.= " WHERE amount > 0";
- $sql.= " AND t.entity = ".$conf->entity;
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
- $sql.= " GROUP BY dm";
+ $sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
+ $sql .= " WHERE amount > 0";
+ $sql .= " AND t.entity = ".$conf->entity;
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+ $sql .= " GROUP BY dm";
dol_syslog("get vat really paid", LOG_DEBUG);
- $result=$db->query($sql);
+ $result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$i = 0;
@@ -449,10 +449,10 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
while ($i < $num) {
$obj = $db->fetch_object($result);
- if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
+ if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;
$decaiss[$obj->dm] += $obj->amount;
- if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
+ if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
$decaiss_ttc[$obj->dm] += $obj->amount;
$i++;
@@ -463,15 +463,15 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
}
// TVA recuperee
$sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
- $sql.= " FROM ".MAIN_DB_PREFIX."tva as t";
- $sql.= " WHERE amount < 0";
- $sql.= " AND t.entity = ".$conf->entity;
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
- $sql.= " GROUP BY dm";
+ $sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
+ $sql .= " WHERE amount < 0";
+ $sql .= " AND t.entity = ".$conf->entity;
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+ $sql .= " GROUP BY dm";
dol_syslog("get vat really received back", LOG_DEBUG);
- $result=$db->query($sql);
+ $result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$i = 0;
@@ -479,10 +479,10 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
while ($i < $num) {
$obj = $db->fetch_object($result);
- if (! isset($encaiss[$obj->dm])) $encaiss[$obj->dm]=0;
+ if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
$encaiss[$obj->dm] += -$obj->amount;
- if (! isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm]=0;
+ if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
$encaiss_ttc[$obj->dm] += -$obj->amount;
$i++;
@@ -493,7 +493,7 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
}
}
}
-elseif ($modecompta=="BOOKKEEPING")
+elseif ($modecompta == "BOOKKEEPING")
{
// Nothing from this table
}
@@ -504,36 +504,36 @@ elseif ($modecompta=="BOOKKEEPING")
$subtotal_ht = 0;
$subtotal_ttc = 0;
-if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta=="RECETTES-DEPENSES"))
+if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{
if ($modecompta == 'CREANCES-DETTES')
{
$sql = "SELECT c.libelle as nom, date_format(cs.date_ech,'%Y-%m') as dm, sum(cs.amount) as amount";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
- $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
- $sql.= " WHERE cs.fk_type = c.id";
- $sql.= " AND c.deductible = 0";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+ $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+ $sql .= " WHERE cs.fk_type = c.id";
+ $sql .= " AND c.deductible = 0";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
}
- elseif ($modecompta=="RECETTES-DEPENSES")
+ elseif ($modecompta == "RECETTES-DEPENSES")
{
$sql = "SELECT c.libelle as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
- $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
- $sql.= ", ".MAIN_DB_PREFIX."paiementcharge as p";
- $sql.= " WHERE p.fk_charge = cs.rowid";
- $sql.= " AND cs.fk_type = c.id";
- $sql.= " AND c.deductible = 0";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+ $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+ $sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
+ $sql .= " WHERE p.fk_charge = cs.rowid";
+ $sql .= " AND cs.fk_type = c.id";
+ $sql .= " AND c.deductible = 0";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
}
- $sql.= " AND cs.entity = ".$conf->entity;
- $sql.= " GROUP BY c.libelle, dm";
+ $sql .= " AND cs.entity = ".$conf->entity;
+ $sql .= " GROUP BY c.libelle, dm";
dol_syslog("get social contributions deductible=0 ", LOG_DEBUG);
- $result=$db->query($sql);
+ $result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$i = 0;
@@ -541,10 +541,10 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
while ($i < $num) {
$obj = $db->fetch_object($result);
- if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
+ if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;
$decaiss[$obj->dm] += $obj->amount;
- if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
+ if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
$decaiss_ttc[$obj->dm] += $obj->amount;
$i++;
@@ -554,7 +554,7 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
dol_print_error($db);
}
}
-elseif ($modecompta=="BOOKKEEPING")
+elseif ($modecompta == "BOOKKEEPING")
{
// Nothing from this table
}
@@ -566,36 +566,36 @@ elseif ($modecompta=="BOOKKEEPING")
$subtotal_ht = 0;
$subtotal_ttc = 0;
-if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta=="RECETTES-DEPENSES"))
+if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{
if ($modecompta == 'CREANCES-DETTES')
{
$sql = "SELECT c.libelle as nom, date_format(cs.date_ech,'%Y-%m') as dm, sum(cs.amount) as amount";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
- $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
- $sql.= " WHERE cs.fk_type = c.id";
- $sql.= " AND c.deductible = 1";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+ $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+ $sql .= " WHERE cs.fk_type = c.id";
+ $sql .= " AND c.deductible = 1";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
}
- elseif ($modecompta=="RECETTES-DEPENSES")
+ elseif ($modecompta == "RECETTES-DEPENSES")
{
$sql = "SELECT c.libelle as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
- $sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
- $sql.= ", ".MAIN_DB_PREFIX."paiementcharge as p";
- $sql.= " WHERE p.fk_charge = cs.rowid";
- $sql.= " AND cs.fk_type = c.id";
- $sql.= " AND c.deductible = 1";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
+ $sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
+ $sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
+ $sql .= " WHERE p.fk_charge = cs.rowid";
+ $sql .= " AND cs.fk_type = c.id";
+ $sql .= " AND c.deductible = 1";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
}
- $sql.= " AND cs.entity = ".$conf->entity;
- $sql.= " GROUP BY c.libelle, dm";
+ $sql .= " AND cs.entity = ".$conf->entity;
+ $sql .= " GROUP BY c.libelle, dm";
dol_syslog("get social contributions paid deductible=1", LOG_DEBUG);
- $result=$db->query($sql);
+ $result = $db->query($sql);
if ($result) {
$num = $db->num_rows($result);
$i = 0;
@@ -603,10 +603,10 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
while ($i < $num) {
$obj = $db->fetch_object($result);
- if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
+ if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;
$decaiss[$obj->dm] += $obj->amount;
- if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
+ if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
$decaiss_ttc[$obj->dm] += $obj->amount;
$i++;
@@ -616,7 +616,7 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
dol_print_error($db);
}
}
-elseif ($modecompta=="BOOKKEEPING")
+elseif ($modecompta == "BOOKKEEPING")
{
// Nothing from this table
}
@@ -626,7 +626,7 @@ elseif ($modecompta=="BOOKKEEPING")
* Salaries
*/
-if (! empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta=="RECETTES-DEPENSES"))
+if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{
if ($modecompta == 'CREANCES-DETTES') $column = 'p.datev';
if ($modecompta == "RECETTES-DEPENSES") $column = 'p.datep';
@@ -634,10 +634,10 @@ if (! empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $m
$subtotal_ht = 0;
$subtotal_ttc = 0;
$sql = "SELECT p.label as nom, date_format(".$column.",'%Y-%m') as dm, sum(p.amount) as amount";
- $sql .= " FROM " . MAIN_DB_PREFIX . "payment_salary as p";
+ $sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
$sql .= " WHERE p.entity IN (".getEntity('payment_salary').")";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
$sql .= " GROUP BY p.label, dm";
dol_syslog("get social salaries payments");
@@ -649,15 +649,15 @@ if (! empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $m
while ($i < $num) {
$obj = $db->fetch_object($result);
- if (! isset($decaiss[$obj->dm]))
+ if (!isset($decaiss[$obj->dm]))
$decaiss[$obj->dm] = 0;
$decaiss[$obj->dm] += $obj->amount;
- if (! isset($decaiss_ttc[$obj->dm]))
+ if (!isset($decaiss_ttc[$obj->dm]))
$decaiss_ttc[$obj->dm] = 0;
$decaiss_ttc[$obj->dm] += $obj->amount;
- $i ++;
+ $i++;
}
}
} else {
@@ -674,38 +674,38 @@ elseif ($modecompta == "BOOKKEEPING")
* Expense reports
*/
-if (! empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta=="RECETTES-DEPENSES"))
+if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{
$langs->load('trips');
if ($modecompta == 'CREANCES-DETTES') {
$sql = "SELECT date_format(date_valid,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
- $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
- $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
- $sql.= " WHERE p.entity IN (".getEntity('expensereport').")";
- $sql.= " AND p.fk_statut>=5";
+ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as p";
+ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
+ $sql .= " WHERE p.entity IN (".getEntity('expensereport').")";
+ $sql .= " AND p.fk_statut>=5";
- $column='p.date_valid';
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
+ $column = 'p.date_valid';
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
} elseif ($modecompta == 'RECETTES-DEPENSES') {
$sql = "SELECT date_format(pe.datep,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
- $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as p";
- $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
- $sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
- $sql.= " WHERE p.entity IN (".getEntity('expensereport').")";
- $sql.= " AND p.fk_statut>=5";
+ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as p";
+ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user_author";
+ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = p.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+ $sql .= " WHERE p.entity IN (".getEntity('expensereport').")";
+ $sql .= " AND p.fk_statut>=5";
- $column='pe.datep';
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
+ $column = 'pe.datep';
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
}
- $sql.= " GROUP BY dm";
+ $sql .= " GROUP BY dm";
dol_syslog("get expense report outcome");
- $result=$db->query($sql);
+ $result = $db->query($sql);
$subtotal_ht = 0;
$subtotal_ttc = 0;
if ($result)
@@ -715,10 +715,10 @@ if (! empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES'
{
while ($obj = $db->fetch_object($result))
{
- if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
+ if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;
$decaiss[$obj->dm] += $obj->amount_ht;
- if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
+ if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
$decaiss_ttc[$obj->dm] += $obj->amount_ttc;
}
}
@@ -737,34 +737,34 @@ elseif ($modecompta == 'BOOKKEEPING') {
* Donation get dunning paiement
*/
-if (! empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta=="RECETTES-DEPENSES"))
+if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{
$subtotal_ht = 0;
$subtotal_ttc = 0;
if ($modecompta == 'CREANCES-DETTES') {
$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
- $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
- $sql.= " WHERE p.entity IN (".getEntity('donation').")";
- $sql.= " AND fk_statut in (1,2)";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
+ $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+ $sql .= " WHERE p.entity IN (".getEntity('donation').")";
+ $sql .= " AND fk_statut in (1,2)";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
} elseif ($modecompta == 'RECETTES-DEPENSES') {
$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(pe.datep,'%Y-%m') as dm, sum(p.amount) as amount";
- $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
- $sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
- $sql.= " WHERE p.entity IN (".getEntity('donation').")";
- $sql.= " AND fk_statut >= 2";
- if (! empty($date_start) && ! empty($date_end)) {
- $sql.= " AND pe.datep >= '".$db->idate($date_start)."' AND pe.datep <= '".$db->idate($date_end)."'";
+ $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+ $sql .= " WHERE p.entity IN (".getEntity('donation').")";
+ $sql .= " AND fk_statut >= 2";
+ if (!empty($date_start) && !empty($date_end)) {
+ $sql .= " AND pe.datep >= '".$db->idate($date_start)."' AND pe.datep <= '".$db->idate($date_end)."'";
}
}
- $sql.= " GROUP BY p.societe, p.firstname, p.lastname, dm";
+ $sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
dol_syslog("get donation payments");
- $result=$db->query($sql);
+ $result = $db->query($sql);
if ($result)
{
$num = $db->num_rows($result);
@@ -775,10 +775,10 @@ if (! empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
{
$obj = $db->fetch_object($result);
- if (! isset($encaiss[$obj->dm])) $encaiss[$obj->dm]=0;
+ if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
$encaiss[$obj->dm] += $obj->amount;
- if (! isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm]=0;
+ if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
$encaiss_ttc[$obj->dm] += $obj->amount;
$i++;
@@ -800,36 +800,36 @@ elseif ($modecompta == 'BOOKKEEPING') {
* Request in mode BOOKKEEPING
*/
-if (! empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
+if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
{
$predefinedgroupwhere = "(";
//$predefinedgroupwhere.= " (pcg_type = 'EXPENSE' and pcg_subtype in ('PRODUCT','SERVICE'))";
- $predefinedgroupwhere.= " (pcg_type = 'EXPENSE')";
- $predefinedgroupwhere.= " OR ";
+ $predefinedgroupwhere .= " (pcg_type = 'EXPENSE')";
+ $predefinedgroupwhere .= " OR ";
//$predefinedgroupwhere.= " (pcg_type = 'INCOME' and pcg_subtype in ('PRODUCT','SERVICE'))";
- $predefinedgroupwhere.= " (pcg_type = 'INCOME')";
- $predefinedgroupwhere.= ")";
+ $predefinedgroupwhere .= " (pcg_type = 'INCOME')";
+ $predefinedgroupwhere .= ")";
$charofaccountstring = $conf->global->CHARTOFACCOUNTS;
- $charofaccountstring=dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
+ $charofaccountstring = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
$sql = "SELECT b.doc_ref, b.numero_compte, b.subledger_account, b.subledger_label, pcg_type, date_format(b.doc_date,'%Y-%m') as dm, sum(b.debit) as debit, sum(b.credit) as credit, sum(b.montant) as amount";
- $sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_account as aa";
- $sql.= " WHERE b.entity = ".$conf->entity;
- $sql.= " AND aa.entity = ".$conf->entity;
- $sql.= " AND b.numero_compte = aa.account_number";
- $sql.= " AND ".$predefinedgroupwhere;
- $sql.= " AND fk_pcg_version = '".$db->escape($charofaccountstring)."'";
- if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND b.doc_date >= '".$db->idate($date_start)."' AND b.doc_date <= '".$db->idate($date_end)."'";
- $sql.= " GROUP BY b.doc_ref, b.numero_compte, b.subledger_account, b.subledger_label, pcg_type, dm";
+ $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_account as aa";
+ $sql .= " WHERE b.entity = ".$conf->entity;
+ $sql .= " AND aa.entity = ".$conf->entity;
+ $sql .= " AND b.numero_compte = aa.account_number";
+ $sql .= " AND ".$predefinedgroupwhere;
+ $sql .= " AND fk_pcg_version = '".$db->escape($charofaccountstring)."'";
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND b.doc_date >= '".$db->idate($date_start)."' AND b.doc_date <= '".$db->idate($date_end)."'";
+ $sql .= " GROUP BY b.doc_ref, b.numero_compte, b.subledger_account, b.subledger_label, pcg_type, dm";
//print $sql;
$subtotal_ht = 0;
$subtotal_ttc = 0;
dol_syslog("get bookkeeping record");
- $result=$db->query($sql);
+ $result = $db->query($sql);
if ($result)
{
$num = $db->num_rows($result);
@@ -840,12 +840,12 @@ if (! empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
{
$obj = $db->fetch_object($result);
- if (! isset($encaiss[$obj->dm])) $encaiss[$obj->dm]=0;
- if (! isset($decaiss[$obj->dm])) $decaiss[$obj->dm]=0;
+ if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
+ if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;
$encaiss[$obj->dm] += $obj->credit;
$decaiss[$obj->dm] += $obj->debit;
- if (! isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm]=0;
- if (! isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm]=0;
+ if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
+ if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
$encaiss_ttc[$obj->dm] += 0;
$decaiss_ttc[$obj->dm] += 0;
@@ -866,7 +866,7 @@ $object = array(&$encaiss, &$encaiss_ttc, &$decaiss, &$decaiss_ttc);
$parameters["mode"] = $modecompta;
// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('externalbalance'));
-$reshook=$hookmanager->executeHooks('addReportInfo', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('addReportInfo', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
@@ -874,34 +874,34 @@ $reshook=$hookmanager->executeHooks('addReportInfo', $parameters, $object, $acti
* Show result array
*/
-$totentrees=array();
-$totsorties=array();
+$totentrees = array();
+$totsorties = array();
print '
';
print '
'."\n";
print ' ';
-for ($annee = $year_start ; $annee <= $year_end ; $annee++)
+for ($annee = $year_start; $annee <= $year_end; $annee++)
{
print '';
print '';
print $annee;
- if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee+1);
+ if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
print ' ';
}
print ''.$langs->trans("Month").' ';
// Loop on each year to ouput
-for ($annee = $year_start ; $annee <= $year_end ; $annee++)
+for ($annee = $year_start; $annee <= $year_end; $annee++)
{
print '';
- $htmlhelp='';
+ $htmlhelp = '';
// if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("PurchasesPlusVATEarnedAndDue");
print $form->textwithpicto($langs->trans("Outcome"), $htmlhelp);
print ' ';
print '';
- $htmlhelp='';
+ $htmlhelp = '';
// if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("SalesPlusVATToRetreive");
print $form->textwithpicto($langs->trans("Income"), $htmlhelp);
print ' ';
@@ -910,18 +910,18 @@ print '';
print "".dol_print_date(dol_mktime(12, 0, 0, $mois_modulo, 1, $annee), "%B")." ";
- for ($annee = $year_start ; $annee <= $year_end ; $annee++)
+ for ($annee = $year_start; $annee <= $year_end; $annee++)
{
- $annee_decalage=$annee;
- if($mois>12) {$annee_decalage=$annee+1;}
+ $annee_decalage = $annee;
+ if ($mois > 12) {$annee_decalage = $annee + 1; }
$case = strftime("%Y-%m", dol_mktime(12, 0, 0, $mois_modulo, 1, $annee_decalage));
print ' ';
@@ -929,18 +929,18 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
{
if (isset($decaiss[$case]) && $decaiss[$case] != 0)
{
- print ''.price(price2num($decaiss[$case], 'MT')).' ';
- if (! isset($totsorties[$annee])) $totsorties[$annee]=0;
- $totsorties[$annee]+=$decaiss[$case];
+ print ''.price(price2num($decaiss[$case], 'MT')).' ';
+ if (!isset($totsorties[$annee])) $totsorties[$annee] = 0;
+ $totsorties[$annee] += $decaiss[$case];
}
}
else
{
if (isset($decaiss_ttc[$case]) && $decaiss_ttc[$case] != 0)
{
- print ''.price(price2num($decaiss_ttc[$case], 'MT')).' ';
- if (! isset($totsorties[$annee])) $totsorties[$annee]=0;
- $totsorties[$annee]+=$decaiss_ttc[$case];
+ print ''.price(price2num($decaiss_ttc[$case], 'MT')).' ';
+ if (!isset($totsorties[$annee])) $totsorties[$annee] = 0;
+ $totsorties[$annee] += $decaiss_ttc[$case];
}
}
print " ";
@@ -950,18 +950,18 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
{
if (isset($encaiss[$case]))
{
- print ''.price(price2num($encaiss[$case], 'MT')).' ';
- if (! isset($totentrees[$annee])) $totentrees[$annee]=0;
- $totentrees[$annee]+=$encaiss[$case];
+ print ''.price(price2num($encaiss[$case], 'MT')).' ';
+ if (!isset($totentrees[$annee])) $totentrees[$annee] = 0;
+ $totentrees[$annee] += $encaiss[$case];
}
}
else
{
if (isset($encaiss_ttc[$case]))
{
- print ''.price(price2num($encaiss_ttc[$case], 'MT')).' ';
- if (! isset($totentrees[$annee])) $totentrees[$annee]=0;
- $totentrees[$annee]+=$encaiss_ttc[$case];
+ print ''.price(price2num($encaiss_ttc[$case], 'MT')).' ';
+ if (!isset($totentrees[$annee])) $totentrees[$annee] = 0;
+ $totentrees[$annee] += $encaiss_ttc[$case];
}
}
print "";
@@ -972,16 +972,16 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
// Total
-$nbcols=0;
+$nbcols = 0;
print ' ';
if ($modecompta == 'BOOKKEEPING') print $langs->trans("Total");
else print $langs->trans("TotalTTC");
print ' ';
-for ($annee = $year_start ; $annee <= $year_end ; $annee++)
+for ($annee = $year_start; $annee <= $year_end; $annee++)
{
- $nbcols+=2;
- print ''.(isset($totsorties[$annee])?price(price2num($totsorties[$annee], 'MT')):' ').' ';
- print ''.(isset($totentrees[$annee])?price(price2num($totentrees[$annee], 'MT')):' ').' ';
+ $nbcols += 2;
+ print ''.(isset($totsorties[$annee]) ?price(price2num($totsorties[$annee], 'MT')) : ' ').' ';
+ print ''.(isset($totentrees[$annee]) ?price(price2num($totentrees[$annee], 'MT')) : ' ').' ';
}
print "'.$langs->trans("AccountingResult").' ';
-for ($annee = $year_start ; $annee <= $year_end ; $annee++)
+for ($annee = $year_start; $annee <= $year_end; $annee++)
{
print ' ';
if (isset($totentrees[$annee]) || isset($totsorties[$annee]))
{
- $in=(isset($totentrees[$annee])?price2num($totentrees[$annee], 'MT'):0);
- $out=(isset($totsorties[$annee])?price2num($totsorties[$annee], 'MT'):0);
- print price(price2num($in-$out, 'MT')).' ';
+ $in = (isset($totentrees[$annee]) ?price2num($totentrees[$annee], 'MT') : 0);
+ $out = (isset($totsorties[$annee]) ?price2num($totsorties[$annee], 'MT') : 0);
+ print price(price2num($in - $out, 'MT')).'';
// print ' ';
}
}
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index fe0668aa9b2..684ef337fcd 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -29,19 +29,19 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
// Load translation files required by the page
-$langs->loadLangs(array('compta','bills','donation','salaries'));
+$langs->loadLangs(array('compta', 'bills', 'donation', 'salaries'));
-$date_startmonth=GETPOST('date_startmonth');
-$date_startday=GETPOST('date_startday');
-$date_startyear=GETPOST('date_startyear');
-$date_endmonth=GETPOST('date_endmonth');
-$date_endday=GETPOST('date_endday');
-$date_endyear=GETPOST('date_endyear');
+$date_startmonth = GETPOST('date_startmonth');
+$date_startday = GETPOST('date_startday');
+$date_startyear = GETPOST('date_startyear');
+$date_endmonth = GETPOST('date_endmonth');
+$date_endday = GETPOST('date_endday');
+$date_endyear = GETPOST('date_endyear');
-$nbofyear=4;
+$nbofyear = 4;
// Date range
-$year=GETPOST('year', 'int');
+$year = GETPOST('year', 'int');
if (empty($year))
{
$year_current = strftime("%Y", dol_now());
@@ -52,55 +52,55 @@ if (empty($year))
$month_current = strftime("%m", dol_now());
$year_start = $year - ($nbofyear - 1);
}
-$date_start=dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
-$date_end=dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
// We define date_start and date_end
if (empty($date_start) || empty($date_end)) // We define date_start and date_end
{
- $q=GETPOST("q")?GETPOST("q"):0;
- if ($q==0)
+ $q = GETPOST("q") ?GETPOST("q") : 0;
+ if ($q == 0)
{
// We define date_start and date_end
- $year_end=$year_start + ($nbofyear - 1);
- $month_start=GETPOST("month")?GETPOST("month"):($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1);
- if (! GETPOST('month'))
+ $year_end = $year_start + ($nbofyear - 1);
+ $month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+ if (!GETPOST('month'))
{
- if (! GETPOST("year") && $month_start > $month_current)
+ if (!GETPOST("year") && $month_start > $month_current)
{
$year_start--;
$year_end--;
}
- $month_end=$month_start-1;
- if ($month_end < 1) $month_end=12;
+ $month_end = $month_start - 1;
+ if ($month_end < 1) $month_end = 12;
}
- else $month_end=$month_start;
- $date_start=dol_get_first_day($year_start, $month_start, false); $date_end=dol_get_last_day($year_end, $month_end, false);
+ else $month_end = $month_start;
+ $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
}
- if ($q==1) { $date_start=dol_get_first_day($year_start, 1, false); $date_end=dol_get_last_day($year_start, 3, false); }
- if ($q==2) { $date_start=dol_get_first_day($year_start, 4, false); $date_end=dol_get_last_day($year_start, 6, false); }
- if ($q==3) { $date_start=dol_get_first_day($year_start, 7, false); $date_end=dol_get_last_day($year_start, 9, false); }
- if ($q==4) { $date_start=dol_get_first_day($year_start, 10, false); $date_end=dol_get_last_day($year_start, 12, false); }
+ if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
+ if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
+ if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
+ if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
}
-$userid=GETPOST('userid', 'int');
+$userid = GETPOST('userid', 'int');
$socid = GETPOST('socid', 'int');
-$tmps=dol_getdate($date_start);
+$tmps = dol_getdate($date_start);
$year_start = $tmps['year'];
-$tmpe=dol_getdate($date_end);
+$tmpe = dol_getdate($date_end);
$year_end = $tmpe['year'];
$nbofyear = ($year_end - $year_start) + 1;
// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
$modecompta = $conf->global->ACCOUNTING_MODE;
-if (! empty($conf->accounting->enabled)) $modecompta='BOOKKEEPING';
-if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta", 'alpha');
+if (!empty($conf->accounting->enabled)) $modecompta = 'BOOKKEEPING';
+if (GETPOST("modecompta")) $modecompta = GETPOST("modecompta", 'alpha');
// Security check
if ($user->socid > 0) $socid = $user->socid;
-if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user, 'compta', '', '', 'resultat');
-if (! empty($conf->accounting->enabled)) $result=restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
+if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
@@ -111,54 +111,54 @@ if (! empty($conf->accounting->enabled)) $result=restrictedArea($user, 'accounti
llxHeader();
-$form=new Form($db);
+$form = new Form($db);
// Affiche en-tete du rapport
-if ($modecompta=="CREANCES-DETTES")
+if ($modecompta == "CREANCES-DETTES")
{
- $name=$langs->trans("Turnover");
- $calcmode=$langs->trans("CalcModeDebt");
+ $name = $langs->trans("Turnover");
+ $calcmode = $langs->trans("CalcModeDebt");
//$calcmode.='',' ').')';
- $calcmode.='', ' ').')';
- $period=$form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
- $periodlink=($year_start?"".img_previous()." ".img_next()." ":"");
- $description=$langs->trans("RulesCADue");
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description.= $langs->trans("DepositsAreNotIncluded");
- else $description.= $langs->trans("DepositsAreIncluded");
- $builddate=dol_now();
+ $calcmode .= '', ' ').')';
+ $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+ $periodlink = ($year_start ? "".img_previous()." ".img_next()." " : "");
+ $description = $langs->trans("RulesCADue");
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
+ else $description .= $langs->trans("DepositsAreIncluded");
+ $builddate = dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
-elseif ($modecompta=="RECETTES-DEPENSES")
+elseif ($modecompta == "RECETTES-DEPENSES")
{
- $name=$langs->trans("TurnoverCollected");
- $calcmode=$langs->trans("CalcModeEngagement");
+ $name = $langs->trans("TurnoverCollected");
+ $calcmode = $langs->trans("CalcModeEngagement");
//$calcmode.='',' ').')';
//$calcmode.='',' ').')';
- $period=$form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
- $periodlink=($year_start?"".img_previous()." ".img_next()." ":"");
- $description=$langs->trans("RulesCAIn");
- $description.= $langs->trans("DepositsAreIncluded");
- $builddate=dol_now();
+ $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+ $periodlink = ($year_start ? "".img_previous()." ".img_next()." " : "");
+ $description = $langs->trans("RulesCAIn");
+ $description .= $langs->trans("DepositsAreIncluded");
+ $builddate = dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
-elseif ($modecompta=="BOOKKEEPING")
+elseif ($modecompta == "BOOKKEEPING")
{
- $name=$langs->trans("Turnover");
- $calcmode=$langs->trans("CalcModeBookkeeping");
- $calcmode.='', ' ').')';
+ $name = $langs->trans("Turnover");
+ $calcmode = $langs->trans("CalcModeBookkeeping");
+ $calcmode .= '', ' ').')';
//$calcmode.='',' ').')';
- $period=$form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
- $periodlink=($year_start?"".img_previous()." ".img_next()." ":"");
- $description=$langs->trans("RulesCATotalSaleJournal");
- $builddate=dol_now();
+ $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+ $periodlink = ($year_start ? "".img_previous()." ".img_next()." " : "");
+ $description = $langs->trans("RulesCATotalSaleJournal");
+ $builddate = dol_now();
//$exportlink=$langs->trans("NotYetAvailable");
}
-$moreparam=array();
-if (! empty($modecompta)) $moreparam['modecompta']=$modecompta;
+$moreparam = array();
+if (!empty($modecompta)) $moreparam['modecompta'] = $modecompta;
report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $moreparam, $calcmode);
-if (! empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
{
print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
}
@@ -166,40 +166,40 @@ if (! empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
if ($modecompta == 'CREANCES-DETTES')
{
- $sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
- $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
- $sql.= " WHERE f.fk_statut in (1,2)";
- if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
- else $sql.= " AND f.type IN (0,1,2,3,5)";
- $sql.= " AND f.entity IN (".getEntity('invoice').")";
- if ($socid) $sql.= " AND f.fk_soc = ".$socid;
+ $sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+ $sql .= " WHERE f.fk_statut in (1,2)";
+ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
+ else $sql .= " AND f.type IN (0,1,2,3,5)";
+ $sql .= " AND f.entity IN (".getEntity('invoice').")";
+ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
}
-elseif ($modecompta=="RECETTES-DEPENSES")
+elseif ($modecompta == "RECETTES-DEPENSES")
{
/*
* Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
* vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
*/
- $sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc";
- $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
- $sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
- $sql.= ", ".MAIN_DB_PREFIX."paiement as p";
- $sql.= " WHERE p.rowid = pf.fk_paiement";
- $sql.= " AND pf.fk_facture = f.rowid";
- $sql.= " AND f.entity IN (".getEntity('invoice').")";
- if ($socid) $sql.= " AND f.fk_soc = ".$socid;
+ $sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+ $sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
+ $sql .= ", ".MAIN_DB_PREFIX."paiement as p";
+ $sql .= " WHERE p.rowid = pf.fk_paiement";
+ $sql .= " AND pf.fk_facture = f.rowid";
+ $sql .= " AND f.entity IN (".getEntity('invoice').")";
+ if ($socid) $sql .= " AND f.fk_soc = ".$socid;
}
-elseif ($modecompta=="BOOKKEEPING")
+elseif ($modecompta == "BOOKKEEPING")
{
- $sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.credit) as amount_ttc";
- $sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
- $sql.= " WHERE b.entity = ".$conf->entity;
- $sql.= " AND aj.entity = ".$conf->entity;
- $sql.= " AND b.code_journal = aj.code AND aj.nature = 2" ; // @todo currently count amount in sale journal, but we need to define a category group for turnover
+ $sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.credit) as amount_ttc";
+ $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
+ $sql .= " WHERE b.entity = ".$conf->entity;
+ $sql .= " AND aj.entity = ".$conf->entity;
+ $sql .= " AND b.code_journal = aj.code AND aj.nature = 2"; // @todo currently count amount in sale journal, but we need to define a category group for turnover
}
-$sql.= " GROUP BY dm";
-$sql.= " ORDER BY dm";
+$sql .= " GROUP BY dm";
+$sql .= " ORDER BY dm";
//print $sql;
$result = $db->query($sql);
@@ -214,8 +214,8 @@ if ($result)
$cum[$obj->dm] = $obj->amount_ttc;
if ($obj->amount_ttc)
{
- $minyearmonth=($minyearmonth?min($minyearmonth, $obj->dm):$obj->dm);
- $maxyearmonth=max($maxyearmonth, $obj->dm);
+ $minyearmonth = ($minyearmonth ?min($minyearmonth, $obj->dm) : $obj->dm);
+ $maxyearmonth = max($maxyearmonth, $obj->dm);
}
$i++;
}
@@ -229,16 +229,16 @@ else {
if ($modecompta == 'RECETTES-DEPENSES')
{
$sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount_ttc";
- $sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
- $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
- $sql.= ", ".MAIN_DB_PREFIX."paiement as p";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
- $sql.= " WHERE pf.rowid IS NULL";
- $sql.= " AND p.fk_bank = b.rowid";
- $sql.= " AND b.fk_account = ba.rowid";
- $sql.= " AND ba.entity IN (".getEntity('bank_account').")";
- $sql.= " GROUP BY dm";
- $sql.= " ORDER BY dm";
+ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
+ $sql .= ", ".MAIN_DB_PREFIX."paiement as p";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+ $sql .= " WHERE pf.rowid IS NULL";
+ $sql .= " AND p.fk_bank = b.rowid";
+ $sql .= " AND b.fk_account = ba.rowid";
+ $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
+ $sql .= " GROUP BY dm";
+ $sql .= " ORDER BY dm";
$result = $db->query($sql);
if ($result)
@@ -251,8 +251,8 @@ if ($modecompta == 'RECETTES-DEPENSES')
$cum[$obj->dm] += $obj->amount_ttc;
if ($obj->amount_ttc)
{
- $minyearmonth=($minyearmonth?min($minyearmonth, $obj->dm):$obj->dm);
- $maxyearmonth=max($maxyearmonth, $obj->dm);
+ $minyearmonth = ($minyearmonth ?min($minyearmonth, $obj->dm) : $obj->dm);
+ $maxyearmonth = max($maxyearmonth, $obj->dm);
}
$i++;
}
@@ -263,20 +263,20 @@ if ($modecompta == 'RECETTES-DEPENSES')
}
}
-$moreforfilter='';
+$moreforfilter = '';
print '';
-print '
'."\n";
+print ''."\n";
print ' ';
-for ($annee = $year_start ; $annee <= $year_end ; $annee++)
+for ($annee = $year_start; $annee <= $year_end; $annee++)
{
if ($modecompta == 'CREANCES-DETTES') print '';
else print ' ';
if ($modecompta != 'BOOKKEEPING') print '';
print $annee;
- if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee+1);
+ if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
if ($modecompta != 'BOOKKEEPING') print ' ';
print ' ';
if ($annee != $year_end) print ' ';
@@ -284,7 +284,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
print ''.$langs->trans("Month").' ';
-for ($annee = $year_start ; $annee <= $year_end ; $annee++)
+for ($annee = $year_start; $annee <= $year_end; $annee++)
{
if ($modecompta == 'CREANCES-DETTES') print ''.$langs->trans("AmountHT").' ';
print ''.$langs->trans("AmountTTC").' ';
@@ -293,31 +293,31 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
}
print '';
print "".dol_print_date(dol_mktime(12, 0, 0, $mois_modulo, 1, 2000), "%B")." ";
- for ($annee = $year_start -1 ; $annee <= $year_end ; $annee++) // We start one year before to have data to be able to make delta
+ for ($annee = $year_start - 1; $annee <= $year_end; $annee++) // We start one year before to have data to be able to make delta
{
- $annee_decalage=$annee;
- if ($mois>12) {$annee_decalage=$annee+1;}
+ $annee_decalage = $annee;
+ if ($mois > 12) {$annee_decalage = $annee + 1; }
$case = dol_print_date(dol_mktime(1, 1, 1, $mois_modulo, 1, $annee_decalage), "%Y-%m");
- $caseprev = dol_print_date(dol_mktime(1, 1, 1, $mois_modulo, 1, $annee_decalage-1), "%Y-%m");
+ $caseprev = dol_print_date(dol_mktime(1, 1, 1, $mois_modulo, 1, $annee_decalage - 1), "%Y-%m");
if ($annee >= $year_start) // We ignore $annee < $year_start, we loop on it to be able to make delta, nothing is output.
{
@@ -326,8 +326,8 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
print '';
if ($cum_ht[$case])
{
- $now_show_delta=1; // On a trouve le premier mois de la premiere annee generant du chiffre.
- print ''.price($cum_ht[$case], 1).' ';
+ $now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
+ print ''.price($cum_ht[$case], 1).' ';
}
else
{
@@ -341,8 +341,8 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
print ' ';
if ($cum[$case])
{
- $now_show_delta=1; // On a trouve le premier mois de la premiere annee generant du chiffre.
- if ($modecompta != 'BOOKKEEPING') print '';
+ $now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
+ if ($modecompta != 'BOOKKEEPING') print ' ';
print price($cum[$case], 1);
if ($modecompta != 'BOOKKEEPING') print ' ';
}
@@ -358,24 +358,24 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
{
if ($cum[$caseprev] && $cum[$case])
{
- $percent=(round(($cum[$case]-$cum[$caseprev])/$cum[$caseprev], 4)*100);
+ $percent = (round(($cum[$case] - $cum[$caseprev]) / $cum[$caseprev], 4) * 100);
//print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
- print ' '.($percent>=0?"+$percent":"$percent").'% ';
+ print ''.($percent >= 0 ? "+$percent" : "$percent").'% ';
}
- if ($cum[$caseprev] && ! $cum[$case])
+ if ($cum[$caseprev] && !$cum[$case])
{
print '-100% ';
}
- if (! $cum[$caseprev] && $cum[$case])
+ if (!$cum[$caseprev] && $cum[$case])
{
//print '+Inf% ';
print '- ';
}
- if (isset($cum[$caseprev]) && ! $cum[$caseprev] && ! $cum[$case])
+ if (isset($cum[$caseprev]) && !$cum[$caseprev] && !$cum[$case])
{
print '+0% ';
}
- if (! isset($cum[$caseprev]) && ! $cum[$case])
+ if (!isset($cum[$caseprev]) && !$cum[$case])
{
print '- ';
}
@@ -391,7 +391,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
if ($annee_decalage < $year_end || ($annee_decalage == $year_end && $mois > 12 && $annee < $year_end)) print ' ';
}
- $total_ht[$annee] += ((! empty($cum_ht[$case])) ? $cum_ht[$case] : 0);
+ $total_ht[$annee] += ((!empty($cum_ht[$case])) ? $cum_ht[$case] : 0);
$total[$annee] += $cum[$case];
}
@@ -465,13 +465,13 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++)
// Affiche total
print ' '.$langs->trans("Total").' ';
-for ($annee = $year_start ; $annee <= $year_end ; $annee++)
+for ($annee = $year_start; $annee <= $year_end; $annee++)
{
if ($modecompta == 'CREANCES-DETTES') {
// Montant total HT
if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
{
- print ''.($total_ht[$annee]?price($total_ht[$annee]):"0")." ";
+ print ''.($total_ht[$annee] ?price($total_ht[$annee]) : "0")." ";
}
else
{
@@ -482,7 +482,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
// Montant total
if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
{
- print ''.($total[$annee]?price($total[$annee]):"0")." ";
+ print ''.($total[$annee] ?price($total[$annee]) : "0")." ";
}
else
{
@@ -492,19 +492,19 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
// Pourcentage total
if ($annee > $minyear && $annee <= max($nowyear, $maxyear))
{
- if ($total[$annee-1] && $total[$annee]) {
- $percent=(round(($total[$annee]-$total[$annee-1])/$total[$annee-1], 4)*100);
- print ''.($percent>=0?"+$percent":"$percent").'% ';
+ if ($total[$annee - 1] && $total[$annee]) {
+ $percent = (round(($total[$annee] - $total[$annee - 1]) / $total[$annee - 1], 4) * 100);
+ print ''.($percent >= 0 ? "+$percent" : "$percent").'% ';
}
- if ($total[$annee-1] && ! $total[$annee])
+ if ($total[$annee - 1] && !$total[$annee])
{
print '-100% ';
}
- if (! $total[$annee-1] && $total[$annee])
+ if (!$total[$annee - 1] && $total[$annee])
{
print '+'.$langs->trans('Inf').'% ';
}
- if (! $total[$annee-1] && ! $total[$annee])
+ if (!$total[$annee - 1] && !$total[$annee])
{
print '+0% ';
}
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 3f13eec2b34..2cd713a5654 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -40,30 +40,30 @@ if (GETPOST('addfile', 'alpha'))
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
// Set tmp user directory
- $vardir=$conf->user->dir_output."/".$user->id;
- $upload_dir_tmp = $vardir.'/temp'; // TODO Add $keytoavoidconflict in upload_dir path
+ $vardir = $conf->user->dir_output."/".$user->id;
+ $upload_dir_tmp = $vardir.'/temp'; // TODO Add $keytoavoidconflict in upload_dir path
dol_add_file_process($upload_dir_tmp, 1, 0, 'addedfile', '', null, $trackid, 0);
- $action='presend';
+ $action = 'presend';
}
/*
* Remove file in email form
*/
-if (! empty($_POST['removedfile']) && empty($_POST['removAll']))
+if (!empty($_POST['removedfile']) && empty($_POST['removAll']))
{
$trackid = GETPOST('trackid', 'aZ09');
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
// Set tmp user directory
- $vardir=$conf->user->dir_output."/".$user->id;
- $upload_dir_tmp = $vardir.'/temp'; // TODO Add $keytoavoidconflict in upload_dir path
+ $vardir = $conf->user->dir_output."/".$user->id;
+ $upload_dir_tmp = $vardir.'/temp'; // TODO Add $keytoavoidconflict in upload_dir path
// TODO Delete only files that was uploaded from email form. This can be addressed by adding the trackid into the temp path then changing donotdeletefile to 2 instead of 1 to say "delete only if into temp dir"
// GETPOST('removedfile','alpha') is position of file into $_SESSION["listofpaths"...] array.
- dol_remove_file_process(GETPOST('removedfile', 'alpha'), 0, 1, $trackid); // We do not delete because if file is the official PDF of doc, we don't want to remove it physically
- $action='presend';
+ dol_remove_file_process(GETPOST('removedfile', 'alpha'), 0, 1, $trackid); // We do not delete because if file is the official PDF of doc, we don't want to remove it physically
+ $action = 'presend';
}
/*
@@ -73,19 +73,19 @@ if (GETPOST('removAll', 'alpha'))
{
$trackid = GETPOST('trackid', 'aZ09');
- $listofpaths=array();
- $listofnames=array();
- $listofmimes=array();
- $keytoavoidconflict = empty($trackid)?'':'-'.$trackid;
- if (! empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths=explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
- if (! empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames=explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
- if (! empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes=explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+ $listofpaths = array();
+ $listofnames = array();
+ $listofmimes = array();
+ $keytoavoidconflict = empty($trackid) ? '' : '-'.$trackid;
+ if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+ if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+ if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->trackid = $trackid;
- foreach($listofpaths as $key => $value)
+ foreach ($listofpaths as $key => $value)
{
$pathtodelete = $value;
$filetodelete = $listofnames[$key];
@@ -101,84 +101,84 @@ if (GETPOST('removAll', 'alpha'))
/*
* Send mail
*/
-if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_POST['removAll'] && ! $_POST['removedfile'] && ! $_POST['cancel'] && !$_POST['modelselected'])
+if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST['removAll'] && !$_POST['removedfile'] && !$_POST['cancel'] && !$_POST['modelselected'])
{
if (empty($trackid)) $trackid = GETPOST('trackid', 'aZ09');
- $subject='';$actionmsg='';$actionmsg2='';
+ $subject = ''; $actionmsg = ''; $actionmsg2 = '';
$langs->load('mails');
if (is_object($object))
{
- $result=$object->fetch($id);
+ $result = $object->fetch($id);
- $sendtosocid=0; // Id of related thirdparty
- if (method_exists($object, "fetch_thirdparty") && ! in_array($object->element, array('societe', 'member', 'user', 'expensereport', 'contact')))
+ $sendtosocid = 0; // Id of related thirdparty
+ if (method_exists($object, "fetch_thirdparty") && !in_array($object->element, array('societe', 'member', 'user', 'expensereport', 'contact')))
{
- $result=$object->fetch_thirdparty();
- if ($object->element == 'user' && $result == 0) $result=1; // Even if not found, we consider ok
- $thirdparty=$object->thirdparty;
- $sendtosocid=$thirdparty->id;
+ $result = $object->fetch_thirdparty();
+ if ($object->element == 'user' && $result == 0) $result = 1; // Even if not found, we consider ok
+ $thirdparty = $object->thirdparty;
+ $sendtosocid = $thirdparty->id;
}
elseif ($object->element == 'member' || $object->element == 'user')
{
- $thirdparty=$object;
- if ($object->socid > 0) $sendtosocid=$object->socid;
+ $thirdparty = $object;
+ if ($object->socid > 0) $sendtosocid = $object->socid;
}
elseif ($object->element == 'expensereport')
{
- $tmpuser=new User($db);
+ $tmpuser = new User($db);
$tmpuser->fetch($object->fk_user_author);
- $thirdparty=$tmpuser;
- if ($object->socid > 0) $sendtosocid=$object->socid;
+ $thirdparty = $tmpuser;
+ if ($object->socid > 0) $sendtosocid = $object->socid;
}
elseif ($object->element == 'societe')
{
- $thirdparty=$object;
- if ($thirdparty->id > 0) $sendtosocid=$thirdparty->id;
+ $thirdparty = $object;
+ if ($thirdparty->id > 0) $sendtosocid = $thirdparty->id;
}
elseif ($object->element == 'contact')
{
- $contact=$object;
- if ($contact->id > 0) $sendtosocid=$contact->fetch_thirdparty()->id;
+ $contact = $object;
+ if ($contact->id > 0) $sendtosocid = $contact->fetch_thirdparty()->id;
}
else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
if (is_object($hookmanager))
{
- $parameters=array();
- $reshook=$hookmanager->executeHooks('initSendToSocid', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('initSendToSocid', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
}
}
else $thirdparty = $mysoc;
if ($result > 0)
{
- $sendto='';
- $sendtocc='';
- $sendtobcc='';
+ $sendto = '';
+ $sendtocc = '';
+ $sendtobcc = '';
$sendtoid = array();
- $sendtouserid=array();
- $sendtoccuserid=array();
+ $sendtouserid = array();
+ $sendtoccuserid = array();
// Define $sendto
- $receiver=$_POST['receiver'];
- if (! is_array($receiver))
+ $receiver = $_POST['receiver'];
+ if (!is_array($receiver))
{
- if ($receiver == '-1') $receiver=array();
- else $receiver=array($receiver);
+ if ($receiver == '-1') $receiver = array();
+ else $receiver = array($receiver);
}
- $tmparray=array();
+ $tmparray = array();
if (trim($_POST['sendto']))
{
// Recipients are provided into free text
$tmparray[] = trim($_POST['sendto']);
}
- if (count($receiver)>0)
+ if (count($receiver) > 0)
{
- foreach($receiver as $key=>$val)
+ foreach ($receiver as $key=>$val)
{
// Recipient was provided from combo list
if ($val == 'thirdparty') // Key selected means currentthird party (may be usd for current member or current user too)
@@ -200,11 +200,11 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
{
- $receiveruser=$_POST['receiveruser'];
- if (is_array($receiveruser) && count($receiveruser)>0)
+ $receiveruser = $_POST['receiveruser'];
+ if (is_array($receiveruser) && count($receiveruser) > 0)
{
$fuserdest = new User($db);
- foreach($receiveruser as $key=>$val)
+ foreach ($receiveruser as $key=>$val)
{
$tmparray[] = $fuserdest->user_get_property($val, 'email');
$sendtouserid[] = $val;
@@ -212,23 +212,23 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
}
}
- $sendto=implode(',', $tmparray);
+ $sendto = implode(',', $tmparray);
// Define $sendtocc
- $receivercc=$_POST['receivercc'];
- if (! is_array($receivercc))
+ $receivercc = $_POST['receivercc'];
+ if (!is_array($receivercc))
{
- if ($receivercc == '-1') $receivercc=array();
- else $receivercc=array($receivercc);
+ if ($receivercc == '-1') $receivercc = array();
+ else $receivercc = array($receivercc);
}
- $tmparray=array();
+ $tmparray = array();
if (trim($_POST['sendtocc']))
{
$tmparray[] = trim($_POST['sendtocc']);
}
if (count($receivercc) > 0)
{
- foreach($receivercc as $key=>$val)
+ foreach ($receivercc as $key=>$val)
{
// Recipient was provided from combo list
if ($val == 'thirdparty') // Key selected means currentthird party (may be usd for current member or current user too)
@@ -248,25 +248,25 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
}
}
if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
- $receiverccuser=$_POST['receiverccuser'];
+ $receiverccuser = $_POST['receiverccuser'];
- if (is_array($receiverccuser) && count($receiverccuser)>0)
+ if (is_array($receiverccuser) && count($receiverccuser) > 0)
{
$fuserdest = new User($db);
- foreach($receiverccuser as $key=>$val)
+ foreach ($receiverccuser as $key=>$val)
{
$tmparray[] = $fuserdest->user_get_property($val, 'email');
$sendtoccuserid[] = $val;
}
}
}
- $sendtocc=implode(',', $tmparray);
+ $sendtocc = implode(',', $tmparray);
if (dol_strlen($sendto))
{
// Define $urlwithroot
- $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
- $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+ $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
//$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -275,24 +275,24 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
$fromtype = GETPOST('fromtype', 'alpha');
if ($fromtype === 'robot') {
- $from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")) .' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
+ $from = dol_string_nospecial($conf->global->MAIN_MAIL_EMAIL_FROM, ' ', array(",")).' <'.$conf->global->MAIN_MAIL_EMAIL_FROM.'>';
}
elseif ($fromtype === 'user') {
- $from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")) .' <'.$user->email.'>';
+ $from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")).' <'.$user->email.'>';
}
elseif ($fromtype === 'company') {
- $from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")) .' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
+ $from = dol_string_nospecial($conf->global->MAIN_INFO_SOCIETE_NOM, ' ', array(",")).' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
}
elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
- $tmp=explode(',', $user->email_aliases);
+ $tmp = explode(',', $user->email_aliases);
$from = trim($tmp[($reg[1] - 1)]);
}
elseif (preg_match('/global_aliases_(\d+)/', $fromtype, $reg)) {
- $tmp=explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
+ $tmp = explode(',', $conf->global->MAIN_INFO_SOCIETE_MAIL_ALIASES);
$from = trim($tmp[($reg[1] - 1)]);
}
elseif (preg_match('/senderprofile_(\d+)_(\d+)/', $fromtype, $reg)) {
- $sql='SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
+ $sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
$resql = $db->query($sql);
$obj = $db->fetch_object($resql);
if ($obj)
@@ -301,10 +301,10 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
}
}
else {
- $from = dol_string_nospecial($_POST['fromname'], ' ', array(",")) . ' <' . $_POST['frommail'] .'>';
+ $from = dol_string_nospecial($_POST['fromname'], ' ', array(",")).' <'.$_POST['frommail'].'>';
}
- $replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")). ' <' . $_POST['replytomail'].'>';
+ $replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")).' <'.$_POST['replytomail'].'>';
$message = GETPOST('message', 'none');
$subject = GETPOST('subject', 'none');
@@ -312,28 +312,28 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
// ';
+ $mesg = '
';
if ($mailfile->error)
{
- $mesg.=$langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
- $mesg.='
';
+ $mesg .= '
'.$langs->trans("BackToModuleList").' ';
+$linkback = ''.$langs->trans("BackToModuleList").' ';
print load_fiche_titre($langs->trans("DonationsSetup"), $linkback, 'title_setup');
$head = donation_admin_prepare_head();
@@ -206,16 +206,16 @@ dol_fiche_head($head, 'general', $langs->trans("Donations"), -1, 'payment');
print load_fiche_titre($langs->trans("DonationsModels"), '', '');
// Defined the template definition table
-$type='donation';
+$type = 'donation';
$def = array();
$sql = "SELECT nom";
-$sql.= " FROM ".MAIN_DB_PREFIX."document_model";
-$sql.= " WHERE type = '".$type."'";
-$resql=$db->query($sql);
+$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+$sql .= " WHERE type = '".$type."'";
+$resql = $db->query($sql);
if ($resql)
{
$i = 0;
- $num_rows=$db->num_rows($resql);
+ $num_rows = $db->num_rows($resql);
while ($i < $num_rows)
{
$array = $db->fetch_array($resql);
@@ -240,22 +240,22 @@ print "'.$langs->trans("FeaturesSupported").': ';
- $htmltooltip.=''.$langs->trans("FeaturesSupported").': ';
+ $htmltooltip .= '';
print $form->textwithpicto('', $htmltooltip, -1, 0);
print ' ';
@@ -365,15 +365,15 @@ print "\n";
print '';
print '';
$label = $langs->trans("AccountAccounting");
-print '' . $label . ' ';
+print ''.$label.' ';
print '';
-if (! empty($conf->accounting->enabled))
+if (!empty($conf->accounting->enabled))
{
print $formaccounting->select_account($conf->global->DONATION_ACCOUNTINGACCOUNT, 'DONATION_ACCOUNTINGACCOUNT', 1, '', 1, 1);
}
else
{
- print ' ';
print ' \n";
print '';
- print '' . $langs->trans("DONATION_ART200") . ' ';
+ print ''.$langs->trans("DONATION_ART200").' ';
print '';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('DONATION_ART200');
@@ -420,7 +420,7 @@ if (preg_match('/fr/i', $conf->global->MAIN_INFO_SOCIETE_COUNTRY))
print ' ';
print '';
- print '' . $langs->trans("DONATION_ART238") . ' ';
+ print ''.$langs->trans("DONATION_ART238").' ';
print '';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('DONATION_ART238');
@@ -431,7 +431,7 @@ if (preg_match('/fr/i', $conf->global->MAIN_INFO_SOCIETE_COUNTRY))
print ' ';
print '';
- print '' . $langs->trans("DONATION_ART885") . ' ';
+ print ''.$langs->trans("DONATION_ART885").' ';
print '';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('DONATION_ART885');
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index bd3e3a8ada9..baa362085c1 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -25,9 +25,9 @@
* \ingroup expensereport
* \brief File to manage Expense Reports
*/
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT .'/expensereport/class/expensereport_ik.class.php';
-require_once DOL_DOCUMENT_ROOT .'/expensereport/class/expensereport_rule.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.php';
/**
* Class to manage Trips and Expenses
@@ -37,12 +37,12 @@ class ExpenseReport extends CommonObject
/**
* @var string ID to identify managed object
*/
- public $element='expensereport';
+ public $element = 'expensereport';
/**
* @var string Name of table without prefix where object is stored
*/
- public $table_element='expensereport';
+ public $table_element = 'expensereport';
public $table_element_line = 'expensereport_det';
public $fk_element = 'fk_expensereport';
@@ -52,14 +52,14 @@ class ExpenseReport extends CommonObject
*/
public $picto = 'trip';
- public $lines=array();
+ public $lines = array();
public $date_debut;
public $date_fin;
public $status;
- public $fk_statut; // -- 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+ public $fk_statut; // -- 0=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
public $fk_c_paiement;
public $paid;
@@ -75,7 +75,7 @@ class ExpenseReport extends CommonObject
// Create
public $date_create;
- public $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
+ public $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
// Update
public $date_modif;
@@ -91,16 +91,16 @@ class ExpenseReport extends CommonObject
public $detail_cancel;
public $fk_user_cancel;
- public $fk_user_validator; // User that is defined to approve
+ public $fk_user_validator; // User that is defined to approve
// Validation
- public $date_valid; // User making validation
+ public $date_valid; // User making validation
public $fk_user_valid;
public $user_valid_infos;
// Approve
public $date_approve;
- public $fk_user_approve; // User that has approved
+ public $fk_user_approve; // User that has approved
// Paiement
public $user_paid_infos;
@@ -137,7 +137,7 @@ class ExpenseReport extends CommonObject
const STATUS_CLOSED = 6;
- public $fields=array(
+ public $fields = array(
'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
'ref' =>array('type'=>'varchar(50)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>15),
'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>20),
@@ -220,77 +220,77 @@ class ExpenseReport extends CommonObject
// Check parameters
if (empty($this->date_debut) || empty($this->date_fin))
{
- $this->error=$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Date'));
+ $this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Date'));
return -1;
}
- $fuserid = $this->fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
+ $fuserid = $this->fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
if (empty($fuserid)) $fuserid = $user->id;
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." (";
- $sql.= "ref";
- $sql.= ",total_ht";
- $sql.= ",total_ttc";
- $sql.= ",total_tva";
- $sql.= ",date_debut";
- $sql.= ",date_fin";
- $sql.= ",date_create";
- $sql.= ",fk_user_author";
- $sql.= ",fk_user_validator";
- $sql.= ",fk_user_approve";
- $sql.= ",fk_user_modif";
- $sql.= ",fk_statut";
- $sql.= ",fk_c_paiement";
- $sql.= ",paid";
- $sql.= ",note_public";
- $sql.= ",note_private";
- $sql.= ",entity";
- $sql.= ") VALUES(";
- $sql.= "'(PROV)'";
- $sql.= ", ".$this->total_ht;
- $sql.= ", ".$this->total_ttc;
- $sql.= ", ".$this->total_tva;
- $sql.= ", '".$this->db->idate($this->date_debut)."'";
- $sql.= ", '".$this->db->idate($this->date_fin)."'";
- $sql.= ", '".$this->db->idate($now)."'";
- $sql.= ", ".$fuserid;
- $sql.= ", ".($this->fk_user_validator > 0 ? $this->fk_user_validator:"null");
- $sql.= ", ".($this->fk_user_approve > 0 ? $this->fk_user_approve:"null");
- $sql.= ", ".($this->fk_user_modif > 0 ? $this->fk_user_modif:"null");
- $sql.= ", ".($this->fk_statut > 1 ? $this->fk_statut:0);
- $sql.= ", ".($this->modepaymentid?$this->modepaymentid:"null");
- $sql.= ", 0";
- $sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
- $sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
- $sql.= ", ".$conf->entity;
- $sql.= ")";
+ $sql .= "ref";
+ $sql .= ",total_ht";
+ $sql .= ",total_ttc";
+ $sql .= ",total_tva";
+ $sql .= ",date_debut";
+ $sql .= ",date_fin";
+ $sql .= ",date_create";
+ $sql .= ",fk_user_author";
+ $sql .= ",fk_user_validator";
+ $sql .= ",fk_user_approve";
+ $sql .= ",fk_user_modif";
+ $sql .= ",fk_statut";
+ $sql .= ",fk_c_paiement";
+ $sql .= ",paid";
+ $sql .= ",note_public";
+ $sql .= ",note_private";
+ $sql .= ",entity";
+ $sql .= ") VALUES(";
+ $sql .= "'(PROV)'";
+ $sql .= ", ".$this->total_ht;
+ $sql .= ", ".$this->total_ttc;
+ $sql .= ", ".$this->total_tva;
+ $sql .= ", '".$this->db->idate($this->date_debut)."'";
+ $sql .= ", '".$this->db->idate($this->date_fin)."'";
+ $sql .= ", '".$this->db->idate($now)."'";
+ $sql .= ", ".$fuserid;
+ $sql .= ", ".($this->fk_user_validator > 0 ? $this->fk_user_validator : "null");
+ $sql .= ", ".($this->fk_user_approve > 0 ? $this->fk_user_approve : "null");
+ $sql .= ", ".($this->fk_user_modif > 0 ? $this->fk_user_modif : "null");
+ $sql .= ", ".($this->fk_statut > 1 ? $this->fk_statut : 0);
+ $sql .= ", ".($this->modepaymentid ? $this->modepaymentid : "null");
+ $sql .= ", 0";
+ $sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
+ $sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
+ $sql .= ", ".$conf->entity;
+ $sql .= ")";
$result = $this->db->query($sql);
if ($result)
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
- $this->ref='(PROV'.$this->id.')';
+ $this->ref = '(PROV'.$this->id.')';
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if (!$resql)
{
$this->error = $this->db->lasterror();
$error++;
}
- if (! $error)
+ if (!$error)
{
- if (is_array($this->lines) && count($this->lines)>0)
+ if (is_array($this->lines) && count($this->lines) > 0)
{
foreach ($this->lines as $i => $val)
{
//$newndfline=new ExpenseReportLine($this->db);
- $newndfline=$this->lines[$i];
- $newndfline->fk_expensereport=$this->id;
- $result=$newndfline->insert();
+ $newndfline = $this->lines[$i];
+ $newndfline->fk_expensereport = $this->id;
+ $result = $newndfline->insert();
if ($result < 0)
{
$this->error = $newndfline->error;
@@ -301,21 +301,21 @@ class ExpenseReport extends CommonObject
}
}
- if (! $error)
+ if (!$error)
{
- $result=$this->insertExtraFields();
+ $result = $this->insertExtraFields();
if ($result < 0) $error++;
}
- if (! $error)
+ if (!$error)
{
- $result=$this->update_price();
+ $result = $this->update_price();
if ($result > 0)
{
if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('EXPENSE_REPORT_CREATE', $user);
+ $result = $this->call_trigger('EXPENSE_REPORT_CREATE', $user);
if ($result < 0) {
$error++;
@@ -349,7 +349,7 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$this->db->lasterror()." sql=".$sql;
+ $this->error = $this->db->lasterror()." sql=".$sql;
$this->db->rollback();
return -1;
}
@@ -367,7 +367,7 @@ class ExpenseReport extends CommonObject
{
global $hookmanager;
- $error=0;
+ $error = 0;
if (empty($fk_user_author)) $fk_user_author = $user->id;
@@ -380,31 +380,31 @@ class ExpenseReport extends CommonObject
// Load source object
$objFrom = clone $this;
- $this->id=0;
+ $this->id = 0;
$this->ref = '';
- $this->status=0;
- $this->fk_statut=0;
+ $this->status = 0;
+ $this->fk_statut = 0;
// Clear fields
- $this->fk_user_author = $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
+ $this->fk_user_author = $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
$this->fk_user_valid = '';
- $this->date_create = '';
+ $this->date_create = '';
$this->date_creation = '';
$this->date_validation = '';
// Create clone
$this->context['createfromclone'] = 'createfromclone';
- $result=$this->create($user);
+ $result = $this->create($user);
if ($result < 0) $error++;
- if (! $error)
+ if (!$error)
{
// Hook of thirdparty module
if (is_object($hookmanager))
{
- $parameters=array('objFrom'=>$objFrom);
- $action='';
- $reshook=$hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ $parameters = array('objFrom'=>$objFrom);
+ $action = '';
+ $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) $error++;
}
}
@@ -412,7 +412,7 @@ class ExpenseReport extends CommonObject
unset($this->context['createfromclone']);
// End
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return $this->id;
@@ -441,25 +441,25 @@ class ExpenseReport extends CommonObject
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
- $sql.= " total_ht = ".$this->total_ht;
- $sql.= " , total_ttc = ".$this->total_ttc;
- $sql.= " , total_tva = ".$this->total_tva;
- $sql.= " , date_debut = '".$this->db->idate($this->date_debut)."'";
- $sql.= " , date_fin = '".$this->db->idate($this->date_fin)."'";
+ $sql .= " total_ht = ".$this->total_ht;
+ $sql .= " , total_ttc = ".$this->total_ttc;
+ $sql .= " , total_tva = ".$this->total_tva;
+ $sql .= " , date_debut = '".$this->db->idate($this->date_debut)."'";
+ $sql .= " , date_fin = '".$this->db->idate($this->date_fin)."'";
if ($userofexpensereport && is_object($userofexpensereport))
{
- $sql.= " , fk_user_author = ".($userofexpensereport->id > 0 ? "'".$userofexpensereport->id."'":"null"); // Note fk_user_author is not the 'author' but the guy the expense report is for.
+ $sql .= " , fk_user_author = ".($userofexpensereport->id > 0 ? "'".$userofexpensereport->id."'" : "null"); // Note fk_user_author is not the 'author' but the guy the expense report is for.
}
- $sql.= " , fk_user_validator = ".($this->fk_user_validator > 0 ? $this->fk_user_validator:"null");
- $sql.= " , fk_user_valid = ".($this->fk_user_valid > 0 ? $this->fk_user_valid:"null");
- $sql.= " , fk_user_approve = ".($this->fk_user_approve > 0 ? $this->fk_user_approve:"null");
- $sql.= " , fk_user_modif = ".$user->id;
- $sql.= " , fk_statut = ".($this->fk_statut >= 0 ? $this->fk_statut:'0');
- $sql.= " , fk_c_paiement = ".($this->fk_c_paiement > 0 ? $this->fk_c_paiement:"null");
- $sql.= " , note_public = ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"''");
- $sql.= " , note_private = ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"''");
- $sql.= " , detail_refuse = ".(!empty($this->detail_refuse)?"'".$this->db->escape($this->detail_refuse)."'":"''");
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= " , fk_user_validator = ".($this->fk_user_validator > 0 ? $this->fk_user_validator : "null");
+ $sql .= " , fk_user_valid = ".($this->fk_user_valid > 0 ? $this->fk_user_valid : "null");
+ $sql .= " , fk_user_approve = ".($this->fk_user_approve > 0 ? $this->fk_user_approve : "null");
+ $sql .= " , fk_user_modif = ".$user->id;
+ $sql .= " , fk_statut = ".($this->fk_statut >= 0 ? $this->fk_statut : '0');
+ $sql .= " , fk_c_paiement = ".($this->fk_c_paiement > 0 ? $this->fk_c_paiement : "null");
+ $sql .= " , note_public = ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "''");
+ $sql .= " , note_private = ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "''");
+ $sql .= " , detail_refuse = ".(!empty($this->detail_refuse) ? "'".$this->db->escape($this->detail_refuse)."'" : "''");
+ $sql .= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
$result = $this->db->query($sql);
@@ -468,7 +468,7 @@ class ExpenseReport extends CommonObject
if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('EXPENSE_REPORT_UPDATE', $user);
+ $result = $this->call_trigger('EXPENSE_REPORT_UPDATE', $user);
if ($result < 0) {
$error++;
@@ -484,14 +484,14 @@ class ExpenseReport extends CommonObject
else
{
$this->db->rollback();
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -2;
}
}
else
{
$this->db->rollback();
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
}
@@ -507,23 +507,23 @@ class ExpenseReport extends CommonObject
{
global $conf;
- $sql = "SELECT d.rowid, d.ref, d.note_public, d.note_private,"; // DEFAULT
- $sql.= " d.detail_refuse, d.detail_cancel, d.fk_user_refuse, d.fk_user_cancel,"; // ACTIONS
- $sql.= " d.date_refuse, d.date_cancel,"; // ACTIONS
- $sql.= " d.total_ht, d.total_ttc, d.total_tva,"; // TOTAUX (int)
- $sql.= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_valid, d.date_approve,"; // DATES (datetime)
- $sql.= " d.fk_user_author, d.fk_user_modif, d.fk_user_validator,";
- $sql.= " d.fk_user_valid, d.fk_user_approve,";
- $sql.= " d.fk_statut as status, d.fk_c_paiement, d.paid,";
- $sql.= " dp.libelle as label_payment, dp.code as code_paiement"; // INNER JOIN paiement
- $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
- if ($ref) $sql.= " WHERE d.ref = '".$this->db->escape($ref)."'";
- else $sql.= " WHERE d.rowid = ".$id;
+ $sql = "SELECT d.rowid, d.ref, d.note_public, d.note_private,"; // DEFAULT
+ $sql .= " d.detail_refuse, d.detail_cancel, d.fk_user_refuse, d.fk_user_cancel,"; // ACTIONS
+ $sql .= " d.date_refuse, d.date_cancel,"; // ACTIONS
+ $sql .= " d.total_ht, d.total_ttc, d.total_tva,"; // TOTAUX (int)
+ $sql .= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_valid, d.date_approve,"; // DATES (datetime)
+ $sql .= " d.fk_user_author, d.fk_user_modif, d.fk_user_validator,";
+ $sql .= " d.fk_user_valid, d.fk_user_approve,";
+ $sql .= " d.fk_statut as status, d.fk_c_paiement, d.paid,";
+ $sql .= " dp.libelle as label_payment, dp.code as code_paiement"; // INNER JOIN paiement
+ $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
+ if ($ref) $sql .= " WHERE d.ref = '".$this->db->escape($ref)."'";
+ else $sql .= " WHERE d.rowid = ".$id;
//$sql.= $restrict;
dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
- $resql = $this->db->query($sql) ;
+ $resql = $this->db->query($sql);
if ($resql)
{
$obj = $this->db->fetch_object($resql);
@@ -548,7 +548,7 @@ class ExpenseReport extends CommonObject
$this->date_refuse = $this->db->jdate($obj->date_refuse);
$this->date_cancel = $this->db->jdate($obj->date_cancel);
- $this->fk_user_author = $obj->fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
+ $this->fk_user_author = $obj->fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
$this->fk_user_modif = $obj->fk_user_modif;
$this->fk_user_validator = $obj->fk_user_validator;
$this->fk_user_valid = $obj->fk_user_valid;
@@ -563,7 +563,7 @@ class ExpenseReport extends CommonObject
$user_approver = new User($this->db);
if ($this->fk_user_approve > 0) $user_approver->fetch($this->fk_user_approve);
- elseif ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator); // For backward compatibility
+ elseif ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator); // For backward compatibility
$this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
$this->fk_statut = $obj->status;
@@ -583,7 +583,7 @@ class ExpenseReport extends CommonObject
$this->lines = array();
- $result=$this->fetch_lines();
+ $result = $this->fetch_lines();
return $result;
}
@@ -594,7 +594,7 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
@@ -615,11 +615,11 @@ class ExpenseReport extends CommonObject
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."expensereport";
- $sql.= " SET fk_statut = ".self::STATUS_CLOSED.", paid=1";
- $sql.= " WHERE rowid = ".$id." AND fk_statut = ".self::STATUS_APPROVED;
+ $sql .= " SET fk_statut = ".self::STATUS_CLOSED.", paid=1";
+ $sql .= " WHERE rowid = ".$id." AND fk_statut = ".self::STATUS_APPROVED;
dol_syslog(get_class($this)."::set_paid sql=".$sql, LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->affected_rows($resql))
@@ -627,7 +627,7 @@ class ExpenseReport extends CommonObject
if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('EXPENSE_REPORT_PAID', $fuser);
+ $result = $this->call_trigger('EXPENSE_REPORT_PAID', $fuser);
if ($result < 0) {
$error++;
@@ -643,7 +643,7 @@ class ExpenseReport extends CommonObject
else
{
$this->db->rollback();
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -2;
}
}
@@ -705,17 +705,17 @@ class ExpenseReport extends CommonObject
global $conf;
$sql = "SELECT f.rowid,";
- $sql.= " f.date_create as datec,";
- $sql.= " f.tms as date_modification,";
- $sql.= " f.date_valid as datev,";
- $sql.= " f.date_approve as datea,";
+ $sql .= " f.date_create as datec,";
+ $sql .= " f.tms as date_modification,";
+ $sql .= " f.date_valid as datev,";
+ $sql .= " f.date_approve as datea,";
//$sql.= " f.fk_user_author as fk_user_creation,"; // This is not user of creation but user the expense is for.
- $sql.= " f.fk_user_modif as fk_user_modification,";
- $sql.= " f.fk_user_valid,";
- $sql.= " f.fk_user_approve";
- $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as f";
- $sql.= " WHERE f.rowid = ".$id;
- $sql.= " AND f.entity = ".$conf->entity;
+ $sql .= " f.fk_user_modif as fk_user_modification,";
+ $sql .= " f.fk_user_valid,";
+ $sql .= " f.fk_user_approve";
+ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as f";
+ $sql .= " WHERE f.rowid = ".$id;
+ $sql .= " AND f.entity = ".$conf->entity;
$resql = $this->db->query($sql);
if ($resql)
@@ -739,25 +739,25 @@ class ExpenseReport extends CommonObject
{
$cuser = new User($this->db);
$cuser->fetch($obj->fk_user_creation);
- $this->user_creation = $cuser;
+ $this->user_creation = $cuser;
}
if ($obj->fk_user_valid)
{
$vuser = new User($this->db);
$vuser->fetch($obj->fk_user_valid);
- $this->user_validation = $vuser;
+ $this->user_validation = $vuser;
}
if ($obj->fk_user_modification)
{
$muser = new User($this->db);
$muser->fetch($obj->fk_user_modification);
- $this->user_modification = $muser;
+ $this->user_modification = $muser;
}
if ($obj->fk_user_approve)
{
$auser = new User($this->db);
$auser->fetch($obj->fk_user_approve);
- $this->user_approve = $auser;
+ $this->user_approve = $auser;
}
}
$this->db->free($resql);
@@ -779,21 +779,21 @@ class ExpenseReport extends CommonObject
*/
public function initAsSpecimen()
{
- global $user,$langs,$conf;
+ global $user, $langs, $conf;
- $now=dol_now();
+ $now = dol_now();
// Initialise parametres
- $this->id=0;
+ $this->id = 0;
$this->ref = 'SPECIMEN';
- $this->specimen=1;
+ $this->specimen = 1;
$this->date_create = $now;
$this->date_debut = $now;
$this->date_fin = $now;
$this->date_valid = $now;
$this->date_approve = $now;
- $type_fees_id = 2; // TF_TRIP
+ $type_fees_id = 2; // TF_TRIP
$this->status = 5;
$this->fk_statut = 5;
@@ -803,32 +803,32 @@ class ExpenseReport extends CommonObject
$this->fk_user_valid = $user->id;
$this->fk_user_approve = $user->id;
- $this->note_private='Private note';
- $this->note_public='SPECIMEN';
+ $this->note_private = 'Private note';
+ $this->note_public = 'SPECIMEN';
$nbp = 5;
$xnbp = 0;
while ($xnbp < $nbp) {
- $line=new ExpenseReportLine($this->db);
- $line->comments=$langs->trans("Comment")." ".$xnbp;
- $line->date=($now-3600*(1+$xnbp));
- $line->total_ht=100;
- $line->total_tva=20;
- $line->total_ttc=120;
- $line->qty=1;
- $line->vatrate=20;
- $line->value_unit=120;
- $line->fk_expensereport=0;
- $line->type_fees_code='TRA';
- $line->fk_c_type_fees=$type_fees_id;
+ $line = new ExpenseReportLine($this->db);
+ $line->comments = $langs->trans("Comment")." ".$xnbp;
+ $line->date = ($now - 3600 * (1 + $xnbp));
+ $line->total_ht = 100;
+ $line->total_tva = 20;
+ $line->total_ttc = 120;
+ $line->qty = 1;
+ $line->vatrate = 20;
+ $line->value_unit = 120;
+ $line->fk_expensereport = 0;
+ $line->type_fees_code = 'TRA';
+ $line->fk_c_type_fees = $type_fees_id;
$line->projet_ref = 'ABC';
- $this->lines[$xnbp]=$line;
+ $this->lines[$xnbp] = $line;
$xnbp++;
- $this->total_ht+=$line->total_ht;
- $this->total_tva+=$line->total_tva;
- $this->total_ttc+=$line->total_ttc;
+ $this->total_ht += $line->total_ht;
+ $this->total_tva += $line->total_tva;
+ $this->total_ttc += $line->total_ttc;
}
}
@@ -843,17 +843,17 @@ class ExpenseReport extends CommonObject
public function fetch_line_by_project($projectid, $user = '')
{
// phpcs:enable
- global $conf,$db,$langs;
+ global $conf, $db, $langs;
$langs->load('trips');
if ($user->rights->expensereport->lire) {
$sql = "SELECT de.fk_expensereport, de.date, de.comments, de.total_ht, de.total_ttc";
- $sql.= " FROM ".MAIN_DB_PREFIX."expensereport_det as de";
- $sql.= " WHERE de.fk_projet = ".$projectid;
+ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as de";
+ $sql .= " WHERE de.fk_projet = ".$projectid;
dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
- $result = $db->query($sql) ;
+ $result = $db->query($sql);
if ($result)
{
$num = $db->num_rows($result);
@@ -866,8 +866,8 @@ class ExpenseReport extends CommonObject
$objp = $db->fetch_object($result);
$sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_statut";
- $sql2.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
- $sql2.= " WHERE d.rowid = '".$objp->fk_expensereport."'";
+ $sql2 .= " FROM ".MAIN_DB_PREFIX."expensereport as d";
+ $sql2 .= " WHERE d.rowid = '".$objp->fk_expensereport."'";
$result2 = $db->query($sql2);
$obj = $db->fetch_object($result2);
@@ -891,7 +891,7 @@ class ExpenseReport extends CommonObject
print ' '.price($objp->total_ttc).' ';
print '';
- switch($objp->fk_c_expensereport_status) {
+ switch ($objp->fk_c_expensereport_status) {
case 4:
print img_picto($langs->trans('StatusOrderCanceled'), 'statut5');
break;
@@ -930,7 +930,7 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$db->lasterror();
+ $this->error = $db->lasterror();
return -1;
}
}
@@ -946,42 +946,42 @@ class ExpenseReport extends CommonObject
public function recalculer($id)
{
$sql = 'SELECT tt.total_ht, tt.total_ttc, tt.total_tva';
- $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as tt';
- $sql.= ' WHERE tt.'.$this->fk_element.' = '.$id;
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as tt';
+ $sql .= ' WHERE tt.'.$this->fk_element.' = '.$id;
$total_ht = 0; $total_tva = 0; $total_ttc = 0;
$result = $this->db->query($sql);
- if($result)
+ if ($result)
{
$num = $this->db->num_rows($result);
$i = 0;
while ($i < $num):
$objp = $this->db->fetch_object($result);
- $total_ht+=$objp->total_ht;
- $total_tva+=$objp->total_tva;
+ $total_ht += $objp->total_ht;
+ $total_tva += $objp->total_tva;
$i++;
endwhile;
$total_ttc = $total_ht + $total_tva;
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
- $sql.= " total_ht = ".$total_ht;
- $sql.= " , total_ttc = ".$total_ttc;
- $sql.= " , total_tva = ".$total_tva;
- $sql.= " WHERE rowid = ".$id;
+ $sql .= " total_ht = ".$total_ht;
+ $sql .= " , total_ttc = ".$total_ttc;
+ $sql .= " , total_tva = ".$total_tva;
+ $sql .= " WHERE rowid = ".$id;
$result = $this->db->query($sql);
if ($result):
$this->db->free($result);
return 1;
else:
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
return -3;
endif;
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::recalculer: Error ".$this->error, LOG_ERR);
return -3;
}
@@ -996,24 +996,24 @@ class ExpenseReport extends CommonObject
public function fetch_lines()
{
// phpcs:enable
- $this->lines=array();
+ $this->lines = array();
$sql = ' SELECT de.rowid, de.comments, de.qty, de.value_unit, de.date, de.rang,';
- $sql.= ' de.'.$this->fk_element.', de.fk_c_type_fees, de.fk_c_exp_tax_cat, de.fk_projet as fk_project, de.tva_tx, de.fk_ecm_files,';
- $sql.= ' de.total_ht, de.total_tva, de.total_ttc,';
- $sql.= ' ctf.code as code_type_fees, ctf.label as libelle_type_fees,';
- $sql.= ' p.ref as ref_projet, p.title as title_projet';
- $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as de';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON de.fk_c_type_fees = ctf.id';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON de.fk_projet = p.rowid';
- $sql.= ' WHERE de.'.$this->fk_element.' = '.$this->id;
- if (! empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID))
+ $sql .= ' de.'.$this->fk_element.', de.fk_c_type_fees, de.fk_c_exp_tax_cat, de.fk_projet as fk_project, de.tva_tx, de.fk_ecm_files,';
+ $sql .= ' de.total_ht, de.total_tva, de.total_ttc,';
+ $sql .= ' ctf.code as code_type_fees, ctf.label as libelle_type_fees,';
+ $sql .= ' p.ref as ref_projet, p.title as title_projet';
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as de';
+ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON de.fk_c_type_fees = ctf.id';
+ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON de.fk_projet = p.rowid';
+ $sql .= ' WHERE de.'.$this->fk_element.' = '.$this->id;
+ if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID))
{
- $sql.= ' ORDER BY de.rang ASC, de.rowid ASC';
+ $sql .= ' ORDER BY de.rang ASC, de.rowid ASC';
}
else
{
- $sql.= ' ORDER BY de.rang ASC, de.date ASC';
+ $sql .= ' ORDER BY de.rang ASC, de.date ASC';
}
$resql = $this->db->query($sql);
@@ -1038,7 +1038,7 @@ class ExpenseReport extends CommonObject
$deplig->fk_expensereport = $objp->fk_expensereport;
$deplig->fk_c_type_fees = $objp->fk_c_type_fees;
$deplig->fk_c_exp_tax_cat = $objp->fk_c_exp_tax_cat;
- $deplig->fk_projet = $objp->fk_project; // deprecated
+ $deplig->fk_projet = $objp->fk_project; // deprecated
$deplig->fk_project = $objp->fk_project;
$deplig->fk_ecm_files = $objp->fk_ecm_files;
@@ -1046,9 +1046,9 @@ class ExpenseReport extends CommonObject
$deplig->total_tva = $objp->total_tva;
$deplig->total_ttc = $objp->total_ttc;
- $deplig->type_fees_code = empty($objp->code_type_fees)?'TF_OTHER':$objp->code_type_fees;
+ $deplig->type_fees_code = empty($objp->code_type_fees) ? 'TF_OTHER' : $objp->code_type_fees;
$deplig->type_fees_libelle = $objp->libelle_type_fees;
- $deplig->tva_tx = $objp->tva_tx;
+ $deplig->tva_tx = $objp->tva_tx;
$deplig->vatrate = $objp->tva_tx;
$deplig->projet_ref = $objp->ref_projet;
$deplig->projet_title = $objp->title_projet;
@@ -1064,7 +1064,7 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::fetch_lines: Error ".$this->error, LOG_ERR);
return -3;
}
@@ -1079,15 +1079,15 @@ class ExpenseReport extends CommonObject
*/
public function delete(User $fuser = null)
{
- global $user,$langs,$conf;
+ global $user, $langs, $conf;
- if (! $rowid) $rowid=$this->id;
+ if (!$rowid) $rowid = $this->id;
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line.' WHERE '.$this->fk_element.' = '.$rowid;
if ($this->db->query($sql))
{
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid = '.$rowid;
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$this->db->commit();
@@ -1095,7 +1095,7 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$this->db->error()." sql=".$sql;
+ $this->error = $this->db->error()." sql=".$sql;
dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
$this->db->rollback();
return -6;
@@ -1103,7 +1103,7 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$this->db->error()." sql=".$sql;
+ $this->error = $this->db->error()." sql=".$sql;
dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
$this->db->rollback();
return -4;
@@ -1119,7 +1119,7 @@ class ExpenseReport extends CommonObject
*/
public function setValidate($fuser, $notrigger = 0)
{
- global $conf,$langs,$user;
+ global $conf, $langs, $user;
$error = 0;
$now = dol_now();
@@ -1131,10 +1131,10 @@ class ExpenseReport extends CommonObject
return 0;
}
- $this->date_valid = $now; // Required for the getNextNum later.
+ $this->date_valid = $now; // Required for the getNextNum later.
// Define new ref
- if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+ if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
{
$num = $this->getNextNumRef();
}
@@ -1150,26 +1150,26 @@ class ExpenseReport extends CommonObject
// Validate
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
- $sql.= " SET ref = '".$num."',";
- $sql.= " fk_statut = ".self::STATUS_VALIDATED.",";
- $sql.= " date_valid='".$this->db->idate($this->date_valid)."',";
- $sql.= " fk_user_valid = ".$user->id;
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= " SET ref = '".$num."',";
+ $sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
+ $sql .= " date_valid='".$this->db->idate($this->date_valid)."',";
+ $sql .= " fk_user_valid = ".$user->id;
+ $sql .= " WHERE rowid = ".$this->id;
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
- if (! $error && ! $notrigger)
+ if (!$error && !$notrigger)
{
// Call trigger
- $result=$this->call_trigger('EXPENSE_REPORT_VALIDATE', $fuser);
+ $result = $this->call_trigger('EXPENSE_REPORT_VALIDATE', $fuser);
if ($result < 0) {
$error++;
}
// End call triggers
}
- if (! $error)
+ if (!$error)
{
$this->oldref = $this->ref;
@@ -1179,17 +1179,17 @@ class ExpenseReport extends CommonObject
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
// Now we rename also files into index
- $sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref)+1).")), filepath = 'expensereport/".$this->db->escape($this->newref)."'";
- $sql.= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expensereport/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+ $sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'expensereport/".$this->db->escape($this->newref)."'";
+ $sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expensereport/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
$resql = $this->db->query($sql);
- if (! $resql) { $error++; $this->error = $this->db->lasterror(); }
+ if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
$oldref = dol_sanitizeFileName($this->ref);
$newref = dol_sanitizeFileName($num);
$dirsource = $conf->expensereport->dir_output.'/'.$oldref;
$dirdest = $conf->expensereport->dir_output.'/'.$newref;
- if (! $error && file_exists($dirsource))
+ if (!$error && file_exists($dirsource))
{
dol_syslog(get_class($this)."::setValidate() rename dir ".$dirsource." into ".$dirdest);
@@ -1197,13 +1197,13 @@ class ExpenseReport extends CommonObject
{
dol_syslog("Rename ok");
// Rename docs starting with $oldref with $newref
- $listoffiles=dol_dir_list($conf->expensereport->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
- foreach($listoffiles as $fileentry)
+ $listoffiles = dol_dir_list($conf->expensereport->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+ foreach ($listoffiles as $fileentry)
{
- $dirsource=$fileentry['name'];
- $dirdest=preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
- $dirsource=$fileentry['path'].'/'.$dirsource;
- $dirdest=$fileentry['path'].'/'.$dirdest;
+ $dirsource = $fileentry['name'];
+ $dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+ $dirsource = $fileentry['path'].'/'.$dirsource;
+ $dirdest = $fileentry['path'].'/'.$dirdest;
@rename($dirsource, $dirdest);
}
}
@@ -1212,7 +1212,7 @@ class ExpenseReport extends CommonObject
}
// Set new ref and current status
- if (! $error)
+ if (!$error)
{
$this->ref = $num;
$this->statut = self::STATUS_VALIDATED;
@@ -1226,14 +1226,14 @@ class ExpenseReport extends CommonObject
else
{
$this->db->rollback();
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -2;
}
}
else
{
$this->db->rollback();
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
@@ -1248,12 +1248,12 @@ class ExpenseReport extends CommonObject
public function set_save_from_refuse($fuser)
{
// phpcs:enable
- global $conf,$langs;
+ global $conf, $langs;
// Sélection de la date de début de la NDF
$sql = 'SELECT date_debut';
- $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
- $sql.= ' WHERE rowid = '.$this->id;
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+ $sql .= ' WHERE rowid = '.$this->id;
$result = $this->db->query($sql);
@@ -1264,8 +1264,8 @@ class ExpenseReport extends CommonObject
if ($this->fk_statut != self::STATUS_VALIDATED)
{
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
- $sql.= " SET fk_statut = ".self::STATUS_VALIDATED;
- $sql.= ' WHERE rowid = '.$this->id;
+ $sql .= " SET fk_statut = ".self::STATUS_VALIDATED;
+ $sql .= ' WHERE rowid = '.$this->id;
dol_syslog(get_class($this)."::set_save_from_refuse sql=".$sql, LOG_DEBUG);
@@ -1275,7 +1275,7 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
@@ -1294,7 +1294,7 @@ class ExpenseReport extends CommonObject
*/
public function setApproved($fuser, $notrigger = 0)
{
- $now=dol_now();
+ $now = dol_now();
$error = 0;
// date approval
@@ -1304,15 +1304,15 @@ class ExpenseReport extends CommonObject
$this->db->begin();
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
- $sql.= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_APPROVED.", fk_user_approve = ".$fuser->id.",";
- $sql.= " date_approve='".$this->db->idate($this->date_approve)."'";
- $sql.= ' WHERE rowid = '.$this->id;
+ $sql .= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_APPROVED.", fk_user_approve = ".$fuser->id.",";
+ $sql .= " date_approve='".$this->db->idate($this->date_approve)."'";
+ $sql .= ' WHERE rowid = '.$this->id;
if ($this->db->query($sql))
{
if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('EXPENSE_REPORT_APPROVE', $fuser);
+ $result = $this->call_trigger('EXPENSE_REPORT_APPROVE', $fuser);
if ($result < 0) {
$error++;
@@ -1328,14 +1328,14 @@ class ExpenseReport extends CommonObject
else
{
$this->db->rollback();
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -2;
}
}
else
{
$this->db->rollback();
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
@@ -1364,11 +1364,11 @@ class ExpenseReport extends CommonObject
if ($this->fk_statut != self::STATUS_REFUSED)
{
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
- $sql.= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_REFUSED.", fk_user_refuse = ".$fuser->id.",";
- $sql.= " date_refuse='".$this->db->idate($now)."',";
- $sql.= " detail_refuse='".$this->db->escape($details)."',";
- $sql.= " fk_user_approve = NULL";
- $sql.= ' WHERE rowid = '.$this->id;
+ $sql .= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_REFUSED.", fk_user_refuse = ".$fuser->id.",";
+ $sql .= " date_refuse='".$this->db->idate($now)."',";
+ $sql .= " detail_refuse='".$this->db->escape($details)."',";
+ $sql .= " fk_user_approve = NULL";
+ $sql .= ' WHERE rowid = '.$this->id;
if ($this->db->query($sql))
{
$this->fk_statut = 99;
@@ -1379,7 +1379,7 @@ class ExpenseReport extends CommonObject
if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('EXPENSE_REPORT_DENY', $fuser);
+ $result = $this->call_trigger('EXPENSE_REPORT_DENY', $fuser);
if ($result < 0) {
$error++;
@@ -1395,14 +1395,14 @@ class ExpenseReport extends CommonObject
else
{
$this->db->rollback();
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -2;
}
}
else
{
$this->db->rollback();
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
@@ -1430,8 +1430,8 @@ class ExpenseReport extends CommonObject
$this->db->begin();
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
- $sql.= " SET paid = 0, fk_statut = ".self::STATUS_APPROVED;
- $sql.= ' WHERE rowid = '.$this->id;
+ $sql .= " SET paid = 0, fk_statut = ".self::STATUS_APPROVED;
+ $sql .= ' WHERE rowid = '.$this->id;
dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
@@ -1440,7 +1440,7 @@ class ExpenseReport extends CommonObject
if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('EXPENSE_REPORT_UNPAID', $fuser);
+ $result = $this->call_trigger('EXPENSE_REPORT_UNPAID', $fuser);
if ($result < 0) {
$error++;
@@ -1456,14 +1456,14 @@ class ExpenseReport extends CommonObject
else
{
$this->db->rollback();
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -2;
}
}
else
{
$this->db->rollback();
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
}
@@ -1492,10 +1492,10 @@ class ExpenseReport extends CommonObject
$this->db->begin();
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
- $sql.= " SET fk_statut = ".self::STATUS_CANCELED.", fk_user_cancel = ".$fuser->id;
- $sql.= ", date_cancel='".$this->db->idate($this->date_cancel)."'";
- $sql.= " ,detail_cancel='".$this->db->escape($detail)."'";
- $sql.= ' WHERE rowid = '.$this->id;
+ $sql .= " SET fk_statut = ".self::STATUS_CANCELED.", fk_user_cancel = ".$fuser->id;
+ $sql .= ", date_cancel='".$this->db->idate($this->date_cancel)."'";
+ $sql .= " ,detail_cancel='".$this->db->escape($detail)."'";
+ $sql .= ' WHERE rowid = '.$this->id;
dol_syslog(get_class($this)."::set_cancel sql=".$sql, LOG_DEBUG);
@@ -1504,7 +1504,7 @@ class ExpenseReport extends CommonObject
if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('EXPENSE_REPORT_CANCEL', $fuser);
+ $result = $this->call_trigger('EXPENSE_REPORT_CANCEL', $fuser);
if ($result < 0) {
$error++;
@@ -1520,14 +1520,14 @@ class ExpenseReport extends CommonObject
else
{
$this->db->rollback();
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -2;
}
}
else
{
$this->db->rollback();
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
}
@@ -1547,21 +1547,21 @@ class ExpenseReport extends CommonObject
global $langs, $conf;
$langs->load("trips");
- if (! empty($conf->global->EXPENSEREPORT_ADDON))
+ if (!empty($conf->global->EXPENSEREPORT_ADDON))
{
- $mybool=false;
+ $mybool = false;
$file = $conf->global->EXPENSEREPORT_ADDON.".php";
$classname = $conf->global->EXPENSEREPORT_ADDON;
// Include file with class
- $dirmodels=array_merge(array('/'), (array) $conf->modules_parts['models']);
+ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
foreach ($dirmodels as $reldir)
{
$dir = dol_buildpath($reldir."core/modules/expensereport/");
// Load file with numbering class (if found)
- $mybool|=@include_once $dir.$file;
+ $mybool |= @include_once $dir.$file;
}
if ($mybool === false) {
@@ -1578,8 +1578,8 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$obj->error;
- $this->errors=$obj->errors;
+ $this->error = $obj->error;
+ $this->errors = $obj->errors;
//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
return -1;
}
@@ -1606,53 +1606,53 @@ class ExpenseReport extends CommonObject
{
global $langs, $conf;
- $result='';
+ $result = '';
$url = DOL_URL_ROOT.'/expensereport/card.php?id='.$this->id;
if ($short) return $url;
- $label = '' . $langs->trans("ShowExpenseReport") . ' ';
- if (! empty($this->ref))
- $label .= '' . $langs->trans('Ref') . ': ' . $this->ref;
- if (! empty($this->total_ht))
- $label.= '' . $langs->trans('AmountHT') . ': ' . price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
- if (! empty($this->total_tva))
- $label.= '' . $langs->trans('VAT') . ': ' . price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
- if (! empty($this->total_ttc))
- $label.= '' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
- if ($moretitle) $label.=' - '.$moretitle;
+ $label = ''.$langs->trans("ShowExpenseReport").' ';
+ if (!empty($this->ref))
+ $label .= ''.$langs->trans('Ref').': '.$this->ref;
+ if (!empty($this->total_ht))
+ $label .= ''.$langs->trans('AmountHT').': '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
+ if (!empty($this->total_tva))
+ $label .= ''.$langs->trans('VAT').': '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+ if (!empty($this->total_ttc))
+ $label .= ''.$langs->trans('AmountTTC').': '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
+ if ($moretitle) $label .= ' - '.$moretitle;
//if ($option != 'nolink')
//{
// Add param to save lastsearch_values or not
- $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
- if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
- if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+ if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
//}
- $ref=$this->ref;
- if (empty($ref)) $ref=$this->id;
+ $ref = $this->ref;
+ if (empty($ref)) $ref = $this->id;
- $linkclose='';
+ $linkclose = '';
if (empty($notooltip))
{
- if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
{
- $label=$langs->trans("ShowExpenseReport");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ $label = $langs->trans("ShowExpenseReport");
+ $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
- $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
- $linkclose.=' class="classfortooltip"';
+ $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose .= ' class="classfortooltip"';
}
$linkstart = '';
- $linkend=' ';
+ $linkstart .= $linkclose.'>';
+ $linkend = '';
$result .= $linkstart;
- if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
- if ($withpicto != 2) $result.=($max?dol_trunc($ref, $max):$ref);
+ if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ if ($withpicto != 2) $result .= ($max ?dol_trunc($ref, $max) : $ref);
$result .= $linkend;
return $result;
@@ -1674,16 +1674,16 @@ class ExpenseReport extends CommonObject
$this->total_ttc = $this->total_ht + $this->total_tva;
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
- $sql.= " total_ht = ".$this->total_ht;
- $sql.= " , total_ttc = ".$this->total_ttc;
- $sql.= " , total_tva = ".$this->total_tva;
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= " total_ht = ".$this->total_ht;
+ $sql .= " , total_ttc = ".$this->total_ttc;
+ $sql .= " , total_tva = ".$this->total_tva;
+ $sql .= " WHERE rowid = ".$this->id;
$result = $this->db->query($sql);
if ($result):
return 1;
else:
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
endif;
}
@@ -1704,16 +1704,16 @@ class ExpenseReport extends CommonObject
$this->total_ttc = $this->total_ht + $this->total_tva;
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
- $sql.= " total_ht = ".$this->total_ht;
- $sql.= " , total_ttc = ".$this->total_ttc;
- $sql.= " , total_tva = ".$this->total_tva;
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= " total_ht = ".$this->total_ht;
+ $sql .= " , total_ttc = ".$this->total_ttc;
+ $sql .= " , total_tva = ".$this->total_tva;
+ $sql .= " WHERE rowid = ".$this->id;
$result = $this->db->query($sql);
if ($result):
return 1;
else:
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
endif;
}
@@ -1749,8 +1749,8 @@ class ExpenseReport extends CommonObject
if (empty($fk_project)) $fk_project = 0;
$qty = price2num($qty);
- if (! preg_match('/\s*\((.*)\)/', $vatrate)) {
- $vatrate = price2num($vatrate); // $txtva can have format '5.0 (XXX)' or '5'
+ if (!preg_match('/\s*\((.*)\)/', $vatrate)) {
+ $vatrate = price2num($vatrate); // $txtva can have format '5.0 (XXX)' or '5'
}
$up = price2num($up);
@@ -1758,17 +1758,17 @@ class ExpenseReport extends CommonObject
$this->line = new ExpenseReportLine($this->db);
- $localtaxes_type=getLocalTaxesFromRate($vatrate, 0, $mysoc, $this->thirdparty);
+ $localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $mysoc, $this->thirdparty);
$vat_src_code = '';
if (preg_match('/\s*\((.*)\)/', $vatrate, $reg))
{
$vat_src_code = $reg[1];
- $vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
+ $vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
}
$vatrate = preg_replace('/\*/', '', $vatrate);
- $seller = ''; // seller is unknown
+ $seller = ''; // seller is unknown
$tmp = calcul_price_total($qty, $up, 0, $vatrate, 0, 0, 0, 'TTC', 0, $type, $seller, $localtaxes_type);
@@ -1785,7 +1785,7 @@ class ExpenseReport extends CommonObject
$this->line->fk_c_type_fees = $fk_c_type_fees;
$this->line->fk_c_exp_tax_cat = $fk_c_exp_tax_cat;
$this->line->comments = $comments;
- $this->line->fk_projet = $fk_project; // deprecated
+ $this->line->fk_projet = $fk_project; // deprecated
$this->line->fk_project = $fk_project;
$this->line->fk_ecm_files = $fk_ecm_files;
@@ -1793,10 +1793,10 @@ class ExpenseReport extends CommonObject
$this->applyOffset();
$this->checkRules($type, $seller);
- $result=$this->line->insert(0, true);
+ $result = $this->line->insert(0, true);
if ($result > 0)
{
- $result=$this->update_price(); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+ $result = $this->update_price(); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
if ($result > 0)
{
$this->db->commit();
@@ -1810,7 +1810,7 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$this->line->error;
+ $this->error = $this->line->error;
dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
$this->db->rollback();
return -2;
@@ -1833,7 +1833,7 @@ class ExpenseReport extends CommonObject
*/
public function checkRules($type = 0, $seller = '')
{
- global $user,$conf,$db,$langs;
+ global $user, $conf, $db, $langs;
$langs->load('trips');
@@ -1883,7 +1883,7 @@ class ExpenseReport extends CommonObject
if ($violation > 0)
{
- $tmp = calcul_price_total($this->line->qty, $new_current_total_ttc/$this->line->qty, 0, $this->line->vatrate, 0, 0, 0, 'TTC', 0, $type, $seller);
+ $tmp = calcul_price_total($this->line->qty, $new_current_total_ttc / $this->line->qty, 0, $this->line->vatrate, 0, 0, 0, 'TTC', 0, $type, $seller);
$this->line->value_unit = $tmp[5];
$this->line->total_ttc = $tmp[2];
@@ -1951,11 +1951,11 @@ class ExpenseReport extends CommonObject
public function offsetAlreadyGiven()
{
$sql = 'SELECT e.rowid FROM '.MAIN_DB_PREFIX.'expensereport e';
- $sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'expensereport_det d ON (e.rowid = d.fk_expensereport)';
- $sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees f ON (d.fk_c_type_fees = f.id AND f.code = "EX_KME")';
- $sql.= ' WHERE e.fk_user_author = '.(int) $this->fk_user_author;
- $sql.= ' AND YEAR(d.date) = "'.dol_print_date($this->line->date, '%Y').'" AND MONTH(d.date) = "'.dol_print_date($this->line->date, '%m').'"';
- if (!empty($this->line->id)) $sql.= ' AND d.rowid <> '.$this->line->id;
+ $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'expensereport_det d ON (e.rowid = d.fk_expensereport)';
+ $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees f ON (d.fk_c_type_fees = f.id AND f.code = "EX_KME")';
+ $sql .= ' WHERE e.fk_user_author = '.(int) $this->fk_user_author;
+ $sql .= ' AND YEAR(d.date) = "'.dol_print_date($this->line->date, '%Y').'" AND MONTH(d.date) = "'.dol_print_date($this->line->date, '%m').'"';
+ if (!empty($this->line->id)) $sql .= ' AND d.rowid <> '.$this->line->id;
dol_syslog(get_class($this)."::offsetAlreadyGiven sql=".$sql);
$resql = $this->db->query($sql);
@@ -1992,24 +1992,24 @@ class ExpenseReport extends CommonObject
{
global $user, $mysoc;
- if ($this->fk_statut==0 || $this->fk_statut==99)
+ if ($this->fk_statut == 0 || $this->fk_statut == 99)
{
$this->db->begin();
- $type = 0; // TODO What if type is service ?
+ $type = 0; // TODO What if type is service ?
// We don't know seller and buyer for expense reports
$seller = $mysoc;
$buyer = new Societe($this->db);
- $localtaxes_type=getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
+ $localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
// Clean vat code
- $vat_src_code='';
+ $vat_src_code = '';
if (preg_match('/\((.*)\)/', $vatrate, $reg))
{
$vat_src_code = $reg[1];
- $vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
+ $vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
}
$vatrate = preg_replace('/\*/', '', $vatrate);
@@ -2020,7 +2020,7 @@ class ExpenseReport extends CommonObject
$tx_tva = $vatrate / 100;
$tx_tva = $tx_tva + 1;
- $total_ht = price2num($total_ttc/$tx_tva, 'MT');
+ $total_ht = price2num($total_ttc / $tx_tva, 'MT');
$total_tva = price2num($total_ttc - $total_ht, 'MT');
// fin calculs
@@ -2031,10 +2031,10 @@ class ExpenseReport extends CommonObject
$this->line->value_unit = $value_unit;
$this->line->date = $date;
- $this->line->fk_expensereport= $expensereport_id;
+ $this->line->fk_expensereport = $expensereport_id;
$this->line->fk_c_type_fees = $type_fees_id;
- $this->line->fk_c_exp_tax_cat = $fk_c_exp_tax_cat;
- $this->line->fk_projet = $projet_id; // deprecated
+ $this->line->fk_c_exp_tax_cat = $fk_c_exp_tax_cat;
+ $this->line->fk_projet = $projet_id; // deprecated
$this->line->fk_project = $projet_id;
$this->line->vat_src_code = $vat_src_code;
@@ -2049,12 +2049,12 @@ class ExpenseReport extends CommonObject
$this->line->fk_ecm_files = $fk_ecm_files;
- $this->line->id = $rowid;
+ $this->line->id = $rowid;
// Select des infos sur le type fees
$sql = "SELECT c.code as code_type_fees, c.label as libelle_type_fees";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
- $sql.= " WHERE c.id = ".$type_fees_id;
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
+ $sql .= " WHERE c.id = ".$type_fees_id;
$resql = $this->db->query($sql);
if ($resql)
{
@@ -2066,8 +2066,8 @@ class ExpenseReport extends CommonObject
// Select des informations du projet
$sql = "SELECT p.ref as ref_projet, p.title as title_projet";
- $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
- $sql.= " WHERE p.rowid = ".$projet_id;
+ $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
+ $sql .= " WHERE p.rowid = ".$projet_id;
$resql = $this->db->query($sql);
if ($resql) {
$objp_projet = $this->db->fetch_object($resql);
@@ -2087,8 +2087,8 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$this->line->error;
- $this->errors=$this->line->errors;
+ $this->error = $this->line->error;
+ $this->errors = $this->line->errors;
$this->db->rollback();
return -2;
}
@@ -2107,13 +2107,13 @@ class ExpenseReport extends CommonObject
$this->db->begin();
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line;
- $sql.= ' WHERE rowid = '.$rowid;
+ $sql .= ' WHERE rowid = '.$rowid;
dol_syslog(get_class($this)."::deleteline sql=".$sql);
$result = $this->db->query($sql);
if (!$result)
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
dol_syslog(get_class($this)."::deleteline Error ".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
@@ -2137,8 +2137,8 @@ class ExpenseReport extends CommonObject
{
// phpcs:enable
$sql = "SELECT rowid, date_debut, date_fin";
- $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element;
- $sql.= " WHERE fk_user_author = '{$fuser->id}'";
+ $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+ $sql .= " WHERE fk_user_author = '{$fuser->id}'";
dol_syslog(get_class($this)."::periode_existe sql=".$sql);
$result = $this->db->query($sql);
@@ -2157,14 +2157,14 @@ class ExpenseReport extends CommonObject
$objp = $this->db->fetch_object($result);
$date_d_req = $this->db->jdate($objp->date_debut); // 3
- $date_f_req = $this->db->jdate($objp->date_fin); // 4
+ $date_f_req = $this->db->jdate($objp->date_fin); // 4
if (!($date_f_form < $date_d_req || $date_d_form > $date_f_req)) $existe = true;
$i++;
}
- if($existe) return 1;
+ if ($existe) return 1;
else return 0;
}
else
@@ -2174,7 +2174,7 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::periode_existe Error ".$this->error, LOG_ERR);
return -1;
}
@@ -2191,20 +2191,20 @@ class ExpenseReport extends CommonObject
public function fetch_users_approver_expensereport()
{
// phpcs:enable
- $users_validator=array();
+ $users_validator = array();
$sql = "SELECT DISTINCT ur.fk_user";
- $sql.= " FROM ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
- $sql.= " WHERE ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'"; // Permission 'Approve';
- $sql.= "UNION";
- $sql.= " SELECT DISTINCT ugu.fk_user";
- $sql.= " FROM ".MAIN_DB_PREFIX."usergroup_user as ugu, ".MAIN_DB_PREFIX."usergroup_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
- $sql.= " WHERE ugu.fk_usergroup = ur.fk_usergroup AND ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'"; // Permission 'Approve';
+ $sql .= " FROM ".MAIN_DB_PREFIX."user_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
+ $sql .= " WHERE ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'"; // Permission 'Approve';
+ $sql .= "UNION";
+ $sql .= " SELECT DISTINCT ugu.fk_user";
+ $sql .= " FROM ".MAIN_DB_PREFIX."usergroup_user as ugu, ".MAIN_DB_PREFIX."usergroup_rights as ur, ".MAIN_DB_PREFIX."rights_def as rd";
+ $sql .= " WHERE ugu.fk_usergroup = ur.fk_usergroup AND ur.fk_id = rd.id and rd.module = 'expensereport' AND rd.perms = 'approve'"; // Permission 'Approve';
//print $sql;
dol_syslog(get_class($this)."::fetch_users_approver_expensereport sql=".$sql);
$result = $this->db->query($sql);
- if($result)
+ if ($result)
{
$num_rows = $this->db->num_rows($result); $i = 0;
while ($i < $num_rows)
@@ -2217,7 +2217,7 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
dol_syslog(get_class($this)."::fetch_users_approver_expensereport Error ".$this->error, LOG_ERR);
return -1;
}
@@ -2236,16 +2236,16 @@ class ExpenseReport extends CommonObject
*/
public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
{
- global $conf,$langs;
+ global $conf, $langs;
$langs->load("trips");
- if (! dol_strlen($modele)) {
+ if (!dol_strlen($modele)) {
$modele = 'standard';
if ($this->modelpdf) {
$modele = $this->modelpdf;
- } elseif (! empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
+ } elseif (!empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
$modele = $conf->global->EXPENSEREPORT_ADDON_PDF;
}
}
@@ -2264,20 +2264,20 @@ class ExpenseReport extends CommonObject
public function listOfTypes($active = 1)
{
global $langs;
- $ret=array();
+ $ret = array();
$sql = "SELECT id, code, label";
- $sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees";
- $sql.= " WHERE active = ".$active;
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees";
+ $sql .= " WHERE active = ".$active;
dol_syslog(get_class($this)."::listOfTypes", LOG_DEBUG);
$result = $this->db->query($sql);
- if ( $result )
+ if ($result)
{
$num = $this->db->num_rows($result);
- $i=0;
+ $i = 0;
while ($i < $num)
{
$obj = $this->db->fetch_object($result);
- $ret[$obj->code]=(($langs->trans($obj->code)!=$obj->code)?$langs->trans($obj->code):$obj->label);
+ $ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
$i++;
}
}
@@ -2299,17 +2299,17 @@ class ExpenseReport extends CommonObject
// phpcs:enable
global $conf;
- $this->nb=array();
+ $this->nb = array();
$sql = "SELECT count(ex.rowid) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
- $sql.= " WHERE ex.fk_statut > 0";
- $sql.= " AND ex.entity IN (".getEntity('expensereport').")";
+ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
+ $sql .= " WHERE ex.fk_statut > 0";
+ $sql .= " AND ex.entity IN (".getEntity('expensereport').")";
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql) {
- while ($obj=$this->db->fetch_object($resql)) {
- $this->nb["expensereports"]=$obj->nb;
+ while ($obj = $this->db->fetch_object($resql)) {
+ $this->nb["expensereports"] = $obj->nb;
}
$this->db->free($resql);
return 1;
@@ -2317,7 +2317,7 @@ class ExpenseReport extends CommonObject
else
{
dol_print_error($this->db);
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
}
@@ -2335,21 +2335,21 @@ class ExpenseReport extends CommonObject
// phpcs:enable
global $conf, $langs;
- if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
+ if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
- $now=dol_now();
+ $now = dol_now();
$userchildids = $user->getAllChildIds(1);
$sql = "SELECT ex.rowid, ex.date_valid";
- $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
- if ($option == 'toapprove') $sql.= " WHERE ex.fk_statut = 2";
- else $sql.= " WHERE ex.fk_statut = 5";
- $sql.= " AND ex.entity IN (".getEntity('expensereport').")";
- $sql.= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
- $sql.= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
+ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
+ if ($option == 'toapprove') $sql .= " WHERE ex.fk_statut = 2";
+ else $sql .= " WHERE ex.fk_statut = 5";
+ $sql .= " AND ex.entity IN (".getEntity('expensereport').")";
+ $sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
+ $sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$langs->load("trips");
@@ -2357,21 +2357,21 @@ class ExpenseReport extends CommonObject
$response = new WorkboardResponse();
if ($option == 'toapprove')
{
- $response->warning_delay=$conf->expensereport->approve->warning_delay/60/60/24;
- $response->label=$langs->trans("ExpenseReportsToApprove");
- $response->labelShort=$langs->trans("ToApprove");
- $response->url=DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&statut=2';
+ $response->warning_delay = $conf->expensereport->approve->warning_delay / 60 / 60 / 24;
+ $response->label = $langs->trans("ExpenseReportsToApprove");
+ $response->labelShort = $langs->trans("ToApprove");
+ $response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&statut=2';
}
else
{
- $response->warning_delay=$conf->expensereport->payment->warning_delay/60/60/24;
- $response->label=$langs->trans("ExpenseReportsToPay");
- $response->labelShort=$langs->trans("StatusToPay");
- $response->url=DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&statut=5';
+ $response->warning_delay = $conf->expensereport->payment->warning_delay / 60 / 60 / 24;
+ $response->label = $langs->trans("ExpenseReportsToPay");
+ $response->labelShort = $langs->trans("StatusToPay");
+ $response->url = DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&statut=5';
}
- $response->img=img_object('', "trip");
+ $response->img = img_object('', "trip");
- while ($obj=$this->db->fetch_object($resql))
+ while ($obj = $this->db->fetch_object($resql))
{
$response->nbtodo++;
@@ -2394,7 +2394,7 @@ class ExpenseReport extends CommonObject
else
{
dol_print_error($this->db);
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
}
@@ -2416,10 +2416,10 @@ class ExpenseReport extends CommonObject
$now = dol_now();
if ($option == 'toapprove')
{
- return ($this->datevalid?$this->datevalid:$this->date_valid) < ($now - $conf->expensereport->approve->warning_delay);
+ return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->approve->warning_delay);
}
else
- return ($this->datevalid?$this->datevalid:$this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
+ return ($this->datevalid ? $this->datevalid : $this->date_valid) < ($now - $conf->expensereport->payment->warning_delay);
}
/**
@@ -2463,15 +2463,15 @@ class ExpenseReport extends CommonObject
*/
public function getSumPayments()
{
- $table='payment_expensereport';
- $field='fk_expensereport';
+ $table = 'payment_expensereport';
+ $field = 'fk_expensereport';
$sql = 'SELECT sum(amount) as amount';
- $sql.= ' FROM '.MAIN_DB_PREFIX.$table;
- $sql.= ' WHERE '.$field.' = '.$this->id;
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$table;
+ $sql .= ' WHERE '.$field.' = '.$this->id;
dol_syslog(get_class($this)."::getSumPayments", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$obj = $this->db->fetch_object($resql);
@@ -2480,7 +2480,7 @@ class ExpenseReport extends CommonObject
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
@@ -2500,7 +2500,7 @@ class ExpenseReportLine
/**
* @var string Error code (or message)
*/
- public $error='';
+ public $error = '';
/**
* @var int ID
@@ -2556,7 +2556,7 @@ class ExpenseReportLine
*/
public function __construct($db)
{
- $this->db= $db;
+ $this->db = $db;
}
/**
@@ -2568,17 +2568,17 @@ class ExpenseReportLine
public function fetch($rowid)
{
$sql = 'SELECT fde.rowid, fde.fk_expensereport, fde.fk_c_type_fees, fde.fk_c_exp_tax_cat, fde.fk_projet as fk_project, fde.date,';
- $sql.= ' fde.tva_tx as vatrate, fde.vat_src_code, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc, fde.fk_ecm_files,';
- $sql.= ' ctf.code as type_fees_code, ctf.label as type_fees_libelle,';
- $sql.= ' pjt.rowid as projet_id, pjt.title as projet_title, pjt.ref as projet_ref';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport_det as fde';
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON fde.fk_c_type_fees=ctf.id'; // Sometimes type of expense report has been removed, so we use a left join here.
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pjt ON fde.fk_projet=pjt.rowid';
- $sql.= ' WHERE fde.rowid = '.$rowid;
+ $sql .= ' fde.tva_tx as vatrate, fde.vat_src_code, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc, fde.fk_ecm_files,';
+ $sql .= ' ctf.code as type_fees_code, ctf.label as type_fees_libelle,';
+ $sql .= ' pjt.rowid as projet_id, pjt.title as projet_title, pjt.ref as projet_ref';
+ $sql .= ' FROM '.MAIN_DB_PREFIX.'expensereport_det as fde';
+ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON fde.fk_c_type_fees=ctf.id'; // Sometimes type of expense report has been removed, so we use a left join here.
+ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pjt ON fde.fk_projet=pjt.rowid';
+ $sql .= ' WHERE fde.rowid = '.$rowid;
$result = $this->db->query($sql);
- if($result)
+ if ($result)
{
$objp = $this->db->fetch_object($result);
@@ -2593,7 +2593,7 @@ class ExpenseReportLine
$this->value_unit = $objp->value_unit;
$this->fk_c_type_fees = $objp->fk_c_type_fees;
$this->fk_c_exp_tax_cat = $objp->fk_c_exp_tax_cat;
- $this->fk_projet = $objp->fk_project; // deprecated
+ $this->fk_projet = $objp->fk_project; // deprecated
$this->fk_project = $objp->fk_project;
$this->type_fees_code = $objp->type_fees_code;
$this->type_fees_libelle = $objp->type_fees_libelle;
@@ -2623,13 +2623,13 @@ class ExpenseReportLine
{
global $langs, $user, $conf;
- $error=0;
+ $error = 0;
dol_syslog("ExpenseReportLine::Insert rang=".$this->rang, LOG_DEBUG);
// Clean parameters
- $this->comments=trim($this->comments);
- if (!$this->value_unit_HT) $this->value_unit_HT=0;
+ $this->comments = trim($this->comments);
+ if (!$this->value_unit_HT) $this->value_unit_HT = 0;
$this->qty = price2num($this->qty);
$this->vatrate = price2num($this->vatrate);
if (empty($this->fk_c_exp_tax_cat)) $this->fk_c_exp_tax_cat = 0;
@@ -2637,33 +2637,33 @@ class ExpenseReportLine
$this->db->begin();
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'expensereport_det';
- $sql.= ' (fk_expensereport, fk_c_type_fees, fk_projet,';
- $sql.= ' tva_tx, vat_src_code, comments, qty, value_unit, total_ht, total_tva, total_ttc, date, rule_warning_message, fk_c_exp_tax_cat, fk_ecm_files)';
- $sql.= " VALUES (".$this->db->escape($this->fk_expensereport).",";
- $sql.= " ".$this->db->escape($this->fk_c_type_fees).",";
- $sql.= " ".$this->db->escape($this->fk_project>0?$this->fk_project:($this->fk_projet>0?$this->fk_projet:'null')).",";
- $sql.= " ".$this->db->escape($this->vatrate).",";
- $sql.= " '".$this->db->escape($this->vat_src_code)."',";
- $sql.= " '".$this->db->escape($this->comments)."',";
- $sql.= " ".$this->db->escape($this->qty).",";
- $sql.= " ".$this->db->escape($this->value_unit).",";
- $sql.= " ".$this->db->escape($this->total_ht).",";
- $sql.= " ".$this->db->escape($this->total_tva).",";
- $sql.= " ".$this->db->escape($this->total_ttc).",";
- $sql.= "'".$this->db->idate($this->date)."',";
- $sql.= " '".$this->db->escape($this->rule_warning_message)."',";
- $sql.= " ".$this->db->escape($this->fk_c_exp_tax_cat).",";
- $sql.= " ".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
- $sql.= ")";
+ $sql .= ' (fk_expensereport, fk_c_type_fees, fk_projet,';
+ $sql .= ' tva_tx, vat_src_code, comments, qty, value_unit, total_ht, total_tva, total_ttc, date, rule_warning_message, fk_c_exp_tax_cat, fk_ecm_files)';
+ $sql .= " VALUES (".$this->db->escape($this->fk_expensereport).",";
+ $sql .= " ".$this->db->escape($this->fk_c_type_fees).",";
+ $sql .= " ".$this->db->escape($this->fk_project > 0 ? $this->fk_project : ($this->fk_projet > 0 ? $this->fk_projet : 'null')).",";
+ $sql .= " ".$this->db->escape($this->vatrate).",";
+ $sql .= " '".$this->db->escape($this->vat_src_code)."',";
+ $sql .= " '".$this->db->escape($this->comments)."',";
+ $sql .= " ".$this->db->escape($this->qty).",";
+ $sql .= " ".$this->db->escape($this->value_unit).",";
+ $sql .= " ".$this->db->escape($this->total_ht).",";
+ $sql .= " ".$this->db->escape($this->total_tva).",";
+ $sql .= " ".$this->db->escape($this->total_ttc).",";
+ $sql .= "'".$this->db->idate($this->date)."',";
+ $sql .= " '".$this->db->escape($this->rule_warning_message)."',";
+ $sql .= " ".$this->db->escape($this->fk_c_exp_tax_cat).",";
+ $sql .= " ".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
+ $sql .= ")";
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
- $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.'expensereport_det');
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'expensereport_det');
- if (! $fromaddline)
+ if (!$fromaddline)
{
- $tmpparent=new ExpenseReport($this->db);
+ $tmpparent = new ExpenseReport($this->db);
$tmpparent->fetch($this->fk_expensereport);
$result = $tmpparent->update_price();
if ($result < 0)
@@ -2679,14 +2679,14 @@ class ExpenseReportLine
$error++;
}
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return $this->rowid;
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
dol_syslog("ExpenseReportLine::insert Error ".$this->error, LOG_ERR);
$this->db->rollback();
return -2;
@@ -2709,11 +2709,11 @@ class ExpenseReportLine
$sql .= ' FROM '.MAIN_DB_PREFIX.'expensereport_det d';
$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'expensereport e ON (d.fk_expensereport = e.rowid)';
$sql .= ' WHERE e.fk_user_author = '.$fk_user;
- if (!empty($this->id)) $sql.= ' AND d.rowid <> '.$this->id;
+ if (!empty($this->id)) $sql .= ' AND d.rowid <> '.$this->id;
$sql .= ' AND d.fk_c_type_fees = '.$rule->fk_c_type_fees;
if ($mode == 'day' || $mode == 'EX_DAY') $sql .= ' AND d.date = \''.dol_print_date($this->date, '%Y-%m-%d').'\'';
- elseif ($mode == 'mon' || $mode == 'EX_MON') $sql .= ' AND DATE_FORMAT(d.date, \'%Y-%m\') = \''.dol_print_date($this->date, '%Y-%m').'\''; // @todo DATE_FORMAT is forbidden
- elseif ($mode == 'year' || $mode == 'EX_YEA') $sql .= ' AND DATE_FORMAT(d.date, \'%Y\') = \''.dol_print_date($this->date, '%Y').'\''; // @todo DATE_FORMAT is forbidden
+ elseif ($mode == 'mon' || $mode == 'EX_MON') $sql .= ' AND DATE_FORMAT(d.date, \'%Y-%m\') = \''.dol_print_date($this->date, '%Y-%m').'\''; // @todo DATE_FORMAT is forbidden
+ elseif ($mode == 'year' || $mode == 'EX_YEA') $sql .= ' AND DATE_FORMAT(d.date, \'%Y\') = \''.dol_print_date($this->date, '%Y').'\''; // @todo DATE_FORMAT is forbidden
dol_syslog('ExpenseReportLine::getExpAmount');
@@ -2743,12 +2743,12 @@ class ExpenseReportLine
*/
public function update(User $user)
{
- global $langs,$conf;
+ global $langs, $conf;
- $error=0;
+ $error = 0;
// Clean parameters
- $this->comments=trim($this->comments);
+ $this->comments = trim($this->comments);
$this->vatrate = price2num($this->vatrate);
$this->value_unit = price2num($this->value_unit);
if (empty($this->fk_c_exp_tax_cat)) $this->fk_c_exp_tax_cat = 0;
@@ -2757,30 +2757,30 @@ class ExpenseReportLine
// Update line in database
$sql = "UPDATE ".MAIN_DB_PREFIX."expensereport_det SET";
- $sql.= " comments='".$this->db->escape($this->comments)."'";
- $sql.= ",value_unit=".$this->db->escape($this->value_unit);
- $sql.= ",qty=".$this->db->escape($this->qty);
- $sql.= ",date='".$this->db->idate($this->date)."'";
- $sql.= ",total_ht=".$this->db->escape($this->total_ht)."";
- $sql.= ",total_tva=".$this->db->escape($this->total_tva)."";
- $sql.= ",total_ttc=".$this->db->escape($this->total_ttc)."";
- $sql.= ",tva_tx=".$this->db->escape($this->vatrate);
- $sql.= ",vat_src_code='".$this->db->escape($this->vat_src_code)."'";
- $sql.= ",rule_warning_message='".$this->db->escape($this->rule_warning_message)."'";
- $sql.= ",fk_c_exp_tax_cat=".$this->db->escape($this->fk_c_exp_tax_cat);
- $sql.= ",fk_ecm_files=".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
- if ($this->fk_c_type_fees) $sql.= ",fk_c_type_fees=".$this->db->escape($this->fk_c_type_fees);
- else $sql.= ",fk_c_type_fees=null";
- if ($this->fk_project > 0) $sql.= ",fk_projet=".$this->db->escape($this->fk_project);
- else $sql.= ",fk_projet=null";
- $sql.= " WHERE rowid = ".$this->db->escape($this->rowid);
+ $sql .= " comments='".$this->db->escape($this->comments)."'";
+ $sql .= ",value_unit=".$this->db->escape($this->value_unit);
+ $sql .= ",qty=".$this->db->escape($this->qty);
+ $sql .= ",date='".$this->db->idate($this->date)."'";
+ $sql .= ",total_ht=".$this->db->escape($this->total_ht)."";
+ $sql .= ",total_tva=".$this->db->escape($this->total_tva)."";
+ $sql .= ",total_ttc=".$this->db->escape($this->total_ttc)."";
+ $sql .= ",tva_tx=".$this->db->escape($this->vatrate);
+ $sql .= ",vat_src_code='".$this->db->escape($this->vat_src_code)."'";
+ $sql .= ",rule_warning_message='".$this->db->escape($this->rule_warning_message)."'";
+ $sql .= ",fk_c_exp_tax_cat=".$this->db->escape($this->fk_c_exp_tax_cat);
+ $sql .= ",fk_ecm_files=".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
+ if ($this->fk_c_type_fees) $sql .= ",fk_c_type_fees=".$this->db->escape($this->fk_c_type_fees);
+ else $sql .= ",fk_c_type_fees=null";
+ if ($this->fk_project > 0) $sql .= ",fk_projet=".$this->db->escape($this->fk_project);
+ else $sql .= ",fk_projet=null";
+ $sql .= " WHERE rowid = ".$this->db->escape($this->rowid);
dol_syslog("ExpenseReportLine::update sql=".$sql);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
- $tmpparent=new ExpenseReport($this->db);
+ $tmpparent = new ExpenseReport($this->db);
$result = $tmpparent->fetch($this->fk_expensereport);
if ($result > 0)
{
@@ -2805,14 +2805,14 @@ class ExpenseReportLine
dol_print_error($this->db);
}
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return 1;
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
dol_syslog("ExpenseReportLine::update Error ".$this->error, LOG_ERR);
$this->db->rollback();
return -2;
@@ -2835,12 +2835,12 @@ function select_expensereport_statut($selected = '', $htmlname = 'fk_statut', $u
{
global $db, $langs;
- $tmpep=new ExpenseReport($db);
+ $tmpep = new ExpenseReport($db);
print '';
if ($useempty) print ' ';
- $arrayoflabels=$tmpep->statuts;
- if ($useshortlabel) $arrayoflabels=$tmpep->statuts_short;
+ $arrayoflabels = $tmpep->statuts;
+ if ($useshortlabel) $arrayoflabels = $tmpep->statuts_short;
foreach ($arrayoflabels as $key => $val)
{
if ($selected != '' && $selected == $key)
@@ -2868,7 +2868,7 @@ function select_expensereport_statut($selected = '', $htmlname = 'fk_statut', $u
*/
function select_type_fees_id($selected = '', $htmlname = 'type', $showempty = 0, $active = 1)
{
- global $db,$langs,$user;
+ global $db, $langs, $user;
$langs->load("trips");
print '';
@@ -2880,9 +2880,9 @@ function select_type_fees_id($selected = '', $htmlname = 'type', $showempty = 0,
}
$sql = "SELECT c.id, c.code, c.label as type FROM ".MAIN_DB_PREFIX."c_type_fees as c";
- if ($active >= 0) $sql.= " WHERE c.active = ".$active;
- $sql.= " ORDER BY c.label ASC";
- $resql=$db->query($sql);
+ if ($active >= 0) $sql .= " WHERE c.active = ".$active;
+ $sql .= " ORDER BY c.label ASC";
+ $resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 9ca729aedfc..9f180fc24b0 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -27,8 +27,8 @@
* \ingroup ficheinter
* \brief Fichier de la classe des gestion des fiches interventions
*/
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
/**
@@ -39,22 +39,22 @@ class Fichinter extends CommonObject
/**
* @var string ID to identify managed object
*/
- public $element='fichinter';
+ public $element = 'fichinter';
/**
* @var string Name of table without prefix where object is stored
*/
- public $table_element='fichinter';
+ public $table_element = 'fichinter';
/**
* @var int Field with ID of parent key if this field has a parent
*/
- public $fk_element='fk_fichinter';
+ public $fk_element = 'fk_fichinter';
/**
* @var int Name of subtable line
*/
- public $table_element_line='fichinterdet';
+ public $table_element_line = 'fichinterdet';
/**
* @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
@@ -66,7 +66,7 @@ class Fichinter extends CommonObject
*/
protected $table_ref_field = 'ref';
- public $socid; // Id client
+ public $socid; // Id client
public $author;
@@ -90,7 +90,7 @@ class Fichinter extends CommonObject
public $datem;
public $duration;
- public $statut = 0; // 0=draft, 1=validated, 2=invoiced, 3=Terminate
+ public $statut = 0; // 0=draft, 1=validated, 2=invoiced, 3=Terminate
/**
* @var string description
@@ -107,7 +107,7 @@ class Fichinter extends CommonObject
*/
public $fk_project = 0;
- public $extraparams=array();
+ public $extraparams = array();
public $lines = array();
@@ -154,26 +154,26 @@ class Fichinter extends CommonObject
// phpcs:enable
global $user;
- $this->nb=array();
+ $this->nb = array();
$clause = "WHERE";
$sql = "SELECT count(fi.rowid) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."fichinter as fi";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON fi.fk_soc = s.rowid";
+ $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as fi";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON fi.fk_soc = s.rowid";
if (!$user->rights->societe->client->voir && !$user->socid)
{
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
- $sql.= " WHERE sc.fk_user = " .$user->id;
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+ $sql .= " WHERE sc.fk_user = ".$user->id;
$clause = "AND";
}
- $sql.= " ".$clause." fi.entity IN (".getEntity('intervention').")";
+ $sql .= " ".$clause." fi.entity IN (".getEntity('intervention').")";
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
- while ($obj=$this->db->fetch_object($resql))
+ while ($obj = $this->db->fetch_object($resql))
{
- $this->nb["fichinters"]=$obj->nb;
+ $this->nb["fichinters"] = $obj->nb;
}
$this->db->free($resql);
return 1;
@@ -181,7 +181,7 @@ class Fichinter extends CommonObject
else
{
dol_print_error($this->db);
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
}
@@ -202,83 +202,83 @@ class Fichinter extends CommonObject
dol_syslog(get_class($this)."::create ref=".$this->ref);
// Check parameters
- if (! empty($this->ref)) // We check that ref is not already used
+ if (!empty($this->ref)) // We check that ref is not already used
{
- $result=self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
+ $result = self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
if ($result > 0)
{
- $this->error='ErrorRefAlreadyExists';
+ $this->error = 'ErrorRefAlreadyExists';
dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
$this->db->rollback();
return -1;
}
}
- if (! is_numeric($this->duration)) $this->duration = 0;
+ if (!is_numeric($this->duration)) $this->duration = 0;
if ($this->socid <= 0)
{
- $this->error='ErrorBadParameterForFunc';
+ $this->error = 'ErrorBadParameterForFunc';
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -1;
}
$soc = new Societe($this->db);
- $result=$soc->fetch($this->socid);
+ $result = $soc->fetch($this->socid);
- $now=dol_now();
+ $now = dol_now();
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."fichinter (";
- $sql.= "fk_soc";
- $sql.= ", datec";
- $sql.= ", ref";
- $sql.= ", entity";
- $sql.= ", fk_user_author";
- $sql.= ", fk_user_modif";
- $sql.= ", description";
- $sql.= ", model_pdf";
- $sql.= ", fk_projet";
- $sql.= ", fk_contrat";
- $sql.= ", fk_statut";
- $sql.= ", note_private";
- $sql.= ", note_public";
- $sql.= ") ";
- $sql.= " VALUES (";
- $sql.= $this->socid;
- $sql.= ", '".$this->db->idate($now)."'";
- $sql.= ", '".$this->db->escape($this->ref)."'";
- $sql.= ", ".$conf->entity;
- $sql.= ", ".$user->id;
- $sql.= ", ".$user->id;
- $sql.= ", ".($this->description?"'".$this->db->escape($this->description)."'":"null");
- $sql.= ", '".$this->db->escape($this->modelpdf)."'";
- $sql.= ", ".($this->fk_project ? $this->fk_project : 0);
- $sql.= ", ".($this->fk_contrat ? $this->fk_contrat : 0);
- $sql.= ", ".$this->statut;
- $sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
- $sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
- $sql.= ")";
+ $sql .= "fk_soc";
+ $sql .= ", datec";
+ $sql .= ", ref";
+ $sql .= ", entity";
+ $sql .= ", fk_user_author";
+ $sql .= ", fk_user_modif";
+ $sql .= ", description";
+ $sql .= ", model_pdf";
+ $sql .= ", fk_projet";
+ $sql .= ", fk_contrat";
+ $sql .= ", fk_statut";
+ $sql .= ", note_private";
+ $sql .= ", note_public";
+ $sql .= ") ";
+ $sql .= " VALUES (";
+ $sql .= $this->socid;
+ $sql .= ", '".$this->db->idate($now)."'";
+ $sql .= ", '".$this->db->escape($this->ref)."'";
+ $sql .= ", ".$conf->entity;
+ $sql .= ", ".$user->id;
+ $sql .= ", ".$user->id;
+ $sql .= ", ".($this->description ? "'".$this->db->escape($this->description)."'" : "null");
+ $sql .= ", '".$this->db->escape($this->modelpdf)."'";
+ $sql .= ", ".($this->fk_project ? $this->fk_project : 0);
+ $sql .= ", ".($this->fk_contrat ? $this->fk_contrat : 0);
+ $sql .= ", ".$this->statut;
+ $sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
+ $sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
+ $sql .= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
- $result=$this->db->query($sql);
+ $result = $this->db->query($sql);
if ($result)
{
- $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."fichinter");
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."fichinter");
if ($this->id)
{
- $this->ref='(PROV'.$this->id.')';
+ $this->ref = '(PROV'.$this->id.')';
$sql = 'UPDATE '.MAIN_DB_PREFIX."fichinter SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::create", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (! $resql) $error++;
+ $resql = $this->db->query($sql);
+ if (!$resql) $error++;
}
- if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
+ if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
{
- $result=$this->insertExtraFields();
+ $result = $this->insertExtraFields();
if ($result < 0)
{
$error++;
@@ -286,22 +286,22 @@ class Fichinter extends CommonObject
}
// Add linked object
- if (! $error && $this->origin && $this->origin_id)
+ if (!$error && $this->origin && $this->origin_id)
{
$ret = $this->add_object_linked();
- if (! $ret) dol_print_error($this->db);
+ if (!$ret) dol_print_error($this->db);
}
- if (! $error && ! $notrigger)
+ if (!$error && !$notrigger)
{
// Call trigger
- $result=$this->call_trigger('FICHINTER_CREATE', $user);
+ $result = $this->call_trigger('FICHINTER_CREATE', $user);
if ($result < 0) { $error++; }
// End call triggers
}
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return $this->id;
@@ -309,14 +309,14 @@ class Fichinter extends CommonObject
else
{
$this->db->rollback();
- $this->error=join(',', $this->errors);
+ $this->error = join(',', $this->errors);
dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
return -1;
}
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
$this->db->rollback();
return -1;
}
@@ -333,10 +333,10 @@ class Fichinter extends CommonObject
{
global $conf;
- if (! is_numeric($this->duration)) {
+ if (!is_numeric($this->duration)) {
$this->duration = 0;
}
- if (! dol_strlen($this->fk_project)) {
+ if (!dol_strlen($this->fk_project)) {
$this->fk_project = 0;
}
@@ -345,30 +345,30 @@ class Fichinter extends CommonObject
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter SET ";
- $sql.= "description = '".$this->db->escape($this->description)."'";
- $sql.= ", duree = ".$this->duration;
- $sql.= ", fk_projet = ".$this->fk_project;
- $sql.= ", note_private = ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
- $sql.= ", note_public = ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
- $sql.= ", fk_user_modif = ".$user->id;
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= "description = '".$this->db->escape($this->description)."'";
+ $sql .= ", duree = ".$this->duration;
+ $sql .= ", fk_projet = ".$this->fk_project;
+ $sql .= ", note_private = ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
+ $sql .= ", note_public = ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
+ $sql .= ", fk_user_modif = ".$user->id;
+ $sql .= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::update", LOG_DEBUG);
if ($this->db->query($sql))
{
- if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+ if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
- $result=$this->insertExtraFields();
+ $result = $this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
- if (! $error && ! $notrigger)
+ if (!$error && !$notrigger)
{
// Call trigger
- $result=$this->call_trigger('FICHINTER_MODIFY', $user);
+ $result = $this->call_trigger('FICHINTER_MODIFY', $user);
if ($result < 0) { $error++; $this->db->rollback(); return -1; }
// End call triggers
}
@@ -378,7 +378,7 @@ class Fichinter extends CommonObject
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
$this->db->rollback();
return -1;
}
@@ -394,19 +394,19 @@ class Fichinter extends CommonObject
public function fetch($rowid, $ref = '')
{
$sql = "SELECT f.rowid, f.ref, f.description, f.fk_soc, f.fk_statut,";
- $sql.= " f.datec, f.dateo, f.datee, f.datet, f.fk_user_author,";
- $sql.= " f.date_valid as datev,";
- $sql.= " f.tms as datem,";
- $sql.= " f.duree, f.fk_projet as fk_project, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat";
- $sql.= " FROM ".MAIN_DB_PREFIX."fichinter as f";
+ $sql .= " f.datec, f.dateo, f.datee, f.datet, f.fk_user_author,";
+ $sql .= " f.date_valid as datev,";
+ $sql .= " f.tms as datem,";
+ $sql .= " f.duree, f.fk_projet as fk_project, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat";
+ $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
if ($ref) {
- $sql.= " WHERE f.entity IN (".getEntity('intervention').")";
- $sql.= " AND f.ref='".$this->db->escape($ref)."'";
+ $sql .= " WHERE f.entity IN (".getEntity('intervention').")";
+ $sql .= " AND f.ref='".$this->db->escape($ref)."'";
}
- else $sql.= " WHERE f.rowid=".$rowid;
+ else $sql .= " WHERE f.rowid=".$rowid;
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))
@@ -443,7 +443,7 @@ class Fichinter extends CommonObject
/*
* Lines
*/
- $result=$this->fetch_lines();
+ $result = $this->fetch_lines();
if ($result < 0)
{
return -3;
@@ -454,7 +454,7 @@ class Fichinter extends CommonObject
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
@@ -469,7 +469,7 @@ class Fichinter extends CommonObject
{
global $langs, $conf;
- $error=0;
+ $error = 0;
// Protection
if ($this->statut <= self::STATUS_DRAFT)
@@ -482,10 +482,10 @@ class Fichinter extends CommonObject
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
- $sql.= " SET fk_statut = ".self::STATUS_DRAFT;
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= " SET fk_statut = ".self::STATUS_DRAFT;
+ $sql .= " WHERE rowid = ".$this->id;
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if (!$error) {
@@ -494,12 +494,12 @@ class Fichinter extends CommonObject
if (!$error) {
// Call trigger
- $result=$this->call_trigger('FICHINTER_UNVALIDATE', $user);
+ $result = $this->call_trigger('FICHINTER_UNVALIDATE', $user);
if ($result < 0) $error++;
}
if (!$error) {
- $this->statut=self::STATUS_DRAFT;
+ $this->statut = self::STATUS_DRAFT;
$this->db->commit();
return 1;
} else {
@@ -510,7 +510,7 @@ class Fichinter extends CommonObject
else
{
$this->db->rollback();
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
@@ -527,16 +527,16 @@ class Fichinter extends CommonObject
global $conf;
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $error=0;
+ $error = 0;
if ($this->statut != 1)
{
$this->db->begin();
- $now=dol_now();
+ $now = dol_now();
// Define new ref
- if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+ if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
{
$num = $this->getNextNumRef($this->thirdparty);
}
@@ -547,31 +547,31 @@ class Fichinter extends CommonObject
$this->newref = $num;
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
- $sql.= " SET fk_statut = 1";
- $sql.= ", ref = '".$num."'";
- $sql.= ", date_valid = '".$this->db->idate($now)."'";
- $sql.= ", fk_user_valid = ".$user->id;
- $sql.= " WHERE rowid = ".$this->id;
- $sql.= " AND entity = ".$conf->entity;
- $sql.= " AND fk_statut = 0";
+ $sql .= " SET fk_statut = 1";
+ $sql .= ", ref = '".$num."'";
+ $sql .= ", date_valid = '".$this->db->idate($now)."'";
+ $sql .= ", fk_user_valid = ".$user->id;
+ $sql .= " WHERE rowid = ".$this->id;
+ $sql .= " AND entity = ".$conf->entity;
+ $sql .= " AND fk_statut = 0";
dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (! $resql)
+ $resql = $this->db->query($sql);
+ if (!$resql)
{
dol_print_error($this->db);
$error++;
}
- if (! $error && ! $notrigger)
+ if (!$error && !$notrigger)
{
// Call trigger
- $result=$this->call_trigger('FICHINTER_VALIDATE', $user);
+ $result = $this->call_trigger('FICHINTER_VALIDATE', $user);
if ($result < 0) { $error++; }
// End call triggers
}
- if (! $error)
+ if (!$error)
{
$this->oldref = $this->ref;
@@ -581,17 +581,17 @@ class Fichinter extends CommonObject
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
// Now we rename also files into index
- $sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref)+1).")), filepath = 'ficheinter/".$this->db->escape($this->newref)."'";
- $sql.= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'ficheinter/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+ $sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'ficheinter/".$this->db->escape($this->newref)."'";
+ $sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'ficheinter/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
$resql = $this->db->query($sql);
- if (! $resql) { $error++; $this->error = $this->db->lasterror(); }
+ if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
$oldref = dol_sanitizeFileName($this->ref);
$newref = dol_sanitizeFileName($num);
$dirsource = $conf->ficheinter->dir_output.'/'.$oldref;
$dirdest = $conf->ficheinter->dir_output.'/'.$newref;
- if (! $error && file_exists($dirsource))
+ if (!$error && file_exists($dirsource))
{
dol_syslog(get_class($this)."::setValid rename dir ".$dirsource." into ".$dirdest);
@@ -599,13 +599,13 @@ class Fichinter extends CommonObject
{
dol_syslog("Rename ok");
// Rename docs starting with $oldref with $newref
- $listoffiles=dol_dir_list($conf->ficheinter->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
- foreach($listoffiles as $fileentry)
+ $listoffiles = dol_dir_list($conf->ficheinter->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+ foreach ($listoffiles as $fileentry)
{
- $dirsource=$fileentry['name'];
- $dirdest=preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
- $dirsource=$fileentry['path'].'/'.$dirsource;
- $dirdest=$fileentry['path'].'/'.$dirdest;
+ $dirsource = $fileentry['name'];
+ $dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+ $dirsource = $fileentry['path'].'/'.$dirsource;
+ $dirdest = $fileentry['path'].'/'.$dirdest;
@rename($dirsource, $dirdest);
}
}
@@ -614,15 +614,15 @@ class Fichinter extends CommonObject
}
// Set new ref and define current statut
- if (! $error)
+ if (!$error)
{
$this->ref = $num;
- $this->statut=1;
- $this->brouillon=0;
- $this->date_validation=$now;
+ $this->statut = 1;
+ $this->brouillon = 0;
+ $this->date_validation = $now;
}
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return 1;
@@ -652,7 +652,7 @@ class Fichinter extends CommonObject
$thm = $this->author->thm;
- foreach($this->lines as $line) {
+ foreach ($this->lines as $line) {
$amount += ($line->duration / 60 / 60 * $thm);
}
@@ -673,16 +673,16 @@ class Fichinter extends CommonObject
*/
public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
{
- global $conf,$langs;
+ global $conf, $langs;
$langs->load("interventions");
- if (! dol_strlen($modele)) {
+ if (!dol_strlen($modele)) {
$modele = 'soleil';
if ($this->modelpdf) {
$modele = $this->modelpdf;
- } elseif (! empty($conf->global->FICHEINTER_ADDON_PDF)) {
+ } elseif (!empty($conf->global->FICHEINTER_ADDON_PDF)) {
$modele = $conf->global->FICHEINTER_ADDON_PDF;
}
}
@@ -720,18 +720,18 @@ class Fichinter extends CommonObject
global $langs;
$langs->load("fichinter");
- $this->statuts[self::STATUS_DRAFT]=$langs->trans('Draft');
- $this->statuts[self::STATUS_VALIDATED]=$langs->trans('Validated');
- $this->statuts[self::STATUS_BILLED]=$langs->trans('StatusInterInvoiced');
- $this->statuts[self::STATUS_CLOSED]=$langs->trans('Done');
- $this->statuts_short[self::STATUS_DRAFT]=$langs->trans('Draft');
- $this->statuts_short[self::STATUS_VALIDATED]=$langs->trans('Validated');
- $this->statuts_short[self::STATUS_BILLED]=$langs->trans('StatusInterInvoiced');
- $this->statuts_short[self::STATUS_CLOSED]=$langs->trans('Done');
- $this->statuts_logo[self::STATUS_DRAFT]='status0';
- $this->statuts_logo[self::STATUS_VALIDATED]='status1';
- $this->statuts_logo[self::STATUS_BILLED]='status6';
- $this->statuts_logo[self::STATUS_CLOSED]='status6';
+ $this->statuts[self::STATUS_DRAFT] = $langs->trans('Draft');
+ $this->statuts[self::STATUS_VALIDATED] = $langs->trans('Validated');
+ $this->statuts[self::STATUS_BILLED] = $langs->trans('StatusInterInvoiced');
+ $this->statuts[self::STATUS_CLOSED] = $langs->trans('Done');
+ $this->statuts_short[self::STATUS_DRAFT] = $langs->trans('Draft');
+ $this->statuts_short[self::STATUS_VALIDATED] = $langs->trans('Validated');
+ $this->statuts_short[self::STATUS_BILLED] = $langs->trans('StatusInterInvoiced');
+ $this->statuts_short[self::STATUS_CLOSED] = $langs->trans('Done');
+ $this->statuts_logo[self::STATUS_DRAFT] = 'status0';
+ $this->statuts_logo[self::STATUS_VALIDATED] = 'status1';
+ $this->statuts_logo[self::STATUS_BILLED] = 'status6';
+ $this->statuts_logo[self::STATUS_CLOSED] = 'status6';
}
return dolGetStatus($this->statuts[$status], $this->statuts_short[$status], '', $this->statuts_logo[$status], $mode);
@@ -750,32 +750,32 @@ class Fichinter extends CommonObject
{
global $conf, $langs, $hookmanager;
- $result='';
+ $result = '';
- $label = '' . $langs->trans("ShowIntervention") . ' ';
- if (! empty($this->ref))
- $label .= '' . $langs->trans('Ref') . ': '.$this->ref;
+ $label = ''.$langs->trans("ShowIntervention").' ';
+ if (!empty($this->ref))
+ $label .= ''.$langs->trans('Ref').': '.$this->ref;
$url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;
if ($option !== 'nolink')
{
// Add param to save lastsearch_values or not
- $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
- if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
- if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+ $add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+ if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
}
- $linkclose='';
+ $linkclose = '';
if (empty($notooltip))
{
- if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
{
- $label=$langs->trans("ShowIntervention");
- $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ $label = $langs->trans("ShowIntervention");
+ $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
- $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
- $linkclose.=' class="classfortooltip"';
+ $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose .= ' class="classfortooltip"';
/*
$hookmanager->initHooks(array('fichinterdao'));
@@ -786,18 +786,18 @@ class Fichinter extends CommonObject
}
$linkstart = '';
- $linkend=' ';
+ $linkstart .= $linkclose.'>';
+ $linkend = '';
$result .= $linkstart;
- if ($withpicto) $result.=img_object(($notooltip?'':$label), $this->picto, ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
- if ($withpicto != 2) $result.= $this->ref;
+ if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ if ($withpicto != 2) $result .= $this->ref;
$result .= $linkend;
global $action;
$hookmanager->initHooks(array('intervnetiondao'));
- $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
- $reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ $parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+ $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook > 0) $result = $hookmanager->resPrint;
else $result .= $hookmanager->resPrint;
@@ -817,7 +817,7 @@ class Fichinter extends CommonObject
global $conf, $db, $langs;
$langs->load("interventions");
- if (! empty($conf->global->FICHEINTER_ADDON))
+ if (!empty($conf->global->FICHEINTER_ADDON))
{
$mybool = false;
@@ -831,7 +831,7 @@ class Fichinter extends CommonObject
$dir = dol_buildpath($reldir."core/modules/fichinter/");
// Load file with numbering class (if found)
- $mybool|=@include_once $dir.$file;
+ $mybool |= @include_once $dir.$file;
}
if ($mybool === false) {
@@ -843,7 +843,7 @@ class Fichinter extends CommonObject
$numref = "";
$numref = $obj->getNextValue($soc, $this);
- if ( $numref != "")
+ if ($numref != "")
{
return $numref;
}
@@ -872,14 +872,14 @@ class Fichinter extends CommonObject
global $conf;
$sql = "SELECT f.rowid,";
- $sql.= " f.datec,";
- $sql.= " f.tms as date_modification,";
- $sql.= " f.date_valid as datev,";
- $sql.= " f.fk_user_author,";
- $sql.= " f.fk_user_modif as fk_user_modification,";
- $sql.= " f.fk_user_valid";
- $sql.= " FROM ".MAIN_DB_PREFIX."fichinter as f";
- $sql.= " WHERE f.rowid = ".$id;
+ $sql .= " f.datec,";
+ $sql .= " f.tms as date_modification,";
+ $sql .= " f.date_valid as datev,";
+ $sql .= " f.fk_user_author,";
+ $sql .= " f.fk_user_modif as fk_user_modification,";
+ $sql .= " f.fk_user_valid";
+ $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
+ $sql .= " WHERE f.rowid = ".$id;
$resql = $this->db->query($sql);
if ($resql)
@@ -896,19 +896,19 @@ class Fichinter 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)
{
$vuser = new User($this->db);
$vuser->fetch($obj->fk_user_valid);
- $this->user_validation = $vuser;
+ $this->user_validation = $vuser;
}
if ($obj->fk_user_modification)
{
$muser = new User($this->db);
$muser->fetch($obj->fk_user_modification);
- $this->user_modification = $muser;
+ $this->user_modification = $muser;
}
}
$this->db->free($resql);
@@ -928,98 +928,98 @@ class Fichinter extends CommonObject
*/
public function delete($user, $notrigger = 0)
{
- global $conf,$langs;
+ global $conf, $langs;
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $error=0;
+ $error = 0;
$this->db->begin();
- if (! $error && ! $notrigger)
+ if (!$error && !$notrigger)
{
// Call trigger
- $result=$this->call_trigger('FICHINTER_DELETE', $user);
+ $result = $this->call_trigger('FICHINTER_DELETE', $user);
if ($result < 0) { $error++; $this->db->rollback(); return -1; }
// End call triggers
}
// Delete linked object
- if (! $error)
+ if (!$error)
{
$res = $this->deleteObjectLinked();
if ($res < 0) $error++;
}
// Delete linked contacts
- if (! $error)
+ if (!$error)
{
$res = $this->delete_linked_contact();
if ($res < 0)
{
- $this->error='ErrorFailToDeleteLinkedContact';
+ $this->error = 'ErrorFailToDeleteLinkedContact';
$error++;
}
}
- if (! $error)
+ if (!$error)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinterdet";
- $sql.= " WHERE fk_fichinter = ".$this->id;
+ $sql .= " WHERE fk_fichinter = ".$this->id;
$resql = $this->db->query($sql);
- if (! $resql) $error++;
+ if (!$resql) $error++;
}
- if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
+ if ((!$error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used
{
// Remove extrafields
$res = $this->deleteExtraFields();
if ($res < 0) $error++;
}
- if (! $error)
+ if (!$error)
{
// Delete object
$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinter";
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= " WHERE rowid = ".$this->id;
dol_syslog("Fichinter::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (! $resql) $error++;
+ if (!$resql) $error++;
}
- if (! $error)
+ if (!$error)
{
// Remove directory with files
$fichinterref = dol_sanitizeFileName($this->ref);
if ($conf->ficheinter->dir_output)
{
- $dir = $conf->ficheinter->dir_output . "/" . $fichinterref ;
- $file = $conf->ficheinter->dir_output . "/" . $fichinterref . "/" . $fichinterref . ".pdf";
+ $dir = $conf->ficheinter->dir_output."/".$fichinterref;
+ $file = $conf->ficheinter->dir_output."/".$fichinterref."/".$fichinterref.".pdf";
if (file_exists($file))
{
dol_delete_preview($this);
- if (! dol_delete_file($file, 0, 0, 0, $this)) // For triggers
+ if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
{
$langs->load("errors");
- $this->error=$langs->trans("ErrorFailToDeleteFile", $file);
+ $this->error = $langs->trans("ErrorFailToDeleteFile", $file);
return 0;
}
}
if (file_exists($dir))
{
- if (! dol_delete_dir_recursive($dir))
+ if (!dol_delete_dir_recursive($dir))
{
$langs->load("errors");
- $this->error=$langs->trans("ErrorFailToDeleteDir", $dir);
+ $this->error = $langs->trans("ErrorFailToDeleteDir", $dir);
return 0;
}
}
}
}
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return 1;
@@ -1047,9 +1047,9 @@ class Fichinter extends CommonObject
if ($user->rights->ficheinter->creer)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
- $sql.= " SET datei = '".$this->db->idate($date_delivery)."'";
- $sql.= " WHERE rowid = ".$this->id;
- $sql.= " AND fk_statut = 0";
+ $sql .= " SET datei = '".$this->db->idate($date_delivery)."'";
+ $sql .= " WHERE rowid = ".$this->id;
+ $sql .= " AND fk_statut = 0";
if ($this->db->query($sql))
{
@@ -1058,7 +1058,7 @@ class Fichinter extends CommonObject
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
dol_syslog("Fichinter::set_date_delivery Erreur SQL");
return -1;
}
@@ -1081,9 +1081,9 @@ class Fichinter extends CommonObject
if ($user->rights->ficheinter->creer)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
- $sql.= " SET description = '".$this->db->escape($description)."',";
- $sql.= " fk_user_modif = ".$user->id;
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= " SET description = '".$this->db->escape($description)."',";
+ $sql .= " fk_user_modif = ".$user->id;
+ $sql .= " WHERE rowid = ".$this->id;
if ($this->db->query($sql))
{
@@ -1092,7 +1092,7 @@ class Fichinter extends CommonObject
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
dol_syslog("Fichinter::set_description Erreur SQL");
return -1;
}
@@ -1116,8 +1116,8 @@ class Fichinter extends CommonObject
if ($user->rights->ficheinter->creer)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
- $sql.= " SET fk_contrat = '".$contractid."'";
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= " SET fk_contrat = '".$contractid."'";
+ $sql .= " WHERE rowid = ".$this->id;
if ($this->db->query($sql))
{
@@ -1126,7 +1126,7 @@ class Fichinter extends CommonObject
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
}
@@ -1146,37 +1146,37 @@ class Fichinter extends CommonObject
{
global $hookmanager;
- $error=0;
+ $error = 0;
$this->db->begin();
// get extrafields so they will be clone
- foreach($this->lines as $line)
+ foreach ($this->lines as $line)
$line->fetch_optionals($line->rowid);
// Load source object
$objFrom = clone $this;
// Change socid if needed
- if (! empty($socid) && $socid != $this->socid)
+ if (!empty($socid) && $socid != $this->socid)
{
$objsoc = new Societe($this->db);
- if ($objsoc->fetch($socid)>0)
+ if ($objsoc->fetch($socid) > 0)
{
- $this->socid = $objsoc->id;
+ $this->socid = $objsoc->id;
//$this->cond_reglement_id = (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
//$this->mode_reglement_id = (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
- $this->fk_project = '';
- $this->fk_delivery_address = '';
+ $this->fk_project = '';
+ $this->fk_delivery_address = '';
}
// TODO Change product price if multi-prices
}
- $this->id=0;
+ $this->id = 0;
$this->ref = '';
- $this->statut=0;
+ $this->statut = 0;
// Clear fields
$this->user_author_id = $user->id;
@@ -1187,10 +1187,10 @@ class Fichinter extends CommonObject
// Create clone
$this->context['createfromclone'] = 'createfromclone';
- $result=$this->create($user);
+ $result = $this->create($user);
if ($result < 0) $error++;
- if (! $error)
+ if (!$error)
{
// Add lines because it is not included into create function
foreach ($this->lines as $line)
@@ -1201,9 +1201,9 @@ class Fichinter extends CommonObject
// Hook of thirdparty module
if (is_object($hookmanager))
{
- $parameters=array('objFrom'=>$objFrom);
- $action='';
- $reshook=$hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ $parameters = array('objFrom'=>$objFrom);
+ $action = '';
+ $reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) $error++;
}
}
@@ -1211,7 +1211,7 @@ class Fichinter extends CommonObject
unset($this->context['createfromclone']);
// End
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return $this->id;
@@ -1244,18 +1244,18 @@ class Fichinter extends CommonObject
$this->db->begin();
// Insertion ligne
- $line=new FichinterLigne($this->db);
+ $line = new FichinterLigne($this->db);
$line->fk_fichinter = $fichinterid;
$line->desc = $desc;
$line->datei = $date_intervention;
$line->duration = $duration;
- if (is_array($array_options) && count($array_options)>0) {
- $line->array_options=$array_options;
+ if (is_array($array_options) && count($array_options) > 0) {
+ $line->array_options = $array_options;
}
- $result=$line->insert($user);
+ $result = $line->insert($user);
if ($result >= 0)
{
@@ -1264,7 +1264,7 @@ class Fichinter extends CommonObject
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
$this->db->rollback();
return -1;
}
@@ -1281,32 +1281,32 @@ class Fichinter extends CommonObject
*/
public function initAsSpecimen()
{
- global $user,$langs,$conf;
+ global $user, $langs, $conf;
- $now=dol_now();
+ $now = dol_now();
// Initialise parametres
- $this->id=0;
+ $this->id = 0;
$this->ref = 'SPECIMEN';
- $this->specimen=1;
+ $this->specimen = 1;
$this->socid = 1;
$this->datec = $now;
- $this->note_private='Private note';
- $this->note_public='SPECIMEN';
+ $this->note_private = 'Private note';
+ $this->note_public = 'SPECIMEN';
$this->duration = 0;
$nbp = 25;
$xnbp = 0;
while ($xnbp < $nbp)
{
- $line=new FichinterLigne($this->db);
- $line->desc=$langs->trans("Description")." ".$xnbp;
- $line->datei=($now-3600*(1+$xnbp));
- $line->duration=600;
- $line->fk_fichinter=0;
- $this->lines[$xnbp]=$line;
+ $line = new FichinterLigne($this->db);
+ $line->desc = $langs->trans("Description")." ".$xnbp;
+ $line->datei = ($now - 3600 * (1 + $xnbp));
+ $line->duration = 600;
+ $line->fk_fichinter = 0;
+ $this->lines[$xnbp] = $line;
$xnbp++;
- $this->duration+=$line->duration;
+ $this->duration += $line->duration;
}
}
@@ -1322,11 +1322,11 @@ class Fichinter extends CommonObject
$this->lines = array();
$sql = 'SELECT rowid, fk_fichinter, description, duree, date, rang';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet';
- $sql.=' WHERE fk_fichinter = '.$this->id .' ORDER BY rang ASC, date ASC' ;
+ $sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet';
+ $sql .= ' WHERE fk_fichinter = '.$this->id.' ORDER BY rang ASC, date ASC';
dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
@@ -1341,7 +1341,7 @@ class Fichinter extends CommonObject
$line->desc = $objp->description;
$line->duration = $objp->duree;
//For invoicing we calculing hours
- $line->qty = round($objp->duree/3600, 2);
+ $line->qty = round($objp->duree / 3600, 2);
$line->date = $this->db->jdate($objp->date);
$line->datei = $this->db->jdate($objp->date);
$line->rang = $objp->rang;
@@ -1357,7 +1357,7 @@ class Fichinter extends CommonObject
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
return -1;
}
}
@@ -1393,7 +1393,7 @@ class FichinterLigne extends CommonObjectLine
/**
* @var string Error code (or message)
*/
- public $error='';
+ public $error = '';
// From llx_fichinterdet
/**
@@ -1401,25 +1401,25 @@ class FichinterLigne extends CommonObjectLine
*/
public $fk_fichinter;
- public $desc; // Description ligne
- public $datei; // Date intervention
- public $duration; // Duree de l'intervention
+ public $desc; // Description ligne
+ public $datei; // Date intervention
+ public $duration; // Duree de l'intervention
public $rang = 0;
/**
* @var string ID to identify managed object
*/
- public $element='fichinterdet';
+ public $element = 'fichinterdet';
/**
* @var string Name of table without prefix where object is stored
*/
- public $table_element='fichinterdet';
+ public $table_element = 'fichinterdet';
/**
* @var int Field with ID of parent key if this field has a parent
*/
- public $fk_element='fk_fichinter';
+ public $fk_element = 'fk_fichinter';
/**
* Constructor
@@ -1440,9 +1440,9 @@ class FichinterLigne extends CommonObjectLine
public function fetch($rowid)
{
$sql = 'SELECT ft.rowid, ft.fk_fichinter, ft.description, ft.duree, ft.rang,';
- $sql.= ' ft.date as datei';
- $sql.= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
- $sql.= ' WHERE ft.rowid = '.$rowid;
+ $sql .= ' ft.date as datei';
+ $sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet as ft';
+ $sql .= ' WHERE ft.rowid = '.$rowid;
dol_syslog("FichinterLigne::fetch", LOG_DEBUG);
$result = $this->db->query($sql);
@@ -1450,9 +1450,9 @@ class FichinterLigne extends CommonObjectLine
{
$objp = $this->db->fetch_object($result);
$this->rowid = $objp->rowid;
- $this->id = $objp->rowid;
+ $this->id = $objp->rowid;
$this->fk_fichinter = $objp->fk_fichinter;
- $this->datei = $this->db->jdate($objp->datei);
+ $this->datei = $this->db->jdate($objp->datei);
$this->desc = $objp->description;
$this->duration = $objp->duree;
$this->rang = $objp->rang;
@@ -1462,7 +1462,7 @@ class FichinterLigne extends CommonObjectLine
}
else
{
- $this->error=$this->db->error().' sql='.$sql;
+ $this->error = $this->db->error().' sql='.$sql;
return -1;
}
}
@@ -1476,7 +1476,7 @@ class FichinterLigne extends CommonObjectLine
*/
public function insert($user, $notrigger = 0)
{
- global $langs,$conf;
+ global $langs, $conf;
$error = 0;
@@ -1484,12 +1484,12 @@ class FichinterLigne extends CommonObjectLine
$this->db->begin();
- $rangToUse=$this->rang;
+ $rangToUse = $this->rang;
if ($rangToUse == -1)
{
// Recupere rang max de la ligne d'intervention dans $rangmax
$sql = 'SELECT max(rang) as max FROM '.MAIN_DB_PREFIX.'fichinterdet';
- $sql.= ' WHERE fk_fichinter ='.$this->fk_fichinter;
+ $sql .= ' WHERE fk_fichinter ='.$this->fk_fichinter;
$resql = $this->db->query($sql);
if ($resql)
{
@@ -1506,24 +1506,24 @@ class FichinterLigne extends CommonObjectLine
// Insertion dans base de la ligne
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'fichinterdet';
- $sql.= ' (fk_fichinter, description, date, duree, rang)';
- $sql.= " VALUES (".$this->fk_fichinter.",";
- $sql.= " '".$this->db->escape($this->desc)."',";
- $sql.= " '".$this->db->idate($this->datei)."',";
- $sql.= " ".$this->duration.",";
- $sql.= ' '.$rangToUse;
- $sql.= ')';
+ $sql .= ' (fk_fichinter, description, date, duree, rang)';
+ $sql .= " VALUES (".$this->fk_fichinter.",";
+ $sql .= " '".$this->db->escape($this->desc)."',";
+ $sql .= " '".$this->db->idate($this->datei)."',";
+ $sql .= " ".$this->duration.",";
+ $sql .= ' '.$rangToUse;
+ $sql .= ')';
dol_syslog("FichinterLigne::insert", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
- $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet');
- $this->rowid=$this->id;
+ $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet');
+ $this->rowid = $this->id;
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
- $result=$this->insertExtraFields();
+ $result = $this->insertExtraFields();
if ($result < 0)
{
$error++;
@@ -1531,16 +1531,16 @@ class FichinterLigne extends CommonObjectLine
}
- $result=$this->update_total();
+ $result = $this->update_total();
if ($result > 0)
{
- $this->rang=$rangToUse;
+ $this->rang = $rangToUse;
- if (! $notrigger)
+ if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('LINEFICHINTER_CREATE', $user);
+ $result = $this->call_trigger('LINEFICHINTER_CREATE', $user);
if ($result < 0) { $error++; }
// End call triggers
}
@@ -1558,7 +1558,7 @@ class FichinterLigne extends CommonObjectLine
}
else
{
- $this->error=$this->db->error()." sql=".$sql;
+ $this->error = $this->db->error()." sql=".$sql;
$this->db->rollback();
return -1;
}
@@ -1574,7 +1574,7 @@ class FichinterLigne extends CommonObjectLine
*/
public function update($user, $notrigger = 0)
{
- global $langs,$conf;
+ global $langs, $conf;
$error = 0;
@@ -1582,32 +1582,32 @@ class FichinterLigne extends CommonObjectLine
// Mise a jour ligne en base
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinterdet SET";
- $sql.= " description='".$this->db->escape($this->desc)."'";
- $sql.= ",date='".$this->db->idate($this->datei)."'";
- $sql.= ",duree=".$this->duration;
- $sql.= ",rang='".$this->db->escape($this->rang)."'";
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= " description='".$this->db->escape($this->desc)."'";
+ $sql .= ",date='".$this->db->idate($this->datei)."'";
+ $sql .= ",duree=".$this->duration;
+ $sql .= ",rang='".$this->db->escape($this->rang)."'";
+ $sql .= " WHERE rowid = ".$this->id;
dol_syslog("FichinterLigne::update", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
{
- $result=$this->insertExtraFields();
+ $result = $this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
- $result=$this->update_total();
+ $result = $this->update_total();
if ($result > 0)
{
- if (! $notrigger)
+ if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('LINEFICHINTER_UPDATE', $user);
+ $result = $this->call_trigger('LINEFICHINTER_UPDATE', $user);
if ($result < 0) { $error++; }
// End call triggers
}
@@ -1620,14 +1620,14 @@ class FichinterLigne extends CommonObjectLine
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
$this->db->rollback();
return -1;
}
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
$this->db->rollback();
return -1;
}
@@ -1647,25 +1647,25 @@ class FichinterLigne extends CommonObjectLine
$this->db->begin();
$sql = "SELECT SUM(duree) as total_duration, min(date) as dateo, max(date) as datee ";
- $sql.= " FROM ".MAIN_DB_PREFIX."fichinterdet";
- $sql.= " WHERE fk_fichinter=".$this->fk_fichinter;
+ $sql .= " FROM ".MAIN_DB_PREFIX."fichinterdet";
+ $sql .= " WHERE fk_fichinter=".$this->fk_fichinter;
dol_syslog("FichinterLigne::update_total", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
- $obj=$this->db->fetch_object($resql);
- $total_duration=0;
+ $obj = $this->db->fetch_object($resql);
+ $total_duration = 0;
if (!empty($obj->total_duration)) $total_duration = $obj->total_duration;
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
- $sql.= " SET duree = ".$total_duration;
- $sql.= " , dateo = ".(! empty($obj->dateo)?"'".$this->db->idate($obj->dateo)."'":"null");
- $sql.= " , datee = ".(! empty($obj->datee)?"'".$this->db->idate($obj->datee)."'":"null");
- $sql.= " WHERE rowid = ".$this->fk_fichinter;
+ $sql .= " SET duree = ".$total_duration;
+ $sql .= " , dateo = ".(!empty($obj->dateo) ? "'".$this->db->idate($obj->dateo)."'" : "null");
+ $sql .= " , datee = ".(!empty($obj->datee) ? "'".$this->db->idate($obj->datee)."'" : "null");
+ $sql .= " WHERE rowid = ".$this->fk_fichinter;
dol_syslog("FichinterLigne::update_total", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
$this->db->commit();
@@ -1673,14 +1673,14 @@ class FichinterLigne extends CommonObjectLine
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
$this->db->rollback();
return -2;
}
}
else
{
- $this->error=$this->db->error();
+ $this->error = $this->db->error();
$this->db->rollback();
return -1;
}
@@ -1695,9 +1695,9 @@ class FichinterLigne extends CommonObjectLine
*/
public function deleteline($user, $notrigger = 0)
{
- global $langs,$conf;
+ global $langs, $conf;
- $error=0;
+ $error = 0;
if ($this->statut == 0)
{
@@ -1712,10 +1712,10 @@ class FichinterLigne extends CommonObjectLine
$result = $this->update_total();
if ($result > 0)
{
- if (! $notrigger)
+ if (!$notrigger)
{
// Call trigger
- $result=$this->call_trigger('LINEFICHINTER_DELETE', $user);
+ $result = $this->call_trigger('LINEFICHINTER_DELETE', $user);
if ($result < 0) { $error++; $this->db->rollback(); return -1; }
// End call triggers
}
@@ -1731,7 +1731,7 @@ class FichinterLigne extends CommonObjectLine
}
else
{
- $this->error=$this->db->error()." sql=".$sql;
+ $this->error = $this->db->error()." sql=".$sql;
$this->db->rollback();
return -1;
}
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index f65acb2eeda..c2ca9da8bbd 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array('companies', 'bills', 'products', 'margins'));
$mesg = '';
// Load variable for pagination
-$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');
@@ -43,16 +43,16 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield)
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield)
{
if ($agentid > 0)
- $sortfield="s.nom";
+ $sortfield = "s.nom";
else
- $sortfield="u.lastname";
+ $sortfield = "u.lastname";
}
-$startdate=$enddate='';
+$startdate = $enddate = '';
$startdateday = GETPOST('startdateday', 'int');
$startdatemonth = GETPOST('startdatemonth', 'int');
@@ -64,7 +64,7 @@ $enddateyear = GETPOST('enddateyear', 'int');
if (!empty($startdatemonth))
$startdate = dol_mktime(0, 0, 0, $startdatemonth, $startdateday, $startdateyear);
if (!empty($enddatemonth))
- $enddate = dol_mktime(23, 59, 59, $enddatemonth, $enddateday, $enddateyear);
+ $enddate = dol_mktime(23, 59, 59, $enddatemonth, $enddateday, $enddateyear);
// Security check
if ($user->rights->margins->read->all) {
@@ -72,7 +72,7 @@ if ($user->rights->margins->read->all) {
} else {
$agentid = $user->id;
}
-$result=restrictedArea($user, 'margins');
+$result = restrictedArea($user, 'margins');
/*
@@ -89,19 +89,19 @@ $result=restrictedArea($user, 'margins');
$userstatic = new User($db);
$companystatic = new Societe($db);
-$invoicestatic=new Facture($db);
+$invoicestatic = new Facture($db);
$form = new Form($db);
llxHeader('', $langs->trans("Margins").' - '.$langs->trans("Agents"));
-$text=$langs->trans("Margins");
+$text = $langs->trans("Margins");
//print load_fiche_titre($text);
// Show tabs
-$head=marges_prepare_head($user);
-$titre=$langs->trans("Margins");
-$picto='margin';
+$head = marges_prepare_head($user);
+$titre = $langs->trans("Margins");
+$picto = 'margin';
print '';
$invoice_status_except_list = array(Facture::STATUS_DRAFT, Facture::STATUS_ABANDONED);
$sql = "SELECT";
-$sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
-$sql.= " u.rowid as agent, u.login, u.lastname, u.firstname,";
-$sql.= " sum(d.total_ht) as selling_price,";
+$sql .= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
+$sql .= " u.rowid as agent, u.login, u.lastname, u.firstname,";
+$sql .= " sum(d.total_ht) as selling_price,";
// Note: qty and buy_price_ht is always positive (if not your database may be corrupted, you can update this)
-$sql.= " sum(".$db->ifsql('d.total_ht < 0', 'd.qty * d.buy_price_ht * -1', 'd.qty * d.buy_price_ht').") as buying_price,";
-$sql.= " sum(".$db->ifsql('d.total_ht < 0', '-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))', 'd.total_ht - (d.buy_price_ht * d.qty)').") as marge" ;
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql.= ", ".MAIN_DB_PREFIX."facture as f";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact e ON e.element_id = f.rowid and e.statut = 4 and e.fk_c_type_contact = ".(empty($conf->global->AGENT_CONTACT_TYPE)?-1:$conf->global->AGENT_CONTACT_TYPE);
-$sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ", ".MAIN_DB_PREFIX."user as u";
-$sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= ' AND f.entity IN ('.getEntity('invoice').')';
-$sql.= " AND sc.fk_soc = f.fk_soc";
-$sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
-if (! empty($conf->global->AGENT_CONTACT_TYPE))
- $sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
+$sql .= " sum(".$db->ifsql('d.total_ht < 0', 'd.qty * d.buy_price_ht * -1', 'd.qty * d.buy_price_ht').") as buying_price,";
+$sql .= " sum(".$db->ifsql('d.total_ht < 0', '-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))', 'd.total_ht - (d.buy_price_ht * d.qty)').") as marge";
+$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql .= ", ".MAIN_DB_PREFIX."facture as f";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact e ON e.element_id = f.rowid and e.statut = 4 and e.fk_c_type_contact = ".(empty($conf->global->AGENT_CONTACT_TYPE) ?-1 : $conf->global->AGENT_CONTACT_TYPE);
+$sql .= ", ".MAIN_DB_PREFIX."facturedet as d";
+$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql .= ", ".MAIN_DB_PREFIX."user as u";
+$sql .= " WHERE f.fk_soc = s.rowid";
+$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
+$sql .= " AND sc.fk_soc = f.fk_soc";
+$sql .= " AND (d.product_type = 0 OR d.product_type = 1)";
+if (!empty($conf->global->AGENT_CONTACT_TYPE))
+ $sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
else
$sql .= " AND sc.fk_user = u.rowid";
-$sql.= " AND f.fk_statut NOT IN (" . implode(', ', $invoice_status_except_list) . ")";
-$sql.= ' AND s.entity IN ('.getEntity('societe').')';
-$sql.= " AND d.fk_facture = f.rowid";
+$sql .= " AND f.fk_statut NOT IN (".implode(', ', $invoice_status_except_list).")";
+$sql .= ' AND s.entity IN ('.getEntity('societe').')';
+$sql .= " AND d.fk_facture = f.rowid";
if ($agentid > 0) {
- if (! empty($conf->global->AGENT_CONTACT_TYPE))
- $sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
+ if (!empty($conf->global->AGENT_CONTACT_TYPE))
+ $sql .= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
else
$sql .= " AND sc.fk_user = ".$agentid;
}
if (!empty($startdate))
- $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
+ $sql .= " AND f.datef >= '".$db->idate($startdate)."'";
if (!empty($enddate))
- $sql.= " AND f.datef <= '".$db->idate($enddate)."'";
+ $sql .= " AND f.datef <= '".$db->idate($enddate)."'";
$sql .= " AND d.buy_price_ht IS NOT NULL";
if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
//if ($agentid > 0) $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
//else $sql.= " GROUP BY u.rowid, u.login, u.lastname, u.firstname";
-$sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
-$sql.=$db->order($sortfield, $sortorder);
+$sql .= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
+$sql .= $db->order($sortfield, $sortorder);
// TODO: calculate total to display then restore pagination
//$sql.= $db->plimit($conf->liste_limit +1, $offset);
@@ -181,7 +181,7 @@ $sql.=$db->order($sortfield, $sortorder);
print '";
@@ -217,9 +217,9 @@ if ($result)
print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", $param, '', $sortfield, $sortorder, 'right ');
- if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+ if (!empty($conf->global->DISPLAY_MARGIN_RATES))
print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
- if (! empty($conf->global->DISPLAY_MARK_RATES))
+ if (!empty($conf->global->DISPLAY_MARK_RATES))
print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
print "\n";
@@ -252,8 +252,8 @@ if ($result)
if ($objp->socid > 0) {
// sql nb sellers
$sql_seller = "SELECT COUNT(sc.rowid) as nb";
- $sql_seller .= " FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
- $sql_seller .= " WHERE sc.fk_soc = " . $objp->socid;
+ $sql_seller .= " FROM ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql_seller .= " WHERE sc.fk_soc = ".$objp->socid;
$sql_seller .= " LIMIT 1";
$resql_seller = $db->query($sql_seller);
@@ -284,18 +284,18 @@ if ($result)
$pv = $group_array['selling_price'];
$marge = $group_array['marge'];
- $marginRate = ($pa != 0)?(100 * $marge / $pa):'';
- $markRate = ($pv != 0)?(100 * $marge / $pv):'';
+ $marginRate = ($pa != 0) ? (100 * $marge / $pa) : '';
+ $markRate = ($pv != 0) ? (100 * $marge / $pv) : '';
print '';
print "".$group_array['htmlname']." \n";
print "".price(price2num($pv, 'MT'))." \n";
print "".price(price2num($pa, 'MT'))." \n";
print "".price(price2num($marge, 'MT'))." \n";
- if (! empty($conf->global->DISPLAY_MARGIN_RATES))
- print "".(($marginRate === '')?'n/a':price(price2num($marginRate, 'MT'))."%")." \n";
- if (! empty($conf->global->DISPLAY_MARK_RATES))
- print "".(($markRate === '')?'n/a':price(price2num($markRate, 'MT'))."%")." \n";
+ if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+ print "".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")." \n";
+ if (!empty($conf->global->DISPLAY_MARK_RATES))
+ print "".(($markRate === '') ? 'n/a' : price(price2num($markRate, 'MT'))."%")." \n";
print " \n";
}
}
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index ea5b6d45bc1..8b9dd15f038 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -373,12 +373,12 @@ else
// Warehouse card
$linkback = ''.$langs->trans("BackToList").' ';
- $morehtmlref='';
- $morehtmlref.=$langs->trans("LocationSummary").' : '.$object->lieu;
- $morehtmlref.='
';
+ $morehtmlref = '';
+ $morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
+ $morehtmlref .= '
';
$shownav = 1;
- if ($user->socid && ! in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+ if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref);
@@ -390,7 +390,7 @@ else
// Parent entrepot
$parentwarehouse = new Entrepot($db);
- if(!empty($object->fk_parent) && $parentwarehouse->fetch($object->fk_parent) > 0) {
+ if (!empty($object->fk_parent) && $parentwarehouse->fetch($object->fk_parent) > 0) {
print ''.$langs->trans("ParentWarehouse").' ';
print $parentwarehouse->getNomUrl(3);
print ' ' . $langs->trans("LastMovement") . ' ';
+ print ' '.$langs->trans("LastMovement").' ';
if ($lastmovementdate) {
- print dol_print_date($lastmovementdate, 'dayhour') . ' ';
- print '(' . $langs->trans("FullList") . ' )';
+ print dol_print_date($lastmovementdate, 'dayhour').' ';
+ print '('.$langs->trans("FullList").' )';
} else {
print $langs->trans("None");
}
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index 463e39a49d1..cb27f37afb6 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -34,14 +34,14 @@ $ref = GETPOST('ref', 'alpha');
// Security check
//$result=restrictedArea($user,'stock', $id, 'entrepot&stock');
-$result=restrictedArea($user, 'stock');
+$result = restrictedArea($user, 'stock');
/*
* View
*/
-$help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks';
+$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks';
llxHeader("", $langs->trans("Stocks"), $help_url);
$object = new Entrepot($db);
@@ -55,12 +55,12 @@ dol_fiche_head($head, 'info', $langs->trans("Warehouse"), -1, 'stock');
$linkback = ''.$langs->trans("BackToList").' ';
-$morehtmlref='';
-$morehtmlref.=$langs->trans("LocationSummary").' : '.$object->lieu;
-$morehtmlref.='
';
+$morehtmlref = '';
+$morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
+$morehtmlref .= '
';
$shownav = 1;
-if ($user->socid && ! in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index e6742cdc78b..ce44f28effe 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -195,14 +195,14 @@ if ($action == "correct_stock")
if ($product->hasbatch())
{
- $batch=GETPOST('batch_number');
+ $batch = GETPOST('batch_number');
//$eatby=GETPOST('eatby');
//$sellby=GETPOST('sellby');
- $eatby=dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear'));
- $sellby=dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear'));
+ $eatby = dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear'));
+ $sellby = dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear'));
- $result=$product->correct_stock_batch(
+ $result = $product->correct_stock_batch(
$user,
$id,
GETPOST("nbpiece", 'int'),
@@ -213,11 +213,11 @@ if ($action == "correct_stock")
GETPOST('inventorycode'),
$origin_element,
$origin_id
- ); // We do not change value of stock for a correction
+ ); // We do not change value of stock for a correction
}
else
{
- $result=$product->correct_stock(
+ $result = $product->correct_stock(
$user,
$id,
GETPOST("nbpiece", 'int'),
@@ -414,63 +414,63 @@ if ($action == "transfert_stock" && !$cancel)
* View
*/
-$productlot=new ProductLot($db);
-$productstatic=new Product($db);
-$warehousestatic=new Entrepot($db);
-$movement=new MouvementStock($db);
-$userstatic=new User($db);
-$form=new Form($db);
-$formother=new FormOther($db);
-$formproduct=new FormProduct($db);
-if (!empty($conf->projet->enabled)) $formproject=new FormProjets($db);
+$productlot = new ProductLot($db);
+$productstatic = new Product($db);
+$warehousestatic = new Entrepot($db);
+$movement = new MouvementStock($db);
+$userstatic = new User($db);
+$form = new Form($db);
+$formother = new FormOther($db);
+$formproduct = new FormProduct($db);
+if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
$sql = "SELECT p.rowid, p.ref as product_ref, p.label as produit, p.tobatch, p.fk_product_type as type, p.entity,";
-$sql.= " e.ref as warehouse_ref, e.rowid as entrepot_id, e.lieu, e.fk_parent, e.statut,";
-$sql.= " m.rowid as mid, m.value as qty, m.datem, m.fk_user_author, m.label, m.inventorycode, m.fk_origin, m.origintype,";
-$sql.= " m.batch, m.price,";
-$sql.= " m.type_mouvement,";
-$sql.= " m.fk_projet as fk_project,";
-$sql.= " pl.rowid as lotid, pl.eatby, pl.sellby,";
-$sql.= " u.login, u.photo, u.lastname, u.firstname";
+$sql .= " e.ref as warehouse_ref, e.rowid as entrepot_id, e.lieu, e.fk_parent, e.statut,";
+$sql .= " m.rowid as mid, m.value as qty, m.datem, m.fk_user_author, m.label, m.inventorycode, m.fk_origin, m.origintype,";
+$sql .= " m.batch, m.price,";
+$sql .= " m.type_mouvement,";
+$sql .= " m.fk_projet as fk_project,";
+$sql .= " pl.rowid as lotid, pl.eatby, pl.sellby,";
+$sql .= " u.login, u.photo, u.lastname, u.firstname";
// Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
}
// Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
-$sql.= " ".MAIN_DB_PREFIX."product as p,";
-$sql.= " ".MAIN_DB_PREFIX."stock_mouvement as m";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (m.rowid = ef.fk_object)";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON m.fk_user_author = u.rowid";
-$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON m.batch = pl.batch AND m.fk_product = pl.fk_product";
-$sql.= " WHERE m.fk_product = p.rowid";
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
+$sql .= " ".MAIN_DB_PREFIX."product as p,";
+$sql .= " ".MAIN_DB_PREFIX."stock_mouvement as m";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (m.rowid = ef.fk_object)";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON m.fk_user_author = u.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON m.batch = pl.batch AND m.fk_product = pl.fk_product";
+$sql .= " WHERE m.fk_product = p.rowid";
if ($msid > 0) $sql .= " AND m.rowid = ".$msid;
-$sql.= " AND m.fk_entrepot = e.rowid";
-$sql.= " AND e.entity IN (".getEntity('stock').")";
-if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql.= " AND p.fk_product_type = 0";
-if ($id > 0) $sql.= " AND e.rowid ='".$id."'";
-$sql.= dolSqlDateFilter('m.datem', 0, $month, $year);
-if ($idproduct > 0) $sql.= " AND p.rowid = '".$idproduct."'";
-if (! empty($search_ref)) $sql.= natural_search('m.rowid', $search_ref, 1);
-if (! empty($search_movement)) $sql.= natural_search('m.label', $search_movement);
-if (! empty($search_inventorycode)) $sql.= natural_search('m.inventorycode', $search_inventorycode);
-if (! empty($search_product_ref)) $sql.= natural_search('p.ref', $search_product_ref);
-if (! empty($search_product)) $sql.= natural_search('p.label', $search_product);
-if ($search_warehouse != '' && $search_warehouse != '-1') $sql.= natural_search('e.rowid', $search_warehouse, 2);
-if (! empty($search_user)) $sql.= natural_search('u.login', $search_user);
-if (! empty($search_batch)) $sql.= natural_search('m.batch', $search_batch);
-if ($search_qty != '') $sql.= natural_search('m.value', $search_qty, 1);
-if ($search_type_mouvement != '' && $search_type_mouvement != '-1') $sql.= natural_search('m.type_mouvement', $search_type_mouvement, 2);
+$sql .= " AND m.fk_entrepot = e.rowid";
+$sql .= " AND e.entity IN (".getEntity('stock').")";
+if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= " AND p.fk_product_type = 0";
+if ($id > 0) $sql .= " AND e.rowid ='".$id."'";
+$sql .= dolSqlDateFilter('m.datem', 0, $month, $year);
+if ($idproduct > 0) $sql .= " AND p.rowid = '".$idproduct."'";
+if (!empty($search_ref)) $sql .= natural_search('m.rowid', $search_ref, 1);
+if (!empty($search_movement)) $sql .= natural_search('m.label', $search_movement);
+if (!empty($search_inventorycode)) $sql .= natural_search('m.inventorycode', $search_inventorycode);
+if (!empty($search_product_ref)) $sql .= natural_search('p.ref', $search_product_ref);
+if (!empty($search_product)) $sql .= natural_search('p.label', $search_product);
+if ($search_warehouse != '' && $search_warehouse != '-1') $sql .= natural_search('e.rowid', $search_warehouse, 2);
+if (!empty($search_user)) $sql .= natural_search('u.login', $search_user);
+if (!empty($search_batch)) $sql .= natural_search('m.batch', $search_batch);
+if ($search_qty != '') $sql .= natural_search('m.value', $search_qty, 1);
+if ($search_type_mouvement != '' && $search_type_mouvement != '-1') $sql .= natural_search('m.type_mouvement', $search_type_mouvement, 2);
// Add where from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
// Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql.= $db->order($sortfield, $sortorder);
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql .= $db->order($sortfield, $sortorder);
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -544,12 +544,12 @@ if ($resql)
$linkback = ''.$langs->trans("BackToList").' ';
- $morehtmlref='';
- $morehtmlref.=$langs->trans("LocationSummary").' : '.$object->lieu;
- $morehtmlref.='
';
+ $morehtmlref = '';
+ $morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
+ $morehtmlref .= '
';
$shownav = 1;
- if ($user->socid && ! in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0;
+ if ($user->socid && !in_array('stock', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref);
@@ -947,53 +947,53 @@ if ($resql)
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
// Hook fields
- $parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
- $reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+ $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- if (! empty($arrayfields['m.datec']['checked'])) {
+ if (!empty($arrayfields['m.datec']['checked'])) {
print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
}
- if (! empty($arrayfields['m.tms']['checked'])) {
+ if (!empty($arrayfields['m.tms']['checked'])) {
print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
}
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print " '.$langs->trans("BackToList").' ';
- $morehtmlref='';
+ $morehtmlref = '
';
// Ref customer reception
- $morehtmlref.=$form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
+ $morehtmlref .= $form->editfieldkey("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefSupplier", '', $object->ref_supplier, $object, $user->rights->reception->creer, 'string', '', null, null, '', 1);
// Thirdparty
- $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+ $morehtmlref .= '
'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
// Project
- if (! empty($conf->projet->enabled)) {
+ if (!empty($conf->projet->enabled)) {
$langs->load("projects");
- $morehtmlref .= '
' . $langs->trans('Project') . ' ';
+ $morehtmlref .= '
'.$langs->trans('Project').' ';
if (0) { // Do not change on reception
if ($action != 'classify') {
- $morehtmlref .= '
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
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);
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
}
} else {
// We don't have project on reception, so we will use the project or source object instead
// TODO Add project on reception
$morehtmlref .= ' : ';
- if (! empty($objectsrc->fk_project)) {
+ if (!empty($objectsrc->fk_project)) {
$proj = new Project($db);
$proj->fetch($objectsrc->fk_project);
- $morehtmlref .= '
';
+ $morehtmlref .= ' ';
$morehtmlref .= $proj->ref;
$morehtmlref .= ' ';
} else {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 3160a701f64..cb595ce8410 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -673,7 +673,7 @@ class Societe extends CommonObject
if (empty($this->status)) $this->status = 0;
$this->name = $this->name ?trim($this->name) : trim($this->nom);
if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
- if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->name=strtoupper($this->name);
+ if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->name = strtoupper($this->name);
$this->nom = $this->name; // For backward compatibility
if (empty($this->client)) $this->client = 0;
if (empty($this->fournisseur)) $this->fournisseur = 0;
@@ -990,7 +990,7 @@ class Societe extends CommonObject
$now = dol_now();
if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->name = ucwords($this->name);
- if (! empty($conf->global->MAIN_ALL_TO_UPPER)) $this->name=strtoupper($this->name);
+ if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->name = strtoupper($this->name);
// Clean parameters
$this->id = $id;
$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
@@ -1538,7 +1538,7 @@ class Societe extends CommonObject
$this->effectif = $obj->effectif_id ? $obj->effectif : '';
$this->forme_juridique_code = $obj->forme_juridique_code;
- $this->forme_juridique = $obj->forme_juridique_code ? $obj->forme_juridique : '';
+ $this->forme_juridique = $obj->forme_juridique_code ? $obj->forme_juridique : '';
$this->fk_prospectlevel = $obj->fk_prospectlevel;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 387d227d6b4..7b89c21972b 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -278,76 +278,76 @@ class User extends CommonObject
global $conf, $user;
// Clean parameters
- $login=trim($login);
+ $login = trim($login);
// Get user
$sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.birth, u.email, u.personal_email, u.job,";
- $sql.= " u.socialnetworks,";
- $sql.= " u.signature, u.office_phone, u.office_fax, u.user_mobile, u.personal_mobile,";
- $sql.= " u.address, u.zip, u.town, u.fk_state as state_id, u.fk_country as country_id,";
- $sql.= " u.admin, u.login, u.note as note_private, u.note_public,";
- $sql.= " u.pass, u.pass_crypted, u.pass_temp, u.api_key,";
- $sql.= " u.fk_soc, u.fk_socpeople, u.fk_member, u.fk_user, u.ldap_sid, u.fk_user_expense_validator, u.fk_user_holiday_validator,";
- $sql.= " u.statut, u.lang, u.entity,";
- $sql.= " u.datec as datec,";
- $sql.= " u.tms as datem,";
- $sql.= " u.datelastlogin as datel,";
- $sql.= " u.datepreviouslogin as datep,";
- $sql.= " u.photo as photo,";
- $sql.= " u.openid as openid,";
- $sql.= " u.accountancy_code,";
- $sql.= " u.thm,";
- $sql.= " u.tjm,";
- $sql.= " u.salary,";
- $sql.= " u.salaryextra,";
- $sql.= " u.weeklyhours,";
- $sql.= " u.color,";
- $sql.= " u.dateemployment, u.dateemploymentend,";
- $sql.= " u.fk_warehouse,";
- $sql.= " u.ref_int, u.ref_ext,";
- $sql.= " u.default_range, u.default_c_exp_tax_cat,"; // Expense report default mode
- $sql.= " c.code as country_code, c.label as country,";
- $sql.= " d.code_departement as state_code, d.nom as state";
- $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON u.fk_country = c.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON u.fk_state = d.rowid";
+ $sql .= " u.socialnetworks,";
+ $sql .= " u.signature, u.office_phone, u.office_fax, u.user_mobile, u.personal_mobile,";
+ $sql .= " u.address, u.zip, u.town, u.fk_state as state_id, u.fk_country as country_id,";
+ $sql .= " u.admin, u.login, u.note as note_private, u.note_public,";
+ $sql .= " u.pass, u.pass_crypted, u.pass_temp, u.api_key,";
+ $sql .= " u.fk_soc, u.fk_socpeople, u.fk_member, u.fk_user, u.ldap_sid, u.fk_user_expense_validator, u.fk_user_holiday_validator,";
+ $sql .= " u.statut, u.lang, u.entity,";
+ $sql .= " u.datec as datec,";
+ $sql .= " u.tms as datem,";
+ $sql .= " u.datelastlogin as datel,";
+ $sql .= " u.datepreviouslogin as datep,";
+ $sql .= " u.photo as photo,";
+ $sql .= " u.openid as openid,";
+ $sql .= " u.accountancy_code,";
+ $sql .= " u.thm,";
+ $sql .= " u.tjm,";
+ $sql .= " u.salary,";
+ $sql .= " u.salaryextra,";
+ $sql .= " u.weeklyhours,";
+ $sql .= " u.color,";
+ $sql .= " u.dateemployment, u.dateemploymentend,";
+ $sql .= " u.fk_warehouse,";
+ $sql .= " u.ref_int, u.ref_ext,";
+ $sql .= " u.default_range, u.default_c_exp_tax_cat,"; // Expense report default mode
+ $sql .= " c.code as country_code, c.label as country,";
+ $sql .= " d.code_departement as state_code, d.nom as state";
+ $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON u.fk_country = c.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON u.fk_state = d.rowid";
if ($entity < 0)
{
- if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (! empty($user->entity)))
+ if ((empty($conf->multicompany->enabled) || empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) && (!empty($user->entity)))
{
- $sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+ $sql .= " WHERE u.entity IN (0,".$conf->entity.")";
}
else
{
- $sql.= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
+ $sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
}
}
else // The fetch was forced on an entity
{
if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
- $sql.= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
+ $sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
else
- $sql.= " WHERE u.entity IN (0, ".(($entity!='' && $entity >= 0)?$entity:$conf->entity).")"; // search in entity provided in parameter
+ $sql .= " WHERE u.entity IN (0, ".(($entity != '' && $entity >= 0) ? $entity : $conf->entity).")"; // search in entity provided in parameter
}
if ($sid) // permet une recherche du user par son SID ActiveDirectory ou Samba
{
- $sql.= " AND (u.ldap_sid = '".$this->db->escape($sid)."' OR u.login = '".$this->db->escape($login)."') LIMIT 1";
+ $sql .= " AND (u.ldap_sid = '".$this->db->escape($sid)."' OR u.login = '".$this->db->escape($login)."') LIMIT 1";
}
elseif ($login)
{
- $sql.= " AND u.login = '".$this->db->escape($login)."'";
+ $sql .= " AND u.login = '".$this->db->escape($login)."'";
}
elseif ($email)
{
- $sql.= " AND u.email = '".$this->db->escape($email)."'";
+ $sql .= " AND u.email = '".$this->db->escape($email)."'";
}
else
{
- $sql.= " AND u.rowid = ".$id;
+ $sql .= " AND u.rowid = ".$id;
}
- $sql.= " ORDER BY u.entity ASC"; // Avoid random result when there is 2 login in 2 different entities
+ $sql .= " ORDER BY u.entity ASC"; // Avoid random result when there is 2 login in 2 different entities
$result = $this->db->query($sql);
if ($result)
@@ -392,14 +392,14 @@ class User extends CommonObject
$this->office_fax = $obj->office_fax;
$this->user_mobile = $obj->user_mobile;
$this->personal_mobile = $obj->personal_mobile;
- $this->email = $obj->email;
+ $this->email = $obj->email;
$this->personal_email = $obj->personal_email;
$this->socialnetworks = (array) json_decode($obj->socialnetworks, true);
- $this->job = $obj->job;
- $this->signature = $obj->signature;
+ $this->job = $obj->job;
+ $this->signature = $obj->signature;
$this->admin = $obj->admin;
- $this->note_public = $obj->note_public;
- $this->note_private = $obj->note_private;
+ $this->note_public = $obj->note_public;
+ $this->note_private = $obj->note_private;
$this->note = $obj->note_private;
$this->statut = $obj->statut;
$this->photo = $obj->photo;
@@ -1177,9 +1177,9 @@ class User extends CommonObject
// Clean parameters
- if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords($this->lastname);
- if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->lastname=strtoupper($this->lastname);
- if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords($this->firstname);
+ if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords($this->lastname);
+ if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->lastname = strtoupper($this->lastname);
+ if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords($this->firstname);
$this->login = trim($this->login);
if (!isset($this->entity)) $this->entity = $conf->entity; // If not defined, we use default value
@@ -1256,7 +1256,7 @@ class User extends CommonObject
$langs->load("stocks");
$entrepot = new Entrepot($this->db);
$entrepot->label = $langs->trans("PersonalStock", $this->getFullName($langs));
- $entrepot->libelle = $entrepot->label; // For backward compatibility
+ $entrepot->libelle = $entrepot->label; // For backward compatibility
$entrepot->description = $langs->trans("ThisWarehouseIsPersonalStock", $this->getFullName($langs));
$entrepot->statut = 1;
$entrepot->country_id = $mysoc->country_id;
@@ -1334,28 +1334,28 @@ class User extends CommonObject
$this->country_id = $contact->country_id;
$this->employee = 0;
- if (empty($login)) $login=strtolower(substr($contact->firstname, 0, 4)) . strtolower(substr($contact->lastname, 0, 4));
+ if (empty($login)) $login = strtolower(substr($contact->firstname, 0, 4)).strtolower(substr($contact->lastname, 0, 4));
$this->login = $login;
$this->db->begin();
// Create user and set $this->id. Trigger is disabled because executed later.
- $result=$this->create($user, 1);
+ $result = $this->create($user, 1);
if ($result > 0)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."user";
- $sql.= " SET fk_socpeople=".$contact->id;
- if ($contact->socid) $sql.=", fk_soc=".$contact->socid;
- $sql.= " WHERE rowid=".$this->id;
- $resql=$this->db->query($sql);
+ $sql .= " SET fk_socpeople=".$contact->id;
+ if ($contact->socid) $sql .= ", fk_soc=".$contact->socid;
+ $sql .= " WHERE rowid=".$this->id;
+ $resql = $this->db->query($sql);
dol_syslog(get_class($this)."::create_from_contact", LOG_DEBUG);
if ($resql)
{
- $this->context['createfromcontact']='createfromcontact';
+ $this->context['createfromcontact'] = 'createfromcontact';
// Call trigger
- $result=$this->call_trigger('USER_CREATE', $user);
+ $result = $this->call_trigger('USER_CREATE', $user);
if ($result < 0) { $error++; $this->db->rollback(); return -1; }
// End call triggers
@@ -1520,9 +1520,9 @@ class User extends CommonObject
// Clean parameters
- if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname=ucwords($this->lastname);
- if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->lastname=strtoupper($this->lastname);
- if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname=ucwords($this->firstname);
+ if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->lastname = ucwords($this->lastname);
+ if (!empty($conf->global->MAIN_ALL_TO_UPPER)) $this->lastname = strtoupper($this->lastname);
+ if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) $this->firstname = ucwords($this->firstname);
$this->lastname = trim($this->lastname);
$this->firstname = trim($this->firstname);
@@ -1544,23 +1544,23 @@ class User extends CommonObject
$this->email = trim($this->email);
$this->personal_email = trim($this->personal_email);
- $this->job = trim($this->job);
+ $this->job = trim($this->job);
$this->signature = trim($this->signature);
$this->note_public = trim($this->note_public);
$this->note_private = trim($this->note_private);
- $this->openid = trim(empty($this->openid)?'':$this->openid); // Avoid warning
- $this->admin = $this->admin?$this->admin:0;
- $this->address = empty($this->address)?'':$this->address;
- $this->zip = empty($this->zip)?'':$this->zip;
- $this->town = empty($this->town)?'':$this->town;
+ $this->openid = trim(empty($this->openid) ? '' : $this->openid); // Avoid warning
+ $this->admin = $this->admin ? $this->admin : 0;
+ $this->address = empty($this->address) ? '' : $this->address;
+ $this->zip = empty($this->zip) ? '' : $this->zip;
+ $this->town = empty($this->town) ? '' : $this->town;
$this->accountancy_code = trim($this->accountancy_code);
- $this->color = empty($this->color)?'':$this->color;
- $this->dateemployment = empty($this->dateemployment)?'':$this->dateemployment;
- $this->dateemploymentend = empty($this->dateemploymentend)?'':$this->dateemploymentend;
- $this->fk_warehouse = trim(empty($this->fk_warehouse)?'':$this->fk_warehouse);
+ $this->color = empty($this->color) ? '' : $this->color;
+ $this->dateemployment = empty($this->dateemployment) ? '' : $this->dateemployment;
+ $this->dateemploymentend = empty($this->dateemploymentend) ? '' : $this->dateemploymentend;
+ $this->fk_warehouse = trim(empty($this->fk_warehouse) ? '' : $this->fk_warehouse);
// Check parameters
- if (! empty($conf->global->USER_MAIL_REQUIRED) && ! isValidEMail($this->email))
+ if (!empty($conf->global->USER_MAIL_REQUIRED) && !isValidEMail($this->email))
{
$langs->load("errors");
$this->error = $langs->trans("ErrorBadEMail", $this->email);
@@ -1577,56 +1577,56 @@ class User extends CommonObject
// Update datas
$sql = "UPDATE ".MAIN_DB_PREFIX."user SET";
- $sql.= " lastname = '".$this->db->escape($this->lastname)."'";
- $sql.= ", firstname = '".$this->db->escape($this->firstname)."'";
- $sql.= ", employee = ".(int) $this->employee;
- $sql.= ", login = '".$this->db->escape($this->login)."'";
- $sql.= ", api_key = ".($this->api_key ? "'".$this->db->escape($this->api_key)."'" : "null");
- $sql.= ", gender = ".($this->gender != -1 ? "'".$this->db->escape($this->gender)."'" : "null"); // 'man' or 'woman'
- $sql.= ", birth=".(strval($this->birth)!='' ? "'".$this->db->idate($this->birth)."'" : 'null');
- if (! empty($user->admin)) $sql.= ", admin = ".(int) $this->admin; // admin flag can be set/unset only by an admin user
- $sql.= ", address = '".$this->db->escape($this->address)."'";
- $sql.= ", zip = '".$this->db->escape($this->zip)."'";
- $sql.= ", town = '".$this->db->escape($this->town)."'";
- $sql.= ", fk_state = ".((! empty($this->state_id) && $this->state_id > 0)?"'".$this->db->escape($this->state_id)."'":"null");
- $sql.= ", fk_country = ".((! empty($this->country_id) && $this->country_id > 0)?"'".$this->db->escape($this->country_id)."'":"null");
- $sql.= ", office_phone = '".$this->db->escape($this->office_phone)."'";
- $sql.= ", office_fax = '".$this->db->escape($this->office_fax)."'";
- $sql.= ", user_mobile = '".$this->db->escape($this->user_mobile)."'";
- $sql.= ", personal_mobile = '".$this->db->escape($this->personal_mobile)."'";
- $sql.= ", email = '".$this->db->escape($this->email)."'";
- $sql.= ", personal_email = '".$this->db->escape($this->personal_email)."'";
- $sql.= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
- $sql.= ", job = '".$this->db->escape($this->job)."'";
- $sql.= ", signature = '".$this->db->escape($this->signature)."'";
- $sql.= ", accountancy_code = '".$this->db->escape($this->accountancy_code)."'";
- $sql.= ", color = '".$this->db->escape($this->color)."'";
- $sql.= ", dateemployment=".(strval($this->dateemployment)!='' ? "'".$this->db->idate($this->dateemployment)."'" : 'null');
- $sql.= ", dateemploymentend=".(strval($this->dateemploymentend)!='' ? "'".$this->db->idate($this->dateemploymentend)."'" : 'null');
- $sql.= ", note = '".$this->db->escape($this->note_private)."'";
- $sql.= ", note_public = '".$this->db->escape($this->note_public)."'";
- $sql.= ", photo = ".($this->photo?"'".$this->db->escape($this->photo)."'":"null");
- $sql.= ", openid = ".($this->openid?"'".$this->db->escape($this->openid)."'":"null");
- $sql.= ", fk_user = ".($this->fk_user > 0?"'".$this->db->escape($this->fk_user)."'":"null");
- $sql.= ", fk_user_expense_validator = ".($this->fk_user_expense_validator > 0?"'".$this->db->escape($this->fk_user_expense_validator)."'":"null");
- $sql.= ", fk_user_holiday_validator = ".($this->fk_user_holiday_validator > 0?"'".$this->db->escape($this->fk_user_holiday_validator)."'":"null");
- if (isset($this->thm) || $this->thm != '') $sql.= ", thm= ".($this->thm != ''?"'".$this->db->escape($this->thm)."'":"null");
- if (isset($this->tjm) || $this->tjm != '') $sql.= ", tjm= ".($this->tjm != ''?"'".$this->db->escape($this->tjm)."'":"null");
- if (isset($this->salary) || $this->salary != '') $sql.= ", salary= ".($this->salary != ''?"'".$this->db->escape($this->salary)."'":"null");
- if (isset($this->salaryextra) || $this->salaryextra != '') $sql.= ", salaryextra= ".($this->salaryextra != ''?"'".$this->db->escape($this->salaryextra)."'":"null");
- $sql.= ", weeklyhours= ".($this->weeklyhours != ''?"'".$this->db->escape($this->weeklyhours)."'":"null");
- $sql.= ", entity = '".$this->db->escape($this->entity)."'";
- $sql.= ", default_range = ".($this->default_range > 0 ? $this->default_range : 'null');
- $sql.= ", default_c_exp_tax_cat = ".($this->default_c_exp_tax_cat > 0 ? $this->default_c_exp_tax_cat : 'null');
- $sql.= ", fk_warehouse = ".($this->fk_warehouse?"'".$this->db->escape($this->fk_warehouse)."'":"null");
+ $sql .= " lastname = '".$this->db->escape($this->lastname)."'";
+ $sql .= ", firstname = '".$this->db->escape($this->firstname)."'";
+ $sql .= ", employee = ".(int) $this->employee;
+ $sql .= ", login = '".$this->db->escape($this->login)."'";
+ $sql .= ", api_key = ".($this->api_key ? "'".$this->db->escape($this->api_key)."'" : "null");
+ $sql .= ", gender = ".($this->gender != -1 ? "'".$this->db->escape($this->gender)."'" : "null"); // 'man' or 'woman'
+ $sql .= ", birth=".(strval($this->birth) != '' ? "'".$this->db->idate($this->birth)."'" : 'null');
+ if (!empty($user->admin)) $sql .= ", admin = ".(int) $this->admin; // admin flag can be set/unset only by an admin user
+ $sql .= ", address = '".$this->db->escape($this->address)."'";
+ $sql .= ", zip = '".$this->db->escape($this->zip)."'";
+ $sql .= ", town = '".$this->db->escape($this->town)."'";
+ $sql .= ", fk_state = ".((!empty($this->state_id) && $this->state_id > 0) ? "'".$this->db->escape($this->state_id)."'" : "null");
+ $sql .= ", fk_country = ".((!empty($this->country_id) && $this->country_id > 0) ? "'".$this->db->escape($this->country_id)."'" : "null");
+ $sql .= ", office_phone = '".$this->db->escape($this->office_phone)."'";
+ $sql .= ", office_fax = '".$this->db->escape($this->office_fax)."'";
+ $sql .= ", user_mobile = '".$this->db->escape($this->user_mobile)."'";
+ $sql .= ", personal_mobile = '".$this->db->escape($this->personal_mobile)."'";
+ $sql .= ", email = '".$this->db->escape($this->email)."'";
+ $sql .= ", personal_email = '".$this->db->escape($this->personal_email)."'";
+ $sql .= ", socialnetworks = '".$this->db->escape(json_encode($this->socialnetworks))."'";
+ $sql .= ", job = '".$this->db->escape($this->job)."'";
+ $sql .= ", signature = '".$this->db->escape($this->signature)."'";
+ $sql .= ", accountancy_code = '".$this->db->escape($this->accountancy_code)."'";
+ $sql .= ", color = '".$this->db->escape($this->color)."'";
+ $sql .= ", dateemployment=".(strval($this->dateemployment) != '' ? "'".$this->db->idate($this->dateemployment)."'" : 'null');
+ $sql .= ", dateemploymentend=".(strval($this->dateemploymentend) != '' ? "'".$this->db->idate($this->dateemploymentend)."'" : 'null');
+ $sql .= ", note = '".$this->db->escape($this->note_private)."'";
+ $sql .= ", note_public = '".$this->db->escape($this->note_public)."'";
+ $sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
+ $sql .= ", openid = ".($this->openid ? "'".$this->db->escape($this->openid)."'" : "null");
+ $sql .= ", fk_user = ".($this->fk_user > 0 ? "'".$this->db->escape($this->fk_user)."'" : "null");
+ $sql .= ", fk_user_expense_validator = ".($this->fk_user_expense_validator > 0 ? "'".$this->db->escape($this->fk_user_expense_validator)."'" : "null");
+ $sql .= ", fk_user_holiday_validator = ".($this->fk_user_holiday_validator > 0 ? "'".$this->db->escape($this->fk_user_holiday_validator)."'" : "null");
+ if (isset($this->thm) || $this->thm != '') $sql .= ", thm= ".($this->thm != '' ? "'".$this->db->escape($this->thm)."'" : "null");
+ if (isset($this->tjm) || $this->tjm != '') $sql .= ", tjm= ".($this->tjm != '' ? "'".$this->db->escape($this->tjm)."'" : "null");
+ if (isset($this->salary) || $this->salary != '') $sql .= ", salary= ".($this->salary != '' ? "'".$this->db->escape($this->salary)."'" : "null");
+ if (isset($this->salaryextra) || $this->salaryextra != '') $sql .= ", salaryextra= ".($this->salaryextra != '' ? "'".$this->db->escape($this->salaryextra)."'" : "null");
+ $sql .= ", weeklyhours= ".($this->weeklyhours != '' ? "'".$this->db->escape($this->weeklyhours)."'" : "null");
+ $sql .= ", entity = '".$this->db->escape($this->entity)."'";
+ $sql .= ", default_range = ".($this->default_range > 0 ? $this->default_range : 'null');
+ $sql .= ", default_c_exp_tax_cat = ".($this->default_c_exp_tax_cat > 0 ? $this->default_c_exp_tax_cat : 'null');
+ $sql .= ", fk_warehouse = ".($this->fk_warehouse ? "'".$this->db->escape($this->fk_warehouse)."'" : "null");
- $sql.= " WHERE rowid = ".$this->id;
+ $sql .= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)
{
- $nbrowsaffected+=$this->db->affected_rows($resql);
+ $nbrowsaffected += $this->db->affected_rows($resql);
// Update password
if (!empty($this->pass))
@@ -1663,55 +1663,55 @@ class User extends CommonObject
// This user is linked with a member, so we also update member information
// if this is an update.
- $adh=new Adherent($this->db);
- $result=$adh->fetch($this->fk_member);
+ $adh = new Adherent($this->db);
+ $result = $adh->fetch($this->fk_member);
if ($result > 0)
{
- $adh->firstname=$this->firstname;
- $adh->lastname=$this->lastname;
- $adh->login=$this->login;
- $adh->gender=$this->gender;
- $adh->birth=$this->birth;
+ $adh->firstname = $this->firstname;
+ $adh->lastname = $this->lastname;
+ $adh->login = $this->login;
+ $adh->gender = $this->gender;
+ $adh->birth = $this->birth;
- $adh->pass=$this->pass;
+ $adh->pass = $this->pass;
- $adh->societe=(empty($adh->societe) && $this->societe_id ? $this->societe_id : $adh->societe);
+ $adh->societe = (empty($adh->societe) && $this->societe_id ? $this->societe_id : $adh->societe);
- $adh->address=$this->address;
- $adh->town=$this->town;
- $adh->zip=$this->zip;
- $adh->state_id=$this->state_id;
- $adh->country_id=$this->country_id;
+ $adh->address = $this->address;
+ $adh->town = $this->town;
+ $adh->zip = $this->zip;
+ $adh->state_id = $this->state_id;
+ $adh->country_id = $this->country_id;
- $adh->email=$this->email;
+ $adh->email = $this->email;
- $adh->socialnetworks=$this->socialnetworks;
+ $adh->socialnetworks = $this->socialnetworks;
- $adh->phone=$this->office_phone;
- $adh->phone_mobile=$this->user_mobile;
+ $adh->phone = $this->office_phone;
+ $adh->phone_mobile = $this->user_mobile;
- $adh->user_id=$this->id;
- $adh->user_login=$this->login;
+ $adh->user_id = $this->id;
+ $adh->user_login = $this->login;
- $result=$adh->update($user, 0, 1, 0);
+ $result = $adh->update($user, 0, 1, 0);
if ($result < 0)
{
- $this->error=$adh->error;
- $this->errors=$adh->errors;
+ $this->error = $adh->error;
+ $this->errors = $adh->errors;
dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);
$error++;
}
}
elseif ($result < 0)
{
- $this->error=$adh->error;
- $this->errors=$adh->errors;
+ $this->error = $adh->error;
+ $this->errors = $adh->errors;
$error++;
}
}
- if ($this->contact_id > 0 && ! $nosynccontact)
+ if ($this->contact_id > 0 && !$nosynccontact)
{
dol_syslog(get_class($this)."::update user is linked with a contact. We try to update contact too.", LOG_DEBUG);
@@ -1719,77 +1719,77 @@ class User extends CommonObject
// This user is linked with a contact, so we also update contact information
// if this is an update.
- $tmpobj=new Contact($this->db);
- $result=$tmpobj->fetch($this->contact_id);
+ $tmpobj = new Contact($this->db);
+ $result = $tmpobj->fetch($this->contact_id);
if ($result >= 0)
{
- $tmpobj->firstname=$this->firstname;
- $tmpobj->lastname=$this->lastname;
- $tmpobj->login=$this->login;
- $tmpobj->gender=$this->gender;
- $tmpobj->birth=$this->birth;
+ $tmpobj->firstname = $this->firstname;
+ $tmpobj->lastname = $this->lastname;
+ $tmpobj->login = $this->login;
+ $tmpobj->gender = $this->gender;
+ $tmpobj->birth = $this->birth;
//$tmpobj->pass=$this->pass;
//$tmpobj->societe=(empty($tmpobj->societe) && $this->societe_id ? $this->societe_id : $tmpobj->societe);
- $tmpobj->email=$this->email;
+ $tmpobj->email = $this->email;
- $tmpobj->socialnetworks=$this->socialnetworks;
+ $tmpobj->socialnetworks = $this->socialnetworks;
- $tmpobj->phone_pro=$this->office_phone;
- $tmpobj->phone_mobile=$this->user_mobile;
- $tmpobj->fax=$this->office_fax;
+ $tmpobj->phone_pro = $this->office_phone;
+ $tmpobj->phone_mobile = $this->user_mobile;
+ $tmpobj->fax = $this->office_fax;
- $tmpobj->address=$this->address;
- $tmpobj->town=$this->town;
- $tmpobj->zip=$this->zip;
- $tmpobj->state_id=$this->state_id;
- $tmpobj->country_id=$this->country_id;
+ $tmpobj->address = $this->address;
+ $tmpobj->town = $this->town;
+ $tmpobj->zip = $this->zip;
+ $tmpobj->state_id = $this->state_id;
+ $tmpobj->country_id = $this->country_id;
- $tmpobj->user_id=$this->id;
- $tmpobj->user_login=$this->login;
+ $tmpobj->user_id = $this->id;
+ $tmpobj->user_login = $this->login;
- $result=$tmpobj->update($tmpobj->id, $user, 0, 'update', 1);
+ $result = $tmpobj->update($tmpobj->id, $user, 0, 'update', 1);
if ($result < 0)
{
- $this->error=$tmpobj->error;
- $this->errors=$tmpobj->errors;
+ $this->error = $tmpobj->error;
+ $this->errors = $tmpobj->errors;
dol_syslog(get_class($this)."::update error after calling adh->update to sync it with user: ".$this->error, LOG_ERR);
$error++;
}
}
else
{
- $this->error=$tmpobj->error;
- $this->errors=$tmpobj->errors;
+ $this->error = $tmpobj->error;
+ $this->errors = $tmpobj->errors;
$error++;
}
}
}
- $action='update';
+ $action = 'update';
// Actions on extra fields
- if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
+ if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
{
- $result=$this->insertExtraFields();
+ $result = $this->insertExtraFields();
if ($result < 0)
{
$error++;
}
}
- if (! $error && ! $notrigger)
+ if (!$error && !$notrigger)
{
// Call trigger
- $result=$this->call_trigger('USER_MODIFY', $user);
+ $result = $this->call_trigger('USER_MODIFY', $user);
if ($result < 0) { $error++; }
// End call triggers
}
- if (! $error)
+ if (!$error)
{
$this->db->commit();
return $nbrowsaffected;
@@ -2332,60 +2332,60 @@ class User extends CommonObject
global $dolibarr_main_authentication, $dolibarr_main_demo;
global $menumanager;
- if(!$user->rights->user->user->lire && $user->id !=$this->id) $option='nolink';
+ if (!$user->rights->user->user->lire && $user->id != $this->id) $option = 'nolink';
- if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg=0;
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) $withpictoimg = 0;
- $result=''; $label='';
+ $result = ''; $label = '';
- if (! empty($this->photo))
+ if (!empty($this->photo))
{
- $label.= '
';
- $label.= Form::showphoto('userphoto', $this, 0, 60, 0, 'photowithmargin photologintooltip', 'small', 0, 1); // Force height to 60 so we total height of tooltip can be calculated and collision can be managed
- $label.= '
';
+ $label .= '
';
+ $label .= Form::showphoto('userphoto', $this, 0, 60, 0, 'photowithmargin photologintooltip', 'small', 0, 1); // Force height to 60 so we total height of tooltip can be calculated and collision can be managed
+ $label .= '
';
}
// Info Login
- $label.= '
';
- $label.= '
' . $langs->trans("User") . ' ';
- $label.= '
' . $langs->trans('Name') . ': ' . $this->getFullName($langs, '');
- if (! empty($this->login)) $label.= '
' . $langs->trans('Login') . ': ' . $this->login;
- if (! empty($this->job)) $label.= '
' . $langs->trans("Job").': '.$this->job;
- $label.= '
' . $langs->trans("Email").': '.$this->email;
- if (! empty($this->phone)) $label.= '
' . $langs->trans("Phone").': '.$this->phone;
- if (! empty($this->admin))
- $label.= '
' . $langs->trans("Administrator").' : '.yn($this->admin);
- if (! empty($this->socid) ) // Add thirdparty for external users
+ $label .= '
';
+ $label .= ''.$langs->trans("User").' '.$langs->trans('Name').': '.$this->getFullName($langs, '');
+ if (!empty($this->login)) $label .= ''.$langs->trans('Login').': '.$this->login;
+ if (!empty($this->job)) $label .= ''.$langs->trans("Job").': '.$this->job;
+ $label .= ''.$langs->trans("Email").': '.$this->email;
+ if (!empty($this->phone)) $label .= ''.$langs->trans("Phone").': '.$this->phone;
+ if (!empty($this->admin))
+ $label .= ''.$langs->trans("Administrator").' : '.yn($this->admin);
+ if (!empty($this->socid)) // Add thirdparty for external users
{
$thirdpartystatic = new Societe($db);
$thirdpartystatic->fetch($this->socid);
- if (empty($hidethirdpartylogo)) $companylink = ' '.$thirdpartystatic->getNomUrl(2, (($option == 'nolink')?'nolink':'')); // picto only of company
- $company=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
+ if (empty($hidethirdpartylogo)) $companylink = ' '.$thirdpartystatic->getNomUrl(2, (($option == 'nolink') ? 'nolink' : '')); // picto only of company
+ $company = ' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
}
- $type=($this->socid?$langs->trans("External").$company:$langs->trans("Internal"));
- $label.= '' . $langs->trans("Type") . ': ' . $type;
- $label.= '' . $langs->trans("Status").' : '.$this->getLibStatut(0);
- $label.='
';
+ $type = ($this->socid ? $langs->trans("External").$company : $langs->trans("Internal"));
+ $label .= '
'.$langs->trans("Type").': '.$type;
+ $label .= '
'.$langs->trans("Status").' : '.$this->getLibStatut(0);
+ $label .= '
';
if ($infologin > 0)
{
- $label.= '
';
- $label.= '
'.$langs->trans("Session").' ';
- $label.= '
'.$langs->trans("IPAddress").' : '.$_SERVER["REMOTE_ADDR"];
- if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $label.= '
'.$langs->trans("ConnectedOnMultiCompany").': '.$conf->entity.' (user entity '.$this->entity.')';
- $label.= '
'.$langs->trans("AuthenticationMode").': '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo)?'':' (demo)');
- $label.= '
'.$langs->trans("ConnectedSince").': '.dol_print_date($this->datelastlogin, "dayhour", 'tzuser');
- $label.= '
'.$langs->trans("PreviousConnexion").': '.dol_print_date($this->datepreviouslogin, "dayhour", 'tzuser');
- $label.= '
'.$langs->trans("CurrentTheme").': '.$conf->theme;
- $label.= '
'.$langs->trans("CurrentMenuManager").': '.$menumanager->name;
- $s=picto_from_langcode($langs->getDefaultLang());
- $label.= '
'.$langs->trans("CurrentUserLanguage").': '.($s?$s.' ':'').$langs->getDefaultLang();
- $label.= '
'.$langs->trans("Browser").': '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')';
- $label.= '
'.$langs->trans("Layout").': '.$conf->browser->layout;
- $label.= '
'.$langs->trans("Screen").': '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
- if ($conf->browser->layout == 'phone') $label.= '
'.$langs->trans("Phone").': '.$langs->trans("Yes");
- if (! empty($_SESSION["disablemodules"])) $label.= '
'.$langs->trans("DisabledModules").': '.join(', ', explode(',', $_SESSION["disablemodules"]));
+ $label .= '
';
+ $label .= '
'.$langs->trans("Session").' ';
+ $label .= '
'.$langs->trans("IPAddress").' : '.$_SERVER["REMOTE_ADDR"];
+ if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $label .= '
'.$langs->trans("ConnectedOnMultiCompany").': '.$conf->entity.' (user entity '.$this->entity.')';
+ $label .= '
'.$langs->trans("AuthenticationMode").': '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');
+ $label .= '
'.$langs->trans("ConnectedSince").': '.dol_print_date($this->datelastlogin, "dayhour", 'tzuser');
+ $label .= '
'.$langs->trans("PreviousConnexion").': '.dol_print_date($this->datepreviouslogin, "dayhour", 'tzuser');
+ $label .= '
'.$langs->trans("CurrentTheme").': '.$conf->theme;
+ $label .= '
'.$langs->trans("CurrentMenuManager").': '.$menumanager->name;
+ $s = picto_from_langcode($langs->getDefaultLang());
+ $label .= '
'.$langs->trans("CurrentUserLanguage").': '.($s ? $s.' ' : '').$langs->getDefaultLang();
+ $label .= '
'.$langs->trans("Browser").': '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.$_SERVER['HTTP_USER_AGENT'].')';
+ $label .= '
'.$langs->trans("Layout").': '.$conf->browser->layout;
+ $label .= '
'.$langs->trans("Screen").': '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
+ if ($conf->browser->layout == 'phone') $label .= '
'.$langs->trans("Phone").': '.$langs->trans("Yes");
+ if (!empty($_SESSION["disablemodules"])) $label .= '
'.$langs->trans("DisabledModules").': '.join(', ', explode(',', $_SESSION["disablemodules"]));
}
- if ($infologin < 0) $label='';
+ if ($infologin < 0) $label = '';
$url = DOL_URL_ROOT.'/user/card.php?id='.$this->id;
if ($option == 'leave') $url = DOL_URL_ROOT.'/holiday/list.php?id='.$this->id;
@@ -2703,43 +2703,43 @@ class User extends CommonObject
*/
public function initAsSpecimen()
{
- global $user,$langs;
+ global $user, $langs;
- $now=dol_now();
+ $now = dol_now();
// Initialise parametres
- $this->id=0;
+ $this->id = 0;
$this->ref = 'SPECIMEN';
- $this->specimen=1;
+ $this->specimen = 1;
- $this->lastname='DOLIBARR';
- $this->firstname='SPECIMEN';
- $this->gender='man';
- $this->note_public='This is a note public';
- $this->note_private='This is a note private';
- $this->email='email@specimen.com';
- $this->personal_email='personalemail@specimen.com';
+ $this->lastname = 'DOLIBARR';
+ $this->firstname = 'SPECIMEN';
+ $this->gender = 'man';
+ $this->note_public = 'This is a note public';
+ $this->note_private = 'This is a note private';
+ $this->email = 'email@specimen.com';
+ $this->personal_email = 'personalemail@specimen.com';
$this->socialnetworks = array(
'skype' => 'skypepseudo',
'twitter' => 'twitterpseudo',
'facebook' => 'facebookpseudo',
'linkedin' => 'linkedinpseudo',
);
- $this->office_phone='0999999999';
- $this->office_fax='0999999998';
- $this->user_mobile='0999999997';
- $this->personal_mobile='0999999996';
- $this->admin=0;
- $this->login='dolibspec';
- $this->pass='dolibspec';
+ $this->office_phone = '0999999999';
+ $this->office_fax = '0999999998';
+ $this->user_mobile = '0999999997';
+ $this->personal_mobile = '0999999996';
+ $this->admin = 0;
+ $this->login = 'dolibspec';
+ $this->pass = 'dolibspec';
//$this->pass_indatabase='dolibspec'; Set after a fetch
//$this->pass_indatabase_crypted='e80ca5a88c892b0aaaf7e154853bccab'; Set after a fetch
- $this->datec=$now;
- $this->datem=$now;
+ $this->datec = $now;
+ $this->datem = $now;
- $this->datelastlogin=$now;
- $this->datepreviouslogin=$now;
- $this->statut=1;
+ $this->datelastlogin = $now;
+ $this->datepreviouslogin = $now;
+ $this->statut = 1;
//$this->societe_id = 1; For external users
//$this->contact_id = 1; For external users
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 04c9e70c447..679c1777297 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -288,23 +288,23 @@ if ($action === 'confirm_deletecombination') {
$form = new Form($db);
-if (! empty($id) || ! empty($ref))
+if (!empty($id) || !empty($ref))
{
llxHeader("", "", $langs->trans("CardProduct".$object->type));
- $showbarcode=empty($conf->barcode->enabled)?0:1;
- if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode=0;
+ $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;
+ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
- $head=product_prepare_head($object);
- $titre=$langs->trans("CardProduct".$object->type);
- $picto=($object->type== Product::TYPE_SERVICE?'service':'product');
+ $head = product_prepare_head($object);
+ $titre = $langs->trans("CardProduct".$object->type);
+ $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
dol_fiche_head($head, 'combinations', $titre, -1, $picto);
$linkback = '
'.$langs->trans("BackToList").' ';
- $object->next_prev_filter=" fk_product_type = ".$object->type;
+ $object->next_prev_filter = " fk_product_type = ".$object->type;
- dol_banner_tab($object, 'ref', $linkback, ($user->socid?0:1), 'ref', '', '', '', 0, '', '', 1);
+ dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', '', '', '', 0, '', '', 1);
print '
';
@@ -494,9 +494,9 @@ if (! empty($id) || ! empty($ref))
print '
// become
// 
- $message=preg_replace('/(