';
print '';
@@ -431,7 +431,7 @@ if ($object->id > 0)
if ($object->client)
{
- if (! empty($conf->commande->enabled) && ! empty($conf->global->ORDER_MANAGE_MIN_AMOUNT))
+ if (!empty($conf->commande->enabled) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT))
{
print ''."\n";
print '
';
}
// Preferred shipping Method
- if (! empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
+ if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
print '
';
print '| ';
print $langs->trans('SendingMethod');
@@ -489,32 +489,32 @@ if ($object->id > 0)
// Categories
if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
$langs->load("categories");
- print ' | | ' . $langs->trans("CustomersCategoriesShort") . ' | ';
+ print ' | '.$langs->trans("CustomersCategoriesShort").' | ';
print '';
print $form->showCategories($object->id, 'customer', 1);
print " | ";
}
// Other attributes
- $parameters=array('socid'=>$object->id);
- include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+ $parameters = array('socid'=>$object->id);
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
// Sales representative
include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
// Module Adherent
- if (! empty($conf->adherent->enabled))
+ if (!empty($conf->adherent->enabled))
{
$langs->load("members");
$langs->load("users");
print '| '.$langs->trans("LinkedToDolibarrMember").' | ';
print '';
- $adh=new Adherent($db);
- $result=$adh->fetch('', '', $object->id);
+ $adh = new Adherent($db);
+ $result = $adh->fetch('', '', $object->id);
if ($result > 0)
{
- $adh->ref=$adh->getFullName($langs);
+ $adh->ref = $adh->getFullName($langs);
print $adh->getNomUrl(1);
}
else
@@ -558,10 +558,10 @@ if ($object->id > 0)
print ' | | '.$langs->trans("StatusProsp").' | '.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
print ' ';
print '';
- foreach($object->cacheprospectstatus as $key => $val)
+ foreach ($object->cacheprospectstatus as $key => $val)
{
- $titlealt='default';
- if (! empty($val['code']) && ! in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt=$val['label'];
+ $titlealt = 'default';
+ if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
if ($object->stcomm_id != $val['id']) print ' '.img_action($titlealt, $val['code']).'';
}
print ' | ';
@@ -574,65 +574,65 @@ if ($object->id > 0)
$boxstat = '';
// Nbre max d'elements des petites listes
- $MAXLIST=$conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+ $MAXLIST = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
// Lien recap
- $boxstat.='';
- $boxstat.=' ';
- $boxstat.='';
+ $boxstat .= '';
+ $boxstat .= ' ';
+ $boxstat .= '| ';
- if (! empty($conf->propal->enabled))
+ if (!empty($conf->propal->enabled))
{
// Box proposals
$tmp = $object->getOutstandingProposals();
- $outstandingOpened=$tmp['opened'];
- $outstandingTotal=$tmp['total_ht'];
- $outstandingTotalIncTax=$tmp['total_ttc'];
- $text=$langs->trans("OverAllProposals");
- $link=DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id;
- $icon='bill';
- if ($link) $boxstat.='';
- $boxstat.=' ';
- $boxstat.=''.img_object("", $icon).' '.$text.'
';
- $boxstat.=''.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'';
- $boxstat.=' ';
- if ($link) $boxstat.='';
+ $outstandingOpened = $tmp['opened'];
+ $outstandingTotal = $tmp['total_ht'];
+ $outstandingTotalIncTax = $tmp['total_ttc'];
+ $text = $langs->trans("OverAllProposals");
+ $link = DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id;
+ $icon = 'bill';
+ if ($link) $boxstat .= '';
+ $boxstat .= '';
+ $boxstat .= ''.img_object("", $icon).' '.$text.'
';
+ $boxstat .= ''.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'';
+ $boxstat .= ' ';
+ if ($link) $boxstat .= '';
}
- if (! empty($conf->commande->enabled))
+ if (!empty($conf->commande->enabled))
{
// Box commandes
$tmp = $object->getOutstandingOrders();
- $outstandingOpened=$tmp['opened'];
- $outstandingTotal=$tmp['total_ht'];
- $outstandingTotalIncTax=$tmp['total_ttc'];
- $text=$langs->trans("OverAllOrders");
- $link=DOL_URL_ROOT.'/commande/list.php?socid='.$object->id;
- $icon='bill';
- if ($link) $boxstat.='';
- $boxstat.='';
- $boxstat.=''.img_object("", $icon).' '.$text.'
';
- $boxstat.=''.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'';
- $boxstat.=' ';
- if ($link) $boxstat.='';
+ $outstandingOpened = $tmp['opened'];
+ $outstandingTotal = $tmp['total_ht'];
+ $outstandingTotalIncTax = $tmp['total_ttc'];
+ $text = $langs->trans("OverAllOrders");
+ $link = DOL_URL_ROOT.'/commande/list.php?socid='.$object->id;
+ $icon = 'bill';
+ if ($link) $boxstat .= '';
+ $boxstat .= '';
+ $boxstat .= ''.img_object("", $icon).' '.$text.'
';
+ $boxstat .= ''.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'';
+ $boxstat .= ' ';
+ if ($link) $boxstat .= '';
}
- if (! empty($conf->facture->enabled))
+ if (!empty($conf->facture->enabled))
{
// Box factures
$tmp = $object->getOutstandingBills();
- $outstandingOpened=$tmp['opened'];
- $outstandingTotal=$tmp['total_ht'];
- $outstandingTotalIncTax=$tmp['total_ttc'];
- $text=$langs->trans("OverAllInvoices");
- $link=DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id;
- $icon='bill';
- if ($link) $boxstat.='';
- $boxstat.='';
- $boxstat.=''.img_object("", $icon).' '.$text.'
';
- $boxstat.=''.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'';
- $boxstat.=' ';
- if ($link) $boxstat.='';
+ $outstandingOpened = $tmp['opened'];
+ $outstandingTotal = $tmp['total_ht'];
+ $outstandingTotalIncTax = $tmp['total_ttc'];
+ $text = $langs->trans("OverAllInvoices");
+ $link = DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id;
+ $icon = 'bill';
+ if ($link) $boxstat .= '';
+ $boxstat .= '';
+ $boxstat .= ''.img_object("", $icon).' '.$text.'
';
+ $boxstat .= ''.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'';
+ $boxstat .= ' ';
+ if ($link) $boxstat .= '';
// Box outstanding bill
$warn = '';
@@ -640,50 +640,50 @@ if ($object->id > 0)
{
$warn = ' '.img_warning($langs->trans("OutstandingBillReached"));
}
- $text=$langs->trans("CurrentOutstandingBill");
- $link=DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id;
- $icon='bill';
- if ($link) $boxstat.='';
- $boxstat.='';
- $boxstat.=''.img_object("", $icon).' '.$text.'
';
- $boxstat.=''.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'';
- $boxstat.=' ';
- if ($link) $boxstat.='';
+ $text = $langs->trans("CurrentOutstandingBill");
+ $link = DOL_URL_ROOT.'/compta/recap-compta.php?socid='.$object->id;
+ $icon = 'bill';
+ if ($link) $boxstat .= '';
+ $boxstat .= '';
+ $boxstat .= ''.img_object("", $icon).' '.$text.'
';
+ $boxstat .= ''.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'';
+ $boxstat .= ' ';
+ if ($link) $boxstat .= '';
}
$parameters = array();
$reshook = $hookmanager->executeHooks('addMoreBoxStatsCustomer', $parameters, $object, $action);
- if(empty($reshook)){
- $boxstat.= $hookmanager->resPrint;
+ if (empty($reshook)) {
+ $boxstat .= $hookmanager->resPrint;
}
- $boxstat.=' | ';
- $boxstat.=' ';
- $boxstat.=' | ';
+ $boxstat .= ' ';
+ $boxstat .= ' ';
print '';
- print '| '.$langs->trans("LastPropals", ($num<=$MAXLIST?"":$MAXLIST)).' | '.$langs->trans("AllPropals").' '.$num.' | ';
+ print ' | ';
print ' ';
@@ -715,7 +715,7 @@ if ($object->id > 0)
$propal_static->total_tva = $objp->total_tva;
$propal_static->total_ttc = $objp->total_ttc;
print $propal_static->getNomUrl(1);
- if ( ($db->jdate($objp->datelimite) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 ) {
+ if (($db->jdate($objp->datelimite) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1) {
print " ".img_warning();
}
print ''.dol_print_date($db->jdate($objp->dp), 'day')." | \n";
@@ -740,39 +740,39 @@ if ($object->id > 0)
/*
* Last orders
*/
- if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
+ if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
{
$sql = "SELECT s.nom, s.rowid";
- $sql.= ", c.rowid as cid, c.total_ht";
- $sql.= ", c.tva as total_tva";
- $sql.= ", c.total_ttc";
- $sql.= ", c.ref, c.ref_client, c.fk_statut, c.facture";
- $sql.= ", c.date_commande as dc";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
- $sql.= " WHERE c.fk_soc = s.rowid ";
- $sql.= " AND s.rowid = ".$object->id;
- $sql.= " AND c.entity = ".$conf->entity;
- $sql.= " ORDER BY c.date_commande DESC";
+ $sql .= ", c.rowid as cid, c.total_ht";
+ $sql .= ", c.tva as total_tva";
+ $sql .= ", c.total_ttc";
+ $sql .= ", c.ref, c.ref_client, c.fk_statut, c.facture";
+ $sql .= ", c.date_commande as dc";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
+ $sql .= " WHERE c.fk_soc = s.rowid ";
+ $sql .= " AND s.rowid = ".$object->id;
+ $sql .= " AND c.entity = ".$conf->entity;
+ $sql .= " ORDER BY c.date_commande DESC";
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
- $commande_static=new Commande($db);
+ $commande_static = new Commande($db);
$num = $db->num_rows($resql);
if ($num > 0)
{
// Check if there are orders billable
$sql2 = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,';
- $sql2.= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut, c.facture as billed';
- $sql2.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
- $sql2.= ', '.MAIN_DB_PREFIX.'commande as c';
- $sql2.= ' WHERE c.fk_soc = s.rowid';
- $sql2.= ' AND s.rowid = '.$object->id;
+ $sql2 .= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut, c.facture as billed';
+ $sql2 .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+ $sql2 .= ', '.MAIN_DB_PREFIX.'commande as c';
+ $sql2 .= ' WHERE c.fk_soc = s.rowid';
+ $sql2 .= ' AND s.rowid = '.$object->id;
// Show orders with status validated, shipping started and delivered (well any order we can bill)
- $sql2.= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))";
+ $sql2 .= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))";
- $resql2=$db->query($sql2);
+ $resql2 = $db->query($sql2);
$orders2invoice = $db->num_rows($resql2);
$db->free($resql2);
@@ -780,7 +780,7 @@ if ($object->id > 0)
print '';
print '';
- print '| '.$langs->trans("LastCustomerOrders", ($num<=$MAXLIST?"":$MAXLIST)).' | '.$langs->trans("AllOrders").' '.$num.' | ';
+ print '";
print '';
@@ -826,24 +826,24 @@ if ($object->id > 0)
/*
* Last shipments
*/
- if (! empty($conf->expedition->enabled) && $user->rights->expedition->lire)
+ if (!empty($conf->expedition->enabled) && $user->rights->expedition->lire)
{
$sql = 'SELECT e.rowid as id';
- $sql.= ', e.ref';
- $sql.= ', e.date_creation';
- $sql.= ', e.fk_statut as statut';
- $sql.= ', s.nom';
- $sql.= ', s.rowid as socid';
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e";
- $sql.= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id;
- $sql.= " AND e.entity IN (".getEntity('expedition').")";
- $sql.= ' GROUP BY e.rowid';
- $sql.= ', e.ref';
- $sql.= ', e.date_creation';
- $sql.= ', e.fk_statut';
- $sql.= ', s.nom';
- $sql.= ', s.rowid';
- $sql.= " ORDER BY e.date_creation DESC";
+ $sql .= ', e.ref';
+ $sql .= ', e.date_creation';
+ $sql .= ', e.fk_statut as statut';
+ $sql .= ', s.nom';
+ $sql .= ', s.rowid as socid';
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e";
+ $sql .= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id;
+ $sql .= " AND e.entity IN (".getEntity('expedition').")";
+ $sql .= ' GROUP BY e.rowid';
+ $sql .= ', e.ref';
+ $sql .= ', e.date_creation';
+ $sql .= ', e.fk_statut';
+ $sql .= ', s.nom';
+ $sql .= ', s.rowid';
+ $sql .= " ORDER BY e.date_creation DESC";
$resql = $db->query($sql);
if ($resql)
@@ -856,7 +856,7 @@ if ($object->id > 0)
print '';
print '';
- print '| '.$langs->trans("LastSendings", ($num<=$MAXLIST?"":$MAXLIST)).' | '.$langs->trans("AllSendings").' '.$num.' | ';
+ print ' | ';
print ' ';
@@ -880,7 +880,7 @@ if ($object->id > 0)
print '!!! | ';
}
- print '' . $sendingstatic->LibStatut($objp->statut, 5) . ' | ';
+ print ''.$sendingstatic->LibStatut($objp->statut, 5).' | ';
print "\n";
$i++;
}
@@ -899,28 +899,28 @@ if ($object->id > 0)
/*
* Last linked contracts
*/
- if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)
{
$sql = "SELECT s.nom, s.rowid, c.rowid as id, c.ref as ref, c.statut, c.datec as dc, c.date_contrat as dcon, c.ref_customer as refcus, c.ref_supplier as refsup";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
- $sql.= " WHERE c.fk_soc = s.rowid ";
- $sql.= " AND s.rowid = ".$object->id;
- $sql.= " AND c.entity = ".$conf->entity;
- $sql.= " ORDER BY c.datec DESC";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
+ $sql .= " WHERE c.fk_soc = s.rowid ";
+ $sql .= " AND s.rowid = ".$object->id;
+ $sql .= " AND c.entity = ".$conf->entity;
+ $sql .= " ORDER BY c.datec DESC";
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
- $contrat=new Contrat($db);
+ $contrat = new Contrat($db);
$num = $db->num_rows($resql);
- if ($num >0)
+ if ($num > 0)
{
print '';
print ' ';
print '';
- print '| '.$langs->trans("LastContracts", ($num<=$MAXLIST?"":$MAXLIST)).' | ';
+ print ' | ';
@@ -932,10 +932,10 @@ if ($object->id > 0)
{
$objp = $db->fetch_object($resql);
- $contrat->id=$objp->id;
- $contrat->ref=$objp->ref?$objp->ref:$objp->id;
- $contrat->ref_customer=$objp->refcus;
- $contrat->ref_supplier=$objp->refsup;
+ $contrat->id = $objp->id;
+ $contrat->ref = $objp->ref ? $objp->ref : $objp->id;
+ $contrat->ref_customer = $objp->refcus;
+ $contrat->ref_supplier = $objp->refsup;
$contrat->fetch_lines();
print ' ';
@@ -969,19 +969,19 @@ if ($object->id > 0)
/*
* Last interventions
*/
- if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
+ if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire)
{
$sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.fk_statut, f.duree as duration, f.datei as startdate";
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as f";
- $sql.= " WHERE f.fk_soc = s.rowid";
- $sql.= " AND s.rowid = ".$object->id;
- $sql.= " AND f.entity = ".$conf->entity;
- $sql.= " ORDER BY f.tms DESC";
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as f";
+ $sql .= " WHERE f.fk_soc = s.rowid";
+ $sql .= " AND s.rowid = ".$object->id;
+ $sql .= " AND f.entity = ".$conf->entity;
+ $sql .= " ORDER BY f.tms DESC";
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
- $fichinter_static=new Fichinter($db);
+ $fichinter_static = new Fichinter($db);
$num = $db->num_rows($resql);
if ($num > 0)
@@ -990,7 +990,7 @@ if ($object->id > 0)
print '';
print '';
- print '| '.$langs->trans("LastInterventions", ($num<=$MAXLIST?"":$MAXLIST)).' | '.$langs->trans("AllInterventions").' '.$num.' | ';
+ print ' | ';
print ' ';
@@ -1001,8 +1001,8 @@ if ($object->id > 0)
{
$objp = $db->fetch_object($resql);
- $fichinter_static->id=$objp->id;
- $fichinter_static->statut=$objp->fk_statut;
+ $fichinter_static->id = $objp->id;
+ $fichinter_static->statut = $objp->fk_statut;
print '';
print '| '.img_object($langs->trans("ShowPropal"), "propal").' '.$objp->ref.' | '."\n";
@@ -1030,28 +1030,28 @@ if ($object->id > 0)
/*
* Last invoices templates
*/
- if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
{
$sql = 'SELECT f.rowid as id, f.titre as ref, f.amount';
- $sql.= ', f.total as total_ht';
- $sql.= ', f.tva as total_tva';
- $sql.= ', f.total_ttc';
- $sql.= ', f.datec as dc';
- $sql.= ', f.date_last_gen, f.date_when';
- $sql.= ', f.frequency';
- $sql.= ', f.unit_frequency';
- $sql.= ', f.suspended as suspended';
- $sql.= ', s.nom, s.rowid as socid';
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
- $sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$object->id;
- $sql.= " AND f.entity = ".$conf->entity;
- $sql.= ' GROUP BY f.rowid, f.titre, f.amount, f.total, f.tva, f.total_ttc,';
- $sql.= ' f.date_last_gen, f.datec, f.frequency, f.unit_frequency,';
- $sql.= ' f.suspended,';
- $sql.= ' s.nom, s.rowid';
- $sql.= " ORDER BY f.date_last_gen, f.datec DESC";
+ $sql .= ', f.total as total_ht';
+ $sql .= ', f.tva as total_tva';
+ $sql .= ', f.total_ttc';
+ $sql .= ', f.datec as dc';
+ $sql .= ', f.date_last_gen, f.date_when';
+ $sql .= ', f.frequency';
+ $sql .= ', f.unit_frequency';
+ $sql .= ', f.suspended as suspended';
+ $sql .= ', s.nom, s.rowid as socid';
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
+ $sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$object->id;
+ $sql .= " AND f.entity = ".$conf->entity;
+ $sql .= ' GROUP BY f.rowid, f.titre, f.amount, f.total, f.tva, f.total_ttc,';
+ $sql .= ' f.date_last_gen, f.datec, f.frequency, f.unit_frequency,';
+ $sql .= ' f.suspended,';
+ $sql .= ' s.nom, s.rowid';
+ $sql .= " ORDER BY f.date_last_gen, f.datec DESC";
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
$invoicetemplate = new FactureRec($db);
@@ -1063,7 +1063,7 @@ if ($object->id > 0)
print '';
print '';
- print '| '.$langs->trans("LatestCustomerTemplateInvoices", ($num<=$MAXLIST?"":$MAXLIST)).' | '.$langs->trans("AllCustomerTemplateInvoices").' '.$num.' | ';
+ print ' | ';
print ' ';
}
@@ -1107,7 +1107,7 @@ if ($object->id > 0)
print price($objp->total_ht);
print '';
- if (! empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES))
+ if (!empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES))
{
print '';
print price($objp->total_ttc);
@@ -1138,25 +1138,25 @@ if ($object->id > 0)
/*
* Last invoices
*/
- if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
+ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
{
$sql = 'SELECT f.rowid as facid, f.ref, f.type, f.amount';
- $sql.= ', f.total as total_ht';
- $sql.= ', f.tva as total_tva';
- $sql.= ', f.total_ttc';
- $sql.= ', f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as statut';
- $sql.= ', s.nom, s.rowid as socid';
- $sql.= ', SUM(pf.amount) as am';
- $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
- $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON f.rowid=pf.fk_facture';
- $sql.= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$object->id;
- $sql.= " AND f.entity IN (".getEntity('invoice').")";
- $sql.= ' GROUP BY f.rowid, f.ref, f.type, f.amount, f.total, f.tva, f.total_ttc,';
- $sql.= ' f.datef, f.datec, f.paye, f.fk_statut,';
- $sql.= ' s.nom, s.rowid';
- $sql.= " ORDER BY f.datef DESC, f.datec DESC";
+ $sql .= ', f.total as total_ht';
+ $sql .= ', f.tva as total_tva';
+ $sql .= ', f.total_ttc';
+ $sql .= ', f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as statut';
+ $sql .= ', s.nom, s.rowid as socid';
+ $sql .= ', SUM(pf.amount) as am';
+ $sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON f.rowid=pf.fk_facture';
+ $sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = ".$object->id;
+ $sql .= " AND f.entity IN (".getEntity('invoice').")";
+ $sql .= ' GROUP BY f.rowid, f.ref, f.type, f.amount, f.total, f.tva, f.total_ttc,';
+ $sql .= ' f.datef, f.datec, f.paye, f.fk_statut,';
+ $sql .= ' s.nom, s.rowid';
+ $sql .= " ORDER BY f.datef DESC, f.datec DESC";
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
$facturestatic = new Facture($db);
@@ -1168,7 +1168,7 @@ if ($object->id > 0)
print '';
print '';
- print '| '.$langs->trans("LastCustomersBills", ($num<=$MAXLIST?"":$MAXLIST)).' | '.$langs->trans("AllBills").' '.$num.' | ';
+ print ' | ';
print ' ';
@@ -1202,7 +1202,7 @@ if ($object->id > 0)
print price($objp->total_ht);
print '';
- if (! empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES))
+ if (!empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES))
{
print '';
print price($objp->total_ttc);
@@ -1249,25 +1249,25 @@ if ($object->id > 0)
print '';
}
- if (! empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status==1)
+ if (!empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status == 1)
{
$langs->load("propal");
print '';
}
- if (! empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status==1)
+ if (!empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status == 1)
{
$langs->load("orders");
print '';
}
- if ($user->rights->contrat->creer && $object->status==1)
+ if ($user->rights->contrat->creer && $object->status == 1)
{
$langs->load("contracts");
print '';
}
- if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status==1)
+ if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status == 1)
{
$langs->load("fichinter");
print '';
@@ -1276,13 +1276,13 @@ if ($object->id > 0)
// Add invoice
if ($user->socid == 0)
{
- if (! empty($conf->deplacement->enabled) && $object->status==1)
+ if (!empty($conf->deplacement->enabled) && $object->status == 1)
{
$langs->load("trips");
print '';
}
- if (! empty($conf->facture->enabled) && $object->status==1)
+ if (!empty($conf->facture->enabled) && $object->status == 1)
{
if (empty($user->rights->facture->creer))
{
@@ -1310,7 +1310,7 @@ if ($object->id > 0)
}
// Add action
- if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status==1)
+ if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1)
{
if ($user->rights->agenda->myactions->create)
{
@@ -1325,13 +1325,13 @@ if ($object->id > 0)
print '';
- if (! empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_CUSTOMER_CARD))
+ if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_CUSTOMER_CARD))
{
// List of contacts
show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
}
- if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+ if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB))
{
print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index f4a0e61095f..a2d8c0a373b 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -23,7 +23,7 @@
* \brief Fiche mailing, onglet general
*/
-if (! defined('NOSTYLECHECK')) define('NOSTYLECHECK', '1');
+if (!defined('NOSTYLECHECK')) define('NOSTYLECHECK', '1');
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/emailing.lib.php';
@@ -54,26 +54,26 @@ $extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('mailingcard','globalcard'));
+$hookmanager->initHooks(array('mailingcard', 'globalcard'));
// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
-$object->substitutionarray=FormMail::getAvailableSubstitKey('emailing');
+$object->substitutionarray = FormMail::getAvailableSubstitKey('emailing');
// Set $object->substitutionarrayfortest
-$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
+$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
-$targetobject = null; // Not defined with mass emailing
+$targetobject = null; // Not defined with mass emailing
-$parameters=array('mode'=>'emailing');
-$substitutionarray=FormMail::getAvailableSubstitKey('emailing', $targetobject);
+$parameters = array('mode'=>'emailing');
+$substitutionarray = FormMail::getAvailableSubstitKey('emailing', $targetobject);
$object->substitutionarrayfortest = $substitutionarray;
// List of sending methods
-$listofmethods=array();
-$listofmethods['mail']='PHP mail function';
-$listofmethods['smtps']='SMTP/SMTPS socket library';
+$listofmethods = array();
+$listofmethods['mail'] = 'PHP mail function';
+$listofmethods['smtps'] = 'SMTP/SMTPS socket library';
@@ -81,8 +81,8 @@ $listofmethods['smtps']='SMTP/SMTPS socket library';
* Actions
*/
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if (empty($reshook))
@@ -96,7 +96,7 @@ if (empty($reshook))
}
else
{
- $result=$object->createFromClone($user, $object->id, $_REQUEST["clone_content"], $_REQUEST["clone_receivers"]);
+ $result = $object->createFromClone($user, $object->id, $_REQUEST["clone_content"], $_REQUEST["clone_receivers"]);
if ($result > 0)
{
header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
@@ -107,7 +107,7 @@ if (empty($reshook))
setEventMessages($object->error, $object->errors, 'errors');
}
}
- $action='';
+ $action = '';
}
// Action send emailing for everybody
@@ -119,16 +119,16 @@ if (empty($reshook))
setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
setEventMessages('', null, 'warnings');
setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
- $action='';
+ $action = '';
}
elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
{
setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
- $action='';
+ $action = '';
}
else
{
- $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id, 2, 0, 1, $object, 'mailing');
+ $upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
if ($object->statut == 0)
{
@@ -143,37 +143,37 @@ if (empty($reshook))
$replyto = $object->email_replyto;
$errorsto = $object->email_errorsto;
// Le message est-il en html
- $msgishtml=-1; // Unknown by default
- if (preg_match('/[\s\t]*/i', $message)) $msgishtml=1;
+ $msgishtml = -1; // Unknown by default
+ if (preg_match('/[\s\t]*/i', $message)) $msgishtml = 1;
// Warning, we must not use begin-commit transaction here
// because we want to save update for each mail sent.
- $nbok=0; $nbko=0;
+ $nbok = 0; $nbko = 0;
// On choisit les mails non deja envoyes pour ce mailing (statut=0)
// ou envoyes en erreur (statut=-1)
$sql = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
$sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$object->id;
- $sql .= " ORDER BY mc.statut DESC"; // first status 0, then status -1
+ $sql .= " ORDER BY mc.statut DESC"; // first status 0, then status -1
dol_syslog("card.php: select targets", LOG_DEBUG);
- $resql=$db->query($sql);
+ $resql = $db->query($sql);
if ($resql)
{
- $num = $db->num_rows($resql); // nb of possible recipients
+ $num = $db->num_rows($resql); // nb of possible recipients
if ($num)
{
dol_syslog("comm/mailing/card.php: nb of targets = ".$num, LOG_DEBUG);
- $now=dol_now();
+ $now = dol_now();
// Positionne date debut envoi
- $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$object->id;
- $resql2=$db->query($sql);
- if (! $resql2)
+ $sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$object->id;
+ $resql2 = $db->query($sql);
+ if (!$resql2)
{
dol_print_error($db);
}
@@ -184,8 +184,8 @@ if (empty($reshook))
while ($i < $num && $i < $conf->global->MAILING_LIMIT_SENDBYWEB)
{
// Here code is common with same loop ino mailing-send.php
- $res=1;
- $now=dol_now();
+ $res = 1;
+ $now = dol_now();
$obj = $db->fetch_object($resql);
@@ -193,18 +193,18 @@ if (empty($reshook))
$sendto = str_replace(',', ' ', dolGetFirstLastname($obj->firstname, $obj->lastname))." <".$obj->email.">";
// Make substitutions on topic and body. From (AA=YY;BB=CC;...) we keep YY, CC, ...
- $other=explode(';', $obj->other);
- $tmpfield=explode('=', $other[0], 2); $other1=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
- $tmpfield=explode('=', $other[1], 2); $other2=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
- $tmpfield=explode('=', $other[2], 2); $other3=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
- $tmpfield=explode('=', $other[3], 2); $other4=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
- $tmpfield=explode('=', $other[4], 2); $other5=(isset($tmpfield[1])?$tmpfield[1]:$tmpfield[0]);
+ $other = explode(';', $obj->other);
+ $tmpfield = explode('=', $other[0], 2); $other1 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+ $tmpfield = explode('=', $other[1], 2); $other2 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+ $tmpfield = explode('=', $other[2], 2); $other3 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+ $tmpfield = explode('=', $other[3], 2); $other4 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
+ $tmpfield = explode('=', $other[4], 2); $other5 = (isset($tmpfield[1]) ? $tmpfield[1] : $tmpfield[0]);
- $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?$user->signature:'');
+ $signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
- $targetobject = null; // Not defined with mass emailing
- $parameters=array('mode'=>'emailing');
- $substitutionarray=getCommonSubstitutionArray($langs, 0, array('object','objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
+ $targetobject = null; // Not defined with mass emailing
+ $parameters = array('mode'=>'emailing');
+ $substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
$substitutionarray['__ID__'] = $obj->source_id;
@@ -217,79 +217,79 @@ if (empty($reshook))
$substitutionarray['__OTHER3__'] = $other3;
$substitutionarray['__OTHER4__'] = $other4;
$substitutionarray['__OTHER5__'] = $other5;
- $substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
- $substitutionarray['__SIGNATURE__'] = $signature; // For backward compatibility
+ $substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
+ $substitutionarray['__SIGNATURE__'] = $signature; // For backward compatibility
$substitutionarray['__CHECK_READ__'] = '.') ';
$substitutionarray['__UNSUBSCRIBE__'] = ''.$langs->trans("MailUnsubcribe").'';
$onlinepaymentenabled = 0;
- if (! empty($conf->paypal->enabled)) $onlinepaymentenabled++;
- if (! empty($conf->paybox->enabled)) $onlinepaymentenabled++;
- if (! empty($conf->stripe->enabled)) $onlinepaymentenabled++;
- if ($onlinepaymentenabled && ! empty($conf->global->PAYMENT_SECURITY_TOKEN))
+ if (!empty($conf->paypal->enabled)) $onlinepaymentenabled++;
+ if (!empty($conf->paybox->enabled)) $onlinepaymentenabled++;
+ if (!empty($conf->stripe->enabled)) $onlinepaymentenabled++;
+ if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN))
{
- $substitutionarray['__SECUREKEYPAYMENT__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+ $substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
{
- $substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
- $substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
- $substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
- $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+ $substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+ $substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+ $substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+ $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
}
else
{
- $substitutionarray['__SECUREKEYPAYMENT_MEMBER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
- $substitutionarray['__SECUREKEYPAYMENT_ORDER__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
- $substitutionarray['__SECUREKEYPAYMENT_INVOICE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
- $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__']=dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+ $substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
+ $substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'order'.$obj->source_id, 2);
+ $substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
+ $substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
}
}
/* For backward compatibility, deprecated */
- if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+ if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN))
{
- $substitutionarray['__SECUREKEYPAYPAL__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+ $substitutionarray['__SECUREKEYPAYPAL__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
- if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
- else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'membersubscription' . $obj->source_id, 2);
+ if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+ else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
- if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
- else $substitutionarray['__SECUREKEYPAYPAL_ORDER__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'order' . $obj->source_id, 2);
+ if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+ else $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
- if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
- else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'invoice' . $obj->source_id, 2);
+ if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+ else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
- if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
- else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__']=dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . 'contractline' . $obj->source_id, 2);
+ if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+ else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
}
//$substitutionisok=true;
complete_substitutions_array($substitutionarray, $langs);
- $newsubject=make_substitutions($subject, $substitutionarray);
- $newmessage=make_substitutions($message, $substitutionarray);
+ $newsubject = make_substitutions($subject, $substitutionarray);
+ $newmessage = make_substitutions($message, $substitutionarray);
$arr_file = array();
$arr_mime = array();
$arr_name = array();
$arr_css = array();
- $listofpaths=dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
+ $listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
if (count($listofpaths))
{
- foreach($listofpaths as $key => $val)
+ foreach ($listofpaths as $key => $val)
{
- $arr_file[]=$listofpaths[$key]['fullname'];
- $arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
- $arr_name[]=$listofpaths[$key]['name'];
+ $arr_file[] = $listofpaths[$key]['fullname'];
+ $arr_mime[] = dol_mimetype($listofpaths[$key]['name']);
+ $arr_name[] = $listofpaths[$key]['name'];
}
}
// Fabrication du mail
- $trackid='emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
+ $trackid = 'emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, '', 'emailing');
if ($mail->error)
{
- $res=0;
+ $res = 0;
}
/*if (! $substitutionisok)
{
@@ -300,7 +300,7 @@ if (empty($reshook))
// Send mail
if ($res)
{
- $res=$mail->sendfile();
+ $res = $mail->sendfile();
}
if ($res)
@@ -308,12 +308,12 @@ if (empty($reshook))
// Mail successful
$nbok++;
- dol_syslog("comm/mailing/card.php: ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
+ dol_syslog("comm/mailing/card.php: ok for #".$i.($mail->error ? ' - '.$mail->error : ''), LOG_DEBUG);
- $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
- $sql.=" SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
- $resql2=$db->query($sql);
- if (! $resql2)
+ $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+ $sql .= " SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
+ $resql2 = $db->query($sql);
+ if (!$resql2)
{
dol_print_error($db);
}
@@ -325,8 +325,8 @@ if (empty($reshook))
//Update status communication of thirdparty prospect
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
- $resql2=$db->query($sql);
- if (! $resql2)
+ $resql2 = $db->query($sql);
+ if (!$resql2)
{
dol_print_error($db);
}
@@ -335,8 +335,8 @@ if (empty($reshook))
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.rowid=".$obj->rowid." AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
- $resql2=$db->query($sql);
- if (! $resql2)
+ $resql2 = $db->query($sql);
+ if (!$resql2)
{
dol_print_error($db);
}
@@ -355,12 +355,12 @@ if (empty($reshook))
// Mail failed
$nbko++;
- dol_syslog("comm/mailing/card.php: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_WARNING);
+ dol_syslog("comm/mailing/card.php: error for #".$i.($mail->error ? ' - '.$mail->error : ''), LOG_WARNING);
- $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
- $sql.=" SET statut=-1, error_text='".$db->escape($mail->error)."', date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
- $resql2=$db->query($sql);
- if (! $resql2)
+ $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+ $sql .= " SET statut=-1, error_text='".$db->escape($mail->error)."', date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
+ $resql2 = $db->query($sql);
+ if (!$resql2)
{
dol_print_error($db);
}
@@ -377,7 +377,7 @@ if (empty($reshook))
// Loop finished, set global statut of mail
if ($nbko > 0)
{
- $statut=2; // Status 'sent partially' (because at least one error)
+ $statut = 2; // Status 'sent partially' (because at least one error)
if ($nbok > 0) setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
}
@@ -385,20 +385,20 @@ if (empty($reshook))
{
if ($nbok >= $num)
{
- $statut=3; // Send to everybody
+ $statut = 3; // Send to everybody
setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
}
else
{
- $statut=2; // Status 'sent partially' (because not send to everybody)
+ $statut = 2; // Status 'sent partially' (because not send to everybody)
setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
}
}
- $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$object->id;
+ $sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$object->id;
dol_syslog("comm/mailing/card.php: update global status", LOG_DEBUG);
- $resql2=$db->query($sql);
- if (! $resql2)
+ $resql2 = $db->query($sql);
+ if (!$resql2)
{
dol_print_error($db);
}
@@ -416,22 +416,22 @@ if (empty($reshook))
// Action send test emailing
if ($action == 'send' && empty($_POST["cancel"]))
{
- $error=0;
+ $error = 0;
- $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id, 2, 0, 1, $object, 'mailing');
+ $upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
$object->sendto = $_POST["sendto"];
- if (! $object->sendto)
+ if (!$object->sendto)
{
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailTo")), null, 'errors');
$error++;
}
- if (! $error)
+ if (!$error)
{
// Le message est-il en html
- $msgishtml=-1; // Inconnu par defaut
- if (preg_match('/[\s\t]*/i', $object->body)) $msgishtml=1;
+ $msgishtml = -1; // Inconnu par defaut
+ if (preg_match('/[\s\t]*/i', $object->body)) $msgishtml = 1;
// other are set at begin of page
$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
@@ -439,8 +439,8 @@ if (empty($reshook))
// Pratique les substitutions sur le sujet et message
complete_substitutions_array($object->substitutionarrayfortest, $langs);
- $tmpsujet=make_substitutions($object->sujet, $object->substitutionarrayfortest);
- $tmpbody=make_substitutions($object->body, $object->substitutionarrayfortest);
+ $tmpsujet = make_substitutions($object->sujet, $object->substitutionarrayfortest);
+ $tmpbody = make_substitutions($object->body, $object->substitutionarrayfortest);
$arr_file = array();
$arr_mime = array();
@@ -448,25 +448,25 @@ if (empty($reshook))
$arr_css = array();
// Ajout CSS
- if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor)?'':'#').$object->bgcolor;
+ if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor;
if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
// Attached files
- $listofpaths=dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
+ $listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
if (count($listofpaths))
{
- foreach($listofpaths as $key => $val)
+ foreach ($listofpaths as $key => $val)
{
- $arr_file[]=$listofpaths[$key]['fullname'];
- $arr_mime[]=dol_mimetype($listofpaths[$key]['name']);
- $arr_name[]=$listofpaths[$key]['name'];
+ $arr_file[] = $listofpaths[$key]['fullname'];
+ $arr_mime[] = dol_mimetype($listofpaths[$key]['name']);
+ $arr_name[] = $listofpaths[$key]['name'];
}
}
- $trackid='emailingtest';
+ $trackid = 'emailingtest';
$mailfile = new CMailFile($tmpsujet, $object->sendto, $object->email_from, $tmpbody, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $object->email_errorsto, $arr_css, $trackid, '', 'emailing');
- $result=$mailfile->sendfile();
+ $result = $mailfile->sendfile();
if ($result)
{
setEventMessages($langs->trans("MailSuccessfulySent", $mailfile->getValidAddress($object->email_from, 2), $mailfile->getValidAddress($object->sendto, 2)), null, 'mesgs');
@@ -494,13 +494,13 @@ if (empty($reshook))
$object->bgcolor = trim($_POST["bgcolor"]);
$object->bgimage = trim($_POST["bgimage"]);
- if (! $object->titre) {
+ if (!$object->titre) {
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
}
- if (! $object->sujet) {
+ if (!$object->sujet) {
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTopic"));
}
- if (! $object->body) {
+ if (!$object->body) {
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailMessage"));
}
@@ -515,17 +515,17 @@ if (empty($reshook))
}
setEventMessages($mesg, $mesgs, 'errors');
- $action="create";
+ $action = "create";
}
// Action update description of emailing
if ($action == 'settitre' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
{
- $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id, 2, 0, 1, $object, 'mailing');
+ $upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
if ($action == 'settitre') $object->titre = trim(GETPOST('titre', 'alpha'));
elseif ($action == 'setemail_from') $object->email_from = trim(GETPOST('email_from', 'alpha'));
- elseif ($action == 'setemail_replyto') $object->email_replyto = trim(GETPOST('email_replyto', 'alpha'));
+ elseif ($action == 'setemail_replyto') $object->email_replyto = trim(GETPOST('email_replyto', 'alpha'));
elseif ($action == 'setemail_errorsto') {
$object->email_errorsto = trim(GETPOST('email_errorsto', 'alpha'));
} elseif ($action == 'settitre' && empty($object->titre)) {
@@ -534,7 +534,7 @@ if (empty($reshook))
$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailFrom"));
}
- if (! $mesg)
+ if (!$mesg)
{
if ($object->update($user) >= 0)
{
@@ -545,34 +545,34 @@ if (empty($reshook))
}
setEventMessages($mesg, $mesgs, 'errors');
- $action="";
+ $action = "";
}
/*
* Add file in email form
*/
- if (! empty($_POST['addfile']))
+ if (!empty($_POST['addfile']))
{
- $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id, 2, 0, 1, $object, 'mailing');
+ $upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
// Set tmp user directory
dol_add_file_process($upload_dir, 0, 0);
- $action="edit";
+ $action = "edit";
}
// Action remove file
- if (! empty($_POST["removedfile"]))
+ if (!empty($_POST["removedfile"]))
{
- $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id, 2, 0, 1, $object, 'mailing');
+ $upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- dol_remove_file_process($_POST['removedfile'], 0, 0); // We really delete file linked to mailing
+ dol_remove_file_process($_POST['removedfile'], 0, 0); // We really delete file linked to mailing
- $action="edit";
+ $action = "edit";
}
// Action update emailing
@@ -580,9 +580,9 @@ if (empty($reshook))
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $isupload=0;
+ $isupload = 0;
- if (! $isupload)
+ if (!$isupload)
{
$mesgs = array();
@@ -591,10 +591,10 @@ if (empty($reshook))
$object->bgcolor = trim($_POST["bgcolor"]);
$object->bgimage = trim($_POST["bgimage"]);
- if (! $object->sujet) {
+ if (!$object->sujet) {
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTopic"));
}
- if (! $object->body) {
+ if (!$object->body) {
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailMessage"));
}
@@ -605,15 +605,15 @@ if (empty($reshook))
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
- $mesgs[] =$object->error;
+ $mesgs[] = $object->error;
}
setEventMessages($mesg, $mesgs, 'errors');
- $action="edit";
+ $action = "edit";
}
else
{
- $action="edit";
+ $action = "edit";
}
}
@@ -663,10 +663,10 @@ if (empty($reshook))
{
$db->begin();
- $result=$object->valid($user);
+ $result = $object->valid($user);
if ($result > 0)
{
- $result=$object->reset_targets_status($user);
+ $result = $object->reset_targets_status($user);
}
if ($result > 0)
@@ -692,13 +692,13 @@ if (empty($reshook))
{
if ($object->delete($object->id))
{
- $url= (! empty($urlfrom) ? $urlfrom : 'list.php');
+ $url = (!empty($urlfrom) ? $urlfrom : 'list.php');
header("Location: ".$url);
exit;
}
}
- if (! empty($_POST["cancel"]))
+ if (!empty($_POST["cancel"]))
{
$action = '';
}
@@ -712,7 +712,7 @@ if (empty($reshook))
$form = new Form($db);
$htmlother = new FormOther($db);
-$help_url='EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing';
+$help_url = 'EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing';
llxHeader('', $langs->trans("Mailing"), $help_url, '', 0, 0,
array(
'/includes/ace/src/ace.js',
@@ -729,14 +729,14 @@ if ($action == 'create')
print '';
$htmltext = ''.$langs->trans("FollowingConstantsWillBeSubstituted").':
';
- foreach($object->substitutionarray as $key => $val)
+ foreach ($object->substitutionarray as $key => $val)
{
- $htmltext.=$key.' = '.$langs->trans($val).'
';
+ $htmltext .= $key.' = '.$langs->trans($val).'
';
}
- $htmltext.='';
+ $htmltext .= '';
- $availablelink=$form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'availvar');
+ $availablelink = $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'availvar');
//print ''.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'';
@@ -748,11 +748,11 @@ if ($action == 'create')
print '';
print '| '.$langs->trans("MailTitle").' | | ';
print '| '.$langs->trans("MailFrom").' | | ';
- print '| '.$langs->trans("MailErrorsTo").' | | ';
+ print '| '.$langs->trans("MailErrorsTo").' | | ';
// Other attributes
- $parameters=array();
- $reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook))
{
@@ -773,7 +773,7 @@ if ($action == 'create')
print '';
// Editeur wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor=new DolEditor('bodyemail', GETPOST('bodyemail', 'none'), '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
+ $doleditor = new DolEditor('bodyemail', GETPOST('bodyemail', 'none'), '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
$doleditor->Create();
print ' ';
@@ -787,7 +787,7 @@ else
{
if ($object->id > 0)
{
- $upload_dir = $conf->mailing->dir_output . "/" . get_exdir($object->id, 2, 0, 1, $object, 'mailing');
+ $upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
$head = emailing_prepare_head($object);
@@ -809,7 +809,7 @@ else
// Confirm delete
elseif ($action == 'delete')
{
- print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(! empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteAMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1);
+ print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(!empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteAMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1);
}
@@ -919,22 +919,22 @@ else
print '| ';
print $langs->trans("TotalNbOfDistinctRecipients");
print ' | ';
- $nbemail = ($object->nbemail?$object->nbemail:0);
+ $nbemail = ($object->nbemail ? $object->nbemail : 0);
if (is_numeric($nbemail))
{
- $text='';
- if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
+ $text = '';
+ if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
{
if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
{
- $text.=$langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
+ $text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
}
else
{
- $text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
+ $text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
}
}
- if (empty($nbemail)) $nbemail.=' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
+ if (empty($nbemail)) $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
if ($text)
{
print $form->textwithpicto($nbemail, $text, 1, 'warning');
@@ -947,7 +947,7 @@ else
print ' | ';
// Other attributes
- include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
print ' ';
@@ -960,9 +960,9 @@ else
if ($action == 'clone')
{
// Create an array for form
- $formquestion=array(
+ $formquestion = array(
'text' => $langs->trans("ConfirmClone"),
- array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContent"), 'value' => 1),
+ array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContent"), 'value' => 1),
array('type' => 'checkbox', 'name' => 'clone_receivers', 'label' => $langs->trans("CloneReceivers"), 'value' => 0)
);
// Paiement incomplet. On demande si motif = escompte ou autre
@@ -973,7 +973,7 @@ else
* Boutons d'action
*/
- if (GETPOST('cancel', 'alpha') || $confirm=='no' || $action == '' || in_array($action, array('settodraft','valid','delete','sendall','clone','test')))
+ if (GETPOST('cancel', 'alpha') || $confirm == 'no' || $action == '' || in_array($action, array('settodraft', 'valid', 'delete', 'sendall', 'clone', 'test')))
{
print "\n\n\n";
@@ -984,7 +984,7 @@ else
if (($object->statut == 0 || $object->statut == 1) && $user->rights->mailing->creer)
{
- if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_ENABLE_MAILING))
+ if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING))
{
print ' '.$langs->trans("EditWithEditor").'';
}
@@ -993,12 +993,12 @@ else
print ' '.$langs->trans("EditWithTextEditor").'';
}
- if (! empty($conf->use_javascript_ajax)) print ' '.$langs->trans("EditHTMLSource").'';
+ if (!empty($conf->use_javascript_ajax)) print ' '.$langs->trans("EditHTMLSource").'';
}
//print ' '.$langs->trans("PreviewMailing").'';
- if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
+ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
{
print ' '.$langs->trans("TestMailing").'';
}
@@ -1029,7 +1029,7 @@ else
{
print ' '.$langs->trans("SendMailing").'';
}
- elseif (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
+ elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
{
print ' '.$langs->trans("SendMailing").'';
}
@@ -1046,7 +1046,7 @@ else
if (($object->statut == 2 || $object->statut == 3) && $user->rights->mailing->valider)
{
- if (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->send)
+ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
{
print ' '.$langs->trans("ResetMailing").'';
}
@@ -1058,13 +1058,13 @@ else
if (($object->statut <= 1 && $user->rights->mailing->creer) || $user->rights->mailing->supprimer)
{
- if ($object->statut > 0 && (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! $user->rights->mailing->mailing_advance->delete))
+ if ($object->statut > 0 && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->delete))
{
print ' '.$langs->trans("DeleteMailing").'';
}
else
{
- print ' '.$langs->trans("DeleteMailing").'';
+ print ' '.$langs->trans("DeleteMailing").'';
}
}
@@ -1084,25 +1084,25 @@ else
$formmail = new FormMail($db);
$formmail->fromname = $object->email_from;
$formmail->frommail = $object->email_from;
- $formmail->withsubstit=1;
- $formmail->withfrom=0;
- $formmail->withto=$user->email?$user->email:1;
- $formmail->withtocc=0;
- $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
- $formmail->withtopic=0;
- $formmail->withtopicreadonly=1;
- $formmail->withfile=0;
- $formmail->withbody=0;
- $formmail->withbodyreadonly=1;
- $formmail->withcancel=1;
- $formmail->withdeliveryreceipt=0;
+ $formmail->withsubstit = 1;
+ $formmail->withfrom = 0;
+ $formmail->withto = $user->email ? $user->email : 1;
+ $formmail->withtocc = 0;
+ $formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+ $formmail->withtopic = 0;
+ $formmail->withtopicreadonly = 1;
+ $formmail->withfile = 0;
+ $formmail->withbody = 0;
+ $formmail->withbodyreadonly = 1;
+ $formmail->withcancel = 1;
+ $formmail->withdeliveryreceipt = 0;
// Tableau des substitutions
- $formmail->substit=$object->substitutionarrayfortest;
+ $formmail->substit = $object->substitutionarrayfortest;
// Tableau des parametres complementaires du post
- $formmail->param["action"]="send";
- $formmail->param["models"]='none';
- $formmail->param["mailid"]=$object->id;
- $formmail->param["returnurl"]=$_SERVER['PHP_SELF']."?id=".$object->id;
+ $formmail->param["action"] = "send";
+ $formmail->param["models"] = 'none';
+ $formmail->param["mailid"] = $object->id;
+ $formmail->param["returnurl"] = $_SERVER['PHP_SELF']."?id=".$object->id;
print $formmail->get_form();
@@ -1115,11 +1115,11 @@ else
$htmltext = ' '.$langs->trans("FollowingConstantsWillBeSubstituted").':
';
- foreach($object->substitutionarray as $key => $val)
+ foreach ($object->substitutionarray as $key => $val)
{
- $htmltext.=$key.' = '.$langs->trans($val).'
';
+ $htmltext .= $key.' = '.$langs->trans($val).'
';
}
- $htmltext.='';
+ $htmltext .= '';
// Print mail content
print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto(' '.$langs->trans("AvailableVariables").'', $htmltext, 1, 'helpclickable', '', 0, 2, 'emailsubstitionhelp'), 'generic');
@@ -1134,10 +1134,10 @@ else
// Joined files
print ' | '.$langs->trans("MailFile").' | ';
// List of files
- $listofpaths=dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
+ $listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
if (count($listofpaths))
{
- foreach($listofpaths as $key => $val)
+ foreach ($listofpaths as $key => $val)
{
print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
print '
';
@@ -1157,13 +1157,13 @@ else
print ' | |
';
// Message
- print '';
+ print ' ';
if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff') // CKEditor does not apply the color of the div into its content area
{
- $readonly=1;
+ $readonly = 1;
// Editeur wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor=new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, empty($conf->global->FCKEDITOR_ENABLE_MAILING)?0:1, 20, '90%', $readonly);
+ $doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, empty($conf->global->FCKEDITOR_ENABLE_MAILING) ? 0 : 1, 20, '90%', $readonly);
$doleditor->Create();
}
else print dol_htmlentitiesbr($object->body);
@@ -1181,8 +1181,8 @@ else
$linkback = ' '.$langs->trans("BackToList").'';
- $morehtmlright='';
- if ($object->statut == 2) $morehtmlright.=' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+ $morehtmlright = '';
+ if ($object->statut == 2) $morehtmlright .= ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
@@ -1209,22 +1209,22 @@ else
print ' | ';
print $langs->trans("TotalNbOfDistinctRecipients");
print ' | ';
- $nbemail = ($object->nbemail?$object->nbemail:0);
+ $nbemail = ($object->nbemail ? $object->nbemail : 0);
if (is_numeric($nbemail))
{
- $text='';
- if ((! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2))
+ $text = '';
+ if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2))
{
if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
{
- $text.=$langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
+ $text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
}
else
{
- $text.=$langs->trans('SendingFromWebInterfaceIsNotAllowed');
+ $text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
}
}
- if (empty($nbemail)) $nbemail.=' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
+ if (empty($nbemail)) $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").'';
if ($text)
{
print $form->textwithpicto($nbemail, $text, 1, 'warning');
@@ -1237,8 +1237,8 @@ else
print ' | ';
// Other attributes
- $parameters=array();
- $reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook))
{
@@ -1260,11 +1260,11 @@ else
print ' ';
$htmltext = ' '.$langs->trans("FollowingConstantsWillBeSubstituted").':
';
- foreach($object->substitutionarray as $key => $val)
+ foreach ($object->substitutionarray as $key => $val)
{
- $htmltext.=$key.' = '.$langs->trans($val).'
';
+ $htmltext .= $key.' = '.$langs->trans($val).'
';
}
- $htmltext.='';
+ $htmltext .= '';
// Print mail content
print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'generic');
@@ -1276,43 +1276,43 @@ else
// Subject
print ' | '.$langs->trans("MailTopic").' | | ';
- $trackid=''; // TODO To avoid conflicts with 2 mass emailing, we should set a trackid here, even if we use another one into email header.
+ $trackid = ''; // TODO To avoid conflicts with 2 mass emailing, we should set a trackid here, even if we use another one into email header.
dol_init_file_process($upload_dir, $trackid);
// Joined files
- $addfileaction='addfile';
+ $addfileaction = 'addfile';
print ' | '.$langs->trans("MailFile").' | ';
print '';
// List of files
- $listofpaths=dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
+ $listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
- $out.= ''."\n";
- $out.= ''."\n";
+ $out .= ''."\n";
+ $out .= ''."\n";
if (count($listofpaths))
{
- foreach($listofpaths as $key => $val)
+ foreach ($listofpaths as $key => $val)
{
- $out.= ' ';
- $out.= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
- $out.= ' ';
- $out.= '
';
+ $out .= '';
+ $out .= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
+ $out .= ' ';
+ $out .= '
';
}
}
else
{
- $out.= $langs->trans("NoAttachedFiles").'
';
+ $out .= $langs->trans("NoAttachedFiles").'
';
}
// Add link to add file
- $out.= '';
- $out.= ' ';
- $out.= '';
+ $out .= '';
+ $out .= ' ';
+ $out .= '';
print $out;
print ' | ';
@@ -1330,14 +1330,14 @@ else
{
// Editeur wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor=new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
+ $doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
$doleditor->Create();
}
if ($action == 'edithtml')
{
// Editor HTML source
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor=new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, 'ace', 20, '90%');
+ $doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, 'ace', 20, '90%');
$doleditor->Create(0, '', false, 'HTML Source', 'php');
}
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 465bf7dcc50..0b47d8c4aa5 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -36,7 +36,7 @@ class AdvanceTargetingMailing extends CommonObject
/**
* @var string Error code (or message)
*/
- public $error='';
+ public $error = '';
/**
* @var string[] Error codes (or messages)
@@ -46,12 +46,12 @@ class AdvanceTargetingMailing extends CommonObject
/**
* @var string ID to identify managed object
*/
- public $element='advtargetemailing';
+ public $element = 'advtargetemailing';
/**
* @var string Name of table without prefix where object is stored
*/
- public $table_element='advtargetemailing';
+ public $table_element = 'advtargetemailing';
/**
* @var int ID
@@ -64,12 +64,12 @@ class AdvanceTargetingMailing extends CommonObject
public $type_element;
public $filtervalue;
public $fk_user_author;
- public $datec='';
+ public $datec = '';
public $fk_user_mod;
- public $tms='';
+ public $tms = '';
public $select_target_type = array();
- public $type_statuscommprospect=array();
+ public $type_statuscommprospect = array();
public $thirdparty_lines;
public $contact_lines;
@@ -88,12 +88,12 @@ class AdvanceTargetingMailing extends CommonObject
$this->select_target_type = array(
'2' => $langs->trans('Contacts'),
- '1' => $langs->trans('Contacts') . '+' . $langs->trans('ThirdParty'),
+ '1' => $langs->trans('Contacts').'+'.$langs->trans('ThirdParty'),
'3' => $langs->trans('ThirdParty'),
'4' => $langs->trans('ContactsWithThirdpartyFilter')
);
$this->type_statuscommprospect = array(
- - 1 => $langs->trans("StatusProspect-1"),
+ -1 => $langs->trans("StatusProspect-1"),
0 => $langs->trans("StatusProspect0"),
1 => $langs->trans("StatusProspect1"),
2 => $langs->trans("StatusProspect2"),
@@ -111,50 +111,50 @@ class AdvanceTargetingMailing extends CommonObject
public function create($user, $notrigger = 0)
{
global $conf, $langs;
- $error=0;
+ $error = 0;
// Clean parameters
- if (isset($this->fk_element)) $this->fk_element=(int) $this->fk_element;
- if (isset($this->type_element)) $this->type_element=trim($this->type_element);
+ if (isset($this->fk_element)) $this->fk_element = (int) $this->fk_element;
+ if (isset($this->type_element)) $this->type_element = trim($this->type_element);
- if (isset($this->name)) $this->name=trim($this->name);
- if (isset($this->filtervalue)) $this->filtervalue=trim($this->filtervalue);
+ if (isset($this->name)) $this->name = trim($this->name);
+ if (isset($this->filtervalue)) $this->filtervalue = trim($this->filtervalue);
// Check parameters
// Put here code to add control on parameters values
// Insert request
$sql = "INSERT INTO ".MAIN_DB_PREFIX."advtargetemailing(";
- $sql.= "name,";
- $sql.= "entity,";
- $sql.= "fk_element,";
- $sql.= "type_element,";
- $sql.= "filtervalue,";
- $sql.= "fk_user_author,";
- $sql.= "datec,";
- $sql.= "fk_user_mod";
- $sql.= ") VALUES (";
- $sql.= " ".(! isset($this->name)?'NULL':"'".$this->db->escape($this->name)."'").",";
- $sql.= " ".$conf->entity.",";
- $sql.= " ".(! isset($this->fk_element)?'NULL':"'".$this->db->escape($this->fk_element)."'").",";
- $sql.= " ".(! isset($this->type_element)?'NULL':"'".$this->db->escape($this->type_element)."'").",";
- $sql.= " ".(! isset($this->filtervalue)?'NULL':"'".$this->db->escape($this->filtervalue)."'").",";
- $sql.= " ".$user->id.",";
- $sql.= " '".$this->db->idate(dol_now())."',";
- $sql.= " null";
- $sql.= ")";
+ $sql .= "name,";
+ $sql .= "entity,";
+ $sql .= "fk_element,";
+ $sql .= "type_element,";
+ $sql .= "filtervalue,";
+ $sql .= "fk_user_author,";
+ $sql .= "datec,";
+ $sql .= "fk_user_mod";
+ $sql .= ") VALUES (";
+ $sql .= " ".(!isset($this->name) ? 'NULL' : "'".$this->db->escape($this->name)."'").",";
+ $sql .= " ".$conf->entity.",";
+ $sql .= " ".(!isset($this->fk_element) ? 'NULL' : "'".$this->db->escape($this->fk_element)."'").",";
+ $sql .= " ".(!isset($this->type_element) ? 'NULL' : "'".$this->db->escape($this->type_element)."'").",";
+ $sql .= " ".(!isset($this->filtervalue) ? 'NULL' : "'".$this->db->escape($this->filtervalue)."'").",";
+ $sql .= " ".$user->id.",";
+ $sql .= " '".$this->db->idate(dol_now())."',";
+ $sql .= " null";
+ $sql .= ")";
$this->db->begin();
dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
- $resql=$this->db->query($sql);
- if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ $resql = $this->db->query($sql);
+ if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
- if (! $error)
+ if (!$error)
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."advtargetemailing");
- if (! $notrigger)
+ if (!$notrigger)
{
// Uncomment this and change MYOBJECT to your own tag if you
// want this action calls a trigger.
@@ -171,13 +171,13 @@ class AdvanceTargetingMailing extends CommonObject
// Commit or rollback
if ($error)
{
- foreach($this->errors as $errmsg)
+ foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
+ $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
}
$this->db->rollback();
- return -1*$error;
+ return -1 * $error;
}
else
{
@@ -196,30 +196,30 @@ class AdvanceTargetingMailing extends CommonObject
{
global $langs;
$sql = "SELECT";
- $sql.= " t.rowid,";
+ $sql .= " t.rowid,";
- $sql.= " t.name,";
- $sql.= " t.entity,";
- $sql.= " t.fk_element,";
- $sql.= " t.type_element,";
- $sql.= " t.filtervalue,";
- $sql.= " t.fk_user_author,";
- $sql.= " t.datec,";
- $sql.= " t.fk_user_mod,";
- $sql.= " t.tms";
+ $sql .= " t.name,";
+ $sql .= " t.entity,";
+ $sql .= " t.fk_element,";
+ $sql .= " t.type_element,";
+ $sql .= " t.filtervalue,";
+ $sql .= " t.fk_user_author,";
+ $sql .= " t.datec,";
+ $sql .= " t.fk_user_mod,";
+ $sql .= " t.tms";
- $sql.= " FROM ".MAIN_DB_PREFIX."advtargetemailing as t";
- $sql.= " WHERE t.rowid = ".$id;
+ $sql .= " FROM ".MAIN_DB_PREFIX."advtargetemailing as t";
+ $sql .= " WHERE t.rowid = ".$id;
dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
{
$obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
+ $this->id = $obj->rowid;
$this->name = $obj->name;
$this->entity = $obj->entity;
@@ -237,7 +237,7 @@ class AdvanceTargetingMailing extends CommonObject
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
@@ -255,34 +255,34 @@ class AdvanceTargetingMailing extends CommonObject
// phpcs:enable
global $langs;
$sql = "SELECT";
- $sql.= " t.rowid,";
+ $sql .= " t.rowid,";
- $sql.= " t.name,";
- $sql.= " t.entity,";
- $sql.= " t.fk_element,";
- $sql.= " t.type_element,";
- $sql.= " t.filtervalue,";
- $sql.= " t.fk_user_author,";
- $sql.= " t.datec,";
- $sql.= " t.fk_user_mod,";
- $sql.= " t.tms";
+ $sql .= " t.name,";
+ $sql .= " t.entity,";
+ $sql .= " t.fk_element,";
+ $sql .= " t.type_element,";
+ $sql .= " t.filtervalue,";
+ $sql .= " t.fk_user_author,";
+ $sql .= " t.datec,";
+ $sql .= " t.fk_user_mod,";
+ $sql .= " t.tms";
- $sql.= " FROM ".MAIN_DB_PREFIX."advtargetemailing as t";
+ $sql .= " FROM ".MAIN_DB_PREFIX."advtargetemailing as t";
if (!empty($id)) {
- $sql.= " WHERE t.fk_element = ".$id." AND type_element='mailing'";
- }else {
- $sql.= " WHERE t.fk_element = ".$this->fk_element." AND type_element='mailing'";
+ $sql .= " WHERE t.fk_element = ".$id." AND type_element='mailing'";
+ } else {
+ $sql .= " WHERE t.fk_element = ".$this->fk_element." AND type_element='mailing'";
}
dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
{
$obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
+ $this->id = $obj->rowid;
$this->name = $obj->name;
$this->entity = $obj->entity;
@@ -300,7 +300,7 @@ class AdvanceTargetingMailing extends CommonObject
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
@@ -322,34 +322,34 @@ class AdvanceTargetingMailing extends CommonObject
// phpcs:enable
global $langs;
$sql = "SELECT";
- $sql.= " t.rowid,";
+ $sql .= " t.rowid,";
- $sql.= " t.name,";
- $sql.= " t.entity,";
- $sql.= " t.fk_element,";
- $sql.= " t.type_element,";
- $sql.= " t.filtervalue,";
- $sql.= " t.fk_user_author,";
- $sql.= " t.datec,";
- $sql.= " t.fk_user_mod,";
- $sql.= " t.tms";
+ $sql .= " t.name,";
+ $sql .= " t.entity,";
+ $sql .= " t.fk_element,";
+ $sql .= " t.type_element,";
+ $sql .= " t.filtervalue,";
+ $sql .= " t.fk_user_author,";
+ $sql .= " t.datec,";
+ $sql .= " t.fk_user_mod,";
+ $sql .= " t.tms";
- $sql.= " FROM ".MAIN_DB_PREFIX."advtargetemailing as t";
+ $sql .= " FROM ".MAIN_DB_PREFIX."advtargetemailing as t";
if (!empty($id)) {
- $sql.= " WHERE t.fk_element = ".$id." AND type_element='$type_element'";
- }else {
- $sql.= " WHERE t.fk_element = ".$this->fk_element." AND type_element='$type_element'";
+ $sql .= " WHERE t.fk_element = ".$id." AND type_element='$type_element'";
+ } else {
+ $sql .= " WHERE t.fk_element = ".$this->fk_element." AND type_element='$type_element'";
}
dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
{
$obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
+ $this->id = $obj->rowid;
$this->name = $obj->name;
$this->entity = $obj->entity;
@@ -367,7 +367,7 @@ class AdvanceTargetingMailing extends CommonObject
}
else
{
- $this->error="Error ".$this->db->lasterror();
+ $this->error = "Error ".$this->db->lasterror();
dol_syslog(get_class($this)."::fetch ".$this->error, LOG_ERR);
return -1;
}
@@ -383,13 +383,13 @@ class AdvanceTargetingMailing extends CommonObject
public function update($user, $notrigger = 0)
{
global $conf, $langs;
- $error=0;
+ $error = 0;
// Clean parameters
- if (isset($this->fk_element)) $this->fk_element=(int) $this->fk_element;
- if (isset($this->type_element)) $this->type_element=trim($this->type_element);
- if (isset($this->name)) $this->name=trim($this->name);
- if (isset($this->filtervalue)) $this->filtervalue=trim($this->filtervalue);
+ if (isset($this->fk_element)) $this->fk_element = (int) $this->fk_element;
+ if (isset($this->type_element)) $this->type_element = trim($this->type_element);
+ if (isset($this->name)) $this->name = trim($this->name);
+ if (isset($this->filtervalue)) $this->filtervalue = trim($this->filtervalue);
// Check parameters
// Put here code to add a control on parameters values
@@ -397,21 +397,21 @@ class AdvanceTargetingMailing extends CommonObject
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."advtargetemailing SET";
- $sql.= " name=".(isset($this->name)?"'".$this->db->escape($this->name)."'":"''").",";
- $sql.= " entity=".$conf->entity.",";
- $sql.= " fk_element=".(isset($this->fk_element)?$this->fk_element:"null").",";
- $sql.= " type_element=".(isset($this->type_element)?"'".$this->db->escape($this->type_element)."'":"null").",";
- $sql.= " filtervalue=".(isset($this->filtervalue)?"'".$this->db->escape($this->filtervalue)."'":"null").",";
- $sql.= " fk_user_mod=".$user->id;
+ $sql .= " name=".(isset($this->name) ? "'".$this->db->escape($this->name)."'" : "''").",";
+ $sql .= " entity=".$conf->entity.",";
+ $sql .= " fk_element=".(isset($this->fk_element) ? $this->fk_element : "null").",";
+ $sql .= " type_element=".(isset($this->type_element) ? "'".$this->db->escape($this->type_element)."'" : "null").",";
+ $sql .= " filtervalue=".(isset($this->filtervalue) ? "'".$this->db->escape($this->filtervalue)."'" : "null").",";
+ $sql .= " fk_user_mod=".$user->id;
- $sql.= " WHERE rowid=".$this->id;
+ $sql .= " WHERE rowid=".$this->id;
$this->db->begin();
dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);
- if (! $resql) {
+ if (!$resql) {
$error++;
- $this->errors[]="Error ".$this->db->lasterror();
+ $this->errors[] = "Error ".$this->db->lasterror();
}
//if (! $error)
@@ -433,13 +433,13 @@ class AdvanceTargetingMailing extends CommonObject
// Commit or rollback
if ($error)
{
- foreach($this->errors as $errmsg)
+ foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
+ $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
}
$this->db->rollback();
- return -1*$error;
+ return -1 * $error;
}
else
{
@@ -458,13 +458,13 @@ class AdvanceTargetingMailing extends CommonObject
public function delete($user, $notrigger = 0)
{
global $conf, $langs;
- $error=0;
+ $error = 0;
$this->db->begin();
- if (! $error)
+ if (!$error)
{
- if (! $notrigger)
+ if (!$notrigger)
{
// Uncomment this and change MYOBJECT to your own tag if you
// want this action calls a trigger.
@@ -478,26 +478,26 @@ class AdvanceTargetingMailing extends CommonObject
}
}
- if (! $error)
+ if (!$error)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."advtargetemailing";
- $sql.= " WHERE rowid=".$this->id;
+ $sql .= " WHERE rowid=".$this->id;
dol_syslog(get_class($this)."::delete sql=".$sql);
$resql = $this->db->query($sql);
- if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+ if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
}
// Commit or rollback
if ($error)
{
- foreach($this->errors as $errmsg)
+ foreach ($this->errors as $errmsg)
{
dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
- $this->error.=($this->error?', '.$errmsg:$errmsg);
+ $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
}
$this->db->rollback();
- return -1*$error;
+ return -1 * $error;
}
else
{
@@ -516,17 +516,17 @@ class AdvanceTargetingMailing extends CommonObject
*/
public function savequery($user, $arrayquery)
{
- global $langs,$conf;
+ global $langs, $conf;
if (!empty($arrayquery)) {
- $result=$this->fetch_by_mailing($this->fk_element);
- $this->filtervalue=json_encode($arrayquery);
- if ($result<0) {
+ $result = $this->fetch_by_mailing($this->fk_element);
+ $this->filtervalue = json_encode($arrayquery);
+ if ($result < 0) {
return -1;
}
if (!empty($this->id)) {
$this->update($user);
- }else {
+ } else {
$this->create($user);
}
}
@@ -662,7 +662,7 @@ class AdvanceTargetingMailing extends CommonObject
if ($num)
{
- while( $i < $num)
+ while ($i < $num)
{
$obj = $this->db->fetch_object($resql);
@@ -675,8 +675,8 @@ class AdvanceTargetingMailing extends CommonObject
return $num;
} else {
- $this->error = "Error " . $this->db->lasterror();
- dol_syslog(get_class($this) . "::query_thirdparty " . $this->error, LOG_ERR);
+ $this->error = "Error ".$this->db->lasterror();
+ dol_syslog(get_class($this)."::query_thirdparty ".$this->error, LOG_ERR);
return -1;
}
}
@@ -905,7 +905,7 @@ class AdvanceTargetingMailing extends CommonObject
if ($num)
{
- while( $i < $num)
+ while ($i < $num)
{
$obj = $this->db->fetch_object($resql);
@@ -918,8 +918,8 @@ class AdvanceTargetingMailing extends CommonObject
return $num;
} else {
- $this->error = "Error " . $this->db->lasterror();
- dol_syslog(get_class($this) . "::query_contact " . $this->error, LOG_ERR);
+ $this->error = "Error ".$this->db->lasterror();
+ dol_syslog(get_class($this)."::query_contact ".$this->error, LOG_ERR);
return -1;
}
}
@@ -940,26 +940,26 @@ class AdvanceTargetingMailing extends CommonObject
//This is a multiple value test
if (preg_match('/;/', $criteria)) {
- $return_sql_not_like=array();
- $return_sql_like=array();
+ $return_sql_not_like = array();
+ $return_sql_like = array();
- $criteria_array=explode(';', $criteria);
- foreach($criteria_array as $inter_criteria) {
+ $criteria_array = explode(';', $criteria);
+ foreach ($criteria_array as $inter_criteria) {
if (preg_match('/!/', $inter_criteria)) {
- $return_sql_not_like[]= '('.$column_to_test.' NOT LIKE \''.str_replace('!', '', $inter_criteria).'\')';
+ $return_sql_not_like[] = '('.$column_to_test.' NOT LIKE \''.str_replace('!', '', $inter_criteria).'\')';
} else {
- $return_sql_like[]= '('.$column_to_test.' LIKE \''.$inter_criteria.'\')';
+ $return_sql_like[] = '('.$column_to_test.' LIKE \''.$inter_criteria.'\')';
}
}
- if (count($return_sql_like)>0) {
- $return_sql_criteria .= '(' . implode(' OR ', $return_sql_like) .')';
+ if (count($return_sql_like) > 0) {
+ $return_sql_criteria .= '('.implode(' OR ', $return_sql_like).')';
}
- if (count($return_sql_not_like)>0) {
- $return_sql_criteria .= ' AND (' . implode(' AND ', $return_sql_not_like).')';
+ if (count($return_sql_not_like) > 0) {
+ $return_sql_criteria .= ' AND ('.implode(' AND ', $return_sql_not_like).')';
}
} else {
- $return_sql_criteria .= $column_to_test . ' LIKE \''.$this->db->escape($criteria).'\'';
+ $return_sql_criteria .= $column_to_test.' LIKE \''.$this->db->escape($criteria).'\'';
}
$return_sql_criteria .= ')';
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 0e3d7a7725e..b38a796d3c7 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -29,22 +29,22 @@ require_once DOL_DOCUMENT_ROOT.'/comm/mailing/class/mailing.class.php';
$langs->load("mails");
// Security check
-$result=restrictedArea($user, 'mailing');
+$result = restrictedArea($user, 'mailing');
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
-$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$page = GETPOST("page", 'int');
if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; } // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="m.date_creat";
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "m.date_creat";
-$search_all=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
-$search_ref=GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : GETPOST("sref", "alpha");
-$filteremail=GETPOST('filteremail', 'alpha');
+$search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
+$search_ref = GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : GETPOST("sref", "alpha");
+$filteremail = GETPOST('filteremail', 'alpha');
$object = new Mailing($db);
@@ -55,7 +55,7 @@ $extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
-$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
@@ -69,11 +69,11 @@ $fieldstosearchall = array(
* Actions
*/
-if (GETPOST('cancel', 'alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if (empty($reshook))
@@ -82,7 +82,7 @@ if (empty($reshook))
include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
// Purge search criteria
- if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') ||GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
{
/*foreach($object->fields as $key => $val)
{
@@ -90,13 +90,13 @@ if (empty($reshook))
}*/
$search_ref = '';
$search_all = '';
- $toselect='';
- $search_array_options=array();
+ $toselect = '';
+ $search_array_options = array();
}
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
{
- $massaction=''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+ $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
}
// Mass actions
@@ -121,28 +121,28 @@ $form = new Form($db);
if ($filteremail)
{
$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi,";
- $sql.= " mc.statut as sendstatut";
- $sql.= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc";
- $sql.= " WHERE m.rowid = mc.fk_mailing AND m.entity = ".$conf->entity;
- $sql.= " AND mc.email = '".$db->escape($filteremail)."'";
- if ($search_ref) $sql.= " AND m.rowid = '".$db->escape($search_ref)."'";
- if ($search_all) $sql.= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
- if (! $sortorder) $sortorder="ASC";
- if (! $sortfield) $sortfield="m.rowid";
- $sql.= $db->order($sortfield, $sortorder);
- $sql.= $db->plimit($conf->liste_limit +1, $offset);
+ $sql .= " mc.statut as sendstatut";
+ $sql .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc";
+ $sql .= " WHERE m.rowid = mc.fk_mailing AND m.entity = ".$conf->entity;
+ $sql .= " AND mc.email = '".$db->escape($filteremail)."'";
+ if ($search_ref) $sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
+ if ($search_all) $sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
+ if (!$sortorder) $sortorder = "ASC";
+ if (!$sortfield) $sortfield = "m.rowid";
+ $sql .= $db->order($sortfield, $sortorder);
+ $sql .= $db->plimit($conf->liste_limit + 1, $offset);
}
else
{
$sql = "SELECT m.rowid, m.titre, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
- $sql.= " FROM ".MAIN_DB_PREFIX."mailing as m";
- $sql.= " WHERE m.entity = ".$conf->entity;
- if ($search_ref) $sql.= " AND m.rowid = '".$db->escape($search_ref)."'";
- if ($search_all) $sql.= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
- if (! $sortorder) $sortorder="ASC";
- if (! $sortfield) $sortfield="m.rowid";
- $sql.= $db->order($sortfield, $sortorder);
- $sql.= $db->plimit($conf->liste_limit +1, $offset);
+ $sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
+ $sql .= " WHERE m.entity = ".$conf->entity;
+ if ($search_ref) $sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
+ if ($search_all) $sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
+ if (!$sortorder) $sortorder = "ASC";
+ if (!$sortfield) $sortfield = "m.rowid";
+ $sql .= $db->order($sortfield, $sortorder);
+ $sql .= $db->plimit($conf->liste_limit + 1, $offset);
}
//print $sql;
@@ -151,19 +151,19 @@ if ($result)
{
$num = $db->num_rows($result);
- $title=$langs->trans("ListOfEMailings");
- if ($filteremail) $title.=' ('.$langs->trans("SentTo", $filteremail).')';
+ $title = $langs->trans("ListOfEMailings");
+ if ($filteremail) $title .= ' ('.$langs->trans("SentTo", $filteremail).')';
- $newcardbutton='';
+ $newcardbutton = '';
if ($user->rights->mailing->creer)
{
- $newcardbutton.= dolGetButtonTitle($langs->trans('NewMailing'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/mailing/card.php?action=create');
+ $newcardbutton .= dolGetButtonTitle($langs->trans('NewMailing'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/mailing/card.php?action=create');
}
$i = 0;
$param = "&search_all=".urlencode($search_all);
- if ($filteremail) $param.='&filteremail='.urlencode($filteremail);
+ if ($filteremail) $param .= '&filteremail='.urlencode($filteremail);
print ' | ';
@@ -707,7 +707,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
// Checkbox
print '';
print '';
- print ' | ' ;
+ print '';
print ' ';
@@ -719,7 +719,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error)
print '';
// Buttons actions
- print '
global->INVOICE_CLOSE_ORDERS_OFF_BY_DEFAULT_FORMASSINVOICE)?' checked="checked"':'').' name="autocloseorders"> '.$langs->trans("CloseProcessedOrdersAutomatically");
+ print ' global->INVOICE_CLOSE_ORDERS_OFF_BY_DEFAULT_FORMASSINVOICE) ? ' checked="checked"' : '').' name="autocloseorders"> '.$langs->trans("CloseProcessedOrdersAutomatically");
print ' ';
print '';
print '';
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 980cf6bd8f2..23f92c773f4 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -29,19 +29,19 @@
*/
require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbank.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-if (! empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+if (!empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("banks","bills","categories","companies","compta"));
+$langs->loadLangs(array("banks", "bills", "categories", "companies", "compta"));
$action = GETPOST('action', 'aZ09');
$cancel = GETPOST('cancel', 'alpha');
@@ -59,17 +59,17 @@ $extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('bankcard','globalcard'));
+$hookmanager->initHooks(array('bankcard', 'globalcard'));
/*
* Actions
*/
-if ($cancel) $action='';
+if ($cancel) $action = '';
if ($action == 'add')
{
- $error=0;
+ $error = 0;
$db->begin();
@@ -124,26 +124,26 @@ if ($action == 'add')
if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
{
setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
- $action='create'; // Force chargement page en mode creation
+ $action = 'create'; // Force chargement page en mode creation
$error++;
}
if (empty($object->ref))
{
setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref")), null, 'errors');
- $action='create'; // Force chargement page en mode creation
+ $action = 'create'; // Force chargement page en mode creation
$error++;
}
if (empty($object->label))
{
setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
- $action='create'; // Force chargement page en mode creation
+ $action = 'create'; // Force chargement page en mode creation
$error++;
}
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost(null, $object);
- if (! $error)
+ if (!$error)
{
$id = $object->create($user);
if ($id > 0)
@@ -152,19 +152,19 @@ if ($action == 'add')
$categories = GETPOST('categories', 'array');
$object->setCategories($categories);
- $_GET["id"]=$id; // Force chargement page en mode visu
+ $_GET["id"] = $id; // Force chargement page en mode visu
- $action='';
+ $action = '';
}
else {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
- $action='create'; // Force chargement page en mode creation
+ $action = 'create'; // Force chargement page en mode creation
}
}
- if (! $error)
+ if (!$error)
{
$db->commit();
}
@@ -176,7 +176,7 @@ if ($action == 'add')
if ($action == 'update')
{
- $error=0;
+ $error = 0;
// Update account
$object = new Account($db);
@@ -225,31 +225,31 @@ if ($action == 'update')
if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
{
setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
- $action='edit'; // Force chargement page en mode creation
+ $action = 'edit'; // Force chargement page en mode creation
$error++;
}
if (empty($object->ref))
{
setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref")), null, 'errors');
- $action='edit'; // Force chargement page en mode creation
+ $action = 'edit'; // Force chargement page en mode creation
$error++;
}
if (empty($object->label))
{
setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
- $action='edit'; // Force chargement page en mode creation
+ $action = 'edit'; // Force chargement page en mode creation
$error++;
}
$db->begin();
- if (! $error)
+ if (!$error)
{
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost(null, $object);
}
- if (! $error)
+ if (!$error)
{
$result = $object->update($user);
if ($result >= 0)
@@ -258,17 +258,17 @@ if ($action == 'update')
$categories = GETPOST('categories', 'array');
$object->setCategories($categories);
- $_GET["id"]=$_POST["id"]; // Force chargement page en mode visu
+ $_GET["id"] = $_POST["id"]; // Force chargement page en mode visu
}
else
{
$error++;
setEventMessages($object->error, $object->errors, 'errors');
- $action='edit'; // Force chargement page edition
+ $action = 'edit'; // Force chargement page edition
}
}
- if (! $error)
+ if (!$error)
{
$db->commit();
}
@@ -306,11 +306,11 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->
$form = new Form($db);
$formbank = new FormBank($db);
$formcompany = new FormCompany($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
-$countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
+$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
-$title = $langs->trans("FinancialAccount") . " - " . $langs->trans("Card");
+$title = $langs->trans("FinancialAccount")." - ".$langs->trans("Card");
$helpurl = "";
llxHeader("", $title, $helpurl);
@@ -319,7 +319,7 @@ llxHeader("", $title, $helpurl);
if ($action == 'create')
{
- $object=new Account($db);
+ $object = new Account($db);
print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'title_bank.png');
@@ -350,7 +350,7 @@ if ($action == 'create')
// Ref
print ' | '.$langs->trans("Ref").' | ';
- print 'ref).'" maxlength="12" autofocus> | ';
+ print 'ref).'" maxlength="12" autofocus> | ';
// Label
print '| '.$langs->trans("LabelBankCashAccount").' | ';
@@ -359,15 +359,15 @@ if ($action == 'create')
// Type
print ' | '.$langs->trans("AccountType").' | ';
print '';
- $formbank->selectTypeOfBankAccount(isset($_POST["type"])?$_POST["type"]: Account::TYPE_CURRENT, "type");
+ $formbank->selectTypeOfBankAccount(isset($_POST["type"]) ? $_POST["type"] : Account::TYPE_CURRENT, "type");
print ' | ';
// Currency
print '| '.$langs->trans("Currency").' | ';
print '';
- $selectedcode=$object->currency_code;
- if (! $selectedcode) $selectedcode=$conf->currency;
- print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
+ $selectedcode = $object->currency_code;
+ if (!$selectedcode) $selectedcode = $conf->currency;
+ print $form->selectCurrency((isset($_POST["account_currency_code"]) ? $_POST["account_currency_code"] : $selectedcode), 'account_currency_code');
//print $langs->trans("Currency".$conf->currency);
//print '';
print ' | ';
@@ -375,17 +375,17 @@ if ($action == 'create')
// Status
print '| '.$langs->trans("Status").' | ';
print '';
- print $form->selectarray("clos", $object->status, (GETPOST("clos", 'int')!=''?GETPOST("clos", 'int'):$object->clos));
+ print $form->selectarray("clos", $object->status, (GETPOST("clos", 'int') != '' ?GETPOST("clos", 'int') : $object->clos));
print ' | ';
// Country
- $selectedcode='';
+ $selectedcode = '';
if (isset($_POST["account_country_id"]))
{
- $selectedcode=$_POST["account_country_id"]?$_POST["account_country_id"]:$object->country_code;
+ $selectedcode = $_POST["account_country_id"] ? $_POST["account_country_id"] : $object->country_code;
}
- elseif (empty($selectedcode)) $selectedcode=$mysoc->country_code;
- $object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
+ elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
+ $object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
print '| '.$langs->trans("BankAccountCountry").' | ';
print '';
@@ -397,7 +397,7 @@ if ($action == 'create')
print ' | | '.$langs->trans('State').' | ';
if ($selectedcode)
{
- $formcompany->select_departement(isset($_POST["account_state_id"])?$_POST["account_state_id"]:'', $selectedcode, 'account_state_id');
+ $formcompany->select_departement(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : '', $selectedcode, 'account_state_id');
}
else
{
@@ -433,13 +433,13 @@ if ($action == 'create')
print ' | ';
// Editor wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor=new DolEditor('account_comment', (GETPOST("account_comment")?GETPOST("account_comment"):$object->comment), '', 90, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_4, '90%');
+ $doleditor = new DolEditor('account_comment', (GETPOST("account_comment") ?GETPOST("account_comment") : $object->comment), '', 90, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_4, '90%');
$doleditor->Create();
print ' | ';
// Other attributes
- $parameters=array();
- $reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook))
{
@@ -454,7 +454,7 @@ if ($action == 'create')
// Sold
print '| '.$langs->trans("InitialBankBalance").' | ';
- print 'solde)).'"> | ';
+ print 'solde)).'"> | ';
print '| '.$langs->trans("Date").' | ';
print '';
@@ -462,10 +462,10 @@ if ($action == 'create')
print ' | ';
print '| '.$langs->trans("BalanceMinimalAllowed").' | ';
- print 'min_allowed).'"> | ';
+ print 'min_allowed).'"> | ';
print '| '.$langs->trans("BalanceMinimalDesired").' | ';
- print 'min_desired).'"> | ';
+ print 'min_desired).'"> | ';
print ' ';
print '
';
@@ -476,7 +476,7 @@ if ($action == 'create')
// If bank account
print ' | | '.$langs->trans("BankName").' | ';
- print ' | ';
+ print ' | ';
print ' ';
// Show fields of bank account
@@ -500,32 +500,32 @@ if ($action == 'create')
}
print ''.$langs->trans($val).' | ';
- print ' | ';
+ print ' | ';
print '';
}
$ibankey = FormBank::getIBANLabel($object);
- $bickey="BICNumber";
- if ($object->getCountryCode() == 'IN') $bickey="SWIFT";
+ $bickey = "BICNumber";
+ if ($object->getCountryCode() == 'IN') $bickey = "SWIFT";
// IBAN
print '| '.$langs->trans($ibankey).' | ';
- print ' | ';
+ print ' | ';
print '| '.$langs->trans($bickey).' | ';
- print ' | ';
+ print ' | ';
print '| '.$langs->trans("BankAccountDomiciliation").' | ';
print " | ";
print '| '.$langs->trans("BankAccountOwner").' | ';
- print '';
+ print ' | ';
print ' | ';
print '| '.$langs->trans("BankAccountOwnerAddress").' | ';
print " | ";
print '
';
@@ -534,10 +534,10 @@ if ($action == 'create')
print '';
// Accountancy code
- $fieldrequired='';
- if (! empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired='fieldrequired ';
+ $fieldrequired = '';
+ if (!empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired = 'fieldrequired ';
- if (! empty($conf->accounting->enabled))
+ if (!empty($conf->accounting->enabled))
{
print '| '.$langs->trans("AccountancyCode").' | ';
print '';
@@ -547,11 +547,11 @@ if ($action == 'create')
else
{
print ' | | '.$langs->trans("AccountancyCode").' | ';
- print 'account_number).'"> | ';
+ print 'account_number).'"> | ';
}
// Accountancy journal
- if (! empty($conf->accounting->enabled))
+ if (!empty($conf->accounting->enabled))
{
print '| '.$langs->trans("AccountancyJournal").' | ';
print '';
@@ -564,9 +564,9 @@ if ($action == 'create')
dol_fiche_end();
print ' ';
- print '';
+ print '';
print ' ';
- print '';
+ print '';
print ' ';
print '';
@@ -588,11 +588,11 @@ else
if ($_GET["ref"])
{
$object->fetch(0, $_GET["ref"]);
- $_GET["id"]=$object->id;
+ $_GET["id"] = $object->id;
}
// Show tabs
- $head=bank_prepare_head($object);
+ $head = bank_prepare_head($object);
dol_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"), -1, 'account');
$formconfirm = '';
@@ -608,7 +608,7 @@ else
$linkback = ''.$langs->trans("BackToList").'';
- $morehtmlref='';
+ $morehtmlref = '';
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -648,7 +648,7 @@ else
// Accountancy code
print ' | | '.$langs->trans("AccountancyCode").' | ';
print '';
- if (! empty($conf->accounting->enabled)) {
+ if (!empty($conf->accounting->enabled)) {
$accountingaccount = new AccountingAccount($db);
$accountingaccount->fetch('', $object->account_number, 1);
@@ -659,7 +659,7 @@ else
print ' | ';
// Accountancy journal
- if (! empty($conf->accounting->enabled))
+ if (!empty($conf->accounting->enabled))
{
print '| '.$langs->trans("AccountancyJournal").' | ';
print '';
@@ -675,7 +675,7 @@ else
// Other attributes
$cols = 2;
- include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
print ' | ';
@@ -725,13 +725,13 @@ else
}
$ibankey = FormBank::getIBANLabel($object);
- $bickey="BICNumber";
- if ($object->getCountryCode() == 'IN') $bickey="SWIFT";
+ $bickey = "BICNumber";
+ if ($object->getCountryCode() == 'IN') $bickey = "SWIFT";
print ' | | '.$langs->trans($ibankey).' | ';
print ''.$object->iban.' ';
- if (! empty($object->iban)) {
- if (! checkIbanForAccount($object)) {
+ if (!empty($object->iban)) {
+ if (!checkIbanForAccount($object)) {
print img_picto($langs->trans("IbanNotValid"), 'warning');
} else {
print img_picto($langs->trans("IbanValid"), 'info');
@@ -741,8 +741,8 @@ else
print ' | | '.$langs->trans($bickey).' | ';
print ''.$object->bic.' ';
- if (! empty($object->bic)) {
- if (! checkSwiftForAccount($object)) {
+ if (!empty($object->bic)) {
+ if (!checkSwiftForAccount($object)) {
print img_picto($langs->trans("SwiftNotValid"), 'warning');
} else {
print img_picto($langs->trans("SwiftValid"), 'info');
@@ -783,7 +783,7 @@ else
print 'id.'">'.$langs->trans("Modify").'';
}
- $canbedeleted=$object->can_be_deleted(); // Renvoi vrai si compte sans mouvements
+ $canbedeleted = $object->can_be_deleted(); // Renvoi vrai si compte sans mouvements
if ($user->rights->banque->configurer && $canbedeleted)
{
print 'id.'">'.$langs->trans("Delete").'';
@@ -837,16 +837,16 @@ else
// Ref
print ' | | '.$langs->trans("Ref").' | ';
- print 'ref).'"> | ';
+ print 'ref).'"> | ';
// Label
print '| '.$langs->trans("Label").' | ';
- print 'label).'"> | ';
+ print 'label).'"> | ';
// Type
print '| '.$langs->trans("AccountType").' | ';
print '';
- $formbank->selectTypeOfBankAccount((isset($_POST["type"])?$_POST["type"]:$object->type), "type");
+ $formbank->selectTypeOfBankAccount((isset($_POST["type"]) ? $_POST["type"] : $object->type), "type");
print ' | ';
// Currency
@@ -854,9 +854,9 @@ else
print '';
print '';
print '';
- $selectedcode=$object->currency_code;
- if (! $selectedcode) $selectedcode=$conf->currency;
- print $form->selectCurrency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code');
+ $selectedcode = $object->currency_code;
+ if (!$selectedcode) $selectedcode = $conf->currency;
+ print $form->selectCurrency((isset($_POST["account_currency_code"]) ? $_POST["account_currency_code"] : $selectedcode), 'account_currency_code');
//print $langs->trans("Currency".$conf->currency);
//print '';
print ' | ';
@@ -864,15 +864,15 @@ else
// Status
print '| '.$langs->trans("Status").' | ';
print '';
- print $form->selectarray("clos", $object->status, (isset($_POST["clos"])?$_POST["clos"]:$object->clos));
+ print $form->selectarray("clos", $object->status, (isset($_POST["clos"]) ? $_POST["clos"] : $object->clos));
print ' | ';
// Country
- $object->country_id=$object->country_id?$object->country_id:$mysoc->country_id;
- $selectedcode=$object->country_code;
- if (isset($_POST["account_country_id"])) $selectedcode=$_POST["account_country_id"];
- elseif (empty($selectedcode)) $selectedcode=$mysoc->country_code;
- $object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
+ $object->country_id = $object->country_id ? $object->country_id : $mysoc->country_id;
+ $selectedcode = $object->country_code;
+ if (isset($_POST["account_country_id"])) $selectedcode = $_POST["account_country_id"];
+ elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
+ $object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
print '| '.$langs->trans("Country").' | ';
print '';
@@ -884,7 +884,7 @@ else
print ' | | '.$langs->trans('State').' | ';
if ($selectedcode)
{
- print $formcompany->select_state(isset($_POST["account_state_id"])?$_POST["account_state_id"]:$object->state_id, $selectedcode, 'account_state_id');
+ print $formcompany->select_state(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : $object->state_id, $selectedcode, 'account_state_id');
}
else
{
@@ -895,22 +895,22 @@ else
// Conciliable
print ' | | '.$langs->trans("Conciliable").' | ';
print '';
- $conciliate=$object->canBeConciliated();
+ $conciliate = $object->canBeConciliated();
if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
elseif ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
- else print ' 0)?'':' checked="checked"').'"> '.$langs->trans("DisableConciliation");
+ else print ' 0) ? '' : ' checked="checked"').'"> '.$langs->trans("DisableConciliation");
print ' | ';
// Balance
print '| '.$langs->trans("BalanceMinimalAllowed").' | ';
- print 'min_allowed).'"> | ';
+ print 'min_allowed).'"> | ';
print '| '.$langs->trans("BalanceMinimalDesired").' | ';
- print 'min_desired).'"> | ';
+ print 'min_desired).'"> | ';
// Web
print '| '.$langs->trans("Web").' | ';
- print 'url).'">';
+ print ' | url).'">';
print ' | ';
// Tags-Categories
@@ -935,13 +935,13 @@ else
print '';
// Editor wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor=new DolEditor('account_comment', (GETPOST("account_comment")?GETPOST("account_comment"):$object->comment), '', 90, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_4, '95%');
+ $doleditor = new DolEditor('account_comment', (GETPOST("account_comment") ?GETPOST("account_comment") : $object->comment), '', 90, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_4, '95%');
$doleditor->Create();
print ' | ';
// Other attributes
- $parameters=array();
- $reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ $parameters = array();
+ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
if (empty($reshook))
{
@@ -973,7 +973,7 @@ else
print '';
// Accountancy journal
- if (! empty($conf->accounting->enabled))
+ if (!empty($conf->accounting->enabled))
{
print '| '.$langs->trans("AccountancyJournal").' | ';
print '';
@@ -1022,8 +1022,8 @@ else
}
$ibankey = FormBank::getIBANLabel($object);
- $bickey="BICNumber";
- if ($object->getCountryCode() == 'IN') $bickey="SWIFT";
+ $bickey = "BICNumber";
+ if ($object->getCountryCode() == 'IN') $bickey = "SWIFT";
// IBAN
print ' | | '.$langs->trans($ibankey).' | ';
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 2244a73b02a..3a9db058c91 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -64,8 +64,8 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortfield) $sortfield='b.label';
-if (! $sortorder) $sortorder='ASC';
+if (!$sortfield) $sortfield = 'b.label';
+if (!$sortorder) $sortorder = 'ASC';
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$object = new Account($db);
@@ -82,14 +82,14 @@ $fieldstosearchall = array(
'b.label'=>'Label',
);
-$checkedtypetiers=0;
-$arrayfields=array(
+$checkedtypetiers = 0;
+$arrayfields = array(
'b.ref'=>array('label'=>$langs->trans("BankAccounts"), 'checked'=>1),
'accountype'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
'b.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
'b.number'=>array('label'=>$langs->trans("AccountIdShort"), 'checked'=>1),
- 'b.account_number'=>array('label'=>$langs->trans("AccountAccounting"), 'checked'=>(! empty($conf->accounting->enabled) || ! empty($conf->accounting->enabled))),
- 'b.fk_accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>(! empty($conf->accounting->enabled) || ! empty($conf->accounting->enabled))),
+ 'b.account_number'=>array('label'=>$langs->trans("AccountAccounting"), 'checked'=>(!empty($conf->accounting->enabled) || !empty($conf->accounting->enabled))),
+ 'b.fk_accountancy_journal'=>array('label'=>$langs->trans("AccountancyJournal"), 'checked'=>(!empty($conf->accounting->enabled) || !empty($conf->accounting->enabled))),
'toreconcile'=>array('label'=>$langs->trans("TransactionsToConciliate"), 'checked'=>1),
'b.currency_code'=>array('label'=>$langs->trans("Currency"), 'checked'=>0),
'b.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
@@ -114,11 +114,11 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
* Actions
*/
-if (GETPOST('cancel', 'alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
@@ -126,10 +126,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
// Purge search criteria
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
{
- $search_ref='';
- $search_label='';
- $search_number='';
- $search_status='';
+ $search_ref = '';
+ $search_label = '';
+ $search_number = '';
+ $search_status = '';
}
@@ -179,7 +179,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
$nbtotalofrecords = $db->num_rows($result);
}
-$sql.= $db->plimit($limit + 1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
$resql = $db->query($sql);
if ($resql)
@@ -198,41 +198,41 @@ else dol_print_error($db);
-$help_url='EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas';
+$help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas';
llxHeader('', $title, $help_url);
-$link='';
+$link = '';
$num_rows = count($accounts);
-$arrayofselected=is_array($toselect)?$toselect:array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-if ($search_ref != '') $param.='&search_ref='.$search_ref;
-if ($search_label != '') $param.='&search_label='.$search_label;
-if ($search_number != '') $param.='&search_number='.$search_number;
-if ($search_status != '') $param.='&search_status='.$search_status;
-if ($show_files) $param.='&show_files=' .$show_files;
-if ($optioncss != '') $param.='&optioncss='.$optioncss;
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if ($search_ref != '') $param .= '&search_ref='.$search_ref;
+if ($search_label != '') $param .= '&search_label='.$search_label;
+if ($search_number != '') $param .= '&search_number='.$search_number;
+if ($search_status != '') $param .= '&search_status='.$search_status;
+if ($show_files) $param .= '&show_files='.$show_files;
+if ($optioncss != '') $param .= '&optioncss='.$optioncss;
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
// List of mass actions available
-$arrayofmassactions = array(
+$arrayofmassactions = array(
// 'presend'=>$langs->trans("SendByMail"),
// 'builddoc'=>$langs->trans("PDFMerge"),
);
-if ($user->rights->banque->supprimer) $arrayofmassactions['predelete']=''.$langs->trans("Delete");
-if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+if ($user->rights->banque->supprimer) $arrayofmassactions['predelete'] = ''.$langs->trans("Delete");
+if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
-$newcardbutton='';
+$newcardbutton = '';
if ($user->rights->banque->configurer)
{
- $newcardbutton.= dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create');
+ $newcardbutton .= dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create');
}
@@ -249,89 +249,89 @@ print '';
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bank', 0, $newcardbutton, '', $limit, 1);
-$topicmail="Information";
+$topicmail = "Information";
//$modelmail="subscription";
-$objecttmp=new Account($db);
+$objecttmp = new Account($db);
//$trackid='sub'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
if ($sall)
{
- foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
- print ''.$langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall).' ';
+ foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+ print ''.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).' ';
}
-$moreforfilter='';
+$moreforfilter = '';
// Bank accounts
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
else $moreforfilter = $hookmanager->resPrint;
-if (! empty($moreforfilter))
+if (!empty($moreforfilter))
{
print '';
print $moreforfilter;
print ' ';
}
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
print '';
-print ' '."\n";
+print ''."\n";
print '';
// Ref
-if (! empty($arrayfields['b.ref']['checked']))
+if (!empty($arrayfields['b.ref']['checked']))
{
print '| ';
print '';
print ' | ';
}
// Label
-if (! empty($arrayfields['b.label']['checked']))
+if (!empty($arrayfields['b.label']['checked']))
{
print '';
print '';
print ' | ';
}
// Account type
-if (! empty($arrayfields['accountype']['checked']))
+if (!empty($arrayfields['accountype']['checked']))
{
print '';
print ' | ';
}
// Bank number
-if (! empty($arrayfields['b.number']['checked']))
+if (!empty($arrayfields['b.number']['checked']))
{
print '';
print '';
print ' | ';
}
// Account number
-if (! empty($arrayfields['b.account_number']['checked']))
+if (!empty($arrayfields['b.account_number']['checked']))
{
print '';
print ' | ';
}
// Accountancy journal
-if (! empty($arrayfields['b.fk_accountancy_journal']['checked']))
+if (!empty($arrayfields['b.fk_accountancy_journal']['checked']))
{
print '';
print ' | ';
}
// Transactions to reconcile
-if (! empty($arrayfields['toreconcile']['checked']))
+if (!empty($arrayfields['toreconcile']['checked']))
{
print '';
print ' | ';
}
// Currency
-if (! empty($arrayfields['b.currency_code']['checked']))
+if (!empty($arrayfields['b.currency_code']['checked']))
{
print '';
print ' | ';
@@ -340,26 +340,26 @@ if (! empty($arrayfields['b.currency_code']['checked']))
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
// Fields from hook
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Date creation
-if (! empty($arrayfields['b.datec']['checked']))
+if (!empty($arrayfields['b.datec']['checked']))
{
print '';
print ' | ';
}
// Date modification
-if (! empty($arrayfields['b.tms']['checked']))
+if (!empty($arrayfields['b.tms']['checked']))
{
print '';
print ' | ';
}
// Status
-if (! empty($arrayfields['b.clos']['checked']))
+if (!empty($arrayfields['b.clos']['checked']))
{
print '';
- $array=array(
+ $array = array(
'opened'=>$langs->trans("Opened"),
'closed'=>$langs->trans("Closed")
);
@@ -367,42 +367,42 @@ if (! empty($arrayfields['b.clos']['checked']))
print ' | ';
}
// Balance
-if (! empty($arrayfields['balance']['checked']))
+if (!empty($arrayfields['balance']['checked']))
{
print ' | ';
}
// Action column
print '';
-$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
+$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
print $searchpicto;
print ' | ';
print ' ';
// Fields title
print '';
-if (! empty($arrayfields['b.ref']['checked'])) print_liste_field_titre($arrayfields['b.ref']['label'], $_SERVER["PHP_SELF"], 'b.ref', '', $param, '', $sortfield, $sortorder);
-if (! empty($arrayfields['b.label']['checked'])) print_liste_field_titre($arrayfields['b.label']['label'], $_SERVER["PHP_SELF"], 'b.label', '', $param, '', $sortfield, $sortorder);
-if (! empty($arrayfields['accountype']['checked'])) print_liste_field_titre($arrayfields['accountype']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-if (! empty($arrayfields['b.number']['checked'])) print_liste_field_titre($arrayfields['b.number']['label'], $_SERVER["PHP_SELF"], 'b.number', '', $param, '', $sortfield, $sortorder);
-if (! empty($arrayfields['b.account_number']['checked'])) print_liste_field_titre($arrayfields['b.account_number']['label'], $_SERVER["PHP_SELF"], 'b.account_number', '', $param, '', $sortfield, $sortorder);
-if (! empty($arrayfields['b.fk_accountancy_journal']['checked'])) print_liste_field_titre($arrayfields['b.fk_accountancy_journal']['label'], $_SERVER["PHP_SELF"], 'b.fk_accountancy_journal', '', $param, '', $sortfield, $sortorder);
-if (! empty($arrayfields['b.currency_code']['checked'])) print_liste_field_titre($arrayfields['b.currency_code']['label'], $_SERVER["PHP_SELF"], 'b.currency_code', '', $param, '', $sortfield, $sortorder, 'center ');
-if (! empty($arrayfields['toreconcile']['checked'])) print_liste_field_titre($arrayfields['toreconcile']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['b.ref']['checked'])) print_liste_field_titre($arrayfields['b.ref']['label'], $_SERVER["PHP_SELF"], 'b.ref', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['b.label']['checked'])) print_liste_field_titre($arrayfields['b.label']['label'], $_SERVER["PHP_SELF"], 'b.label', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['accountype']['checked'])) print_liste_field_titre($arrayfields['accountype']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['b.number']['checked'])) print_liste_field_titre($arrayfields['b.number']['label'], $_SERVER["PHP_SELF"], 'b.number', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['b.account_number']['checked'])) print_liste_field_titre($arrayfields['b.account_number']['label'], $_SERVER["PHP_SELF"], 'b.account_number', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['b.fk_accountancy_journal']['checked'])) print_liste_field_titre($arrayfields['b.fk_accountancy_journal']['label'], $_SERVER["PHP_SELF"], 'b.fk_accountancy_journal', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['b.currency_code']['checked'])) print_liste_field_titre($arrayfields['b.currency_code']['label'], $_SERVER["PHP_SELF"], 'b.currency_code', '', $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['toreconcile']['checked'])) print_liste_field_titre($arrayfields['toreconcile']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
// Extra fields
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['b.datec']['checked'])) print_liste_field_titre($arrayfields['b.datec']['label'], $_SERVER["PHP_SELF"], "b.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (! empty($arrayfields['b.tms']['checked'])) print_liste_field_titre($arrayfields['b.tms']['label'], $_SERVER["PHP_SELF"], "b.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (! empty($arrayfields['b.clos']['checked'])) print_liste_field_titre($arrayfields['b.clos']['label'], $_SERVER["PHP_SELF"], 'b.clos', '', $param, '', $sortfield, $sortorder, 'center ');
-if (! empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['b.datec']['checked'])) print_liste_field_titre($arrayfields['b.datec']['label'], $_SERVER["PHP_SELF"], "b.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+if (!empty($arrayfields['b.tms']['checked'])) print_liste_field_titre($arrayfields['b.tms']['label'], $_SERVER["PHP_SELF"], "b.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+if (!empty($arrayfields['b.clos']['checked'])) print_liste_field_titre($arrayfields['b.clos']['label'], $_SERVER["PHP_SELF"], 'b.clos', '', $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print " \n";
-$total = array(); $found = 0; $i=0; $lastcurrencycode='';
+$total = array(); $found = 0; $i = 0; $lastcurrencycode = '';
foreach ($accounts as $key=>$type)
{
@@ -488,26 +488,26 @@ foreach ($accounts as $key=>$type)
print '';
}
print '';
- if (! $i) $totalarray['nbfield']++;
+ if (!$i) $totalarray['nbfield']++;
}
// Currency
- if (! empty($arrayfields['b.currency_code']['checked']))
+ if (!empty($arrayfields['b.currency_code']['checked']))
{
print '';
print $objecttmp->currency_code;
print ' | ';
- if (! $i) $totalarray['nbfield']++;
+ if (!$i) $totalarray['nbfield']++;
}
// Transactions to reconcile
- if (! empty($arrayfields['toreconcile']['checked']))
+ if (!empty($arrayfields['toreconcile']['checked']))
{
print '';
if ($objecttmp->rappro)
{
- $result=$objecttmp->load_board($user, $objecttmp->id);
- if ($result<0) {
+ $result = $objecttmp->load_board($user, $objecttmp->id);
+ if ($result < 0) {
setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
} else {
print ''.$result->nbtodo.'';
@@ -571,12 +571,12 @@ foreach ($accounts as $key=>$type)
print ' | ';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
{
- $selected=0;
- if (in_array($objecttmp->id, $arrayofselected)) $selected=1;
- print '';
+ $selected = 0;
+ if (in_array($objecttmp->id, $arrayofselected)) $selected = 1;
+ print '';
}
print ' | ';
- if (! $i) $totalarray['nbfield']++;
+ if (!$i) $totalarray['nbfield']++;
print '';
@@ -586,10 +586,10 @@ foreach ($accounts as $key=>$type)
}
// If no record found
-if (! $found)
+if (!$found)
{
- $colspan=1;
- foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+ $colspan = 1;
+ foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
print '| '.$langs->trans("NoRecordFound").' | ';
}
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 5e7904ad7d6..c80a0cd0ab8 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
-if (! empty($conf->projet->enabled))
+if (!empty($conf->projet->enabled))
{
require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -85,39 +85,39 @@ if (empty($reshook))
{
if ($action != 'addlink')
{
- $urltogo=$backtopage?$backtopage:dol_buildpath('/compta/bank/various_payment/list.php', 1);
+ $urltogo = $backtopage ? $backtopage : dol_buildpath('/compta/bank/various_payment/list.php', 1);
header("Location: ".$urltogo);
exit;
}
- if ($id > 0 || ! empty($ref)) $ret = $object->fetch($id, $ref);
- $action='';
+ if ($id > 0 || !empty($ref)) $ret = $object->fetch($id, $ref);
+ $action = '';
}
if ($action == 'add')
{
- $error=0;
+ $error = 0;
- $datep=dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday", 'int'), GETPOST("datepyear", 'int'));
- $datev=dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", 'int'), GETPOST("datevyear", 'int'));
- if (empty($datev)) $datev=$datep;
+ $datep = dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday", 'int'), GETPOST("datepyear", 'int'));
+ $datev = dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", 'int'), GETPOST("datevyear", 'int'));
+ if (empty($datev)) $datev = $datep;
- $object->ref=''; // TODO
- $object->accountid=GETPOST("accountid", 'int') > 0 ? GETPOST("accountid", "int") : 0;
- $object->datev=$datev;
- $object->datep=$datep;
- $object->amount=price2num(GETPOST("amount", 'alpha'));
- $object->label=GETPOST("label", 'none');
- $object->note=GETPOST("note", 'none');
- $object->type_payment=GETPOST("paymenttype", 'int') > 0 ? GETPOST("paymenttype", "int") : 0;
- $object->num_payment=GETPOST("num_payment", 'alpha');
- $object->fk_user_author=$user->id;
- $object->category_transaction=GETPOST("category_transaction", 'alpha');
+ $object->ref = ''; // TODO
+ $object->accountid = GETPOST("accountid", 'int') > 0 ? GETPOST("accountid", "int") : 0;
+ $object->datev = $datev;
+ $object->datep = $datep;
+ $object->amount = price2num(GETPOST("amount", 'alpha'));
+ $object->label = GETPOST("label", 'none');
+ $object->note = GETPOST("note", 'none');
+ $object->type_payment = GETPOST("paymenttype", 'int') > 0 ? GETPOST("paymenttype", "int") : 0;
+ $object->num_payment = GETPOST("num_payment", 'alpha');
+ $object->fk_user_author = $user->id;
+ $object->category_transaction = GETPOST("category_transaction", 'alpha');
- $object->accountancy_code=GETPOST("accountancy_code") > 0 ? GETPOST("accountancy_code", "alpha") : "";
- $object->subledger_account=GETPOST("subledger_account") > 0 ? GETPOST("subledger_account", "alpha") : "";
+ $object->accountancy_code = GETPOST("accountancy_code") > 0 ? GETPOST("accountancy_code", "alpha") : "";
+ $object->subledger_account = GETPOST("subledger_account") > 0 ? GETPOST("subledger_account", "alpha") : "";
- $object->sens=GETPOST('sens');
- $object->fk_project= GETPOST('fk_project', 'int');
+ $object->sens = GETPOST('sens');
+ $object->fk_project = GETPOST('fk_project', 'int');
if (empty($datep) || empty($datev))
{
@@ -137,29 +137,29 @@ if (empty($reshook))
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
$error++;
}
- if (! empty($conf->banque->enabled) && ! $object->accountid > 0)
+ if (!empty($conf->banque->enabled) && !$object->accountid > 0)
{
$langs->load('errors');
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
$error++;
}
// TODO Remove this and allow instead to edit a various payment to enter accounting code
- if (! empty($conf->accounting->enabled) && ! $object->accountancy_code)
+ if (!empty($conf->accounting->enabled) && !$object->accountancy_code)
{
$langs->load('errors');
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountAccounting")), null, 'errors');
$error++;
}
- if (! $error)
+ if (!$error)
{
$db->begin();
- $ret=$object->create($user);
+ $ret = $object->create($user);
if ($ret > 0)
{
$db->commit();
- $urltogo=($backtopage ? $backtopage : DOL_URL_ROOT.'/compta/bank/various_payment/list.php');
+ $urltogo = ($backtopage ? $backtopage : DOL_URL_ROOT.'/compta/bank/various_payment/list.php');
header("Location: ".$urltogo);
exit;
}
@@ -167,29 +167,29 @@ if (empty($reshook))
{
$db->rollback();
setEventMessages($object->error, $object->errors, 'errors');
- $action="create";
+ $action = "create";
}
}
- $action='create';
+ $action = 'create';
}
if ($action == 'delete')
{
- $result=$object->fetch($id);
+ $result = $object->fetch($id);
if ($object->rappro == 0)
{
$db->begin();
- $ret=$object->delete($user);
+ $ret = $object->delete($user);
if ($ret > 0)
{
if ($object->fk_bank)
{
- $accountline=new AccountLine($db);
- $result=$accountline->fetch($object->fk_bank);
- if ($result > 0) $result=$accountline->delete($user); // $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+ $accountline = new AccountLine($db);
+ $result = $accountline->fetch($object->fk_bank);
+ if ($result > 0) $result = $accountline->delete($user); // $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
}
if ($result >= 0)
@@ -200,7 +200,7 @@ if (empty($reshook))
}
else
{
- $object->error=$accountline->error;
+ $object->error = $accountline->error;
$db->rollback();
setEventMessages($object->error, $object->errors, 'errors');
}
@@ -226,8 +226,8 @@ if (empty($reshook))
llxHeader("", $langs->trans("VariousPayment"));
$form = new Form($db);
-if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
-if (! empty($conf->projet->enabled)) $formproject = new FormProjets($db);
+if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
if ($id)
{
@@ -271,25 +271,25 @@ if ($action == 'create')
// Date payment
print '| ';
print $form->editfieldkey('DatePayment', 'datep', '', $object, 0, 'string', '', 1).' | ';
- print $form->selectDate((empty($datep)?-1:$datep), "datep", '', '', '', 'add', 1, 1);
+ print $form->selectDate((empty($datep) ?-1 : $datep), "datep", '', '', '', 'add', 1, 1);
print ' | ';
// Date value for bank
print '| ';
print $form->editfieldkey('DateValue', 'datev', '', $object, 0).' | ';
- print $form->selectDate((empty($datev)?-1:$datev), "datev", '', '', '', 'add', 1, 1);
+ print $form->selectDate((empty($datev) ?-1 : $datev), "datev", '', '', '', 'add', 1, 1);
print ' | ';
// Label
print '| ';
print $form->editfieldkey('Label', 'label', '', $object, 0, 'string', '', 1).' | ';
- print '';
+ print '';
print ' | ';
// Sens
print '| ';
print $form->editfieldkey('Sens', 'sens', '', $object, 0, 'string', '', 1).' | ';
- $sensarray=array( '0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
+ $sensarray = array('0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
print $form->selectarray('sens', $sensarray, $sens);
print ' | ';
@@ -300,11 +300,11 @@ if ($action == 'create')
print '';
// Bank
- if (! empty($conf->banque->enabled))
+ if (!empty($conf->banque->enabled))
{
print '| ';
print $form->editfieldkey('BankAccount', 'selectaccountid', '', $object, 0, 'string', '', 1).' | ';
- $form->select_comptes($accountid, "accountid", 0, '', 1); // Affiche liste des comptes courant
+ $form->select_comptes($accountid, "accountid", 0, '', 1); // Affiche liste des comptes courant
print ' | ';
}
@@ -315,7 +315,7 @@ if ($action == 'create')
print '';
// Number
- if (! empty($conf->banque->enabled))
+ if (!empty($conf->banque->enabled))
{
// Number
print ' | ';
@@ -355,7 +355,7 @@ if ($action == 'create')
}
// Accountancy account
- if (! empty($conf->accounting->enabled))
+ if (!empty($conf->accounting->enabled))
{
// TODO Remove the fieldrequired and allow instead to edit a various payment to enter accounting code
print '| '.$langs->trans("AccountAccounting").' | ';
@@ -371,11 +371,11 @@ if ($action == 'create')
}
// Subledger account
- if (! empty($conf->accounting->enabled))
+ if (!empty($conf->accounting->enabled))
{
print ' | '.$langs->trans("SubledgerAccount").' | ';
print '';
- if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+ if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
{
print $formaccounting->select_auxaccount($subledger_account, 'subledger_account', 1, '');
}
@@ -484,7 +484,7 @@ if ($id)
print ' | | ';
print $langs->trans("AccountAccounting");
print ' | ';
- if (! empty($conf->accounting->enabled))
+ if (!empty($conf->accounting->enabled))
{
$accountingaccount = new AccountingAccount($db);
$accountingaccount->fetch('', $object->accountancy_code, 1);
@@ -502,11 +502,11 @@ if ($id)
print $object->subledger_account;
print ' | ';
- if (! empty($conf->banque->enabled))
+ if (!empty($conf->banque->enabled))
{
if ($object->fk_account > 0)
{
- $bankline=new AccountLine($db);
+ $bankline = new AccountLine($db);
$bankline->fetch($object->fk_bank);
print '';
@@ -519,8 +519,8 @@ if ($id)
}
// Other attributes
- $parameters=array('socid'=>$object->id);
- include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+ $parameters = array('socid'=>$object->id);
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
print ' ';
@@ -542,7 +542,7 @@ if ($id)
// Delete
if (empty($object->rappro))
{
- if (! empty($user->rights->banque->modifier))
+ if (!empty($user->rights->banque->modifier))
{
print '';
}
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 7070946e2c7..6e8fb2a65ea 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -50,22 +50,22 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
$object = new PaymentVarious($db);
$object->fetch($id, $ref);
$upload_dir = $conf->bank->dir_output.'/'.dol_sanitizeFileName($object->id);
-$modulepart='banque';
+$modulepart = 'banque';
/*
* Actions
*/
-include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
/*
@@ -125,11 +125,11 @@ if ($object->id)
print '';
// Build file list
- $filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
- $totalsize=0;
- foreach($filearray as $key => $file)
+ $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+ $totalsize = 0;
+ foreach ($filearray as $key => $file)
{
- $totalsize+=$file['size'];
+ $totalsize += $file['size'];
}
print '';
@@ -146,8 +146,8 @@ if ($object->id)
$modulepart = 'banque';
$permission = $user->rights->banque->modifier;
- $param = '&id=' . $object->id;
- include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+ $param = '&id='.$object->id;
+ include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
}
else
{
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 602cd9142cf..ef88c586ede 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -31,20 +31,20 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
-$langs->loadLangs(array("install","cashdesk","admin","banks"));
+$langs->loadLangs(array("install", "cashdesk", "admin", "banks"));
-$id=GETPOST('id', 'int');
+$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
-$action=GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'aZ09');
$categid = GETPOST('categid');
$label = GETPOST("label");
-$now=dol_now();
-$syear = (GETPOSTISSET('closeyear')?GETPOST('closeyear', 'int'):dol_print_date($now, "%Y"));
-$smonth = (GETPOSTISSET('closemonth')?GETPOST('closemonth', 'int'):dol_print_date($now, "%m"));
-$sday = (GETPOSTISSET('closeday')?GETPOST('closeday', 'int'):dol_print_date($now, "%d"));
+$now = dol_now();
+$syear = (GETPOSTISSET('closeyear') ?GETPOST('closeyear', 'int') : dol_print_date($now, "%Y"));
+$smonth = (GETPOSTISSET('closemonth') ?GETPOST('closemonth', 'int') : dol_print_date($now, "%m"));
+$sday = (GETPOSTISSET('closeday') ?GETPOST('closeday', 'int') : dol_print_date($now, "%d"));
-$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');
@@ -52,30 +52,30 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortfield) $sortfield='rowid';
-if (! $sortorder) $sortorder='ASC';
+if (!$sortfield) $sortfield = 'rowid';
+if (!$sortorder) $sortorder = 'ASC';
// Security check
-if (! $user->rights->cashdesk->use && ! $user->rights->takepos->use)
+if (!$user->rights->cashdesk->use && !$user->rights->takepos->use)
{
accessforbidden();
}
-$arrayofpaymentmode=array('cash'=>'Cash', 'cheque'=>'Cheque', 'card'=>'CreditCard');
+$arrayofpaymentmode = array('cash'=>'Cash', 'cheque'=>'Cheque', 'card'=>'CreditCard');
-$arrayofposavailable=array();
-if (! empty($conf->cashdesk->enabled)) $arrayofposavailable['cashdesk']=$langs->trans('CashDesk').' (cashdesk)';
-if (! empty($conf->takepos->enabled)) $arrayofposavailable['takepos']=$langs->trans('TakePOS').' (takepos)';
+$arrayofposavailable = array();
+if (!empty($conf->cashdesk->enabled)) $arrayofposavailable['cashdesk'] = $langs->trans('CashDesk').' (cashdesk)';
+if (!empty($conf->takepos->enabled)) $arrayofposavailable['takepos'] = $langs->trans('TakePOS').' (takepos)';
// TODO Add hook here to allow other POS to add themself
-$object= new CashControl($db);
+$object = new CashControl($db);
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('cashcontrolcard','globalcard'));
+$hookmanager->initHooks(array('cashcontrolcard', 'globalcard'));
/*
@@ -86,7 +86,7 @@ $permissiontoadd = ($user->rights->cashdesk->use || $user->rights->takepos->use)
$permissiontodelete = ($user->rights->cashdesk->use || $user->rights->takepos->use) || ($permissiontoadd && $object->status == 0);
if (empty($backtopage)) $backtopage = dol_buildpath('/compta/cashcontrol/cashcontrol_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
$backurlforlist = dol_buildpath('/compta/cashcontrol/cashcontrol_list.php', 1);
-$triggermodname = 'CACHCONTROL_MODIFY'; // Name of trigger action code to execute when we modify record
+$triggermodname = 'CACHCONTROL_MODIFY'; // Name of trigger action code to execute when we modify record
if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) && empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH1))
{
@@ -99,70 +99,70 @@ if (GETPOST('cancel', 'alpha'))
$action = 'create';
}
-if ($action=="start")
+if ($action == "start")
{
- $error=0;
- if (! GETPOST('posmodule', 'alpha') || GETPOST('posmodule', 'alpha') == '-1')
+ $error = 0;
+ if (!GETPOST('posmodule', 'alpha') || GETPOST('posmodule', 'alpha') == '-1')
{
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Module")), null, 'errors');
- $action='create';
+ $action = 'create';
$error++;
}
if (GETPOST('posnumber', 'alpha') == '')
{
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CashDesk")), null, 'errors');
- $action='create';
+ $action = 'create';
$error++;
}
- if (! GETPOST('closeyear', 'alpha') || GETPOST('closeyear', 'alpha') == '-1')
+ if (!GETPOST('closeyear', 'alpha') || GETPOST('closeyear', 'alpha') == '-1')
{
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Year")), null, 'errors');
- $action='create';
+ $action = 'create';
$error++;
}
}
-elseif ($action=="add")
+elseif ($action == "add")
{
if (GETPOST('opening', 'alpha') == '')
{
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InitialBankBalance")), null, 'errors');
- $action='start';
+ $action = 'start';
$error++;
}
- $error=0;
- foreach($arrayofpaymentmode as $key=>$val)
+ $error = 0;
+ foreach ($arrayofpaymentmode as $key=>$val)
{
$object->$key = price2num(GETPOST($key.'_amount', 'alpha'));
}
- if (! $error)
+ if (!$error)
{
$object->day_close = GETPOST('closeday', 'int');
$object->month_close = GETPOST('closemonth', 'int');
$object->year_close = GETPOST('closeyear', 'int');
- $object->opening=price2num(GETPOST('opening', 'alpha'));
- $object->posmodule=GETPOST('posmodule', 'alpha');
- $object->posnumber=GETPOST('posnumber', 'alpha');
+ $object->opening = price2num(GETPOST('opening', 'alpha'));
+ $object->posmodule = GETPOST('posmodule', 'alpha');
+ $object->posnumber = GETPOST('posnumber', 'alpha');
$db->begin();
- $id=$object->create($user);
+ $id = $object->create($user);
if ($id > 0)
{
$db->commit();
- $action="view";
+ $action = "view";
}
else
{
$db->rollback;
- $action="view";
+ $action = "view";
}
}
}
-if ($action=="close")
+if ($action == "close")
{
$object->fetch($id);
@@ -176,21 +176,21 @@ if ($action=="close")
setEventMessages($langs->trans("CashFenceDone"), null);
}
- $action="view";
+ $action = "view";
}
// Action to delete
-if ($action == 'confirm_delete' && ! empty($permissiontodelete))
+if ($action == 'confirm_delete' && !empty($permissiontodelete))
{
$object->fetch($id);
- if (! ($object->id > 0))
+ if (!($object->id > 0))
{
dol_print_error('', 'Error, object must be fetched before being deleted');
exit;
}
- $result=$object->delete($user);
+ $result = $object->delete($user);
//var_dump($result);
if ($result > 0)
{
@@ -201,7 +201,7 @@ if ($action == 'confirm_delete' && ! empty($permissiontodelete))
}
else
{
- if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+ if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
else setEventMessages($object->error, null, 'errors');
}
}
@@ -211,15 +211,15 @@ if ($action == 'confirm_delete' && ! empty($permissiontodelete))
* View
*/
-$form=new Form($db);
+$form = new Form($db);
-if ($action=="create" || $action=="start")
+if ($action == "create" || $action == "start")
{
llxHeader();
- $initialbalanceforterminal=array();
- $theoricalamountforterminal=array();
- $theoricalnbofinvoiceforterminal=array();
+ $initialbalanceforterminal = array();
+ $theoricalamountforterminal = array();
+ $theoricalnbofinvoiceforterminal = array();
if (GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '-1')
{
@@ -227,16 +227,16 @@ if ($action=="create" || $action=="start")
$terminalid = GETPOST('posnumber', 'alpha');
$terminaltouse = $terminalid;
- if ($terminaltouse == '1' && $posmodule=='cashdesk') $terminaltouse = '';
+ if ($terminaltouse == '1' && $posmodule == 'cashdesk') $terminaltouse = '';
- if ($posmodule=='cashdesk' && $terminaltouse != '' && $terminaltouse != '1') {
+ if ($posmodule == 'cashdesk' && $terminaltouse != '' && $terminaltouse != '1') {
$terminaltouse = '';
setEventMessages($langs->trans("OnlyTerminal1IsAvailableForCashDeskModule"), null, 'errors');
$error++;
}
// Calculate $initialbalanceforterminal for terminal 0
- foreach($arrayofpaymentmode as $key => $val)
+ foreach ($arrayofpaymentmode as $key => $val)
{
if ($key != 'cash')
{
@@ -245,18 +245,18 @@ if ($action=="create" || $action=="start")
}
// Get the bank account dedicated to this point of sale module/terminal
- $vartouse='CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse;
- $bankid = $conf->global->$vartouse; // This value is ok for 'Terminal 0' for module 'CashDesk' and 'TakePos' (they manage only 1 terminal)
+ $vartouse = 'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse;
+ $bankid = $conf->global->$vartouse; // This value is ok for 'Terminal 0' for module 'CashDesk' and 'TakePos' (they manage only 1 terminal)
// Hook to get the good bank id according to posmodule and posnumber.
// @TODO add hook here
if ($bankid > 0)
{
$sql = "SELECT SUM(amount) as total FROM ".MAIN_DB_PREFIX."bank";
- $sql.= " WHERE fk_account = ".$bankid;
- if ($syear && ! $smonth) $sql.= " AND dateo < '".$db->idate(dol_get_first_day($syear, 1))."'";
- elseif ($syear && $smonth && ! $sday) $sql.= " AND dateo < '".$db->idate(dol_get_first_day($syear, $smonth))."'";
- elseif ($syear && $smonth && $sday) $sql.= " AND dateo < '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."'";
+ $sql .= " WHERE fk_account = ".$bankid;
+ if ($syear && !$smonth) $sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, 1))."'";
+ elseif ($syear && $smonth && !$sday) $sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, $smonth))."'";
+ elseif ($syear && $smonth && $sday) $sql .= " AND dateo < '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."'";
else dol_print_error('', 'Year not defined');
$resql = $db->query($sql);
@@ -275,28 +275,28 @@ if ($action=="create" || $action=="start")
}
// Calculate $theoricalamountforterminal for terminal 0
- foreach($arrayofpaymentmode as $key => $val)
+ foreach ($arrayofpaymentmode as $key => $val)
{
/*$sql = "SELECT SUM(amount) as total FROM ".MAIN_DB_PREFIX."bank";
$sql.= " WHERE fk_account = ".$bankid;*/
$sql = "SELECT SUM(pf.amount) as total, COUNT(*) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as cp";
- $sql.= " WHERE pf.fk_facture = f.rowid AND p.rowid = pf.fk_paiement AND cp.id = p.fk_paiement";
- $sql.= " AND f.module_source = '".$db->escape($posmodule)."'";
- $sql.= " AND f.pos_source = '".$db->escape($terminalid)."'";
- $sql.= " AND f.paye = 1";
- $sql.= " AND p.entity IN (".getEntity('facture').")";
- if ($key == 'cash') $sql.=" AND cp.code = 'LIQ'";
- elseif ($key == 'cheque') $sql.=" AND cp.code = 'CHQ'";
- elseif ($key == 'card') $sql.=" AND cp.code = 'CB'";
+ $sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as cp";
+ $sql .= " WHERE pf.fk_facture = f.rowid AND p.rowid = pf.fk_paiement AND cp.id = p.fk_paiement";
+ $sql .= " AND f.module_source = '".$db->escape($posmodule)."'";
+ $sql .= " AND f.pos_source = '".$db->escape($terminalid)."'";
+ $sql .= " AND f.paye = 1";
+ $sql .= " AND p.entity IN (".getEntity('facture').")";
+ if ($key == 'cash') $sql .= " AND cp.code = 'LIQ'";
+ elseif ($key == 'cheque') $sql .= " AND cp.code = 'CHQ'";
+ elseif ($key == 'card') $sql .= " AND cp.code = 'CB'";
else
{
dol_print_error('Value for key = '.$key.' not supported');
exit;
}
- if ($syear && ! $smonth) $sql.= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, 1))."' AND '".$db->idate(dol_get_last_day($syear, 12))."'";
- elseif ($syear && $smonth && ! $sday) $sql.= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, $smonth))."' AND '".$db->idate(dol_get_last_day($syear, $smonth))."'";
- elseif ($syear && $smonth && $sday) $sql.= " AND datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
+ if ($syear && !$smonth) $sql .= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, 1))."' AND '".$db->idate(dol_get_last_day($syear, 12))."'";
+ elseif ($syear && $smonth && !$sday) $sql .= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, $smonth))."' AND '".$db->idate(dol_get_last_day($syear, $smonth))."'";
+ elseif ($syear && $smonth && $sday) $sql .= " AND datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
else dol_print_error('', 'Year not defined');
$resql = $db->query($sql);
@@ -337,53 +337,53 @@ if ($action=="create" || $action=="start")
print ' | ';
print "\n";
- $disabled=0;
- $prefix='close';
+ $disabled = 0;
+ $prefix = 'close';
print '';
- print '| '.$form->selectarray('posmodule', $arrayofposavailable, GETPOST('posmodule', 'alpha'), (count($arrayofposavailable)>1?1:0)).' | ';
+ print ''.$form->selectarray('posmodule', $arrayofposavailable, GETPOST('posmodule', 'alpha'), (count($arrayofposavailable) > 1 ? 1 : 0)).' | ';
print '';
- $array=array(1=>"1", 2=>"2", 3=>"3", 4=>"4", 5=>"5", 6=>"6", 7=>"7", 8=>"8", 9=>"9");
- $selectedposnumber=0; $showempty=1;
+ $array = array(1=>"1", 2=>"2", 3=>"3", 4=>"4", 5=>"5", 6=>"6", 7=>"7", 8=>"8", 9=>"9");
+ $selectedposnumber = 0; $showempty = 1;
if ($conf->global->TAKEPOS_NUM_TERMINALS == '1')
{
- $selectedposnumber=1; $showempty=0;
+ $selectedposnumber = 1; $showempty = 0;
}
- print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber')?GETPOST('posnumber', 'int'):$selectedposnumber, $showempty);
+ print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber') ?GETPOST('posnumber', 'int') : $selectedposnumber, $showempty);
//print '';
print ' | ';
// Year
print '';
- $retstring='';
- for ($year = $syear - 10; $year < $syear + 10 ; $year++)
+ $retstring = '';
+ for ($year = $syear - 10; $year < $syear + 10; $year++)
{
- $retstring.='';
+ $retstring .= '';
}
- $retstring.="\n";
+ $retstring .= "\n";
print $retstring;
print ' | ';
// Month
print '';
- $retstring='';
- $retstring.='';
- for ($month = 1 ; $month <= 12 ; $month++)
+ $retstring = '';
+ $retstring .= '';
+ for ($month = 1; $month <= 12; $month++)
{
- $retstring.='";
+ $retstring .= '";
}
- $retstring.="";
+ $retstring .= "";
print $retstring;
print ' | ';
// Day
print '';
- $retstring='';
- $retstring.='';
- for ($day = 1 ; $day <= 31; $day++)
+ $retstring = '';
+ $retstring .= '';
+ for ($day = 1; $day <= 31; $day++)
{
- $retstring.='';
+ $retstring .= '';
}
- $retstring.="";
+ $retstring .= "";
print $retstring;
print ' | ';
// Button Start
@@ -425,10 +425,10 @@ if ($action=="create" || $action=="start")
print ''.$langs->trans("Cash");
//print '
'.$langs->trans("TheoricalAmount").'
'.$langs->trans("RealAmount");
print ' | ';
- $i=0;
- foreach($arrayofpaymentmode as $key => $val)
+ $i = 0;
+ foreach ($arrayofpaymentmode as $key => $val)
{
- print ''.$langs->trans($val);
+ print ' | '.$langs->trans($val);
//print '
'.$langs->trans("TheoricalAmount").'
'.$langs->trans("RealAmount");
print ' | ';
$i++;
@@ -442,10 +442,10 @@ if ($action=="create" || $action=="start")
print '';
print ' | ';
// Amount per payment type
- $i=0;
- foreach($arrayofpaymentmode as $key => $val)
+ $i = 0;
+ foreach ($arrayofpaymentmode as $key => $val)
{
- print '';
+ print ' | ';
print $theoricalnbofinvoiceforterminal[$terminalid][$key];
print ' | ';
$i++;
@@ -461,10 +461,10 @@ if ($action=="create" || $action=="start")
print price($initialbalanceforterminal[$terminalid]['cash']).'
';
print '';
// Amount per payment type
- $i=0;
- foreach($arrayofpaymentmode as $key => $val)
+ $i = 0;
+ foreach ($arrayofpaymentmode as $key => $val)
{
- print '';
+ print ' | ';
print price($theoricalamountforterminal[$terminalid][$key]).'
';
print ' | ';
$i++;
@@ -477,14 +477,14 @@ if ($action=="create" || $action=="start")
print ''.$langs->trans("RealAmount").' | ';
// Initial amount
print '';
- print '';
+ print '';
print ' | ';
// Amount per payment type
- $i=0;
- foreach($arrayofpaymentmode as $key => $val)
+ $i = 0;
+ foreach ($arrayofpaymentmode as $key => $val)
{
- print '';
- print '';
+ print ' | ';
+ print '';
print ' | ';
$i++;
}
@@ -500,23 +500,23 @@ if ($action=="create" || $action=="start")
print '';
}
-if (empty($action) || $action=="view")
+if (empty($action) || $action == "view")
{
$object->fetch($id);
llxHeader('', $langs->trans("CashControl"));
- $head=array();
+ $head = array();
$head[0][0] = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.$object->id;
$head[0][1] = $langs->trans("Card");
$head[0][2] = 'cashcontrol';
dol_fiche_head($head, 'cashcontrol', $langs->trans("CashControl"), -1, 'cashcontrol');
- $linkback = '' . $langs->trans("BackToList") . '';
+ $linkback = ''.$langs->trans("BackToList").'';
- $morehtmlref='';
- $morehtmlref.=' ';
+ $morehtmlref = '';
+ $morehtmlref .= ' ';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
@@ -563,7 +563,7 @@ if (empty($action) || $action=="view")
print price($object->opening, 0, $langs, 1, -1, -1, $conf->currency);
print " ";
- foreach($arrayofpaymentmode as $key => $val)
+ foreach ($arrayofpaymentmode as $key => $val)
{
print '| '.$langs->trans($val).' | ';
print price($object->$key, 0, $langs, 1, -1, -1, $conf->currency);
@@ -578,12 +578,12 @@ if (empty($action) || $action=="view")
dol_fiche_end();
print '';
- print ' ';
+ print ' ';
if ($object->status == CashControl::STATUS_DRAFT)
{
- print ' ';
+ print ' ';
- print ' ';
+ print ' ';
}
print '
';
// Contacts lines (modules that overwrite templates must declare this into descriptor)
- $dirtpls=array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
- foreach($dirtpls as $reldir)
+ $dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+ foreach ($dirtpls as $reldir)
{
- $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+ $res = @include dol_buildpath($reldir.'/contacts.tpl.php');
if ($res) break;
}
}
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 36f768991f8..91e6ab46c5a 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -63,14 +63,14 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined,
$offset = $conf->liste_limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
$object = new Facture($db);
if ($object->fetch($id))
{
$object->fetch_thirdparty();
- $upload_dir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($object->ref);
+ $upload_dir = $conf->facture->dir_output."/".dol_sanitizeFileName($object->ref);
}
@@ -78,20 +78,20 @@ if ($object->fetch($id))
* Actions
*/
-require_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
/*
* View
*/
-$title = $langs->trans('InvoiceCustomer') . " - " . $langs->trans('Documents');
+$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Documents');
$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
llxHeader('', $title, $helpurl);
$form = new Form($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
{
if ($object->fetch($id, $ref) > 0)
{
@@ -105,60 +105,60 @@ if ($id > 0 || ! empty($ref))
$totalpaye = $object->getSommePaiement();
// Build file list
- $filearray=dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC), 1);
- $totalsize=0;
- foreach($filearray as $key => $file)
+ $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+ $totalsize = 0;
+ foreach ($filearray as $key => $file)
{
- $totalsize+=$file['size'];
+ $totalsize += $file['size'];
}
// Invoice content
- $linkback = '' . $langs->trans("BackToList") . '';
+ $linkback = ''.$langs->trans("BackToList").'';
- $morehtmlref='';
+ $morehtmlref = ' ';
// Ref customer
- $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
// Thirdparty
- $morehtmlref.=' '.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'customer');
+ $morehtmlref .= ' '.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
// Project
- if (! empty($conf->projet->enabled))
+ if (!empty($conf->projet->enabled))
{
$langs->load("projects");
- $morehtmlref.=' '.$langs->trans('Project') . ' ';
+ $morehtmlref .= ' '.$langs->trans('Project').' ';
if ($user->rights->facture->creer)
{
if ($action != 'classify')
//$morehtmlref.=' ' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref.=' : ';
+ $morehtmlref .= ' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.=' ';
+ $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 {
- if (! empty($object->fk_project)) {
+ if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref.=' ';
- $morehtmlref.=$proj->ref;
- $morehtmlref.='';
+ $morehtmlref .= ' ';
+ $morehtmlref .= $proj->ref;
+ $morehtmlref .= '';
} else {
- $morehtmlref.='';
+ $morehtmlref .= '';
}
}
}
- $morehtmlref.=' ';
+ $morehtmlref .= ' ';
+$morehtmlref = ' ';
// Ref customer
-$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
// Thirdparty
-$morehtmlref.=' '.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'customer');
+$morehtmlref .= ' '.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
// Project
-if (! empty($conf->projet->enabled))
+if (!empty($conf->projet->enabled))
{
$langs->load("projects");
- $morehtmlref.=' '.$langs->trans('Project') . ' ';
+ $morehtmlref .= ' '.$langs->trans('Project').' ';
if ($user->rights->facture->creer)
{
if ($action != 'classify')
//$morehtmlref.=' ' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref.=' : ';
+ $morehtmlref .= ' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.=' ';
+ $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 {
- if (! empty($object->fk_project)) {
+ if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref.=' ';
- $morehtmlref.=$proj->ref;
- $morehtmlref.='';
+ $morehtmlref .= ' ';
+ $morehtmlref .= $proj->ref;
+ $morehtmlref .= '';
} else {
- $morehtmlref.='';
+ $morehtmlref .= '';
}
}
}
-$morehtmlref.=' ';
+$morehtmlref .= ' | ";
print " \n";
@@ -671,8 +671,8 @@ if ($resql)
}
else
{
- $colspan=1;
- foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+ $colspan = 1;
+ foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
print '| '.$langs->trans("NoRecordFound").' | ';
}
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index ff71b1ff9af..d211c04d375 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -64,13 +64,13 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
* View
*/
-$title = $langs->trans('InvoiceCustomer') . " - " . $langs->trans('Notes');
+$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Notes');
$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
llxHeader('', $title, $helpurl);
$form = new Form($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
{
$object = new Facture($db);
$object->fetch($id, $ref);
@@ -85,50 +85,50 @@ if ($id > 0 || ! empty($ref))
// Invoice content
- $linkback = '' . $langs->trans("BackToList") . '';
+ $linkback = ''.$langs->trans("BackToList").'';
- $morehtmlref='';
+ $morehtmlref = ' ';
// Ref customer
- $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+ $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
// Thirdparty
- $morehtmlref.=' '.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'customer');
+ $morehtmlref .= ' '.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
// Project
- if (! empty($conf->projet->enabled))
+ if (!empty($conf->projet->enabled))
{
$langs->load("projects");
- $morehtmlref.=' '.$langs->trans('Project') . ' ';
+ $morehtmlref .= ' '.$langs->trans('Project').' ';
if ($user->rights->facture->creer)
{
if ($action != 'classify')
//$morehtmlref.=' ' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref.=' : ';
+ $morehtmlref .= ' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.=' ';
+ $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 {
- if (! empty($object->fk_project)) {
+ if (!empty($object->fk_project)) {
$proj = new Project($db);
$proj->fetch($object->fk_project);
- $morehtmlref.=' ';
- $morehtmlref.=$proj->ref;
- $morehtmlref.='';
+ $morehtmlref .= ' ';
+ $morehtmlref .= $proj->ref;
+ $morehtmlref .= '';
} else {
- $morehtmlref.='';
+ $morehtmlref .= '';
}
}
}
- $morehtmlref.=' ';
+ $morehtmlref .= ' ';
@@ -312,7 +312,7 @@ if ($object->id > 0)
print '';
print ' | ';
if ($object->type != Facture::TYPE_CREDIT_NOTE)
@@ -337,7 +337,7 @@ if ($object->id > 0)
print '';
print ' | ';
if ($object->type != Facture::TYPE_CREDIT_NOTE)
@@ -365,7 +365,7 @@ if ($object->id > 0)
print '';
print ' | ';
if ($action == 'editmode')
@@ -383,7 +383,7 @@ if ($object->id > 0)
print '| ';
print $langs->trans('BankAccount');
print ' | ';
- if (($action != 'editbankaccount') && $user->rights->commande->creer && ! empty($object->brouillon))
+ if (($action != 'editbankaccount') && $user->rights->commande->creer && !empty($object->brouillon))
print ' | id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' | ';
print '
';
print ' | ';
@@ -414,39 +414,39 @@ if ($object->id > 0)
if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
{
// Multicurrency Amount HT
- print ' | | ' . $form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0) . ' | ';
- print '' . price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | ';
+ print ' | '.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).' | ';
+ print ''.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print ' ';
// Multicurrency Amount VAT
- print '| ' . $form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0) . ' | ';
- print '' . price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | ';
+ print ' | '.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).' | ';
+ print ''.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print ' ';
// Multicurrency Amount TTC
- print '| ' . $form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0) . ' | ';
- print '' . price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)) . ' | ';
+ print ' | '.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).' | ';
+ print ''.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).' | ';
print ' ';
}
// Amount
- print '| ' . $langs->trans('AmountHT') . ' | ';
- print '' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . ' | ';
+ print '| '.$langs->trans('AmountHT').' | ';
+ print ''.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).' | ';
// Vat
- print '| ' . $langs->trans('AmountVAT') . ' | ' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . ' | ';
+ print '| '.$langs->trans('AmountVAT').' | '.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).' | ';
print '';
// Amount Local Taxes
if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) // Localtax1
{
- print '| ' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ' | ';
- print '' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . ' | ';
+ print '| '.$langs->transcountry("AmountLT1", $mysoc->country_code).' | ';
+ print ''.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).' | ';
}
if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) // Localtax2
{
- print '| ' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ' | ';
- print '' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . ' | ';
+ print '| '.$langs->transcountry("AmountLT2", $mysoc->country_code).' | ';
+ print ''.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).' | ';
}
// Revenue stamp
@@ -456,9 +456,9 @@ if ($object->id > 0)
print '';
print '';
@@ -467,7 +467,7 @@ if ($object->id > 0)
}
// Total with tax
- print ' | | ' . $langs->trans('AmountTTC') . ' | ' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . ' | ';
+ print '| '.$langs->trans('AmountTTC').' | '.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).' | ';
$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
@@ -545,10 +545,10 @@ if ($object->id > 0)
$remaintopaylesspendingdebit = $resteapayer - $pending;
print '';
}
@@ -596,14 +596,14 @@ if ($object->id > 0)
print '';
$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande";
- $sql.= " , pfd.date_traite as date_traite, pfd.amount,";
- $sql.= " u.rowid as user_id, u.lastname, u.firstname, u.login";
- $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."prelevement_bons as pb ON pb.rowid = pfd.fk_prelevement_bons";
- $sql.= " WHERE fk_facture = ".$object->id;
- $sql.= " AND pfd.traite = 0";
- $sql.= " ORDER BY pfd.date_demande DESC";
+ $sql .= " , pfd.date_traite as date_traite, pfd.amount,";
+ $sql .= " u.rowid as user_id, u.lastname, u.firstname, u.login";
+ $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."prelevement_bons as pb ON pb.rowid = pfd.fk_prelevement_bons";
+ $sql .= " WHERE fk_facture = ".$object->id;
+ $sql .= " AND pfd.traite = 0";
+ $sql .= " ORDER BY pfd.date_demande DESC";
$result_sql = $db->query($sql);
@@ -646,14 +646,14 @@ if ($object->id > 0)
// Past requests
$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande, pfd.date_traite, pfd.fk_prelevement_bons, pfd.amount,";
- $sql.= " pb.ref,";
- $sql.= " u.rowid as user_id, u.lastname, u.firstname, u.login";
- $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid";
- $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."prelevement_bons as pb ON pb.rowid = pfd.fk_prelevement_bons";
- $sql.= " WHERE fk_facture = ".$object->id;
- $sql.= " AND pfd.traite = 1";
- $sql.= " ORDER BY pfd.date_demande DESC";
+ $sql .= " pb.ref,";
+ $sql .= " u.rowid as user_id, u.lastname, u.firstname, u.login";
+ $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."prelevement_bons as pb ON pb.rowid = pfd.fk_prelevement_bons";
+ $sql .= " WHERE fk_facture = ".$object->id;
+ $sql .= " AND pfd.traite = 1";
+ $sql .= " ORDER BY pfd.date_demande DESC";
$result = $db->query($sql);
if ($result)
@@ -677,9 +677,9 @@ if ($object->id > 0)
print '';
if ($obj->fk_prelevement_bons > 0)
{
- $withdrawreceipt=new BonPrelevement($db);
- $withdrawreceipt->id=$obj->fk_prelevement_bons;
- $withdrawreceipt->ref=$obj->ref;
+ $withdrawreceipt = new BonPrelevement($db);
+ $withdrawreceipt->id = $obj->fk_prelevement_bons;
+ $withdrawreceipt->ref = $obj->ref;
print $withdrawreceipt->getNomUrl(1);
}
print " | \n";
@@ -694,7 +694,7 @@ if ($object->id > 0)
$i++;
}
- if (! $numopen && ! $numclosed)
+ if (!$numopen && !$numclosed)
print '| '.$langs->trans("None").' | ';
$db->free($result);
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 3f1e4aef717..609181dec96 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -42,21 +42,21 @@ $langs->loadLangs(array('companies', 'bills', 'banks', 'multicurrency'));
$action = GETPOST('action', 'alpha');
$confirm = GETPOST('confirm', 'alpha');
-$facid = GETPOST('facid', 'int');
-$accountid = GETPOST('accountid', 'int');
+$facid = GETPOST('facid', 'int');
+$accountid = GETPOST('accountid', 'int');
$paymentnum = GETPOST('num_paiement', 'alpha');
$socid = GETPOST('socid', 'int');
$sortfield = GETPOST('sortfield', 'alpha');
$sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page', 'int');
+$page = GETPOST('page', 'int');
-$amounts=array();
-$amountsresttopay=array();
-$addwarning=0;
+$amounts = array();
+$amountsresttopay = array();
+$addwarning = 0;
-$multicurrency_amounts=array();
-$multicurrency_amountsresttopay=array();
+$multicurrency_amounts = array();
+$multicurrency_amountsresttopay = array();
// Security check
if ($user->socid > 0)
@@ -64,24 +64,24 @@ if ($user->socid > 0)
$socid = $user->socid;
}
-$object=new Facture($db);
+$object = new Facture($db);
// Load object
if ($facid > 0)
{
- $ret=$object->fetch($facid);
+ $ret = $object->fetch($facid);
}
// Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('paiementcard','globalcard'));
+$hookmanager->initHooks(array('paiementcard', 'globalcard'));
/*
* Actions
*/
-$parameters=array('socid'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if (empty($reshook))
@@ -97,7 +97,7 @@ if (empty($reshook))
$atleastonepaymentnotnull = 0;
// Generate payment array and check if there is payment higher than invoice and payment date before invoice date
- $tmpinvoice=new Facture($db);
+ $tmpinvoice = new Facture($db);
foreach ($_POST as $key => $value)
{
if (substr($key, 0, 7) == 'amount_' && GETPOST($key) != '')
@@ -105,16 +105,16 @@ if (empty($reshook))
$cursorfacid = substr($key, 7);
$amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
$totalpayment = $totalpayment + $amounts[$cursorfacid];
- if (! empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
- $result=$tmpinvoice->fetch($cursorfacid);
+ if (!empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+ $result = $tmpinvoice->fetch($cursorfacid);
if ($result <= 0) dol_print_error($db);
- $amountsresttopay[$cursorfacid]=price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
+ $amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
if ($amounts[$cursorfacid])
{
// Check amount
if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
{
- $addwarning=1;
+ $addwarning = 1;
$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
}
// Check date
@@ -126,23 +126,23 @@ if (empty($reshook))
}
}
- $formquestion[$i++]=array('type' => 'hidden','name' => $key, 'value' => $_POST[$key]);
+ $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
}
elseif (substr($key, 0, 21) == 'multicurrency_amount_')
{
$cursorfacid = substr($key, 21);
$multicurrency_amounts[$cursorfacid] = price2num(trim(GETPOST($key)));
$multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
- if (! empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
- $result=$tmpinvoice->fetch($cursorfacid);
+ if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+ $result = $tmpinvoice->fetch($cursorfacid);
if ($result <= 0) dol_print_error($db);
- $multicurrency_amountsresttopay[$cursorfacid]=price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
+ $multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
if ($multicurrency_amounts[$cursorfacid])
{
// Check amount
if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
{
- $addwarning=1;
+ $addwarning = 1;
$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
}
// Check date
@@ -154,18 +154,18 @@ if (empty($reshook))
}
}
- $formquestion[$i++]=array('type' => 'hidden','name' => $key, 'value' => GETPOST($key, 'int'));
+ $formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key, 'int'));
}
}
// Check parameters
- if (! GETPOST('paiementcode'))
+ if (!GETPOST('paiementcode'))
{
setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('PaymentMode')), null, 'errors');
$error++;
}
- if (! empty($conf->banque->enabled))
+ if (!empty($conf->banque->enabled))
{
// If bank module is on, account is required to enter a payment
if (GETPOST('accountid') <= 0)
@@ -212,7 +212,7 @@ if (empty($reshook))
*/
if ($action == 'confirm_paiement' && $confirm == 'yes')
{
- $error=0;
+ $error = 0;
$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
@@ -244,7 +244,7 @@ if (empty($reshook))
}
}
- if (! empty($conf->banque->enabled))
+ if (!empty($conf->banque->enabled))
{
// Si module bank actif, un compte est obligatoire lors de la saisie d'un paiement
if (GETPOST('accountid', 'int') <= 0)
@@ -257,17 +257,17 @@ if (empty($reshook))
// Creation of payment line
$paiement = new Paiement($db);
$paiement->datepaye = $datepaye;
- $paiement->amounts = $amounts; // Array with all payments dispatching with invoice id
- $paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+ $paiement->amounts = $amounts; // Array with all payments dispatching with invoice id
+ $paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
$paiement->paiementid = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
$paiement->num_paiement = GETPOST('num_paiement', 'alpha');
$paiement->note = GETPOST('comment', 'alpha');
- if (! $error)
+ if (!$error)
{
// Create payment and update this->multicurrency_amounts if this->amounts filled or
// this->amounts if this->multicurrency_amounts filled.
- $paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices')=='on'?1:0), $thirdparty); // This include closing invoices and regenerating documents
+ $paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
if ($paiement_id < 0)
{
setEventMessages($paiement->error, $paiement->errors, 'errors');
@@ -275,11 +275,11 @@ if (empty($reshook))
}
}
- if (! $error)
+ if (!$error)
{
- $label='(CustomerInvoicePayment)';
- if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) $label='(CustomerInvoicePaymentBack)'; // Refund of a credit note
- $result=$paiement->addPaymentToBank($user, 'payment', $label, GETPOST('accountid'), GETPOST('chqemetteur'), GETPOST('chqbank'));
+ $label = '(CustomerInvoicePayment)';
+ if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+ $result = $paiement->addPaymentToBank($user, 'payment', $label, GETPOST('accountid'), GETPOST('chqemetteur'), GETPOST('chqbank'));
if ($result < 0)
{
setEventMessages($paiement->error, $paiement->errors, 'errors');
@@ -287,19 +287,19 @@ if (empty($reshook))
}
}
- if (! $error)
+ if (!$error)
{
$db->commit();
// If payment dispatching on more than one invoice, we stay on summary page, otherwise jump on invoice card
- $invoiceid=0;
+ $invoiceid = 0;
foreach ($paiement->amounts as $key => $amount)
{
$facid = $key;
if (is_numeric($amount) && $amount <> 0)
{
- if ($invoiceid != 0) $invoiceid=-1; // There is more than one invoice payed by this payment
- else $invoiceid=$facid;
+ if ($invoiceid != 0) $invoiceid = -1; // There is more than one invoice payed by this payment
+ else $invoiceid = $facid;
}
}
if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
@@ -319,7 +319,7 @@ if (empty($reshook))
* View
*/
-$form=new Form($db);
+$form = new Form($db);
llxHeader('', $langs->trans("Payment"));
@@ -335,31 +335,31 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
{
$facture->fetch_thirdparty();
- $title='';
- if ($facture->type != Facture::TYPE_CREDIT_NOTE) $title.=$langs->trans("EnterPaymentReceivedFromCustomer");
- if ($facture->type == Facture::TYPE_CREDIT_NOTE) $title.=$langs->trans("EnterPaymentDueToCustomer");
+ $title = '';
+ if ($facture->type != Facture::TYPE_CREDIT_NOTE) $title .= $langs->trans("EnterPaymentReceivedFromCustomer");
+ if ($facture->type == Facture::TYPE_CREDIT_NOTE) $title .= $langs->trans("EnterPaymentDueToCustomer");
print load_fiche_titre($title);
// Initialize data for confirmation (this is used because data can be change during confirmation)
if ($action == 'add_paiement')
{
- $i=0;
+ $i = 0;
- $formquestion[$i++]=array('type' => 'hidden','name' => 'facid', 'value' => $facture->id);
- $formquestion[$i++]=array('type' => 'hidden','name' => 'socid', 'value' => $facture->socid);
- $formquestion[$i++]=array('type' => 'hidden','name' => 'type', 'value' => $facture->type);
+ $formquestion[$i++] = array('type' => 'hidden', 'name' => 'facid', 'value' => $facture->id);
+ $formquestion[$i++] = array('type' => 'hidden', 'name' => 'socid', 'value' => $facture->socid);
+ $formquestion[$i++] = array('type' => 'hidden', 'name' => 'type', 'value' => $facture->type);
}
// Invoice with Paypal transaction
// TODO add hook possibility (regis)
- if (! empty($conf->paypalplus->enabled) && $conf->global->PAYPAL_ENABLE_TRANSACTION_MANAGEMENT && ! empty($facture->ref_int))
+ if (!empty($conf->paypalplus->enabled) && $conf->global->PAYPAL_ENABLE_TRANSACTION_MANAGEMENT && !empty($facture->ref_int))
{
- if (! empty($conf->global->PAYPAL_BANK_ACCOUNT)) $accountid=$conf->global->PAYPAL_BANK_ACCOUNT;
- $paymentnum=$facture->ref_int;
+ if (!empty($conf->global->PAYPAL_BANK_ACCOUNT)) $accountid = $conf->global->PAYPAL_BANK_ACCOUNT;
+ $paymentnum = $facture->ref_int;
}
// Add realtime total information
- if (! empty($conf->use_javascript_ajax))
+ if (!empty($conf->use_javascript_ajax))
{
print "\n".''."\n";
+ $this->stringtoshow .= 'plotWithOptions_'.$tag.'();'."\n";
+ $this->stringtoshow .= '});'."\n";
+ $this->stringtoshow .= ''."\n";
}
@@ -1138,8 +1138,8 @@ class DolGraph
if ($shownographyet)
{
- $s= '';
- $s.=''.$langs->trans("NotEnoughDataYet").' ';
+ $s = '';
+ $s .= ''.$langs->trans("NotEnoughDataYet").' ';
return $s;
}
@@ -1161,11 +1161,11 @@ class DolGraph
if ($direction == 'width')
{
if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
- else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
+ else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width'] - 40));
}
if ($direction == 'height')
{
- return (empty($conf->dol_optimize_smallscreen)?($defaultsize?$defaultsize:'200'):'160');
+ return (empty($conf->dol_optimize_smallscreen) ? ($defaultsize ? $defaultsize : '200') : '160');
}
return 0;
}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 8567ef595a0..81dffc51b67 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -140,7 +140,7 @@ class ExtraFields
/**
* @var string Error code (or message)
*/
- public $error='';
+ public $error = '';
/**
* @var string[] Array of Error code (or message)
@@ -153,7 +153,7 @@ class ExtraFields
public $errno;
- public static $type2label=array(
+ public static $type2label = array(
'varchar'=>'String',
'text'=>'TextLong',
'html'=>'HtmlText',
@@ -280,67 +280,67 @@ class ExtraFields
*/
private function create($attrname, $type = 'varchar', $length = 255, $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = '', $perms = '', $list = '0', $computed = '', $help = '')
{
- if ($elementtype == 'thirdparty') $elementtype='societe';
- if ($elementtype == 'contact') $elementtype='socpeople';
+ if ($elementtype == 'thirdparty') $elementtype = 'societe';
+ if ($elementtype == 'contact') $elementtype = 'socpeople';
- $table=$elementtype.'_extrafields';
- if ($elementtype == 'categorie') $table='categories_extrafields';
+ $table = $elementtype.'_extrafields';
+ if ($elementtype == 'categorie') $table = 'categories_extrafields';
- if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/", $attrname) && ! is_numeric($attrname))
+ if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/", $attrname) && !is_numeric($attrname))
{
- if ($type=='boolean') {
- $typedb='int';
- $lengthdb='1';
- } elseif($type=='price') {
- $typedb='double';
- $lengthdb='24,8';
- } elseif($type=='phone') {
- $typedb='varchar';
- $lengthdb='20';
- } elseif($type=='mail') {
- $typedb='varchar';
- $lengthdb='128';
- } elseif($type=='url') {
- $typedb='varchar';
- $lengthdb='255';
- } elseif (($type=='select') || ($type=='sellist') || ($type=='radio') ||($type=='checkbox') ||($type=='chkbxlst')){
- $typedb='varchar';
- $lengthdb='255';
- } elseif ($type=='link') {
- $typedb='int';
- $lengthdb='11';
- } elseif ($type=='html') {
- $typedb='text';
- $lengthdb=$length;
- } elseif($type=='password') {
- $typedb='varchar';
- $lengthdb='128';
+ if ($type == 'boolean') {
+ $typedb = 'int';
+ $lengthdb = '1';
+ } elseif ($type == 'price') {
+ $typedb = 'double';
+ $lengthdb = '24,8';
+ } elseif ($type == 'phone') {
+ $typedb = 'varchar';
+ $lengthdb = '20';
+ } elseif ($type == 'mail') {
+ $typedb = 'varchar';
+ $lengthdb = '128';
+ } elseif ($type == 'url') {
+ $typedb = 'varchar';
+ $lengthdb = '255';
+ } elseif (($type == 'select') || ($type == 'sellist') || ($type == 'radio') || ($type == 'checkbox') || ($type == 'chkbxlst')) {
+ $typedb = 'varchar';
+ $lengthdb = '255';
+ } elseif ($type == 'link') {
+ $typedb = 'int';
+ $lengthdb = '11';
+ } elseif ($type == 'html') {
+ $typedb = 'text';
+ $lengthdb = $length;
+ } elseif ($type == 'password') {
+ $typedb = 'varchar';
+ $lengthdb = '128';
} else {
- $typedb=$type;
- $lengthdb=$length;
- if ($type == 'varchar' && empty($lengthdb)) $lengthdb='255';
+ $typedb = $type;
+ $lengthdb = $length;
+ if ($type == 'varchar' && empty($lengthdb)) $lengthdb = '255';
}
$field_desc = array(
'type'=>$typedb,
'value'=>$lengthdb,
- 'null'=>($required?'NOT NULL':'NULL'),
+ 'null'=>($required ? 'NOT NULL' : 'NULL'),
'default' => $default_value
);
- $result=$this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+ $result = $this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
if ($result > 0)
{
if ($unique)
{
- $sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
- $resql=$this->db->query($sql, 1, 'dml');
+ $sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+ $resql = $this->db->query($sql, 1, 'dml');
}
return 1;
}
else
{
- $this->error=$this->db->lasterror();
- $this->errno=$this->db->lasterrno();
+ $this->error = $this->db->lasterror();
+ $this->errno = $this->db->lasterrno();
return -1;
}
}
@@ -378,19 +378,19 @@ class ExtraFields
private function create_label($attrname, $label = '', $type = '', $pos = 0, $size = 0, $elementtype = 'member', $unique = 0, $required = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0)
{
// phpcs:enable
- global $conf,$user;
+ global $conf, $user;
- if ($elementtype == 'thirdparty') $elementtype='societe';
- if ($elementtype == 'contact') $elementtype='socpeople';
+ if ($elementtype == 'thirdparty') $elementtype = 'societe';
+ if ($elementtype == 'contact') $elementtype = 'socpeople';
// Clean parameters
- if (empty($pos)) $pos=0;
- if (empty($list)) $list='0';
- if (empty($required)) $required=0;
- if (empty($unique)) $unique=0;
- if (empty($alwayseditable)) $alwayseditable=0;
+ if (empty($pos)) $pos = 0;
+ if (empty($list)) $list = '0';
+ if (empty($required)) $required = 0;
+ if (empty($unique)) $unique = 0;
+ if (empty($alwayseditable)) $alwayseditable = 0;
- if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && ! is_numeric($attrname))
+ if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && !is_numeric($attrname))
{
if (is_array($param) && count($param) > 0)
{
@@ -460,8 +460,8 @@ class ExtraFields
}
else
{
- $this->error=$this->db->lasterror();
- $this->errno=$this->db->lasterrno();
+ $this->error = $this->db->lasterror();
+ $this->errno = $this->db->lasterrno();
return -1;
}
}
@@ -476,30 +476,30 @@ class ExtraFields
*/
public function delete($attrname, $elementtype = 'member')
{
- if ($elementtype == 'thirdparty') $elementtype='societe';
- if ($elementtype == 'contact') $elementtype='socpeople';
+ if ($elementtype == 'thirdparty') $elementtype = 'societe';
+ if ($elementtype == 'contact') $elementtype = 'socpeople';
- $table=$elementtype.'_extrafields';
- if ($elementtype == 'categorie') $table='categories_extrafields';
+ $table = $elementtype.'_extrafields';
+ if ($elementtype == 'categorie') $table = 'categories_extrafields';
- $error=0;
+ $error = 0;
- if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
+ if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
{
- $result=$this->delete_label($attrname, $elementtype);
+ $result = $this->delete_label($attrname, $elementtype);
if ($result < 0)
{
- $this->error=$this->db->lasterror();
- $this->errors[]=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
+ $this->errors[] = $this->db->lasterror();
$error++;
}
- if (! $error)
+ if (!$error)
{
$sql = "SELECT COUNT(rowid) as nb";
- $sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
- $sql.= " WHERE elementtype = '".$elementtype."'";
- $sql.= " AND name = '".$attrname."'";
+ $sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
+ $sql .= " WHERE elementtype = '".$elementtype."'";
+ $sql .= " AND name = '".$attrname."'";
//$sql.= " AND entity IN (0,".$conf->entity.")"; Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
$resql = $this->db->query($sql);
if ($resql)
@@ -507,11 +507,11 @@ class ExtraFields
$obj = $this->db->fetch_object($resql);
if ($obj->nb <= 0)
{
- $result=$this->db->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key
+ $result = $this->db->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key
if ($result < 0)
{
- $this->error=$this->db->lasterror();
- $this->errors[]=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
+ $this->errors[] = $this->db->lasterror();
$error++;
}
}
@@ -539,18 +539,18 @@ class ExtraFields
// phpcs:enable
global $conf;
- if ($elementtype == 'thirdparty') $elementtype='societe';
- if ($elementtype == 'contact') $elementtype='socpeople';
+ if ($elementtype == 'thirdparty') $elementtype = 'societe';
+ if ($elementtype == 'contact') $elementtype = 'socpeople';
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
- $sql.= " WHERE name = '".$attrname."'";
- $sql.= " AND entity IN (0,".$conf->entity.')';
- $sql.= " AND elementtype = '".$elementtype."'";
+ $sql .= " WHERE name = '".$attrname."'";
+ $sql .= " AND entity IN (0,".$conf->entity.')';
+ $sql .= " AND elementtype = '".$elementtype."'";
dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
return 1;
@@ -593,80 +593,80 @@ class ExtraFields
*/
public function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0)
{
- if ($elementtype == 'thirdparty') $elementtype='societe';
- if ($elementtype == 'contact') $elementtype='socpeople';
+ if ($elementtype == 'thirdparty') $elementtype = 'societe';
+ if ($elementtype == 'contact') $elementtype = 'socpeople';
- $table=$elementtype.'_extrafields';
- if ($elementtype == 'categorie') $table='categories_extrafields';
+ $table = $elementtype.'_extrafields';
+ if ($elementtype == 'categorie') $table = 'categories_extrafields';
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
{
- if ($type=='boolean') {
- $typedb='int';
- $lengthdb='1';
- } elseif($type=='price') {
- $typedb='double';
- $lengthdb='24,8';
- } elseif($type=='phone') {
- $typedb='varchar';
- $lengthdb='20';
- } elseif($type=='mail') {
- $typedb='varchar';
- $lengthdb='128';
- } elseif($type=='url') {
- $typedb='varchar';
- $lengthdb='255';
- } elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) {
- $typedb='varchar';
- $lengthdb='255';
+ if ($type == 'boolean') {
+ $typedb = 'int';
+ $lengthdb = '1';
+ } elseif ($type == 'price') {
+ $typedb = 'double';
+ $lengthdb = '24,8';
+ } elseif ($type == 'phone') {
+ $typedb = 'varchar';
+ $lengthdb = '20';
+ } elseif ($type == 'mail') {
+ $typedb = 'varchar';
+ $lengthdb = '128';
+ } elseif ($type == 'url') {
+ $typedb = 'varchar';
+ $lengthdb = '255';
+ } elseif (($type == 'select') || ($type == 'sellist') || ($type == 'radio') || ($type == 'checkbox') || ($type == 'chkbxlst')) {
+ $typedb = 'varchar';
+ $lengthdb = '255';
} elseif ($type == 'html') {
- $typedb='text';
- } elseif ($type=='link') {
- $typedb='int';
- $lengthdb='11';
- } elseif($type=='password') {
- $typedb='varchar';
- $lengthdb='50';
+ $typedb = 'text';
+ } elseif ($type == 'link') {
+ $typedb = 'int';
+ $lengthdb = '11';
+ } elseif ($type == 'password') {
+ $typedb = 'varchar';
+ $lengthdb = '50';
} else {
- $typedb=$type;
- $lengthdb=$length;
+ $typedb = $type;
+ $lengthdb = $length;
}
- $field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required?'NOT NULL':'NULL'), 'default'=>$default);
+ $field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required ? 'NOT NULL' : 'NULL'), 'default'=>$default);
if ($type != 'separate') // No table update when separate type
{
- $result=$this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
+ $result = $this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
}
if ($result > 0 || $type == 'separate')
{
if ($label)
{
- $result=$this->update_label($attrname, $label, $type, $length, $elementtype, $unique, $required, $pos, $param, $alwayseditable, $perms, $list, $help, $default, $computed, $entity, $langfile, $enabled, $totalizable);
+ $result = $this->update_label($attrname, $label, $type, $length, $elementtype, $unique, $required, $pos, $param, $alwayseditable, $perms, $list, $help, $default, $computed, $entity, $langfile, $enabled, $totalizable);
}
if ($result > 0)
{
- $sql='';
+ $sql = '';
if ($unique)
{
- $sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
+ $sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
}
else
{
- $sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
+ $sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
}
dol_syslog(get_class($this).'::update', LOG_DEBUG);
- $resql=$this->db->query($sql, 1, 'dml');
+ $resql = $this->db->query($sql, 1, 'dml');
return 1;
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
else
{
- $this->error=$this->db->lasterror();
+ $this->error = $this->db->lasterror();
return -1;
}
}
@@ -708,17 +708,17 @@ class ExtraFields
dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);
// Clean parameters
- if ($elementtype == 'thirdparty') $elementtype='societe';
- if ($elementtype == 'contact') $elementtype='socpeople';
+ if ($elementtype == 'thirdparty') $elementtype = 'societe';
+ if ($elementtype == 'contact') $elementtype = 'socpeople';
- if (empty($pos)) $pos=0;
- if (empty($list)) $list='0';
+ if (empty($pos)) $pos = 0;
+ if (empty($list)) $list = '0';
if (empty($totalizable)) {
$totalizable = 0;
}
- if (empty($required)) $required=0;
- if (empty($unique)) $unique=0;
- if (empty($alwayseditable)) $alwayseditable=0;
+ if (empty($required)) $required = 0;
+ if (empty($unique)) $unique = 0;
+ if (empty($alwayseditable)) $alwayseditable = 0;
if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
{
@@ -734,76 +734,76 @@ class ExtraFields
}
else
{
- $params='';
+ $params = '';
}
if ($entity === '' || $entity != '0')
{
// We dont want on all entities, we delete all and current
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
- $sql_del.= " WHERE name = '".$attrname."'";
- $sql_del.= " AND entity IN (0, ".($entity===''?$conf->entity:$entity).")";
- $sql_del.= " AND elementtype = '".$elementtype."'";
+ $sql_del .= " WHERE name = '".$attrname."'";
+ $sql_del .= " AND entity IN (0, ".($entity === '' ? $conf->entity : $entity).")";
+ $sql_del .= " AND elementtype = '".$elementtype."'";
}
else
{
// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
- $sql_del.= " WHERE name = '".$attrname."'";
- $sql_del.= " AND entity = 0";
- $sql_del.= " AND elementtype = '".$elementtype."'";
+ $sql_del .= " WHERE name = '".$attrname."'";
+ $sql_del .= " AND entity = 0";
+ $sql_del .= " AND elementtype = '".$elementtype."'";
}
- $resql1=$this->db->query($sql_del);
+ $resql1 = $this->db->query($sql_del);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
- $sql.= " name,"; // This is code
- $sql.= " entity,";
- $sql.= " label,";
- $sql.= " type,";
- $sql.= " size,";
- $sql.= " elementtype,";
- $sql.= " fieldunique,";
- $sql.= " fieldrequired,";
- $sql.= " perms,";
- $sql.= " langs,";
- $sql.= " pos,";
- $sql.= " alwayseditable,";
- $sql.= " param,";
- $sql.= " list,";
- $sql.= " totalizable,";
- $sql.= " fielddefault,";
- $sql.= " fieldcomputed,";
- $sql.= " fk_user_author,";
- $sql.= " fk_user_modif,";
- $sql.= " datec,";
- $sql.= " enabled,";
- $sql.= " help";
- $sql.= ") VALUES (";
- $sql.= "'".$attrname."',";
- $sql.= " ".($entity===''?$conf->entity:$entity).",";
- $sql.= " '".$this->db->escape($label)."',";
- $sql.= " '".$this->db->escape($type)."',";
- $sql.= " '".$this->db->escape($size)."',";
- $sql.= " '".$this->db->escape($elementtype)."',";
- $sql.= " ".$unique.",";
- $sql.= " ".$required.",";
- $sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
- $sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").",";
- $sql.= " ".$pos.",";
- $sql.= " '".$this->db->escape($alwayseditable)."',";
- $sql.= " '".$this->db->escape($params)."',";
- $sql.= " '".$this->db->escape($list)."', ";
- $sql.= " ".$totalizable.",";
- $sql.= " ".(($default!='')?"'".$this->db->escape($default)."'":"null").",";
- $sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").",";
- $sql .= " " . $user->id . ",";
- $sql .= " " . $user->id . ",";
- $sql .= "'" . $this->db->idate(dol_now()) . "',";
- $sql .= "'" . $this->db->escape($enabled). "',";
- $sql.= " ".($help?"'".$this->db->escape($help)."'":"null");
- $sql.= ")";
+ $sql .= " name,"; // This is code
+ $sql .= " entity,";
+ $sql .= " label,";
+ $sql .= " type,";
+ $sql .= " size,";
+ $sql .= " elementtype,";
+ $sql .= " fieldunique,";
+ $sql .= " fieldrequired,";
+ $sql .= " perms,";
+ $sql .= " langs,";
+ $sql .= " pos,";
+ $sql .= " alwayseditable,";
+ $sql .= " param,";
+ $sql .= " list,";
+ $sql .= " totalizable,";
+ $sql .= " fielddefault,";
+ $sql .= " fieldcomputed,";
+ $sql .= " fk_user_author,";
+ $sql .= " fk_user_modif,";
+ $sql .= " datec,";
+ $sql .= " enabled,";
+ $sql .= " help";
+ $sql .= ") VALUES (";
+ $sql .= "'".$attrname."',";
+ $sql .= " ".($entity === '' ? $conf->entity : $entity).",";
+ $sql .= " '".$this->db->escape($label)."',";
+ $sql .= " '".$this->db->escape($type)."',";
+ $sql .= " '".$this->db->escape($size)."',";
+ $sql .= " '".$this->db->escape($elementtype)."',";
+ $sql .= " ".$unique.",";
+ $sql .= " ".$required.",";
+ $sql .= " ".($perms ? "'".$this->db->escape($perms)."'" : "null").",";
+ $sql .= " ".($langfile ? "'".$this->db->escape($langfile)."'" : "null").",";
+ $sql .= " ".$pos.",";
+ $sql .= " '".$this->db->escape($alwayseditable)."',";
+ $sql .= " '".$this->db->escape($params)."',";
+ $sql .= " '".$this->db->escape($list)."', ";
+ $sql .= " ".$totalizable.",";
+ $sql .= " ".(($default != '') ? "'".$this->db->escape($default)."'" : "null").",";
+ $sql .= " ".($computed ? "'".$this->db->escape($computed)."'" : "null").",";
+ $sql .= " ".$user->id.",";
+ $sql .= " ".$user->id.",";
+ $sql .= "'".$this->db->idate(dol_now())."',";
+ $sql .= "'".$this->db->escape($enabled)."',";
+ $sql .= " ".($help ? "'".$this->db->escape($help)."'" : "null");
+ $sql .= ")";
- $resql2=$this->db->query($sql);
+ $resql2 = $this->db->query($sql);
if ($resql1 && $resql2)
{
@@ -839,11 +839,11 @@ class ExtraFields
if (empty($elementtype)) return array();
- if ($elementtype == 'thirdparty') $elementtype='societe';
- if ($elementtype == 'contact') $elementtype='socpeople';
- if ($elementtype == 'order_supplier') $elementtype='commande_fournisseur';
+ if ($elementtype == 'thirdparty') $elementtype = 'societe';
+ if ($elementtype == 'contact') $elementtype = 'socpeople';
+ if ($elementtype == 'order_supplier') $elementtype = 'commande_fournisseur';
- $array_name_label=array();
+ $array_name_label = array();
// To avoid conflicts with external modules. TODO Remove this.
if (empty($forceload) && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
@@ -871,12 +871,12 @@ class ExtraFields
// We should not have several time this request. If we have, there is some optimization to do by calling a simple $extrafields->fetch_optionals() in top of code and not into subcode
$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
- $sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
+ $sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
//$sql.= " WHERE entity IN (0,".$conf->entity.")"; // Filter is done later
- if ($elementtype) $sql.= " WHERE elementtype = '".$elementtype."'"; // Filed with object->table_element
- $sql.= " ORDER BY pos";
+ if ($elementtype) $sql .= " WHERE elementtype = '".$elementtype."'"; // Filed with object->table_element
+ $sql .= " ORDER BY pos";
- $resql=$this->db->query($sql);
+ $resql = $this->db->query($sql);
if ($resql)
{
if ($this->db->num_rows($resql))
@@ -888,7 +888,7 @@ class ExtraFields
// This field is not in current entity. We discard but before we save it into the array of mandatory fields if it is a mandatory field without default value
if ($tab->fieldrequired && is_null($tab->fielddefault))
{
- $this->attributes[$tab->elementtype]['mandatoryfieldsofotherentities'][$tab->name]=$tab->type;
+ $this->attributes[$tab->elementtype]['mandatoryfieldsofotherentities'][$tab->name] = $tab->type;
}
continue;
}
@@ -969,58 +969,58 @@ class ExtraFields
*/
public function showInputField($key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '', $objectid = 0, $extrafieldsobjectkey = '', $mode = 0)
{
- global $conf,$langs,$form;
+ global $conf, $langs, $form;
- if (! is_object($form))
+ if (!is_object($form))
{
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
- $form=new Form($this->db);
+ $form = new Form($this->db);
}
- $out='';
+ $out = '';
- if (! preg_match('/options_$/', $keyprefix)) // Because we work on extrafields, we add 'options_' to prefix if not already added
+ if (!preg_match('/options_$/', $keyprefix)) // Because we work on extrafields, we add 'options_' to prefix if not already added
{
$keyprefix = $keyprefix.'options_';
}
- if (! empty($extrafieldsobjectkey))
+ if (!empty($extrafieldsobjectkey))
{
- $label=$this->attributes[$extrafieldsobjectkey]['label'][$key];
- $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
- $size=$this->attributes[$extrafieldsobjectkey]['size'][$key];
- $default=$this->attributes[$extrafieldsobjectkey]['default'][$key];
- $computed=$this->attributes[$extrafieldsobjectkey]['computed'][$key];
- $unique=$this->attributes[$extrafieldsobjectkey]['unique'][$key];
- $required=$this->attributes[$extrafieldsobjectkey]['required'][$key];
- $param=$this->attributes[$extrafieldsobjectkey]['param'][$key];
- $perms=dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
- $langfile=$this->attributes[$extrafieldsobjectkey]['langfile'][$key];
- $list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
- $totalizable=$this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
- $help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
- $hidden=(empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+ $label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
+ $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+ $size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
+ $default = $this->attributes[$extrafieldsobjectkey]['default'][$key];
+ $computed = $this->attributes[$extrafieldsobjectkey]['computed'][$key];
+ $unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
+ $required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
+ $param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
+ $perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+ $langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
+ $list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+ $totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
+ $help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
+ $hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
}
else // Old usage
{
- $label=$this->attribute_label[$key];
- $type =$this->attribute_type[$key];
- $size =$this->attribute_size[$key];
- $elementtype=$this->attribute_elementtype[$key]; // Seems not used
- $default=$this->attribute_default[$key];
- $computed=$this->attribute_computed[$key];
- $unique=$this->attribute_unique[$key];
- $required=$this->attribute_required[$key];
- $param=$this->attribute_param[$key];
- $langfile=$this->attribute_langfile[$key];
- $list=$this->attribute_list[$key];
- $totalizable=$this->attribute_totalizable[$key];
- $hidden=(empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+ $label = $this->attribute_label[$key];
+ $type = $this->attribute_type[$key];
+ $size = $this->attribute_size[$key];
+ $elementtype = $this->attribute_elementtype[$key]; // Seems not used
+ $default = $this->attribute_default[$key];
+ $computed = $this->attribute_computed[$key];
+ $unique = $this->attribute_unique[$key];
+ $required = $this->attribute_required[$key];
+ $param = $this->attribute_param[$key];
+ $langfile = $this->attribute_langfile[$key];
+ $list = $this->attribute_list[$key];
+ $totalizable = $this->attribute_totalizable[$key];
+ $hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
}
if ($computed)
{
- if (! preg_match('/^search_/', $keyprefix)) return ''.$langs->trans("AutomaticallyCalculated").'';
+ if (!preg_match('/^search_/', $keyprefix)) return ''.$langs->trans("AutomaticallyCalculated").'';
else return '';
}
@@ -1034,21 +1034,21 @@ class ExtraFields
{
$morecss = 'minwidth200imp';
}
- elseif (in_array($type, array('int','integer','double','price')))
+ elseif (in_array($type, array('int', 'integer', 'double', 'price')))
{
$morecss = 'maxwidth75';
}
elseif ($type == 'password')
{
- $morecss='maxwidth100';
+ $morecss = 'maxwidth100';
}
elseif ($type == 'url')
{
- $morecss='minwidth400';
+ $morecss = 'minwidth400';
}
elseif ($type == 'boolean')
{
- $morecss='';
+ $morecss = '';
}
else
{
@@ -1067,10 +1067,10 @@ class ExtraFields
}
}
- if (in_array($type, array('date','datetime')))
+ if (in_array($type, array('date', 'datetime')))
{
- $tmp=explode(',', $size);
- $newsize=$tmp[0];
+ $tmp = explode(',', $size);
+ $newsize = $tmp[0];
$showtime = in_array($type, array('datetime')) ? 1 : 0;
@@ -1080,118 +1080,118 @@ class ExtraFields
// TODO Must also support $moreparam
$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
}
- elseif (in_array($type, array('int','integer')))
+ elseif (in_array($type, array('int', 'integer')))
{
- $tmp=explode(',', $size);
- $newsize=$tmp[0];
- $out='';
+ $tmp = explode(',', $size);
+ $newsize = $tmp[0];
+ $out = '';
}
elseif (preg_match('/varchar/', $type))
{
- $out='';
+ $out = '';
}
elseif (in_array($type, array('mail', 'phone', 'url')))
{
- $out='';
+ $out = '';
}
elseif ($type == 'text')
{
- if (! preg_match('/search_/', $keyprefix)) // If keyprefix is search_ or search_options_, we must just use a simple text field
+ if (!preg_match('/search_/', $keyprefix)) // If keyprefix is search_ or search_options_, we must just use a simple text field
{
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor=new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
- $out=$doleditor->Create(1);
+ $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
+ $out = $doleditor->Create(1);
}
else
{
- $out='';
+ $out = '';
}
}
elseif ($type == 'html')
{
- if (! preg_match('/search_/', $keyprefix)) // If keyprefix is search_ or search_options_, we must just use a simple text field
+ if (!preg_match('/search_/', $keyprefix)) // If keyprefix is search_ or search_options_, we must just use a simple text field
{
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor=new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, ! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
- $out=$doleditor->Create(1);
+ $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
+ $out = $doleditor->Create(1);
}
else
{
- $out='';
+ $out = '';
}
}
elseif ($type == 'boolean')
{
if (empty($mode))
{
- $checked='';
+ $checked = '';
if (!empty($value)) {
- $checked=' checked value="1" ';
+ $checked = ' checked value="1" ';
} else {
- $checked=' value="1" ';
+ $checked = ' value="1" ';
}
- $out='';
+ $out = '';
}
else
{
- $out.=$form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);
+ $out .= $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);
}
}
elseif ($type == 'price')
{
if (!empty($value)) { // $value in memory is a php numeric, we format it into user number format.
- $value=price($value);
+ $value = price($value);
}
- $out=' '.$langs->getCurrencySymbol($conf->currency);
+ $out = ' '.$langs->getCurrencySymbol($conf->currency);
}
elseif ($type == 'double')
{
if (!empty($value)) { // $value in memory is a php numeric, we format it into user number format.
- $value=price($value);
+ $value = price($value);
}
- $out=' ';
+ $out = ' ';
}
elseif ($type == 'select')
{
$out = '';
- if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+ if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
{
- include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
- $out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+ $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
}
- $out.='';
}
elseif ($type == 'sellist')
{
$out = '';
- if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
+ if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
{
- include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
- $out.= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+ $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
}
- $out.='';
}
elseif ($type == 'checkbox')
{
- $value_arr=explode(',', $value);
- $out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
+ $value_arr = explode(',', $value);
+ $out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
}
elseif ($type == 'radio')
{
- $out='';
+ $out = '';
foreach ($param['options'] as $keyopt => $val)
{
- $out.=''.$val.'
';
+ $out .= ''.$val.'
';
}
}
elseif ($type == 'chkbxlst')
@@ -1364,8 +1364,8 @@ class ExtraFields
if (is_array($param['options'])) {
$param_list = array_keys($param['options']);
$InfoFieldList = explode(":", $param_list[0]);
- $parentName='';
- $parentField='';
+ $parentName = '';
+ $parentField = '';
// 0 : tableName
// 1 : label field name
// 2 : key fields name (if differ of rowid)
@@ -1373,17 +1373,17 @@ class ExtraFields
// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
// 5 : id category type
// 6 : ids categories list separated by comma for category root
- $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+ $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
- if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
- list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
- $keyList .= ', ' . $parentField;
+ if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
+ list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+ $keyList .= ', '.$parentField;
}
- if (count($InfoFieldList) > 4 && ! empty($InfoFieldList[4])) {
+ if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
if (strpos($InfoFieldList[4], 'extra.') !== false) {
- $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+ $keyList = 'main.'.$InfoFieldList[2].' as rowid';
} else {
- $keyList = $InfoFieldList[2] . ' as rowid';
+ $keyList = $InfoFieldList[2].' as rowid';
}
}
@@ -1402,8 +1402,8 @@ class ExtraFields
}
$sqlwhere = '';
- $sql = 'SELECT ' . $keyList;
- $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+ $sql = 'SELECT '.$keyList;
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
if (!empty($InfoFieldList[4])) {
// can use SELECT request
if (strpos($InfoFieldList[4], '$SEL$') !== false) {
@@ -1426,11 +1426,11 @@ class ExtraFields
// Init des compteurs
$nbPregRepl = $nbPregSel = 0;
// On retire toutes les parenthèses sans = avant
- $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*(' . $word . ')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);
+ $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);
// On retire les espaces autour des = et parenthèses
$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
// On retire toutes les parenthèses avec = avant
- $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*(' . $word . ')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);
+ $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);
// On retire les espaces autour des = et parenthèses
$InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
@@ -1439,7 +1439,7 @@ class ExtraFields
}
// Si l'on a un AND ou un OR, avant ou après
- preg_match('#(AND|OR|) *(' . $word . ') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
+ preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
while (!empty($matchCondition[0])) {
// If the two sides differ but are not empty
if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {
@@ -1448,7 +1448,7 @@ class ExtraFields
} else {
if (!empty($matchCondition[1])) {
$boolCond = (($matchCondition[1] == "AND") ? ' AND TRUE ' : ' OR FALSE ');
- $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond . $matchCondition[3], $InfoFieldList[4]);
+ $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);
} elseif (!empty($matchCondition[3])) {
$boolCond = (($matchCondition[3] == "AND") ? ' TRUE AND ' : ' FALSE OR');
$InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);
@@ -1458,7 +1458,7 @@ class ExtraFields
}
// Si l'on a un AND ou un OR, avant ou après
- preg_match('#(AND|OR|) *(' . $word . ') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
+ preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
}
} else {
$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
@@ -1466,23 +1466,23 @@ class ExtraFields
// We have to join on extrafield table
if (strpos($InfoFieldList[4], 'extra') !== false) {
- $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
- $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+ $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+ $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
} else {
- $sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+ $sqlwhere .= ' WHERE '.$InfoFieldList[4];
}
} else {
$sqlwhere .= ' WHERE 1=1';
}
// Some tables may have field, some other not. For the moment we disable it.
if (in_array($InfoFieldList[0], array('tablewithentity'))) {
- $sqlwhere .= ' AND entity = ' . $conf->entity;
+ $sqlwhere .= ' AND entity = '.$conf->entity;
}
// $sql.=preg_replace('/^ AND /','',$sqlwhere);
// print $sql;
$sql .= $sqlwhere;
- dol_syslog(get_class($this) . '::showInputField type=chkbxlst', LOG_DEBUG);
+ dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
@@ -1500,7 +1500,7 @@ class ExtraFields
if (is_array($fields_label)) {
$notrans = true;
foreach ($fields_label as $field_toshow) {
- $labeltoshow .= $obj->$field_toshow . ' ';
+ $labeltoshow .= $obj->$field_toshow.' ';
}
} else {
$labeltoshow = $obj->{$InfoFieldList[1]};
@@ -1511,9 +1511,9 @@ class ExtraFields
foreach ($fields_label as $field_toshow) {
$translabel = $langs->trans($obj->$field_toshow);
if ($translabel != $obj->$field_toshow) {
- $labeltoshow = dol_trunc($translabel, 18) . ' ';
+ $labeltoshow = dol_trunc($translabel, 18).' ';
} else {
- $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+ $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
}
}
@@ -1535,7 +1535,7 @@ class ExtraFields
}
if (!empty($InfoFieldList[3]) && $parentField) {
- $parent = $parentName . ':' . $obj->{$parentField};
+ $parent = $parentName.':'.$obj->{$parentField};
}
$data[$obj->rowid] = $labeltoshow;
@@ -1653,70 +1653,70 @@ class ExtraFields
//$value=price($value);
$sizeparts = explode(",", $size);
$number_decimals = $sizeparts[1];
- $value=price($value, 0, $langs, 0, 0, $number_decimals, '');
+ $value = price($value, 0, $langs, 0, 0, $number_decimals, '');
}
}
elseif ($type == 'boolean')
{
- $checked='';
+ $checked = '';
if (!empty($value)) {
- $checked=' checked ';
+ $checked = ' checked ';
}
- $value='';
+ $value = '';
}
elseif ($type == 'mail')
{
- $value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
+ $value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
}
elseif ($type == 'url')
{
- $value=dol_print_url($value, '_blank', 32, 1);
+ $value = dol_print_url($value, '_blank', 32, 1);
}
elseif ($type == 'phone')
{
- $value=dol_print_phone($value, '', 0, 0, '', ' ', 'phone');
+ $value = dol_print_phone($value, '', 0, 0, '', ' ', 'phone');
}
elseif ($type == 'price')
{
- $value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
+ $value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
}
elseif ($type == 'select')
{
- if ($langfile && $param['options'][$value]) $value=$langs->trans($param['options'][$value]);
- else $value=$param['options'][$value];
+ if ($langfile && $param['options'][$value]) $value = $langs->trans($param['options'][$value]);
+ else $value = $param['options'][$value];
}
elseif ($type == 'sellist')
{
- $param_list=array_keys($param['options']);
+ $param_list = array_keys($param['options']);
$InfoFieldList = explode(":", $param_list[0]);
- $selectkey="rowid";
- $keyList='rowid';
+ $selectkey = "rowid";
+ $keyList = 'rowid';
- if (count($InfoFieldList)>=3)
+ if (count($InfoFieldList) >= 3)
{
$selectkey = $InfoFieldList[2];
- $keyList=$InfoFieldList[2].' as rowid';
+ $keyList = $InfoFieldList[2].' as rowid';
}
$fields_label = explode('|', $InfoFieldList[1]);
- if(is_array($fields_label)) {
- $keyList .=', ';
+ if (is_array($fields_label)) {
+ $keyList .= ', ';
$keyList .= implode(', ', $fields_label);
}
$sql = 'SELECT '.$keyList;
- $sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[0];
- if (strpos($InfoFieldList[4], 'extra')!==false)
+ $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
+ if (strpos($InfoFieldList[4], 'extra') !== false)
{
- $sql.= ' as main';
+ $sql .= ' as main';
}
- if ($selectkey=='rowid' && empty($value)) {
- $sql.= " WHERE ".$selectkey."=0";
- } elseif ($selectkey=='rowid') {
- $sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
- }else {
- $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
+ if ($selectkey == 'rowid' && empty($value)) {
+ $sql .= " WHERE ".$selectkey."=0";
+ } elseif ($selectkey == 'rowid') {
+ $sql .= " WHERE ".$selectkey."=".$this->db->escape($value);
+ } else {
+ $sql .= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
}
//$sql.= ' AND entity = '.$conf->entity;
@@ -1725,38 +1725,38 @@ class ExtraFields
$resql = $this->db->query($sql);
if ($resql)
{
- $value=''; // value was used, so now we reste it to use it to build final output
+ $value = ''; // value was used, so now we reste it to use it to build final output
$obj = $this->db->fetch_object($resql);
// Several field into label (eq table:code|libelle:rowid)
$fields_label = explode('|', $InfoFieldList[1]);
- if(is_array($fields_label) && count($fields_label)>1)
+ if (is_array($fields_label) && count($fields_label) > 1)
{
foreach ($fields_label as $field_toshow)
{
- $translabel='';
+ $translabel = '';
if (!empty($obj->$field_toshow)) {
- $translabel=$langs->trans($obj->$field_toshow);
+ $translabel = $langs->trans($obj->$field_toshow);
}
- if ($translabel!=$field_toshow) {
- $value.=dol_trunc($translabel, 18).' ';
- }else {
- $value.=$obj->$field_toshow.' ';
+ if ($translabel != $field_toshow) {
+ $value .= dol_trunc($translabel, 18).' ';
+ } else {
+ $value .= $obj->$field_toshow.' ';
}
}
}
else
{
- $translabel='';
+ $translabel = '';
if (!empty($obj->{$InfoFieldList[1]})) {
- $translabel=$langs->trans($obj->{$InfoFieldList[1]});
+ $translabel = $langs->trans($obj->{$InfoFieldList[1]});
}
- if ($translabel!=$obj->{$InfoFieldList[1]}) {
- $value=dol_trunc($translabel, 18);
- }else {
- $value=$obj->{$InfoFieldList[1]};
+ if ($translabel != $obj->{$InfoFieldList[1]}) {
+ $value = dol_trunc($translabel, 18);
+ } else {
+ $value = $obj->{$InfoFieldList[1]};
}
}
}
@@ -1764,20 +1764,20 @@ class ExtraFields
}
elseif ($type == 'radio')
{
- $value=$param['options'][$value];
+ $value = $param['options'][$value];
}
elseif ($type == 'checkbox')
{
- $value_arr=explode(',', $value);
- $value='';
- $toprint=array();
+ $value_arr = explode(',', $value);
+ $value = '';
+ $toprint = array();
if (is_array($value_arr))
{
foreach ($value_arr as $keyval=>$valueval) {
- $toprint[]=''.$param['options'][$valueval].'';
+ $toprint[] = ''.$param['options'][$valueval].'';
}
}
- $value=''.implode(' ', $toprint).' '.implode(' ', $toprint).' '.implode(' ', $toprint).' '.implode(' ', $toprint).'
|
|
| |
|
|
|