';
@@ -642,20 +667,29 @@ while ($i < min($num, $limit))
$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+ } elseif ($line->doc_type == 'bank')
+ {
+ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+ $objectstatic = new AccountLine($db);
+ $objectstatic->fetch($line->fk_doc);
} else {
// Other type
}
- print '';
+ print ' ';
print '';
// Picto + Ref
- print '';
+ print ' ';
if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
{
print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
print $documentlink;
+ } elseif ($line->doc_type == 'bank') {
+ print $objectstatic->getNomUrl(1);
+ $bank_ref = strstr($line->doc_ref, '-');
+ print " " . $bank_ref;
} else {
print $line->doc_ref;
}
@@ -725,8 +759,15 @@ while ($i < min($num, $limit))
}
// Show sub-total of last shown account
-$colspan = $totalarray['nbfield'] - 3;
-$colspanend = $totalarray['nbfield'] - 8;
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+ $colnumber = 3;
+ $colnumberend = 7;
+} else {
+ $colnumber = 4;
+ $colnumberend = 7;
+}
+$colspan = $totalarray['nbfield'] - $colnumber;
+$colspanend = $totalarray['nbfield'] - $colnumberend;
print ' ';
print ''.$langs->trans("TotalForAccount").' '.$accountg.': ';
print ''.price($sous_total_debit).' ';
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 3bc0351b09b..e54d20cd647 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -39,8 +39,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$langs->loadLangs(array("accountancy", "compta"));
$action = GETPOST('action', 'aZ09');
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
-$search_date_end = dol_mktime(0, 0, 0, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
+$search_date_end = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);
$search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
$search_accountancy_code = GETPOST("search_accountancy_code");
@@ -126,6 +132,20 @@ $arrayfields = array(
if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
+if ($search_date_start && empty($search_date_startyear)) {
+ $tmparray = dol_getdate($search_date_start);
+ $search_date_startyear = $tmparray['year'];
+ $search_date_startmonth = $tmparray['mon'];
+ $search_date_startday = $tmparray['mday'];
+}
+if ($search_date_end && empty($search_date_endyear)) {
+ $tmparray = dol_getdate($search_date_end);
+ $search_date_endyear = $tmparray['year'];
+ $search_date_endmonth = $tmparray['mon'];
+ $search_date_endday = $tmparray['mday'];
+}
+
+
/*
* Action
*/
@@ -172,11 +192,11 @@ if (empty($reshook))
if (!empty($search_date_start)) {
$filter['t.doc_date>='] = $search_date_start;
- $param .= '&search_date_startmonth='.GETPOST('search_date_startmonth', 'int').'&search_date_startday='.GETPOST('search_date_startday', 'int').'&search_date_startyear='.GETPOST('search_date_startyear', 'int');
+ $param .= '&search_date_startmonth='.$search_date_startmonth.'&search_date_startday='.$search_date_startday.'&search_date_startyear='.$search_date_startyear;
}
if (!empty($search_date_end)) {
$filter['t.doc_date<='] = $search_date_end;
- $param .= '&search_date_endmonth='.GETPOST('search_date_endmonth', 'int').'&search_date_endday='.GETPOST('search_date_endday', 'int').'&search_date_endyear='.GETPOST('search_date_endyear', 'int');
+ $param .= '&search_date_endmonth='.$search_date_endmonth.'&search_date_endday='.$search_date_endday.'&search_date_endyear='.$search_date_endyear;
}
if (!empty($search_doc_date)) {
$filter['t.doc_date'] = $search_doc_date;
@@ -242,7 +262,7 @@ if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->suppri
}
// Make a redirect to avoid to launch the delete later after a back button
- header("Location: listbyaccount.php".($param ? '?'.$param : ''));
+ header("Location: ".$_SERVER["PHP_SELF"].($param ? '?'.$param : ''));
exit;
}
}
@@ -380,14 +400,19 @@ print ' ';
@@ -554,8 +586,16 @@ while ($i < min($num, $limit))
// Show the break account
print " ";
print '';
- if ($line->subledger_account != "" && $line->subledger_account != '-1') print length_accounta($line->subledger_account).' : '.$object->get_compte_desc($line->numero_compte);
- else print ''.$langs->trans("Unknown").' ';
+ if ($line->subledger_account != "" && $line->subledger_account != '-1') {
+ print $object->get_compte_desc($line->numero_compte).' : '.length_accounta($line->subledger_account);
+ } else {
+ // Should not happen: subledger account must be null or a non empty value
+ print ''.$langs->trans("Unknown");
+ if ($line->subledger_label) print ' ('.$line->subledger_label.')';
+ $htmltext = 'EmptyStringForSubledgerAccountButSubledgerLabelDefined';
+ print $form->textwithpicto('', $htmltext);
+ print ' ';
+ }
print ' ';
print ' ';
@@ -639,20 +679,29 @@ while ($i < min($num, $limit))
$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+ } elseif ($line->doc_type == 'bank')
+ {
+ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+ $objectstatic = new AccountLine($db);
+ $objectstatic->fetch($line->fk_doc);
} else {
// Other type
}
- print '';
+ print ' ';
print '';
// Picto + Ref
- print '';
+ print ' ';
if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
{
print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
print $documentlink;
+ } elseif ($line->doc_type == 'bank') {
+ print $objectstatic->getNomUrl(1);
+ $bank_ref = strstr($line->doc_ref, '-');
+ print " " . $bank_ref;
} else {
print $line->doc_ref;
}
@@ -722,8 +771,15 @@ while ($i < min($num, $limit))
}
// Show sub-total of last shown account
-$colspan = $totalarray['nbfield'] - 3;
-$colspanend = $totalarray['nbfield'] - 8;
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+ $colnumber = 3;
+ $colnumberend = 7;
+} else {
+ $colnumber = 4;
+ $colnumberend = 7;
+}
+$colspan = $totalarray['nbfield'] - $colnumber;
+$colspanend = $totalarray['nbfield'] - $colnumberend;
print ' ';
print ''.$langs->trans("TotalForAccount").' '.$accountg.': ';
print ''.price($sous_total_debit).' ';
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index f15a2a0c704..1bcc4129821 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -60,6 +60,7 @@ class AccountancyExport
public static $EXPORT_TYPE_GESTINUMV3 = 130;
public static $EXPORT_TYPE_GESTINUMV5 = 135;
public static $EXPORT_TYPE_FEC = 1000;
+ public static $EXPORT_TYPE_FEC2 = 1010;
/**
@@ -121,6 +122,7 @@ class AccountancyExport
self::$EXPORT_TYPE_GESTINUMV3 => $langs->trans('Modelcsv_Gestinum_v3'),
self::$EXPORT_TYPE_GESTINUMV5 => $langs->trans('Modelcsv_Gestinum_v5'),
self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'),
+ self::$EXPORT_TYPE_FEC2 => $langs->trans('Modelcsv_FEC2'),
);
ksort($listofexporttypes, SORT_NUMERIC);
@@ -155,6 +157,7 @@ class AccountancyExport
self::$EXPORT_TYPE_GESTINUMV3 => 'gestinumv3',
self::$EXPORT_TYPE_GESTINUMV5 => 'gestinumv5',
self::$EXPORT_TYPE_FEC => 'fec',
+ self::$EXPORT_TYPE_FEC2 => 'fec2',
);
return $formatcode[$type];
@@ -234,6 +237,10 @@ class AccountancyExport
'label' => $langs->trans('Modelcsv_FEC'),
'ACCOUNTING_EXPORT_FORMAT' => 'txt',
),
+ self::$EXPORT_TYPE_FEC2 => array(
+ 'label' => $langs->trans('Modelcsv_FEC2'),
+ 'ACCOUNTING_EXPORT_FORMAT' => 'txt',
+ ),
),
'cr'=> array(
'1' => $langs->trans("Unix"),
@@ -322,6 +329,9 @@ class AccountancyExport
case self::$EXPORT_TYPE_FEC :
$this->exportFEC($TData);
break;
+ case self::$EXPORT_TYPE_FEC2 :
+ $this->exportFEC2($TData);
+ break;
default:
$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
break;
@@ -505,9 +515,9 @@ class AccountancyExport
$end_line = "\r\n";
- //We should use dol_now function not time however this is wrong date to transfert in accounting
- //$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
- //$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
+ // We should use dol_now function not time however this is wrong date to transfert in accounting
+ // $date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
+ // $date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
foreach ($TData as $data) {
$code_compta = $data->numero_compte;
if (!empty($data->subledger_account))
@@ -519,36 +529,46 @@ class AccountancyExport
$Tab['code_journal'] = str_pad(self::trunc($data->code_journal, 2), 2);
$Tab['folio'] = '000';
- //We use invoice date $data->doc_date not $date_ecriture which is the transfert date
- //maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ?
+ // We use invoice date $data->doc_date not $date_ecriture which is the transfert date
+ // maybe we should set an option for customer who prefer to keep in accounting software the tranfert date instead of invoice date ?
//$Tab['date_ecriture'] = $date_ecriture;
$Tab['date_ecriture'] = dol_print_date($data->doc_date, '%d%m%y');
$Tab['filler'] = ' ';
$Tab['libelle_ecriture'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref).' '.dol_string_unaccent($data->label_operation), 20), 20);
- $Tab['sens'] = $data->sens; // C or D
- $Tab['signe_montant'] = '+';
- //elarifr le montant doit etre en centimes sans point decimal !
- $Tab['montant'] = str_pad(abs($data->montant * 100), 12, '0', STR_PAD_LEFT); // TODO manage negative amount
- // $Tab['montant'] = str_pad(abs($data->montant), 12, '0', STR_PAD_LEFT); // TODO manage negative amount
+ // Credit invoice - invert sens
+ if ($data->montant < 0) {
+ if ($data->sens == 'C') {
+ $Tab['sens'] = 'D';
+ } else {
+ $Tab['sens'] = 'C';
+ }
+ $Tab['signe_montant'] = '-';
+ } else {
+ $Tab['sens'] = $data->sens; // C or D
+ $Tab['signe_montant'] = '+';
+ }
+
+ // The amount must be in centimes without decimal points.
+ $Tab['montant'] = str_pad(abs($data->montant * 100), 12, '0', STR_PAD_LEFT);
$Tab['contrepartie'] = str_repeat(' ', 8);
- // elarifr: date format must be fixed format : 6 char ddmmyy = %d%m%yand not defined by user / dolibarr setting
+ // Force date format : %d%m%y
if (!empty($data->date_echeance)) {
//$Tab['date_echeance'] = dol_print_date($data->date_echeance, $conf->global->ACCOUNTING_EXPORT_DATE);
- $Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%y'); // elarifr: format must be ddmmyy
+ $Tab['date_echeance'] = dol_print_date($data->date_echeance, '%d%m%y'); // Format must be ddmmyy
} else {
$Tab['date_echeance'] = '000000';
}
- //elarifr please keep quadra named field lettrage(2) + codestat(3) instead of fake lettrage(5)
- //$Tab['lettrage'] = str_repeat(' ', 5);
+ // Please keep quadra named field lettrage(2) + codestat(3) instead of fake lettrage(5)
+ // $Tab['lettrage'] = str_repeat(' ', 5);
$Tab['lettrage'] = str_repeat(' ', 2);
$Tab['codestat'] = str_repeat(' ', 3);
$Tab['num_piece'] = str_pad(self::trunc($data->piece_num, 5), 5);
- //elarifr keep correct quadra named field instead of anon filler
- //$Tab['filler2'] = str_repeat(' ', 20);
+ // Keep correct quadra named field instead of anon filler
+ // $Tab['filler2'] = str_repeat(' ', 20);
$Tab['affaire'] = str_repeat(' ', 10);
$Tab['quantity1'] = str_repeat(' ', 10);
$Tab['num_piece2'] = str_pad(self::trunc($data->piece_num, 8), 8);
@@ -556,17 +576,17 @@ class AccountancyExport
$Tab['code_journal2'] = str_pad(self::trunc($data->code_journal, 3), 3);
$Tab['filler3'] = str_repeat(' ', 3);
- //elarifr keep correct quadra named field instead of anon filler libelle_ecriture2 is 30 char not 32 !!!!
- //as we use utf8, we must remove accent to have only one ascii char instead of utf8 2 chars for specials that report wrong line size that will exceed import format spec
- //todo we should filter more than only accent to avoid wrong line size
- //TODO: remove invoice number doc_ref in libelle,
- //TODO: we should offer an option for customer to build the libelle using invoice number / name / date in accounting software
+ // Keep correct quadra named field instead of anon filler libelle_ecriture2 is 30 char not 32 !!!!
+ // as we use utf8, we must remove accent to have only one ascii char instead of utf8 2 chars for specials that report wrong line size that will exceed import format spec
+ // TODO: we should filter more than only accent to avoid wrong line size
+ // TODO: remove invoice number doc_ref in libelle,
+ // TODO: we should offer an option for customer to build the libelle using invoice number / name / date in accounting software
//$Tab['libelle_ecriture2'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref) . ' ' . dol_string_unaccent($data->label_operation), 30), 30);
$Tab['libelle_ecriture2'] = str_pad(self::trunc(dol_string_unaccent($data->label_operation), 30), 30);
$Tab['codetva'] = str_repeat(' ', 2);
- //elarifr we need to keep the 10 lastest number of invoice doc_ref not the beginning part that is the unusefull almost same part
- //$Tab['num_piece3'] = str_pad(self::trunc($data->piece_num, 10), 10);
+ // We need to keep the 10 lastest number of invoice doc_ref not the beginning part that is the unusefull almost same part
+ // $Tab['num_piece3'] = str_pad(self::trunc($data->piece_num, 10), 10);
$Tab['num_piece3'] = substr(self::trunc($data->doc_ref, 20), -10);
$Tab['filler4'] = str_repeat(' ', 73);
@@ -891,6 +911,105 @@ class AccountancyExport
}
}
+ /**
+ * Export format : FEC2
+ *
+ * @param array $objectLines data
+ * @return void
+ */
+ public function exportFEC2($objectLines)
+ {
+ $separator = "\t";
+ $end_line = "\r\n";
+
+ print "JournalCode".$separator;
+ print "JournalLib".$separator;
+ print "EcritureNum".$separator;
+ print "EcritureDate".$separator;
+ print "CompteNum".$separator;
+ print "CompteLib".$separator;
+ print "CompAuxNum".$separator;
+ print "CompAuxLib".$separator;
+ print "PieceRef".$separator;
+ print "PieceDate".$separator;
+ print "EcritureLib".$separator;
+ print "Debit".$separator;
+ print "Credit".$separator;
+ print "EcritureLet".$separator;
+ print "DateLet".$separator;
+ print "ValidDate".$separator;
+ print "Montantdevise".$separator;
+ print "Idevise";
+ print $end_line;
+
+ foreach ($objectLines as $line) {
+ if ($line->debit == 0 && $line->credit == 0) {
+ unset($array[$line]);
+ } else {
+ $date_creation = dol_print_date($line->date_creation, '%Y%m%d');
+ $date_document = dol_print_date($line->doc_date, '%Y%m%d');
+ $date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
+ $date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+
+ // FEC:JournalCode
+ print $line->code_journal . $separator;
+
+ // FEC:JournalLib
+ print $line->journal_label . $separator;
+
+ // FEC:EcritureNum
+ print $line->piece_num . $separator;
+
+ // FEC:EcritureDate
+ print $date_creation . $separator;
+
+ // FEC:CompteNum
+ print $line->numero_compte . $separator;
+
+ // FEC:CompteLib
+ print dol_string_unaccent($line->label_compte) . $separator;
+
+ // FEC:CompAuxNum
+ print $line->subledger_account . $separator;
+
+ // FEC:CompAuxLib
+ print dol_string_unaccent($line->subledger_label) . $separator;
+
+ // FEC:PieceRef
+ print $line->doc_ref . $separator;
+
+ // FEC:PieceDate
+ print $date_document . $separator;
+
+ // FEC:EcritureLib
+ print dol_string_unaccent($line->label_operation) . $separator;
+
+ // FEC:Debit
+ print price2fec($line->debit) . $separator;
+
+ // FEC:Credit
+ print price2fec($line->credit) . $separator;
+
+ // FEC:EcritureLet
+ print $line->lettering_code . $separator;
+
+ // FEC:DateLet
+ print $date_lettering . $separator;
+
+ // FEC:ValidDate
+ print $date_validation . $separator;
+
+ // FEC:Montantdevise
+ print $line->multicurrency_amount . $separator;
+
+ // FEC:Idevise
+ print $line->multicurrency_code;
+
+ print $end_line;
+ }
+ }
+ }
+
/**
* Export format : SAGE50SWISS
*
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 8312b155b8b..72428762459 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -825,6 +825,10 @@ class BookKeeping extends CommonObject
$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
} elseif ($key == 't.credit' || $key == 't.debit') {
$sqlwhere[] = natural_search($key, $value, 1, 1);
+ } elseif ($key == 't.reconciled_option') {
+ $sqlwhere[] = 't.lettering_code IS NULL';
+ } elseif ($key == 't.code_journal' && !empty($value)) {
+ $sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
} else {
$sqlwhere[] = natural_search($key, $value, 0, 1);
}
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 418c5cc5674..9e1647d9760 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1064,7 +1064,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '';
// Ref
- print ''.$langs->trans("Ref").' '.$object->id.' '.$langs->trans("Ref").' '.$object->ref.' ';
if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) print_liste_field_titre("ID", $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder);
-if (!empty($arrayfields['d.ref']['checked'])) print_liste_field_titre($arrayfields['d.ref']['label'], $_SERVER["PHP_SELF"], 'd.rowid', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['d.ref']['checked'])) print_liste_field_titre($arrayfields['d.ref']['label'], $_SERVER["PHP_SELF"], 'd.ref', '', $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['d.civility']['checked'])) print_liste_field_titre($arrayfields['d.civility']['label'], $_SERVER["PHP_SELF"], 'd.civility', '', $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['d.firstname']['checked'])) print_liste_field_titre($arrayfields['d.firstname']['label'], $_SERVER["PHP_SELF"], 'd.firstname', '', $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['d.lastname']['checked'])) print_liste_field_titre($arrayfields['d.lastname']['label'], $_SERVER["PHP_SELF"], 'd.lastname', '', $param, '', $sortfield, $sortorder);
@@ -647,7 +649,7 @@ while ($i < min($num, $limit)) {
$datefin = $db->jdate($obj->datefin);
$memberstatic->id = $obj->rowid;
- $memberstatic->ref = $obj->rowid;
+ $memberstatic->ref = $obj->ref;
$memberstatic->civility_id = $obj->civility;
$memberstatic->lastname = $obj->lastname;
$memberstatic->firstname = $obj->firstname;
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 1c4e42da1fe..a00c52b88e5 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -300,57 +300,75 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
if (!$error) {
// Send confirmation Email
if ($object->email && $sendalsoemail) { // $object is 'Adherent'
- $subject = '';
- $msg = '';
-
- // Send subscription email
- include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
- $formmail = new FormMail($db);
- // Set output language
- $outputlangs = new Translate('', $conf);
- $outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
- // Load traductions files required by page
- $outputlangs->loadLangs(array("main", "members"));
-
- // Get email content from template
- $arraydefaultmessage = null;
- $labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
-
- if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
-
- if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
- $subject = $arraydefaultmessage->topic;
- $msg = $arraydefaultmessage->content;
+ $parameters = array(
+ 'datesubscription' => $datesubscription,
+ 'amount' => $amount,
+ 'ccountid' => $accountid,
+ 'operation' => $operation,
+ 'label' => $label,
+ 'num_chq' => $num_chq,
+ 'emetteur_nom' => $emetteur_nom,
+ 'emetteur_banque' => $emetteur_banque,
+ 'datesubend' => $datesubend
+ );
+ $reshook = $hookmanager->executeHooks('sendMail', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
}
- $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
- complete_substitutions_array($substitutionarray, $outputlangs, $object);
- $subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
- $texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
+ if (empty($reshook)) {
+ $subject = '';
+ $msg = '';
- // Attach a file ?
- $file = '';
- $listofpaths = array();
- $listofnames = array();
- $listofmimes = array();
- if (is_object($object->invoice) && (!is_object($arraydefaultmessage) || intval($arraydefaultmessage->joinfiles))) {
- $invoicediroutput = $conf->facture->dir_output;
- $fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
- $file = $fileparams['fullname'];
+ // Send subscription email
+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+ $formmail = new FormMail($db);
+ // Set output language
+ $outputlangs = new Translate('', $conf);
+ $outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+ // Load traductions files required by page
+ $outputlangs->loadLangs(array("main", "members"));
- $listofpaths = array($file);
- $listofnames = array(basename($file));
- $listofmimes = array(dol_mimetype($file));
- }
+ // Get email content from template
+ $arraydefaultmessage = null;
+ $labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION;
- $moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
+ if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
- $result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
- if ($result < 0) {
- $errmsg = $object->error;
- setEventMessages($object->error, $object->errors, 'errors');
- } else {
- setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
+ if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+ $subject = $arraydefaultmessage->topic;
+ $msg = $arraydefaultmessage->content;
+ }
+
+ $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+ complete_substitutions_array($substitutionarray, $outputlangs, $object);
+ $subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+ $texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnSubscription()), $substitutionarray, $outputlangs);
+
+ // Attach a file ?
+ $file = '';
+ $listofpaths = array();
+ $listofnames = array();
+ $listofmimes = array();
+ if (is_object($object->invoice) && (!is_object($arraydefaultmessage) || intval($arraydefaultmessage->joinfiles))) {
+ $invoicediroutput = $conf->facture->dir_output;
+ $fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+');
+ $file = $fileparams['fullname'];
+
+ $listofpaths = array($file);
+ $listofnames = array(basename($file));
+ $listofmimes = array(dol_mimetype($file));
+ }
+
+ $moreinheader = 'X-Dolibarr-Info: send_an_email by adherents/subscription.php'."\r\n";
+
+ $result = $object->send_an_email($texttosend, $subjecttosend, $listofpaths, $listofmimes, $listofnames, "", "", 0, -1, '', $moreinheader);
+ if ($result < 0) {
+ $errmsg = $object->error;
+ setEventMessages($object->error, $object->errors, 'errors');
+ } else {
+ setEventMessages($langs->trans("EmailSentToMember", $object->email), null, 'mesgs');
+ }
}
} else {
setEventMessages($langs->trans("NoEmailSentToMember"), null, 'mesgs');
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 9da8f89310a..27c6bbeed73 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -187,10 +187,18 @@ print ' '."\n";
print ''."\n";
if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
- print ''.img_picto($langs->trans('Disabled'), 'switch_off').' ';
+ if (! getIsHTTPS()) {
+ $langs->load("errors");
+ print img_warning($langs->trans("WarningAvailableOnlyForHTTPSServers"), '', 'valignmiddle size15x').' ';
+ }
+ print ''.img_picto($langs->trans('Disabled'), 'switch_off').' ';
print ' '."\n";
} else {
- print ''.img_picto($langs->trans('Enabled'), 'switch_on').' ';
+ if (! getIsHTTPS()) {
+ $langs->load("errors");
+ print img_warning($langs->trans("WarningAvailableOnlyForHTTPSServers"), '', 'valignmiddle size15x').' ';
+ }
+ print ''.img_picto($langs->trans('Enabled'), 'switch_on').' ';
print ''."\n";
print ''."\n";
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 25a220e8e2d..cde0253f99a 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -111,11 +111,9 @@ if ($action == 'updateMask')
}
// Activate a model
-elseif ($action == 'set')
-{
+elseif ($action == 'set') {
$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
$ret = delDocumentModel($value, $type);
if ($ret > 0)
{
@@ -124,8 +122,7 @@ elseif ($action == 'set')
}
// Set default model
-elseif ($action == 'setdoc')
-{
+elseif ($action == 'setdoc') {
if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
{
// The constant that was read before the new set
@@ -139,8 +136,7 @@ elseif ($action == 'setdoc')
{
$ret = addDocumentModel($value, $type, $label, $scandir);
}
-} elseif ($action == 'setmod')
-{
+} elseif ($action == 'setmod') {
// TODO Check if numbering module chosen can be activated
// by calling method canBeActivated
@@ -254,6 +250,7 @@ print dol_get_fiche_head($head, 'general', $langs->trans("Orders"), -1, 'order')
print load_fiche_titre($langs->trans("OrdersNumberingModules"), '', '');
+print '';
print '
';
print '';
print ''.$langs->trans("Name").' ';
@@ -346,7 +343,7 @@ foreach ($dirmodels as $reldir)
}
}
}
-print "
\n";
+print "
';
print "
\n";
print "\n";
print ''.$langs->trans("Name").' ';
@@ -501,6 +499,7 @@ foreach ($dirmodels as $reldir)
}
print '
';
+print '
';
print '
';
print '';
- print ''.$langs->trans("Filters").' '.$form->textwithpicto($langs->trans("Filters"), $langs->trans("EmailCollectorFilterDesc")).' ';
// Add filter
print '';
@@ -491,7 +515,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
'isnotanswer'=>array('label'=>'IsNotAnAnswer', 'data-noparam'=>1),
'isanswer'=>array('label'=>'IsAnAnswer', 'data-noparam'=>1)
);
- print $form->selectarray('filtertype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth500', 0, '', 2);
+ print $form->selectarray('filtertype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth500', 1, '', 2);
print "\n";
print '';
} else {
$html = '
-
-
- ';
+
+
+ ';
$html .= '
-
-
- '.$bookmarkList.'
-
- ';
+
+
+ '.$bookmarkList.'
+
+ ';
$html .= '
-
-
- ';
+
+
+ ';
$html .= '
';
+ if ($(this).text().search(new RegExp(filter, "i")) < 0) {
+ $(this).addClass("hidden-search-result");
+ } else {
+ $(this).removeClass("hidden-search-result");
+ count++;
+ }
+ });
+ $("#top-bookmark-search-filter-count").text(count);
+ });
+ ';
}
return $html;
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index f7098f1d780..f5bbefae3d3 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -83,8 +83,14 @@ class Bookmark extends CommonObject
*/
public $title;
+ /**
+ * @var int position of bookmark
+ */
public $position;
+ /**
+ * @var string favicon
+ */
public $favicon;
@@ -116,8 +122,7 @@ class Bookmark extends CommonObject
dol_syslog("Bookmark::fetch", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$obj = $this->db->fetch_object($resql);
$this->id = $obj->rowid;
@@ -151,7 +156,9 @@ class Bookmark extends CommonObject
// Clean parameters
$this->url = trim($this->url);
$this->title = trim($this->title);
- if (empty($this->position)) $this->position = 0;
+ if (empty($this->position)) {
+ $this->position = 0;
+ }
$now = dol_now();
@@ -164,17 +171,15 @@ class Bookmark extends CommonObject
$sql .= ($this->fk_user > 0 ? $this->fk_user : "0").",";
$sql .= " '".$this->db->idate($now)."',";
$sql .= " '".$this->db->escape($this->url)."', '".$this->db->escape($this->target)."',";
- $sql .= " '".$this->db->escape($this->title)."', '".$this->db->escape($this->favicon)."', '".$this->db->escape($this->position)."'";
- $sql .= ", ".$this->db->escape($conf->entity);
+ $sql .= " '".$this->db->escape($this->title)."', '".$this->db->escape($this->favicon)."', ".(int) $this->position;
+ $sql .= ", ".(int) $conf->entity;
$sql .= ")";
dol_syslog("Bookmark::create", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$id = $this->db->last_insert_id(MAIN_DB_PREFIX."bookmark");
- if ($id > 0)
- {
+ if ($id > 0) {
$this->id = $id;
$this->db->commit();
return $id;
@@ -202,7 +207,9 @@ class Bookmark extends CommonObject
// Clean parameters
$this->url = trim($this->url);
$this->title = trim($this->title);
- if (empty($this->position)) $this->position = 0;
+ if (empty($this->position)) {
+ $this->position = 0;
+ }
$sql = "UPDATE ".MAIN_DB_PREFIX."bookmark";
$sql .= " SET fk_user = ".($this->fk_user > 0 ? $this->fk_user : "0");
@@ -211,12 +218,11 @@ class Bookmark extends CommonObject
$sql .= " ,target = '".$this->db->escape($this->target)."'";
$sql .= " ,title = '".$this->db->escape($this->title)."'";
$sql .= " ,favicon = '".$this->db->escape($this->favicon)."'";
- $sql .= " ,position = '".$this->db->escape($this->position)."'";
+ $sql .= " ,position = ".(int) $this->position;
$sql .= " WHERE rowid = ".$this->id;
dol_syslog("Bookmark::update", LOG_DEBUG);
- if ($this->db->query($sql))
- {
+ if ($this->db->query($sql)) {
return 1;
} else {
$this->error = $this->db->lasterror();
@@ -237,8 +243,7 @@ class Bookmark extends CommonObject
dol_syslog("Bookmark::remove", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
return 1;
} else {
$this->error = $this->db->lasterror();
@@ -288,7 +293,9 @@ class Bookmark extends CommonObject
{
global $conf, $langs, $hookmanager;
- if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+ if (!empty($conf->dol_no_mouse_hover)) {
+ $notooltip = 1; // Force disable tooltips
+ }
$result = '';
@@ -298,33 +305,40 @@ class Bookmark extends CommonObject
$url = DOL_URL_ROOT.'/bookmarks/card.php?id='.$this->id;
- if ($option != 'nolink')
- {
+ if ($option != 'nolink') {
// Add param to save lastsearch_values or not
$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
- if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
- if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+ $add_save_lastsearch_values = 1;
+ }
+ if ($add_save_lastsearch_values) {
+ $url .= '&save_lastsearch_values=1';
+ }
}
$linkclose = '';
- if (empty($notooltip))
- {
- if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
- {
+ if (empty($notooltip)) {
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$label = $langs->trans("ShowBookmark");
$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
- } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+ } else {
+ $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+ }
$linkstart = '';
$linkend = ' ';
$result .= $linkstart;
- if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
- if ($withpicto != 2) $result .= $this->ref;
+ if ($withpicto) {
+ $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ }
+ if ($withpicto != 2) {
+ $result .= $this->ref;
+ }
$result .= $linkend;
//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
@@ -332,8 +346,11 @@ class Bookmark extends CommonObject
$hookmanager->initHooks(array('mybookmarkdao'));
$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
- if ($reshook > 0) $result = $hookmanager->resPrint;
- else $result .= $hookmanager->resPrint;
+ if ($reshook > 0) {
+ $result = $hookmanager->resPrint;
+ } else {
+ $result .= $hookmanager->resPrint;
+ }
return $result;
}
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index f55b3403546..8e2f07ec4fc 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -98,6 +98,7 @@ class Categorie extends CommonObject
8 => 'bank_line',
9 => 'warehouse',
10 => 'actioncomm',
+ 11 => 'website_page'
);
/**
@@ -221,7 +222,6 @@ class Categorie extends CommonObject
/**
* @var string Category type
*
- * @see Categorie::TYPE_ACCOUNT
* @see Categorie::TYPE_PRODUCT
* @see Categorie::TYPE_SUPPLIER
* @see Categorie::TYPE_CUSTOMER
@@ -229,9 +229,11 @@ class Categorie extends CommonObject
* @see Categorie::TYPE_CONTACT
* @see Categorie::TYPE_USER
* @see Categorie::TYPE_PROJECT
+ * @see Categorie::TYPE_ACCOUNT
* @see Categorie::TYPE_BANK_LINE
- * @see Categorie::TYPE_WAREHOUSE
- * @see Categorie::TYPE_ACTIONCOMM
+ * @see Categorie::TYPE_WAREHOUSE
+ * @see Categorie::TYPE_ACTIONCOMM
+ * @see Categorie::TYPE_WEBSITE_PAGE
*/
public $type;
@@ -312,7 +314,7 @@ class Categorie extends CommonObject
// Check parameters
if (empty($id) && empty($label) && empty($ref_ext)) return -1;
- if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+ if (!is_null($type) && !is_numeric($type)) $type = $this->MAP_ID[$type];
$sql = "SELECT rowid, fk_parent, entity, label, description, color, fk_soc, visible, type, ref_ext";
$sql .= ", date_creation, tms, fk_user_creat, fk_user_modif";
@@ -1058,7 +1060,7 @@ class Categorie extends CommonObject
$current_lang = $langs->getDefaultLang();
// Init $this->cats array
- $sql = "SELECT DISTINCT c.rowid, c.label, c.description, c.color, c.fk_parent, c.visible"; // Distinct reduce pb with old tables with duplicates
+ $sql = "SELECT DISTINCT c.rowid, c.label, c.ref_ext, c.description, c.color, c.fk_parent, c.visible"; // Distinct reduce pb with old tables with duplicates
if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= ", t.label as label_trans, t.description as description_trans";
$sql .= " FROM ".MAIN_DB_PREFIX."categorie as c";
if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_lang as t ON t.fk_category=c.rowid AND t.lang='".$this->db->escape($current_lang)."'";
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index f4b7e12cc30..a5578032a3d 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -35,10 +35,10 @@ $langs->load("categories");
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alphanohtml');
-$type = GETPOST('type', 'aZ09'); // Can be int or string
$action = (GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'edit');
$confirm = GETPOST('confirm');
$cancel = GETPOST('cancel', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
$socid = (int) GETPOST('socid', 'int');
$label = (string) GETPOST('label', 'alphanohtml');
@@ -56,10 +56,14 @@ if ($id == "") {
$result = restrictedArea($user, 'categorie', $id, '&category');
$object = new Categorie($db);
-if ($id > 0) {
- $result = $object->fetch($id);
+$result = $object->fetch($id, $label);
+if ($result <= 0) {
+ dol_print_error($db, $object->error); exit;
}
+$type = $object->type;
+if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($object->table_element);
@@ -74,8 +78,13 @@ $error = 0;
*/
if ($cancel) {
- header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
- exit;
+ if ($backtopage) {
+ header("Location: ".$backtopage);
+ exit;
+ } else {
+ header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
+ exit;
+ }
}
// Action mise a jour d'une categorie
@@ -98,9 +107,15 @@ if ($action == 'update' && $user->rights->categorie->creer) {
$ret = $extrafields->setOptionalsFromPost(null, $object);
if ($ret < 0) $error++;
- if (!$error && $object->update($user) > 0) {
- header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
- exit;
+ if (!$error && $object->update($user) > 0)
+ {
+ if ($backtopage) {
+ header("Location: ".$backtopage);
+ exit;
+ } else {
+ header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
+ exit;
+ }
} else {
setEventMessages($object->error, $object->errors, 'errors');
}
@@ -131,6 +146,7 @@ print ' '."\n";
print "\t\t";
@@ -160,26 +160,45 @@ foreach ($fulltree as $key => $val)
$categstatic->ref = $val['label'];
$categstatic->color = $val['color'];
$categstatic->type = $type;
- $li = $categstatic->getNomUrl(1, '', 60, $moreparam.'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam));
$desc = dol_htmlcleanlastbr($val['description']);
$counter = '';
-
if ($conf->global->CATEGORY_SHOW_COUNTS)
{
// we need only a count of the elements, so it is enough to consume only the id's from the database
- $elements = $categstatic->getObjectsInCateg($type, 1);
+ $elements = $type == Categorie::TYPE_ACCOUNT
+ ? $categstatic->getObjectsInCateg("account", 1) // Categorie::TYPE_ACCOUNT is "bank_account" instead of "account"
+ : $categstatic->getObjectsInCateg($type, 1);
+
$counter = " ".(is_countable($elements) ? count($elements) : '0')." ";
}
$color = $categstatic->color ? ' style="background: #'.sprintf("%06s", $categstatic->color).';"' : ' style="background: #bbb"';
+ $li = $categstatic->getNomUrl(1, '', 60, '&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam));
- $data[] = array(
- 'rowid'=>$val['rowid'],
- 'fk_menu'=>$val['fk_parent'],
- 'entry'=>''
- );
+ $entry = '';
+ $entry .= '';
+
+ $entry .= '';
+ $entry .= ''.$li.' ';
+ $entry .= ' ';
+
+ $entry .= $counter;
+
+ $entry .= '';
+ $entry .= ''.img_view().' ';
+ $entry .= ' ';
+ $entry .= '';
+ $entry .= ''.img_edit().' ';
+ $entry .= ' ';
+ $entry .= '';
+ $entry .= ''.img_delete().' ';
+ $entry .= ' ';
+
+ $entry .= ' ';
+ $entry .= '
';
+
+ $data[] = array('rowid' => $val['rowid'], 'fk_menu' => $val['fk_parent'], 'entry' => $entry);
}
@@ -194,7 +213,6 @@ if (!empty($conf->use_javascript_ajax))
print ' ';
$nbofentries = (count($data) - 1);
-
if ($nbofentries > 0)
{
print '';
diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index f64f3be8f9e..536b0c20a2c 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -37,16 +37,18 @@ $langs->loadLangs(array('categories', 'sendings'));
$socid = 0;
$id = GETPOST('id', 'int');
+$label = GETPOST('label', 'alpha');
// Security check
if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'categorie', $id, '&category');
$object = new Categorie($db);
-if (!$object->fetch($id) > 0) {
- dol_print_error($db);
- exit;
+$result = $object->fetch($id, $label);
+if ($result <= 0) {
+ dol_print_error($db, $object->error); exit;
}
+
$type = $object->type;
if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
@@ -63,11 +65,11 @@ llxHeader('', $langs->trans('Categories'), '');
$title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
$head = categories_prepare_head($object, $type);
-
print dol_get_fiche_head($head, 'info', $langs->trans($title), -1, 'category');
+
$backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
$linkback = ''.$langs->trans("BackToList").' ';
-$object->next_prev_filter = ' type = '.$type;
+$object->next_prev_filter = ' type = '.$object->type;
$object->ref = $object->label;
$morehtmlref = ''.$langs->trans("Root").' >> ';
$ways = $object->print_all_ways(" >> ", '', 1);
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 73c7664f6c2..6bb5d79980c 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -38,7 +38,6 @@ $langs->loadlangs(array('categories', 'bills'));
$id = GETPOST('id', 'int');
$label = GETPOST('label', 'alpha');
-$type = GETPOST('type');
$action = GETPOST('action', 'aZ09');
$confirm = GETPOST('confirm');
@@ -52,18 +51,16 @@ if ($id == '' && $label == '')
$result = restrictedArea($user, 'categorie', $id, '&category');
$object = new Categorie($db);
-$result = $object->fetch($id, $label, $type);
+$result = $object->fetch($id, $label);
if ($result <= 0) {
dol_print_error($db, $object->error); exit;
}
-$object->fetch_optionals();
-if ($result <= 0) {
- dol_print_error($db, $object->error); exit;
-}
-$upload_dir = $conf->categorie->multidir_output[$object->entity];
+$type = $object->type;
if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+$upload_dir = $conf->categorie->multidir_output[$object->entity];
+
/*
* Actions
*/
@@ -115,8 +112,6 @@ if ($object->id)
$title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
$head = categories_prepare_head($object, $type);
-
-
print dol_get_fiche_head($head, 'photos', $langs->trans($title), -1, 'category');
$linkback = '
'.$langs->trans("BackToList").' ';
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 423819c49ac..898484d0d51 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -39,7 +39,6 @@ $id = GETPOST('id', 'int');
$label = GETPOST('label', 'alpha');
$action = GETPOST('action', 'aZ09');
$cancel = GETPOST('cancel', 'alpha');
-$type = GETPOST('type', 'aZ09');
if ($id == '' && $label == '')
{
@@ -51,15 +50,12 @@ if ($id == '' && $label == '')
$result = restrictedArea($user, 'categorie', $id, '&category');
$object = new Categorie($db);
-$result = $object->fetch($id, $label, $type);
-if ($result <= 0) {
- dol_print_error($db, $object->error); exit;
-}
-$object->fetch_optionals();
+$result = $object->fetch($id, $label);
if ($result <= 0) {
dol_print_error($db, $object->error); exit;
}
+$type = $object->type;
if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
/*
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 864de6e2e98..93b162e4f28 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -38,7 +38,6 @@ $langs->load("categories");
$id = GETPOST('id', 'int');
$label = GETPOST('label', 'alpha');
-$type = GETPOST('type', 'aZ09');
$removeelem = GETPOST('removeelem', 'int');
$elemid = GETPOST('elemid', 'int');
@@ -73,19 +72,12 @@ if ($id == "" && $label == "")
$result = restrictedArea($user, 'categorie', $id, '&category');
$object = new Categorie($db);
-$result = $object->fetch($id, $label, $type);
-if ($result <= 0) {
- dol_print_error($db, $object->error); exit;
-}
-$object->fetch_optionals();
+$result = $object->fetch($id, $label);
if ($result <= 0) {
dol_print_error($db, $object->error); exit;
}
-$objecttype = $object->type;
-if (is_numeric($objecttype)) $objecttype = Categorie::$MAP_ID_TO_CODE[$objecttype];
-if ($type === '') $type = $objecttype;
-
+$type = $object->type;
if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
$extrafields = new ExtraFields($db);
@@ -94,16 +86,18 @@ $extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('categorycard', 'globalcard'));
-// Protection when type provided is not similare to type of category
-if ($objecttype != $type) {
- print 'Error: Value for type parameter does not match value of the type of the category with id='.$id;
- exit;
-}
-
/*
* Actions
*/
+if ($confirm == 'no')
+{
+ if ($backtopage) {
+ header("Location: ".$backtopage);
+ exit;
+ }
+}
+
$parameters = array();
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
// Remove element from category
@@ -164,8 +158,13 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
{
if ($object->delete($user) >= 0)
{
- header("Location: ".DOL_URL_ROOT.'/categories/index.php?type='.$type);
- exit;
+ if ($backtopage) {
+ header("Location: ".$backtopage);
+ exit;
+ } else {
+ header("Location: ".DOL_URL_ROOT.'/categories/index.php?type='.$type);
+ exit;
+ }
} else {
setEventMessages($object->error, $object->errors, 'errors');
}
@@ -226,9 +225,8 @@ llxHeader("", $langs->trans("Categories"), $helpurl, '', 0, 0, $arrayofjs, $arra
$title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
$head = categories_prepare_head($object, $type);
-
-
print dol_get_fiche_head($head, 'card', $langs->trans($title), -1, 'category');
+
$backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
$linkback = '
'.$langs->trans("BackToList").' ';
$object->next_prev_filter = ' type = '.$object->type;
@@ -250,7 +248,11 @@ dol_banner_tab($object, 'label', $linkback, ($user->socid ? 0 : 1), 'label', 'la
if ($action == 'delete')
{
- print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type, $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 1);
+ if ($backtopage) {
+ print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&backtopage='.urlencode($backtopage), $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 2);
+ } else {
+ print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type, $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 1);
+ }
}
print '
';
@@ -294,7 +296,7 @@ if ($user->rights->categorie->creer)
if ($user->rights->categorie->supprimer)
{
- print '
id.'&type='.$type.'">'.$langs->trans("Delete").' ';
+ print '
id.'&type='.$type.'&backtolist='.urlencode($backtolist).'">'.$langs->trans("Delete").' ';
}
print "
".(is_countable($elements) ? count($elements) : '0')." ";
}
- $color = $categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"';
+ $color = $categstatic->color ? ' style="background: #'.sprintf("%06s", $categstatic->color).';"' : ' style="background: #bbb"';
+ $li = $categstatic->getNomUrl(1, '', 60, '&backtolist='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.$type));
$entry = '';
$entry .= '';
$entry .= '';
- $entry .= ''.$categstatic->getNomUrl(1, '', 60).' ';
+ $entry .= ''.$li.' ';
$entry .= ' ';
- $entry .= ''.$counter.' ';
+ $entry .= $counter;
$entry .= '';
- $entry .= ''.img_view().' ';
+ $entry .= ''.img_view().' ';
+ $entry .= ' ';
+ $entry .= '';
+ $entry .= ''.img_edit().' ';
+ $entry .= ' ';
+ $entry .= '';
+ $entry .= ''.img_delete().' ';
$entry .= ' ';
$entry .= ' ';
@@ -409,7 +417,8 @@ if ($cats < 0)
$data[] = array('rowid' => $val['rowid'], 'fk_menu' => $val['fk_parent'], 'entry' => $entry);
}
- if ((count($data) - 1))
+ $nbofentries = (count($data) - 1);
+ if ($nbofentries > 0)
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
print '';
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 510fa67dcdb..2fe47ab39f1 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -141,14 +141,8 @@ $arrayfields = array(
'a.tms'=>array('label'=>'DateModification', 'checked'=>0)
);
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
- {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
- $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index fe41203e946..93316384c2a 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -286,7 +286,10 @@ if ($object->id > 0)
print ' ';
print $langs->trans('CustomerCode').' ';
print $object->code_client;
- if ($object->check_codeclient() <> 0) print ' ('.$langs->trans("WrongCustomerCode").') ';
+ $tmpcheck = $object->check_codeclient();
+ if ($tmpcheck != 0 && $tmpcheck != -5) {
+ print ' ('.$langs->trans("WrongCustomerCode").') ';
+ }
print ' ';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 1a3a1c9fe62..e045401bef4 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -23,7 +23,9 @@
* \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';
@@ -38,7 +40,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
// Load translation files required by the page
$langs->load("mails");
-if (!$user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) accessforbidden();
+if (!$user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) {
+ accessforbidden();
+}
$id = (GETPOST('mailid', 'int') ? GETPOST('mailid', 'int') : GETPOST('id', 'int'));
$action = GETPOST('action', 'aZ09');
@@ -83,20 +87,18 @@ $listofmethods['smtps'] = 'SMTP/SMTPS socket library';
$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 ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
-if (empty($reshook))
-{
+if (empty($reshook)) {
// Action clone object
- if ($action == 'confirm_clone' && $confirm == 'yes')
- {
- if (!GETPOST("clone_content", 'alpha') && !GETPOST("clone_receivers", 'alpha'))
- {
+ if ($action == 'confirm_clone' && $confirm == 'yes') {
+ if (!GETPOST("clone_content", 'alpha') && !GETPOST("clone_receivers", 'alpha')) {
setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
} else {
$result = $object->createFromClone($user, $object->id, GETPOST("clone_content", 'alpha'), GETPOST("clone_receivers", 'alpha'));
- if ($result > 0)
- {
+ if ($result > 0) {
header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
exit;
} else {
@@ -107,24 +109,20 @@ if (empty($reshook))
}
// Action send emailing for everybody
- if ($action == 'sendallconfirmed' && $confirm == 'yes')
- {
- if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
- {
+ if ($action == 'sendallconfirmed' && $confirm == 'yes') {
+ if (empty($conf->global->MAILING_LIMIT_SENDBYWEB)) {
// As security measure, we don't allow send from the GUI
setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
setEventMessages('', null, 'warnings');
setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings');
$action = '';
- } elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
- {
+ } elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) {
setEventMessages($langs->trans("NotEnoughPermissions"), null, 'warnings');
$action = '';
} else {
$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
- if ($object->statut == 0)
- {
+ if ($object->statut == 0) {
dol_print_error('', 'ErrorMailIsNotValidated');
exit;
}
@@ -137,7 +135,9 @@ if (empty($reshook))
$errorsto = $object->email_errorsto;
// Is the message in html
$msgishtml = -1; // Unknown by default
- if (preg_match('/[\s\t]*/i', $message)) $msgishtml = 1;
+ 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.
@@ -153,12 +153,10 @@ if (empty($reshook))
dol_syslog("card.php: select targets", LOG_DEBUG);
$resql = $db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$num = $db->num_rows($resql); // Number of possible recipients
- if ($num)
- {
+ if ($num) {
dol_syslog("comm/mailing/card.php: nb of targets = ".$num, LOG_DEBUG);
$now = dol_now();
@@ -166,16 +164,14 @@ if (empty($reshook))
// Positioning date of start sending
$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$object->id;
$resql2 = $db->query($sql);
- if (!$resql2)
- {
+ if (!$resql2) {
dol_print_error($db);
}
// Loop on each email and send it
$i = 0;
- while ($i < $num && $i < $conf->global->MAILING_LIMIT_SENDBYWEB)
- {
+ 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();
@@ -215,14 +211,18 @@ if (empty($reshook))
$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);
- if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
- {
+ 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);
@@ -235,21 +235,32 @@ if (empty($reshook))
}
}
/* 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);
- 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;
@@ -263,10 +274,8 @@ if (empty($reshook))
$arr_css = array();
$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
- if (count($listofpaths))
- {
- foreach ($listofpaths as $key => $val)
- {
+ if (count($listofpaths)) {
+ foreach ($listofpaths as $key => $val) {
$arr_file[] = $listofpaths[$key]['fullname'];
$arr_mime[] = dol_mimetype($listofpaths[$key]['name']);
$arr_name[] = $listofpaths[$key]['name'];
@@ -277,8 +286,7 @@ if (empty($reshook))
$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)
- {
+ if ($mail->error) {
$res = 0;
}
/*if (! $substitutionisok)
@@ -288,13 +296,11 @@ if (empty($reshook))
}*/
// Send mail
- if ($res)
- {
+ if ($res) {
$res = $mail->sendfile();
}
- if ($res)
- {
+ if ($res) {
// Mail successful
$nbok++;
@@ -303,19 +309,16 @@ if (empty($reshook))
$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)
- {
+ if (!$resql2) {
dol_print_error($db);
} else {
//if cheack read is use then update prospect contact status
- if (strpos($message, '__CHECK_READ__') !== false)
- {
+ if (strpos($message, '__CHECK_READ__') !== false) {
//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)
- {
+ if (!$resql2) {
dol_print_error($db);
}
@@ -324,17 +327,15 @@ if (empty($reshook))
dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
$resql2 = $db->query($sql);
- if (!$resql2)
- {
+ if (!$resql2) {
dol_print_error($db);
}
}
}
- if (!empty($conf->global->MAILING_DELAY))
- {
+ if (!empty($conf->global->MAILING_DELAY)) {
dol_syslog("Wait a delay of MAILING_DELAY=".$conf->global->MAILING_DELAY);
- sleep($conf->global->MAILING_DELAY);
+ usleep((float) $conf->global->MAILING_DELAY * 1000000);
}
//test if CHECK READ change statut prospect contact
@@ -347,8 +348,7 @@ if (empty($reshook))
$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)
- {
+ if (!$resql2) {
dol_print_error($db);
}
}
@@ -360,14 +360,15 @@ if (empty($reshook))
}
// Loop finished, set global statut of mail
- if ($nbko > 0)
- {
+ if ($nbko > 0) {
$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');
+ if ($nbok > 0) {
+ setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
+ } else {
+ setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
+ }
} else {
- if ($nbok >= $num)
- {
+ if ($nbok >= $num) {
$statut = 3; // Send to everybody
setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
} else {
@@ -379,8 +380,7 @@ if (empty($reshook))
$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)
- {
+ if (!$resql2) {
dol_print_error($db);
}
} else {
@@ -393,24 +393,23 @@ if (empty($reshook))
}
// Action send test emailing
- if ($action == 'send' && empty($_POST["cancel"]))
- {
+ if ($action == 'send' && empty($_POST["cancel"])) {
$error = 0;
$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) {
// Is the message in html
$msgishtml = -1; // Unknow by default
- if (preg_match('/[\s\t]*/i', $object->body)) $msgishtml = 1;
+ if (preg_match('/[\s\t]*/i', $object->body)) {
+ $msgishtml = 1;
+ }
// other are set at begin of page
$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
@@ -427,15 +426,17 @@ if (empty($reshook))
$arr_css = array();
// Add CSS
- if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor;
- if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
+ 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);
- if (count($listofpaths))
- {
- foreach ($listofpaths as $key => $val)
- {
+ if (count($listofpaths)) {
+ foreach ($listofpaths as $key => $val) {
$arr_file[] = $listofpaths[$key]['fullname'];
$arr_mime[] = dol_mimetype($listofpaths[$key]['name']);
$arr_name[] = $listofpaths[$key]['name'];
@@ -446,8 +447,7 @@ if (empty($reshook))
$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();
- if ($result)
- {
+ if ($result) {
setEventMessages($langs->trans("MailSuccessfulySent", $mailfile->getValidAddress($object->email_from, 2), $mailfile->getValidAddress($object->sendto, 2)), null, 'mesgs');
$action = '';
} else {
@@ -458,18 +458,17 @@ if (empty($reshook))
}
// Action add emailing
- if ($action == 'add')
- {
+ if ($action == 'add') {
$mesgs = array();
- $object->email_from = GETPOST("from", "none"); // Must allow 'name '
- $object->email_replyto = GETPOST("replyto", "none"); // Must allow 'name '
- $object->email_errorsto = GETPOST("errorsto", "none"); // Must allow 'name '
- $object->title = GETPOST("title");
- $object->sujet = GETPOST("sujet");
- $object->body = GETPOST("bodyemail", 'restricthtml');
- $object->bgcolor = GETPOST("bgcolor");
- $object->bgimage = GETPOST("bgimage");
+ $object->email_from = (string) GETPOST("from", "none"); // Must allow 'name '
+ $object->email_replyto = (string) GETPOST("replyto", "none"); // Must allow 'name '
+ $object->email_errorsto = (string) GETPOST("errorsto", "none"); // Must allow 'name '
+ $object->title = (string) GETPOST("title");
+ $object->sujet = (string) GETPOST("sujet");
+ $object->body = (string) GETPOST("bodyemail", 'restricthtml');
+ $object->bgcolor = (string) GETPOST("bgcolor");
+ $object->bgimage = (string) GETPOST("bgimage");
if (!$object->title) {
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
@@ -481,10 +480,8 @@ if (empty($reshook))
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailMessage"));
}
- if (!count($mesgs))
- {
- if ($object->create($user) >= 0)
- {
+ if (!count($mesgs)) {
+ if ($object->create($user) >= 0) {
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
@@ -496,24 +493,25 @@ if (empty($reshook))
}
// Action update description of emailing
- if ($action == 'settitle' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
- {
+ if ($action == 'settitle' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto') {
$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
- if ($action == 'settitle') $object->title = trim(GETPOST('title', 'alpha'));
- elseif ($action == 'setemail_from') $object->email_from = trim(GETPOST('email_from', 'none')); // Must allow 'name '
- elseif ($action == 'setemail_replyto') $object->email_replyto = trim(GETPOST('email_replyto', 'none')); // Must allow 'name '
- elseif ($action == 'setemail_errorsto') $object->email_errorsto = trim(GETPOST('email_errorsto', 'none')); // Must allow 'name '
- elseif ($action == 'settitle' && empty($object->title)) {
+ if ($action == 'settitle') {
+ $object->title = trim(GETPOST('title', 'alpha'));
+ } elseif ($action == 'setemail_from') {
+ $object->email_from = trim(GETPOST('email_from', 'none')); // Must allow 'name '
+ } elseif ($action == 'setemail_replyto') {
+ $object->email_replyto = trim(GETPOST('email_replyto', 'none')); // Must allow 'name '
+ } elseif ($action == 'setemail_errorsto') {
+ $object->email_errorsto = trim(GETPOST('email_errorsto', 'none')); // Must allow 'name '
+ } elseif ($action == 'settitle' && empty($object->title)) {
$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
} elseif ($action == 'setfrom' && empty($object->email_from)) {
$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailFrom"));
}
- if (!$mesg)
- {
- if ($object->update($user) >= 0)
- {
+ if (!$mesg) {
+ if ($object->update($user) >= 0) {
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
@@ -527,8 +525,7 @@ if (empty($reshook))
/*
* 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');
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -540,8 +537,7 @@ if (empty($reshook))
}
// Action of file remove
- if (!empty($_POST["removedfile"]))
- {
+ if (!empty($_POST["removedfile"])) {
$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';
@@ -552,20 +548,18 @@ if (empty($reshook))
}
// Action of emailing update
- if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
- {
+ if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"])) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$isupload = 0;
- if (!$isupload)
- {
+ if (!$isupload) {
$mesgs = array();
- $object->sujet = GETPOST("sujet");
- $object->body = GETPOST("bodyemail", 'restricthtml');
- $object->bgcolor = GETPOST("bgcolor");
- $object->bgimage = GETPOST("bgimage");
+ $object->sujet = (string) GETPOST("sujet");
+ $object->body = (string) GETPOST("bodyemail", 'restricthtml');
+ $object->bgcolor = (string) GETPOST("bgcolor");
+ $object->bgimage = (string) GETPOST("bgimage");
if (!$object->sujet) {
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTopic"));
@@ -574,10 +568,8 @@ if (empty($reshook))
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailMessage"));
}
- if (!count($mesgs))
- {
- if ($object->update($user) >= 0)
- {
+ if (!count($mesgs)) {
+ if ($object->update($user) >= 0) {
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
@@ -592,10 +584,8 @@ if (empty($reshook))
}
// Action of validation confirmation
- if ($action == 'confirm_valid' && $confirm == 'yes')
- {
- if ($object->id > 0)
- {
+ if ($action == 'confirm_valid' && $confirm == 'yes') {
+ if ($object->id > 0) {
$object->valid($user);
setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -606,13 +596,10 @@ if (empty($reshook))
}
// Action of validation confirmation
- if ($action == 'confirm_settodraft' && $confirm == 'yes')
- {
- if ($object->id > 0)
- {
+ if ($action == 'confirm_settodraft' && $confirm == 'yes') {
+ if ($object->id > 0) {
$result = $object->setStatut(0);
- if ($result > 0)
- {
+ if ($result > 0) {
//setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
@@ -625,20 +612,16 @@ if (empty($reshook))
}
// Resend
- if ($action == 'confirm_reset' && $confirm == 'yes')
- {
- if ($object->id > 0)
- {
+ if ($action == 'confirm_reset' && $confirm == 'yes') {
+ if ($object->id > 0) {
$db->begin();
$result = $object->valid($user);
- if ($result > 0)
- {
+ if ($result > 0) {
$result = $object->reset_targets_status($user);
}
- if ($result > 0)
- {
+ if ($result > 0) {
$db->commit();
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
@@ -652,18 +635,15 @@ if (empty($reshook))
}
// Action of delete confirmation
- if ($action == 'confirm_delete' && $confirm == 'yes')
- {
- if ($object->delete($object->id))
- {
+ if ($action == 'confirm_delete' && $confirm == 'yes') {
+ if ($object->delete($object->id)) {
$url = (!empty($urlfrom) ? $urlfrom : 'list.php');
header("Location: ".$url);
exit;
}
}
- if (!empty($_POST["cancel"]))
- {
+ if (!empty($_POST["cancel"])) {
$action = '';
}
}
@@ -677,24 +657,30 @@ $form = new Form($db);
$htmlother = new FormOther($db);
$help_url = 'EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing';
-llxHeader('', $langs->trans("Mailing"), $help_url, '', 0, 0,
+llxHeader(
+ '',
+ $langs->trans("Mailing"),
+ $help_url,
+ '',
+ 0,
+ 0,
array(
- '/includes/ace/src/ace.js',
- '/includes/ace/src/ext-statusbar.js',
- '/includes/ace/src/ext-language_tools.js',
- //'/includes/ace/src/ext-chromevox.js'
- ), array());
+ '/includes/ace/src/ace.js',
+ '/includes/ace/src/ext-statusbar.js',
+ '/includes/ace/src/ext-language_tools.js',
+ //'/includes/ace/src/ext-chromevox.js'
+ ),
+ array()
+);
-if ($action == 'create')
-{
+if ($action == 'create') {
// EMailing in creation mode
print '';
} else {
- if ($object->id > 0)
- {
+ if ($object->id > 0) {
$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
$head = emailing_prepare_head($object);
- // Confirmation back to draft
- if ($action == 'settodraft')
- {
+ if ($action == 'settodraft') {
+ // Confirmation back to draft
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("SetToDraft"), $langs->trans("ConfirmUnvalidateEmailing"), "confirm_settodraft", '', '', 1);
- }
- // Confirmation of mailing validation
- if ($action == 'valid')
- {
+ } elseif ($action == 'valid') {
+ // Confirmation of mailing validation
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ValidMailing"), $langs->trans("ConfirmValidMailing"), "confirm_valid", '', '', 1);
- } // Confirm reset
- elseif ($action == 'reset')
- {
+ } elseif ($action == 'reset') {
+ // Confirm reset
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ResetMailing"), $langs->trans("ConfirmResetMailing", $object->ref), "confirm_reset", '', '', 2);
- } // Confirm delete
- elseif ($action == 'delete')
- {
+ } elseif ($action == 'delete') {
+ // Confirm delete
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(!empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteAMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1);
}
-
- if ($action != 'edit' && $action != 'edithtml')
- {
+ if ($action != 'edit' && $action != 'edithtml') {
print dol_get_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
/*
* View mode mailing
*/
- if ($action == 'sendall')
- {
+ if ($action == 'sendall') {
// Define message to recommand from command line
$sendingmode = $conf->global->EMAILING_MAIL_SENDMODE;
- if (empty($sendingmode)) $sendingmode = $conf->global->MAIN_MAIL_SENDMODE;
- if (empty($sendingmode)) $sendingmode = 'mail'; // If not defined, we use php mail function
+ if (empty($sendingmode)) {
+ $sendingmode = $conf->global->MAIN_MAIL_SENDMODE;
+ }
+ if (empty($sendingmode)) {
+ $sendingmode = 'mail'; // If not defined, we use php mail function
+ }
// MAILING_NO_USING_PHPMAIL may be defined or not.
// MAILING_LIMIT_SENDBYWEB is always defined to something != 0 (-1=forbidden).
// MAILING_LIMIT_SENDBYCLI may be defined ot not (-1=forbidden, 0 or undefined=no limit).
- if (!empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')
- {
+ if (!empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail') {
// EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
// You ensure that every user is using its own SMTP server when using the mass emailing module.
$linktoadminemailbefore = '';
$linktoadminemailend = ' ';
setEventMessages($langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]), null, 'warnings');
setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
- if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
+ if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) {
+ setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
+ }
$_GET["action"] = '';
} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) {
- if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
- if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+ if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') {
+ setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+ }
+ if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') {
+ setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+ }
// The feature is forbidden from GUI, we show just message to use from command line.
setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
setEventMessages('', null, 'warnings');
- if ($conf->file->mailing_limit_sendbyweb != '-1') // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
- {
+ if ($conf->file->mailing_limit_sendbyweb != '-1') { // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
}
$_GET["action"] = '';
} else {
- if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
- if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+ if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') {
+ setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+ }
+ if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') {
+ setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+ }
$text = '';
- if (!isset($conf->global->MAILING_LIMIT_SENDBYCLI) || $conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
- {
+ if (!isset($conf->global->MAILING_LIMIT_SENDBYCLI) || $conf->global->MAILING_LIMIT_SENDBYCLI >= 0) {
$text .= $langs->trans("MailingNeedCommand");
$text .= '';
$nbemail = ($object->nbemail ? $object->nbemail : 0);
- if (is_numeric($nbemail))
- {
+ 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)))
- {
- if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
- {
+ 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);
} else {
$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
}
}
- if (empty($nbemail)) $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").' ';
- if ($text)
- {
+ if (empty($nbemail)) {
+ $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").' ';
+ }
+ if ($text) {
print $form->textwithpicto($nbemail, $text, 1, 'warning');
} else {
print $nbemail;
@@ -926,8 +912,7 @@ if ($action == 'create')
// Clone confirmation
- if ($action == 'clone')
- {
+ if ($action == 'clone') {
// Create an array for form
$formquestion = array(
'text' => $langs->trans("ConfirmClone"),
@@ -942,81 +927,67 @@ if ($action == 'create')
* Actions Buttons
*/
- 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";
- if (($object->statut == 1) && ($user->rights->mailing->valider || $object->fk_user_valid == $user->id))
- {
+ if (($object->statut == 1) && ($user->rights->mailing->valider || $object->fk_user_valid == $user->id)) {
print '
'.$langs->trans("SetToDraft").' ';
}
- if (($object->statut == 0 || $object->statut == 1 || $object->statut == 2) && $user->rights->mailing->creer)
- {
- if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING))
- {
+ if (($object->statut == 0 || $object->statut == 1 || $object->statut == 2) && $user->rights->mailing->creer) {
+ if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING)) {
print '
'.$langs->trans("EditWithEditor").' ';
} 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").' ';
} else {
print '
'.$langs->trans("TestMailing").' ';
}
- if ($object->statut == 0)
- {
- if ($object->nbemail <= 0)
- {
+ if ($object->statut == 0) {
+ if ($object->nbemail <= 0) {
print '
'.$langs->trans("ValidMailing").' ';
- } elseif (empty($user->rights->mailing->valider))
- {
+ } elseif (empty($user->rights->mailing->valider)) {
print '
'.$langs->trans("ValidMailing").' ';
} else {
print '
'.$langs->trans("ValidMailing").' ';
}
}
- if (($object->statut == 1 || $object->statut == 2) && $object->nbemail > 0 && $user->rights->mailing->valider)
- {
- if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
- {
+ if (($object->statut == 1 || $object->statut == 2) && $object->nbemail > 0 && $user->rights->mailing->valider) {
+ if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) {
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").' ';
} else {
print '
'.$langs->trans("SendMailing").' ';
}
}
- if ($user->rights->mailing->creer)
- {
+ if ($user->rights->mailing->creer) {
print '
'.$langs->trans("ToClone").' ';
}
- 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 (($object->statut == 2 || $object->statut == 3) && $user->rights->mailing->valider) {
+ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send) {
print '
'.$langs->trans("ResetMailing").' ';
} else {
print '
'.$langs->trans("ResetMailing").' ';
}
}
- 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 <= 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)) {
print '
'.$langs->trans("DeleteMailing").' ';
} else {
print '
'.$langs->trans("DeleteMailing").' ';
@@ -1027,8 +998,7 @@ if ($action == 'create')
}
// Display of the TEST form
- if ($action == 'test')
- {
+ if ($action == 'test') {
print '
';
print load_fiche_titre($langs->trans("TestMailing"));
@@ -1070,8 +1040,7 @@ if ($action == 'create')
$htmltext = '
'.$langs->trans("FollowingConstantsWillBeSubstituted").': ';
@@ -1090,10 +1059,8 @@ if ($action == 'create')
print '
'.$langs->trans("MailFile").' ';
// List of files
$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
- if (count($listofpaths))
- {
- foreach ($listofpaths as $key => $val)
- {
+ if (count($listofpaths)) {
+ foreach ($listofpaths as $key => $val) {
print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
print ' '.$langs->trans("BackgroundColorByDefault").' ';
- print $htmlother->selectColor($object->bgcolor,'bgcolor','',0);
- print ' ';*/
+ print $htmlother->selectColor($object->bgcolor,'bgcolor','',0);
+ print '
';*/
print '
';
// Message
print '';
- if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff') // CKEditor does not apply the color of the div into its content area
- {
+ if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff') { // CKEditor does not apply the color of the div into its content area
$readonly = 1;
// wysiwyg editor
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->Create();
- } else print dol_htmlentitiesbr($object->body);
+ } else {
+ print dol_htmlentitiesbr($object->body);
+ }
print '
';
print dol_get_fiche_end();
@@ -1132,7 +1100,9 @@ if ($action == 'create')
$linkback = ''.$langs->trans("BackToList").' ';
$morehtmlright = '';
- if ($object->statut == 2) $morehtmlright .= ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+ if ($object->statut == 2) {
+ $morehtmlright .= ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+ }
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
@@ -1160,21 +1130,19 @@ if ($action == 'create')
print $langs->trans("TotalNbOfDistinctRecipients");
print '';
$nbemail = ($object->nbemail ? $object->nbemail : 0);
- if (is_numeric($nbemail))
- {
+ if (is_numeric($nbemail)) {
$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)
- {
+ 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);
} else {
$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
}
}
- if (empty($nbemail)) $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").' ';
- if ($text)
- {
+ if (empty($nbemail)) {
+ $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").' ';
+ }
+ if ($text) {
print $form->textwithpicto($nbemail, $text, 1, 'warning');
} else {
print $nbemail;
@@ -1186,8 +1154,7 @@ if ($action == 'create')
$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))
- {
+ if (empty($reshook)) {
print $object->showOptionals($extrafields, 'edit', $parameters);
}
@@ -1206,8 +1173,7 @@ if ($action == 'create')
print ''.$langs->trans("FollowingConstantsWillBeSubstituted").': ';
@@ -1241,10 +1207,8 @@ if ($action == 'create')
$out .= ' });';
$out .= '})';
$out .= ''."\n";
- if (count($listofpaths))
- {
- foreach ($listofpaths as $key => $val)
- {
+ if (count($listofpaths)) {
+ foreach ($listofpaths as $key => $val) {
$out .= '';
$out .= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
$out .= '
';
@@ -1270,15 +1234,13 @@ if ($action == 'create')
// Message
print '
';
- if ($action == 'edit')
- {
+ if ($action == 'edit') {
// wysiwyg editor
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->Create();
}
- if ($action == 'edithtml')
- {
+ if ($action == 'edithtml') {
// HTML source editor
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, 'ace', 20, '90%');
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 0d621dfa186..81f64ef6016 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -463,24 +463,51 @@ if ($object->fetch($id) >= 0)
$sql .= " mc.source_url, mc.source_id, mc.source_type, mc.error_text";
$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
$sql .= " WHERE mc.fk_mailing=".$object->id;
- if ($search_lastname) $sql .= natural_search("mc.lastname", $search_lastname);
- if ($search_firstname) $sql .= natural_search("mc.firstname", $search_firstname);
- if ($search_email) $sql .= natural_search("mc.email", $search_email);
- if ($search_other) $sql .= natural_search("mc.other", $search_other);
- if ($search_dest_status != '' && $search_dest_status >= -1) $sql .= " AND mc.statut=".$db->escape($search_dest_status)." ";
+ $asearchcriteriahasbeenset = 0;
+ if ($search_lastname) {
+ $sql .= natural_search("mc.lastname", $search_lastname);
+ $asearchcriteriahasbeenset++;
+ }
+ if ($search_firstname) {
+ $sql .= natural_search("mc.firstname", $search_firstname);
+ $asearchcriteriahasbeenset++;
+ }
+ if ($search_email) {
+ $sql .= natural_search("mc.email", $search_email);
+ $asearchcriteriahasbeenset++;
+ }
+ if ($search_other) {
+ $sql .= natural_search("mc.other", $search_other);
+ $asearchcriteriahasbeenset++;
+ }
+ if ($search_dest_status != '' && $search_dest_status >= -1) {
+ $sql .= " AND mc.statut=".$db->escape($search_dest_status)." ";
+ $asearchcriteriahasbeenset++;
+ }
$sql .= $db->order($sortfield, $sortorder);
// Count total nb of records
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
- $result = $db->query($sql);
- $nbtotalofrecords = $db->num_rows($result);
- if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
- {
- $page = 0;
- $offset = 0;
- }
+ $result = $db->query($sql);
+ $nbtotalofrecords = $db->num_rows($result);
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
+ $page = 0;
+ $offset = 0;
+ }
+
+ // Fix/update nbemail on emailing record if it differs (may happen if user edit lines from database directly)
+ if (empty($asearchcriteriahasbeenset)) {
+ if ($nbtotalofrecords != $object->email) {
+ dol_syslog("We found a difference in nb of record in target table and the property ->nbemail, we fix ->nbemail");
+ //print "nbemail=".$object->nbemail." nbtotalofrecords=".$nbtotalofrecords;
+ $resultrefresh = $object->refreshNbOfTargets();
+ if ($resultrefresh < 0) {
+ dol_print_error($db, $object->error, $object->errors);
+ }
+ }
+ }
}
//$nbtotalofrecords=$object->nbemail; // nbemail is a denormalized field storing nb of targets
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 2f2b16bd119..2961218f148 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -118,36 +118,48 @@ class Mailing extends CommonObject
/**
* @var int id of user create
- * @deprecated
*/
public $user_creation;
/**
* @var int id of user create
+ * @deprecated
*/
public $user_creat;
/**
* @var int id of user validate
- * @deprecated
*/
public $user_validation;
/**
* @var int id of user validate
+ * @deprecated
*/
public $user_valid;
/**
* @var integer|string date_creation
+ * @deprecated
*/
public $date_creat;
+ /**
+ * @var integer|string date_creation
+ */
+ public $date_creation;
+
/**
* @var int date validate
+ * @deprecated
*/
public $date_valid;
+ /**
+ * @var int date validate
+ */
+ public $date_validation;
+
/**
* @var array extraparams
*/
@@ -314,10 +326,14 @@ class Mailing extends CommonObject
$this->email_errorsto = $obj->email_errorsto;
$this->user_creat = $obj->fk_user_creat;
+ $this->user_creation = $obj->fk_user_creat;
$this->user_valid = $obj->fk_user_valid;
+ $this->user_validation = $obj->fk_user_valid;
$this->date_creat = $this->db->jdate($obj->date_creat);
+ $this->date_creation = $this->db->jdate($obj->date_creat);
$this->date_valid = $this->db->jdate($obj->date_valid);
+ $this->date_validation = $this->db->jdate($obj->date_valid);
$this->date_envoi = $this->db->jdate($obj->date_envoi);
$this->extraparams = (array) json_decode($obj->extraparams, true);
@@ -510,6 +526,8 @@ class Mailing extends CommonObject
dol_syslog("Mailing::delete_targets", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
+ $this->refreshNbOfTargets();
+
return 1;
} else {
$this->error = $this->db->lasterror();
@@ -577,6 +595,38 @@ class Mailing extends CommonObject
return 0;
}
+ /**
+ * Refresh denormalized value ->nbemail into emailing record
+ * Note: There is also the method update_nb into modules_mailings that is used for this.
+ *
+ * @return int <0 if KO, >0 if OK
+ */
+ public function refreshNbOfTargets()
+ {
+ $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
+ $sql .= " WHERE fk_mailing = ".$this->id;
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $obj = $this->db->fetch_object($resql);
+ if ($obj) {
+ $nbforupdate = $obj->nb;
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'mailing SET nbemail = '.((int) $nbforupdate);
+ $sql .= ' WHERE rowid = '.$this->id;
+
+ $resqlupdate = $this->db->query($sql);
+ if (! $resqlupdate) {
+ $this->error = $this->db->lasterror();
+ return -1;
+ }
+ }
+ } else {
+ $this->error = $this->db->lasterror();
+ return -1;
+ }
+ return 1;
+ }
/**
* Return a link to the object card (with optionally the picto)
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 199a5caad8b..4bd39309701 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -33,8 +33,9 @@ $id = GETPOST('id', 'int');
$langs->load("mails");
// Security check
-if (!$user->rights->mailing->lire || $user->socid > 0)
-accessforbidden();
+if (!$user->rights->mailing->lire || $user->socid > 0) {
+ accessforbidden();
+}
@@ -48,8 +49,7 @@ $form = new Form($db);
$object = new Mailing($db);
-if ($object->fetch($id) >= 0)
-{
+if ($object->fetch($id) >= 0) {
$head = emailing_prepare_head($object);
print dol_get_fiche_head($head, 'info', $langs->trans("Mailing"), -1, 'email');
@@ -58,13 +58,14 @@ if ($object->fetch($id) >= 0)
$morehtmlright = '';
$nbtry = $nbok = 0;
- if ($object->statut == 2 || $object->statut == 3)
- {
+ if ($object->statut == 2 || $object->statut == 3) {
$nbtry = $object->countNbOfTargets('alreadysent');
$nbko = $object->countNbOfTargets('alreadysentko');
$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
- if ($nbko) $morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+ if ($nbko) {
+ $morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+ }
$morehtmlright .= ') ';
}
@@ -73,10 +74,6 @@ if ($object->fetch($id) >= 0)
print '
';
//print '
';
- $object->user_creation = $object->user_creat;
- $object->date_creation = $object->date_creat;
- $object->user_validation = $object->user_valid;
- $object->date_validation = $object->date_valid;
dol_print_object_info($object, 0);
//print '
';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 12146179db0..f6a63ba9a48 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1660,7 +1660,7 @@ if ($action == 'create')
print '
'.$langs->trans('NotePublic').' ';
print '
';
$note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc) ? $objectsrc->note_public : null));
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// Private note
@@ -1670,7 +1670,7 @@ if ($action == 'create')
print ' '.$langs->trans('NotePrivate').' ';
print '
';
$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc)) ? $objectsrc->note_private : null));
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '
print ' '.$langs->trans('NotePublic').' ';
print '';
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '';
print ' ';
@@ -1747,7 +1747,7 @@ if ($action == 'create' && $usercancreate)
print ''.$langs->trans('NotePrivate').' ';
print '';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '';
print ' ';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 9ea05a13065..d8fdb51141e 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -492,26 +492,21 @@ class Commande extends CommonOrder
$error++;
}
- if (!$error)
- {
+ if (!$error) {
// If stock is incremented on validate order, we must increment it
- if ($result >= 0 && !empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
- {
+ if ($result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1) {
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
$langs->load("agenda");
// Loop on each line
$cpt = count($this->lines);
- for ($i = 0; $i < $cpt; $i++)
- {
- if ($this->lines[$i]->fk_product > 0)
- {
+ for ($i = 0; $i < $cpt; $i++) {
+ if ($this->lines[$i]->fk_product > 0) {
$mouvP = new MouvementStock($this->db);
$mouvP->origin = &$this;
// We decrement stock of product (and sub-products)
$result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderValidatedInDolibarr", $num));
- if ($result < 0)
- {
+ if ($result < 0) {
$error++;
$this->error = $mouvP->error;
}
@@ -521,16 +516,14 @@ class Commande extends CommonOrder
}
}
- if (!$error && !$notrigger)
- {
+ if (!$error && !$notrigger) {
// Call trigger
$result = $this->call_trigger('ORDER_VALIDATE', $user);
if ($result < 0) $error++;
// End call triggers
}
- if (!$error)
- {
+ if (!$error) {
$this->oldref = $this->ref;
// Rename directory if dir was a temporary ref
@@ -631,7 +624,7 @@ class Commande extends CommonOrder
}
// If stock is decremented on validate order, we must reincrement it
- if (!empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
+ if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
{
$result = 0;
@@ -817,7 +810,7 @@ class Commande extends CommonOrder
if ($this->db->query($sql))
{
// If stock is decremented on validate order, we must reincrement it
- if (!empty($conf->stock->enabled) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
+ if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
{
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
$langs->load("agenda");
@@ -3166,8 +3159,8 @@ class Commande extends CommonOrder
$this->line->tva_tx = $txtva;
$this->line->localtax1_tx = $txlocaltax1;
$this->line->localtax2_tx = $txlocaltax2;
- $this->line->localtax1_type = $localtaxes_type[0];
- $this->line->localtax2_type = $localtaxes_type[2];
+ $this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+ $this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
$this->line->remise_percent = $remise_percent;
$this->line->subprice = $subprice;
$this->line->info_bits = $info_bits;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 72a5e179f25..5fa4a3adfaa 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -675,7 +675,7 @@ if ($resql)
if (!empty($arrayfields['s.nom']['checked']))
{
print '';
- print ' ';
}
// Town
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index cc9abb8d594..734d21b1c87 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -529,7 +529,7 @@ print ''.$langs->trans("ExportAccountingSourceDocHel
print '
';
+ print ''.$langs->trans($val['label']).'
';
}
print '';
print '
'."\n";
@@ -993,9 +991,8 @@ if ($resql)
while ($i < min($num, $limit))
{
$objp = $db->fetch_object($resql);
-
// If we are in a situation where we need/can show balance, we calculate the start of balance
- if (!$balancecalculated && (!empty($arrayfields['balancebefore']['checked']) || !empty($arrayfields['balance']['checked'])) && $mode_balance_ok)
+ if (!$balancecalculated && (!empty($arrayfields['balancebefore']['checked']) || !empty($arrayfields['balance']['checked'])) && ($mode_balance_ok || $search_conciliated === '0'))
{
if (!$search_account)
{
@@ -1016,11 +1013,9 @@ if ($resql)
$sqlforbalance .= " AND (b.datev < '".$db->idate($db->jdate($objp->dv))."' OR (b.datev = '".$db->idate($db->jdate($objp->dv))."' AND (b.dateo < '".$db->idate($db->jdate($objp->do))."' OR (b.dateo = '".$db->idate($db->jdate($objp->do))."' AND b.rowid < ".$objp->rowid."))))";
$resqlforbalance = $db->query($sqlforbalance);
//print $sqlforbalance;
- if ($resqlforbalance)
- {
+ if ($resqlforbalance) {
$objforbalance = $db->fetch_object($resqlforbalance);
- if ($objforbalance)
- {
+ if ($objforbalance) {
// If sort is desc,desc,desc then total of previous date + amount is the balancebefore of the previous line before the line to show
if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
{
@@ -1081,24 +1076,30 @@ if ($resql)
if (!empty($arrayfields['balancebefore']['checked']))
{
print '';
- print price(price2num($balance, 'MT'), 1, $langs);
+ if ($search_conciliated !== '0') {
+ print price(price2num($balance, 'MT'), 1, $langs);
+ }
print ' ';
}
if (!empty($arrayfields['balance']['checked']))
{
print '';
- print price(price2num($balance, 'MT'), 1, $langs);
+ if ($search_conciliated !== '0') {
+ print price(price2num($balance, 'MT'), 1, $langs);
+ }
+ print ' ';
+ }
+ if (!empty($arrayfields['b.num_releve']['checked']))
+ {
+ print '';
+ print ' ';
}
-
- print '';
- print ' ';
print '';
print ' ';
print ' ';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index e93491ceee4..b2d499c5f34 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1741,13 +1741,6 @@ class AccountLine extends CommonObject
public $amount;
- /**
- * @var string bank transaction lines label
- */
- public $label;
-
- public $note;
-
/**
* @var int ID
*/
@@ -1763,11 +1756,6 @@ class AccountLine extends CommonObject
*/
public $fk_type;
- public $rappro; // Is it conciliated
- public $num_releve; // If conciliated, what is bank statement
- public $num_chq; // Num of cheque
- public $bank_chq; // Bank of cheque
-
/**
* @var int ID of cheque receipt
*/
@@ -1778,16 +1766,40 @@ class AccountLine extends CommonObject
*/
public $fk_account;
+ /**
+ * @var string Ref of bank account
+ */
+ public $bank_account_ref;
+
/**
* @var string Label of bank account
*/
public $bank_account_label;
+ /**
+ * @var string Bank account numero
+ */
+ public $numero_compte;
+
/**
* @var string Name of check issuer
*/
public $emetteur;
+ public $rappro; // Is it conciliated
+ public $num_releve; // If conciliated, what is bank statement
+ public $num_chq; // Num of cheque
+ public $bank_chq; // Bank of cheque
+
+ /**
+ * @var string bank transaction lines label
+ */
+ public $label;
+
+ public $note;
+
+
+
/**
* Constructor
*
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 5c8031f2702..6c2e12ba500 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -93,7 +93,18 @@ class PaymentVarious extends CommonObject
public $fk_project;
/**
- * @var int ID
+ * @var int Bank account ID
+ */
+ public $fk_account;
+
+ /**
+ * @var int Bank account ID
+ * @deprecated See fk_account
+ */
+ public $accountid;
+
+ /**
+ * @var int ID record into llx_bank
*/
public $fk_bank;
@@ -102,11 +113,6 @@ class PaymentVarious extends CommonObject
*/
public $categorie_transaction;
- /**
- * @var int Account ID
- */
- public $accountid;
-
/**
* @var int ID
*/
@@ -397,6 +403,10 @@ class PaymentVarious extends CommonObject
$this->fk_bank = (int) $this->fk_bank;
$this->fk_user_author = (int) $this->fk_user_author;
$this->fk_user_modif = (int) $this->fk_user_modif;
+ $this->fk_account = (int) $this->fk_account;
+ if (empty($this->fk_account) && isset($this->accountid)) { // For compatibility
+ $this->fk_account = $this->accountid;
+ }
// Check parameters
if (!$this->label)
@@ -409,9 +419,9 @@ class PaymentVarious extends CommonObject
$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
return -5;
}
- if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
+ if (!empty($conf->banque->enabled) && (empty($this->fk_account) || $this->fk_account <= 0))
{
- $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+ $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("BankAccount"));
return -6;
}
if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
@@ -454,7 +464,7 @@ class PaymentVarious extends CommonObject
$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 0);
$sql .= ", ".$user->id;
$sql .= ", '".$this->db->idate($now)."'";
- $sql .= ", NULL";
+ $sql .= ", NULL"; // Filled later
$sql .= ", ".$conf->entity;
$sql .= ")";
@@ -473,7 +483,7 @@ class PaymentVarious extends CommonObject
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$acc = new Account($this->db);
- $result = $acc->fetch($this->accountid);
+ $result = $acc->fetch($this->fk_account);
if ($result <= 0) dol_print_error($this->db);
// Insert payment into llx_bank
@@ -495,7 +505,7 @@ class PaymentVarious extends CommonObject
$this->datev
);
- // Update fk_bank into llx_paiement.
+ // Update fk_bank into llx_payment_various
// So we know the payment which has generate the banking ecriture
if ($bank_line_id > 0) {
$this->update_fk_bank($bank_line_id);
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 87c8380ebda..f3efea15235 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -106,14 +106,8 @@ $arrayfields = array(
'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1010),
);
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
- {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
- $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index db539e060d2..dfdad0b589b 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -491,7 +491,7 @@ if ($id)
);
$formquestion[] = array('type' => 'date', 'tdclass'=>'fieldrequired', 'name' => 'clone_date_payment', 'label' => $langs->trans("DatePayment"), 'value' => -1);
$formquestion[] = array('type' => 'date', 'name' => 'clone_date_value', 'label' => $langs->trans("DateValue"), 'value' => -1);
- $formquestion[] = array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($accountid, "accountid", 0, '', 1));
+ $formquestion[] = array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($accountid, "accountid", 0, '', 1, '', 0, 'minwidth200', 1));
print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVariousPayment', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 300);
}
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 48da6483152..9c936c1d943 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -466,14 +466,18 @@ if ($result)
// Project
if ($arrayfields['project']['checked']) {
- $proj->fetch($obj->fk_project);
- print ''.$proj->getNomUrl(1).' ';
+ print '';
+ if ($obj->fk_project > 0) {
+ $proj->fetch($obj->fk_project);
+ print $proj->getNomUrl(1);
+ }
+ print ' ';
if (!$i) $totalarray['nbfield']++;
}
// Bank account
if ($arrayfields['bank']['checked']) {
- print '';
+ print ' ';
if ($obj->bid > 0)
{
$accountstatic->id = $obj->bid;
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index fdc3e57bdba..c6431143a98 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -120,14 +120,8 @@ foreach ($object->fields as $key => $val)
if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
}
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
- {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
- $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 515067900e3..04cdea52f7f 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -133,7 +133,8 @@ if ($resql) {
print "";
if ($cashcontrol->status != $cashcontrol::STATUS_DRAFT) print $langs->trans("CashControl")." ".$cashcontrol->id;
else print $langs->trans("CashControl")." - ".$langs->trans("Draft");
- print "
";
//$cash = $amountpertype['LIQ'] + $cashcontrol->opening;
- $cash = $cash + $cashcontrol->opening;
+ $cash = price2num($cash + $cashcontrol->opening, 'MT');
print "
";
print $langs->trans("Cash").": ".price($cash);
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 0a18d68b5db..f1e34e99985 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -252,7 +252,7 @@ if ($action == 'create')
print ''.$langs->trans('NotePublic').' ';
print '';
- $doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+ $doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_8, '90%');
print $doleditor->Create(1);
print ' ';
@@ -264,7 +264,7 @@ if ($action == 'create')
print ''.$langs->trans('NotePrivate').' ';
print '';
- $doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+ $doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_8, '90%');
print $doleditor->Create(1);
print ' ';
@@ -349,7 +349,7 @@ if ($action == 'create')
print ''.$langs->trans("NotePublic").' ';
print '';
- $doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+ $doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_8, '90%');
print $doleditor->Create(1);
print " '.$langs->trans("NotePrivate").' ';
print '';
- $doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+ $doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_8, '90%');
print $doleditor->Create(1);
print " '.$langs->trans("Title").' ';
- print ' ';
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// Private note
@@ -1019,7 +1019,7 @@ if ($action == 'create')
print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
print ' ';
print '';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '
print ' ';
@@ -1237,7 +1237,7 @@ if ($action == 'create')
}
$morehtmlref .= ' ';
- dol_banner_tab($object, 'ref', $linkback, 1, 'titre', 'none', $morehtmlref, '', 0, '', $morehtmlright);
+ dol_banner_tab($object, 'ref', $linkback, 1, 'title', 'none', $morehtmlref, '', 0, '', $morehtmlright);
print '
';
print '
';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 4451f13bd77..e16d07f084f 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2433,22 +2433,22 @@ if (empty($reshook))
{
$object->fetch($id, '', '', '', true);
- if ($object->statut == Facture::STATUS_VALIDATED
- && $object->type == Facture::TYPE_SITUATION
- && $usercancreate
- && !$objectidnext
- && $object->is_last_in_cycle()
- && $usercanunvalidate
- )
- {
- $outingError = 0;
- $newCycle = $object->newCycle(); // we need to keep the "situation behavior" so we place it on a new situation cycle
- if ($newCycle > 1)
- {
- // Search credit notes
- $lastCycle = $object->situation_cycle_ref;
- $lastSituationCounter = $object->situation_counter;
- $linkedCreditNotesList = array();
+ if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
+ && $object->type == Facture::TYPE_SITUATION
+ && $usercancreate
+ && !$objectidnext
+ && $object->is_last_in_cycle()
+ && $usercanunvalidate
+ )
+ {
+ $outingError = 0;
+ $newCycle = $object->newCycle(); // we need to keep the "situation behavior" so we place it on a new situation cycle
+ if ($newCycle > 1)
+ {
+ // Search credit notes
+ $lastCycle = $object->situation_cycle_ref;
+ $lastSituationCounter = $object->situation_counter;
+ $linkedCreditNotesList = array();
if (count($object->tab_next_situation_invoice) > 0) {
foreach ($object->tab_next_situation_invoice as $next_invoice) {
@@ -3534,7 +3534,7 @@ if ($action == 'create')
print $form->textwithpicto($langs->trans('NotePublic'), $htmltext);
print '';
print '
';
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// Private note
@@ -3545,7 +3545,7 @@ if ($action == 'create')
print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext);
print ' ';
print '
';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '
print ' ';
@@ -3764,18 +3764,18 @@ if ($action == 'create')
// Confirmation to remove invoice from cycle
if ($action == 'situationout') {
- $text = $langs->trans('ConfirmRemoveSituationFromCycle', $object->ref);
- $label = $langs->trans("ConfirmOuting");
- $formquestion = array();
- // remove situation from cycle
- if ($object->statut == Facture::STATUS_VALIDATED
- && $usercancreate
- && !$objectidnext
- && $object->is_last_in_cycle()
- && $usercanunvalidate
- )
- {
- $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $label, $text, 'confirm_situationout', $formquestion, "yes", 1);
+ $text = $langs->trans('ConfirmRemoveSituationFromCycle', $object->ref);
+ $label = $langs->trans("ConfirmOuting");
+ $formquestion = array();
+ // remove situation from cycle
+ if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
+ && $usercancreate
+ && !$objectidnext
+ && $object->is_last_in_cycle()
+ && $usercanunvalidate
+ )
+ {
+ $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $label, $text, 'confirm_situationout', $formquestion, "yes", 1);
}
}
@@ -5278,12 +5278,12 @@ if ($action == 'create')
}
// Remove situation from cycle
- if ($object->statut > Facture::STATUS_DRAFT
- && $object->type == Facture::TYPE_SITUATION
- && $usercancreate
- && !$objectidnext
- && $object->situation_counter > 1
- && $object->is_last_in_cycle()
+ if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
+ && $object->type == Facture::TYPE_SITUATION
+ && $usercancreate
+ && !$objectidnext
+ && $object->situation_counter > 1
+ && $object->is_last_in_cycle()
&& $usercanunvalidate
)
{
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 48e2ad574ed..9c0d191f0cf 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -215,7 +215,7 @@ class FactureRec extends CommonInvoice
$now = dol_now();
// Clean parameters
- $this->titre = trim($this->titre); // deprecated
+ $this->titre = trim(isset($this->titre) ? $this->titre : $this->title); // deprecated
$this->title = trim($this->title);
$this->usenewprice = empty($this->usenewprice) ? 0 : $this->usenewprice;
if (empty($this->suspended)) $this->suspended = 0;
@@ -366,7 +366,7 @@ class FactureRec extends CommonInvoice
}
// Add object linked
- if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects))
+ if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
{
foreach ($this->linked_objects as $origin => $tmp_origin_id)
{
@@ -702,7 +702,7 @@ class FactureRec extends CommonInvoice
$line->total_ht = $objp->total_ht;
$line->total_tva = $objp->total_tva;
$line->total_ttc = $objp->total_ttc;
- $line->code_ventilation = $objp->fk_code_ventilation;
+ //$line->code_ventilation = $objp->fk_code_ventilation;
$line->fk_fournprice = $objp->fk_fournprice;
$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
$line->pa_ht = $marginInfos[0];
@@ -935,9 +935,9 @@ class FactureRec extends CommonInvoice
$sql .= ", ".price2num($txtva);
$sql .= ", '".$this->db->escape($vat_src_code)."'";
$sql .= ", ".price2num($txlocaltax1);
- $sql .= ", '".$this->db->escape($localtaxes_type[0])."'";
+ $sql .= ", '".$this->db->escape(isset($localtaxes_type[0]) ? $localtaxes_type[0] : '')."'";
$sql .= ", ".price2num($txlocaltax2);
- $sql .= ", '".$this->db->escape($localtaxes_type[2])."'";
+ $sql .= ", '".$this->db->escape(isset($localtaxes_type[2]) ? $localtaxes_type[2] : '')."'";
$sql .= ", ".(!empty($fk_product) ? "'".$this->db->escape($fk_product)."'" : "null");
$sql .= ", ".$product_type;
$sql .= ", ".price2num($remise_percent);
@@ -1996,7 +1996,7 @@ class FactureLigneRec extends CommonInvoiceLine
$this->localtax1_type = $objp->localtax1_type;
$this->localtax2_type = $objp->localtax2_type;
$this->remise_percent = $objp->remise_percent;
- $this->fk_remise_except = $objp->fk_remise_except;
+ //$this->fk_remise_except = $objp->fk_remise_except;
$this->fk_product = $objp->fk_product;
$this->date_start_fill = $objp->date_start_fill;
$this->date_end_fill = $objp->date_end_fill;
@@ -2004,7 +2004,7 @@ class FactureLigneRec extends CommonInvoiceLine
$this->total_ht = $objp->total_ht;
$this->total_tva = $objp->total_tva;
$this->total_ttc = $objp->total_ttc;
- $this->code_ventilation = $objp->fk_code_ventilation;
+ //$this->code_ventilation = $objp->fk_code_ventilation;
$this->rang = $objp->rang;
$this->special_code = $objp->special_code;
$this->fk_unit = $objp->fk_unit;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 5f7bf4fcf77..ac1270ed550 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -868,7 +868,7 @@ class Facture extends CommonInvoice
$line->situation_percent,
$line->fk_prev_id,
$line->fk_unit,
- $line->pu_ht_devise,
+ $line->multicurrency_subprice,
$line->ref_ext
);
if ($result < 0)
@@ -968,7 +968,7 @@ class Facture extends CommonInvoice
$_facrec->lines[$i]->situation_percent,
'',
$_facrec->lines[$i]->fk_unit,
- $_facrec->lines[$i]->pu_ht_devise
+ $_facrec->lines[$i]->multicurrency_subprice
);
if ($result_insert < 0)
@@ -2971,7 +2971,7 @@ class Facture extends CommonInvoice
* @param int $situation_percent Situation advance percentage
* @param int $fk_prev_id Previous situation line id reference
* @param string $fk_unit Code of the unit to use. Null to use the default one
- * @param double $pu_ht_devise Unit price in currency
+ * @param double $pu_ht_devise Unit price in foreign currency
* @param string $ref_ext External reference of the line
* @return int <0 if KO, Id of line if OK
*/
@@ -3136,8 +3136,8 @@ class Facture extends CommonInvoice
$this->line->tva_tx = $txtva;
$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
- $this->line->localtax1_type = isset($localtaxes_type[0]) ? $localtaxes_type[0] : '';
- $this->line->localtax2_type = isset($localtaxes_type[2]) ? $localtaxes_type[2] : '';
+ $this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+ $this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
$this->line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
$this->line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc); // For credit note and if qty is negative, total is negative
@@ -3375,8 +3375,8 @@ class Facture extends CommonInvoice
$this->line->tva_tx = $txtva;
$this->line->localtax1_tx = $txlocaltax1;
$this->line->localtax2_tx = $txlocaltax2;
- $this->line->localtax1_type = $localtaxes_type[0];
- $this->line->localtax2_type = $localtaxes_type[2];
+ $this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+ $this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
$this->line->remise_percent = $remise_percent;
$this->line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ?-abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index c0abc5a6028..6beb5caa1e2 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -135,14 +135,8 @@ $arrayfields = array(
'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
);
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
- {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
- $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 7e852846d5c..d50813cbea4 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -213,7 +213,7 @@ if ($object->id > 0)
$head = facture_prepare_head($object);
}
- print dol_get_fiche_head($head, 'standingorders', $title, -1, 'bill');
+ print dol_get_fiche_head($head, 'standingorders', $title, -1, ($type == 'bank-transfer' ? 'supplier_invoice' : 'bill'));
// Invoice content
if ($type == 'bank-transfer') {
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 8a1655cdefb..3072dcdee2b 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -229,6 +229,8 @@ if ($modecompta == 'BOOKKEEPING')
print "\n";
+$total_ht_outcome = $total_ttc_outcome = $total_ht_income = $total_ttc_income = 0;
+
if ($modecompta == 'BOOKKEEPING')
{
@@ -438,16 +440,97 @@ if ($modecompta == 'BOOKKEEPING')
if ($total_ttc == 0)
{
print '
';
- print ''.$langs->trans("None").' ';
+ print ''.$langs->trans("None").' ';
}
+ $total_ht_income += $total_ht;
+ $total_ttc_income += $total_ttc;
print '
';
if ($modecompta == 'CREANCES-DETTES')
print ''.price($total_ht).' ';
print ''.price($total_ttc).' ';
print ' ';
+ /*
+ * Donations
+ */
+
+ if (!empty($conf->don->enabled))
+ {
+ print '
'.$langs->trans("Donations").' ';
+
+ if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
+ {
+ if ($modecompta == 'CREANCES-DETTES')
+ {
+ $sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+ $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+ $sql .= " WHERE p.entity IN (".getEntity('donation').")";
+ $sql .= " AND fk_statut in (1,2)";
+ } else {
+ $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+ $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
+ $sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
+ $sql .= " WHERE p.entity IN (".getEntity('donation').")";
+ $sql .= " AND fk_statut >= 2";
+ }
+ if (!empty($date_start) && !empty($date_end))
+ $sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
+ }
+ $sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
+ $newsortfield = $sortfield;
+ if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.societe, p.firstname, p.lastname, dm';
+ if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
+ if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+ $sql .= $db->order($newsortfield, $sortorder);
+
+ dol_syslog("get dunning");
+ $result = $db->query($sql);
+ $subtotal_ht = 0;
+ $subtotal_ttc = 0;
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+ $i = 0;
+ if ($num)
+ {
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($result);
+
+ $total_ht += $obj->amount;
+ $total_ttc += $obj->amount;
+ $subtotal_ht += $obj->amount;
+ $subtotal_ttc += $obj->amount;
+
+ print '
';
+
+ print "".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name." ".$obj->firstname." ".$obj->lastname." \n";
+
+ if ($modecompta == 'CREANCES-DETTES') print ''.price($obj->amount).' ';
+ print ''.price($obj->amount).' ';
+ print '';
+ $i++;
+ }
+ } else {
+ print '
';
+ print ''.$langs->trans("None").' ';
+ }
+ } else {
+ dol_print_error($db);
+ }
+
+ $total_ht_income += $subtotal_ht;
+ $total_ttc_income += $subtotal_ttc;
+ print '
';
+ if ($modecompta == 'CREANCES-DETTES')
+ print ''.price($subtotal_ht).' ';
+ print ''.price($subtotal_ttc).' ';
+ print ' ';
+ }
/*
* Suppliers invoices
@@ -515,7 +598,7 @@ if ($modecompta == 'BOOKKEEPING')
}
} else {
print '
';
- print ''.$langs->trans("None").' ';
+ print ''.$langs->trans("None").' ';
}
@@ -523,6 +606,9 @@ if ($modecompta == 'BOOKKEEPING')
} else {
dol_print_error($db);
}
+
+ $total_ht_outcome += $subtotal_ht;
+ $total_ttc_outcome += $subtotal_ttc;
print '
';
if ($modecompta == 'CREANCES-DETTES')
print ''.price(-$subtotal_ht).' ';
@@ -530,7 +616,6 @@ if ($modecompta == 'BOOKKEEPING')
print ' ';
-
/*
* Charges sociales non deductibles
*/
@@ -592,12 +677,15 @@ if ($modecompta == 'BOOKKEEPING')
}
} else {
print '
';
- print ''.$langs->trans("None").' ';
+ print ''.$langs->trans("None").' ';
}
} else {
dol_print_error($db);
}
+
+ $total_ht_outcome += $subtotal_ht;
+ $total_ttc_outcome += $subtotal_ttc;
print '
';
if ($modecompta == 'CREANCES-DETTES')
print ''.price(-$subtotal_ht).' ';
@@ -667,36 +755,21 @@ if ($modecompta == 'BOOKKEEPING')
}
} else {
print ' ';
- print ''.$langs->trans("None").' ';
+ print ''.$langs->trans("None").' ';
}
} else {
dol_print_error($db);
}
+
+ $total_ht_outcome += $subtotal_ht;
+ $total_ttc_outcome += $subtotal_ttc;
print '
';
if ($modecompta == 'CREANCES-DETTES')
print ''.price(-$subtotal_ht).' ';
print ''.price(-$subtotal_ttc).' ';
print ' ';
- if ($mysoc->tva_assuj == 'franchise') // Non assujetti
- {
- // Total
- print '
';
- print ' ';
- print ' ';
-
- print '
'.$langs->trans("Profit").' ';
- if ($modecompta == 'CREANCES-DETTES')
- print ''.price($total_ht).' ';
- print ''.price($total_ttc).' ';
- print '';
-
- print '
';
- print ' ';
- print ' ';
- }
-
/*
* Salaries
@@ -759,12 +832,15 @@ if ($modecompta == 'BOOKKEEPING')
}
} else {
print '
';
- print ''.$langs->trans("None").' ';
+ print ''.$langs->trans("None").' ';
}
} else {
dol_print_error($db);
}
+
+ $total_ht_outcome += $subtotal_ht;
+ $total_ttc_outcome += $subtotal_ttc;
print '
';
if ($modecompta == 'CREANCES-DETTES')
print ''.price(-$subtotal_ht).' ';
@@ -841,98 +917,26 @@ if ($modecompta == 'BOOKKEEPING')
}
} else {
print ' ';
- print ''.$langs->trans("None").' ';
+ print ''.$langs->trans("None").' ';
}
} else {
dol_print_error($db);
}
+
+ $total_ht_outcome += $subtotal_ht;
+ $total_ttc_outcome += $subtotal_ttc;
print '
';
if ($modecompta == 'CREANCES-DETTES') print ''.price(-$subtotal_ht).' ';
print ''.price(-$subtotal_ttc).' ';
print ' ';
}
- /*
- * Donations
- */
-
- if (!empty($conf->don->enabled))
- {
- print '
'.$langs->trans("Donations").' ';
-
- if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
- {
- if ($modecompta == 'CREANCES-DETTES')
- {
- $sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
- $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
- $sql .= " WHERE p.entity IN (".getEntity('donation').")";
- $sql .= " AND fk_statut in (1,2)";
- } else {
- $sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
- $sql .= " FROM ".MAIN_DB_PREFIX."don as p";
- $sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
- $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
- $sql .= " WHERE p.entity IN (".getEntity('donation').")";
- $sql .= " AND fk_statut >= 2";
- }
- if (!empty($date_start) && !empty($date_end))
- $sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
- }
- $sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
- $newsortfield = $sortfield;
- if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.societe, p.firstname, p.lastname, dm';
- if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
- if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
- $sql .= $db->order($newsortfield, $sortorder);
-
- dol_syslog("get dunning");
- $result = $db->query($sql);
- $subtotal_ht = 0;
- $subtotal_ttc = 0;
- if ($result)
- {
- $num = $db->num_rows($result);
- $i = 0;
- if ($num)
- {
- while ($i < $num)
- {
- $obj = $db->fetch_object($result);
-
- $total_ht += $obj->amount;
- $total_ttc += $obj->amount;
- $subtotal_ht += $obj->amount;
- $subtotal_ttc += $obj->amount;
-
- print '
';
-
- print "".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name." ".$obj->firstname." ".$obj->lastname." \n";
-
- if ($modecompta == 'CREANCES-DETTES') print ''.price($obj->amount).' ';
- print ''.price($obj->amount).' ';
- print '';
- $i++;
- }
- } else {
- print '
';
- print ''.$langs->trans("None").' ';
- print '';
- }
- } else {
- dol_print_error($db);
- }
- print '
';
- if ($modecompta == 'CREANCES-DETTES')
- print ''.price($subtotal_ht).' ';
- print ''.price($subtotal_ttc).' ';
- print ' ';
- }
/*
* Various Payments
*/
+ //$conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY = 1;
if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{
@@ -953,12 +957,14 @@ if ($modecompta == 'BOOKKEEPING')
$result = $db->query($sql);
if ($result)
{
- // Debit
+ // Debit (payment of suppliers for example)
$obj = $db->fetch_object($result);
if (isset($obj->amount))
{
$subtotal_ht += -$obj->amount;
$subtotal_ttc += -$obj->amount;
+ $total_ht_outcome += $obj->amount;
+ $total_ttc_outcome += $obj->amount;
}
print '
';
print "".$langs->trans("Debit")." \n";
@@ -966,12 +972,14 @@ if ($modecompta == 'BOOKKEEPING')
print ''.price(-$obj->amount)." \n";
print "\n";
- // Credit
+ // Credit (payment received from customer for example)
$obj = $db->fetch_object($result);
if (isset($obj->amount))
{
$subtotal_ht += $obj->amount;
$subtotal_ttc += $obj->amount;
+ $total_ht_income += $obj->amount;
+ $total_ttc_income += $obj->amount;
}
print '
';
print "".$langs->trans("Credit")." \n";
@@ -1030,6 +1038,8 @@ if ($modecompta == 'BOOKKEEPING')
}
$total_ht += $subtotal_ht;
$total_ttc += $subtotal_ttc;
+ $total_ht_income += $subtotal_ht;
+ $total_ttc_income += $subtotal_ttc;
print '';
if ($modecompta == 'CREANCES-DETTES')
print ''.price($subtotal_ht).' ';
@@ -1050,7 +1060,7 @@ if ($modecompta == 'BOOKKEEPING')
{
if ($modecompta == 'CREANCES-DETTES')
{
- // TVA a payer
+ // VAT to pay
$amount = 0;
$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.tva) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
@@ -1091,13 +1101,15 @@ if ($modecompta == 'BOOKKEEPING')
} else {
dol_print_error($db);
}
+ $total_ht_outcome -= 0;
+ $total_ttc_outcome -= $amount;
print ' ';
print "".$langs->trans("VATToPay")." \n";
print ' '."\n";
print ''.price($amount)." \n";
print "\n";
- // TVA a recuperer
+ // VAT to retreive
$amount = 0;
$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_tva) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -1139,6 +1151,9 @@ if ($modecompta == 'BOOKKEEPING')
} else {
dol_print_error($db);
}
+ $total_ht_income += 0;
+ $total_ttc_income += $amount;
+
print '
';
print ''.$langs->trans("VATToCollect")." \n";
print ' '."\n";
@@ -1182,10 +1197,12 @@ if ($modecompta == 'BOOKKEEPING')
} else {
dol_print_error($db);
}
+ $total_ht_outcome -= 0;
+ $total_ttc_outcome -= $amount;
print ' ';
print "".$langs->trans("VATPaid")." \n";
if ($modecompta == 'CREANCES-DETTES')
- print ''.price($amount)." \n";
+ print ''.price($amount)." \n";
print "\n";
@@ -1226,16 +1243,18 @@ if ($modecompta == 'BOOKKEEPING')
} else {
dol_print_error($db);
}
+ $total_ht_income += 0;
+ $total_ttc_income += $amount;
print '
';
print "".$langs->trans("VATCollected")." \n";
if ($modecompta == 'CREANCES-DETTES')
- print ''.price($amount)." \n";
+ print ''.price($amount)." \n";
print "\n";
}
}
- if ($mysoc->tva_assuj != 'franchise') // Assujetti
+ if ($mysoc->tva_assuj != '0') // Assujetti
{
print '
';
if ($modecompta == 'CREANCES-DETTES')
@@ -1250,25 +1269,31 @@ $object = array(&$total_ht, &$total_ttc);
$parameters["mode"] = $modecompta;
$parameters["date_start"] = $date_start;
$parameters["date_end"] = $date_end;
-$parameters["bc"] = $bc;
// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('externalbalance'));
$reshook = $hookmanager->executeHooks('addBalanceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
print $hookmanager->resPrint;
-if ($mysoc->tva_assuj != 'franchise') // Assujetti
-{
- // Total
- print ' ';
- print ' ';
- print ' ';
+// Total
+print '
';
+print ' ';
+print ' ';
- print '
'.$langs->trans("Profit").' ';
- if ($modecompta == 'CREANCES-DETTES')
- print ''.price(price2num($total_ht, 'MT')).' ';
- print ''.price(price2num($total_ttc, 'MT')).' ';
- print '';
-}
+print '
'.$langs->trans("Outcome").' ';
+if ($modecompta == 'CREANCES-DETTES')
+ print ''.price(price2num(-$total_ht_outcome, 'MT')).' ';
+print ''.price(price2num(-$total_ttc_outcome, 'MT')).' ';
+print '';
+print '
'.$langs->trans("Income").' ';
+if ($modecompta == 'CREANCES-DETTES')
+ print ''.price(price2num($total_ht_income, 'MT')).' ';
+print ''.price(price2num($total_ttc_income, 'MT')).' ';
+print '';
+print '
'.$langs->trans("Profit").' ';
+if ($modecompta == 'CREANCES-DETTES')
+ print ''.price(price2num($total_ht, 'MT')).' ';
+print ''.price(price2num($total_ttc, 'MT')).' ';
+print '';
print "
";
print '
';
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 2ea2497efbb..ffb2d04e155 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -512,13 +512,13 @@ class ChargeSociales extends CommonObject
* Return a link to the object card (with optionaly the picto)
*
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
- * @param int $maxlen Max length of label
+ * @param string $option On what the link point to ('nolink', ...)
* @param int $notooltip 1=Disable tooltip
* @param int $short 1=Return just URL
* @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
* @return string String with link
*/
- public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $short = 0, $save_lastsearch_value = -1)
+ public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $short = 0, $save_lastsearch_value = -1)
{
global $langs, $conf, $user, $form;
@@ -569,7 +569,7 @@ class ChargeSociales extends CommonObject
$result .= $linkstart;
if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
- if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref);
+ if ($withpicto != 2) $result .= $this->ref;
$result .= $linkend;
return $result;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 752bdc4d642..23297438e19 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1129,13 +1129,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
// Note Public
print '
'.$langs->trans("NotePublic").' ';
- $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' ';
// Note Private
print '
'.$langs->trans("NotePrivate").' ';
- $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' ';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 2e692dc25c4..3ed21f03873 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1174,14 +1174,14 @@ if ($action == 'create')
}
print '
'.$langs->trans("NotePublic").' ';
- $doleditor = new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', '100', 'dolibarr_notes', 'In', 1, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' ';
if (empty($user->socid))
{
print '
'.$langs->trans("NotePrivate").' ';
- $doleditor = new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', '100', 'dolibarr_notes', 'In', 1, true, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' ';
}
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index bd5b39f717b..72a8ec2974d 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -131,14 +131,8 @@ $arrayfields = array(
'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
);
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
- {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
- $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
@@ -208,7 +202,7 @@ $contracttmp = new Contrat($db);
$sql = 'SELECT';
$sql .= " c.rowid, c.ref, c.datec as date_creation, c.tms as date_update, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
-$sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip, s.fk_pays as country_id, s.client, s.code_client, s.status as company_status, s.logo as company_logo,';
$sql .= " typent.code as typent_code,";
$sql .= " state.code_departement as state_code, state.nom as state_name,";
$sql .= " MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") as lower_planned_end_date,";
@@ -263,7 +257,7 @@ $parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
$sql .= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
-$sql .= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql .= ' s.rowid, s.nom, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, s.status, s.logo,';
$sql .= " typent.code,";
$sql .= " state.code_departement, state.nom";
// Add fields from extrafields
@@ -341,7 +335,7 @@ if ($socid > 0)
$param = '';
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
if ($sall != '') $param .= '&sall='.urlencode($sall);
if ($search_contract != '') $param .= '&search_contract='.urlencode($search_contract);
if ($search_name != '') $param .= '&search_name='.urlencode($search_name);
@@ -596,6 +590,10 @@ if (!empty($arrayfields['status']['checked'])) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
print "
\n";
+$totalarray = array();
+$typenArray = array();
+$cacheCountryIDCode = array();
+
while ($i < min($num, $limit))
{
$obj = $db->fetch_object($resql);
@@ -608,6 +606,24 @@ while ($i < min($num, $limit))
if ($obj->socid > 0) {
$result = $socstatic->fetch($obj->socid);
}
+ /*$socstatic->id = $obj->socid;
+ $socstatic->name = $obj->name;
+ $socstatic->name_alias = $obj->name_alias;
+ $socstatic->email = $obj->email;
+ $socstatic->status = $obj->company_status;
+ $socstatic->logo = $obj->logo;
+ $socstatic->country_id = $obj->country_id;
+ $socstatic->country_code = '';
+ $socstatic->country = '';*/
+ if ($obj->country_id > 0) {
+ if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) {
+ $tmparray = getCountry($obj->country_id, 'all');
+ $cacheCountryIDCode[$obj->country_id] = array('code'=> empty($tmparray['code']) ? '' : $tmparray['code'], 'label' => empty($tmparray['label']) ? '' : $tmparray['label']);
+ }
+ $socstatic->country_code = $cacheCountryIDCode[$obj->country_id]['code'];
+ $socstatic->country = $cacheCountryIDCode[$obj->country_id]['label'];
+ }
+
print '';
@@ -643,9 +659,8 @@ while ($i < min($num, $limit))
if (!empty($arrayfields['s.nom']['checked']))
{
print '';
- //print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.' ';
- if ($obj->socid > 0)
- {
+ if ($obj->socid > 0) {
+ // TODO Use a cache for this string
print $socstatic->getNomUrl(1, '');
}
print ' ';
@@ -680,8 +695,7 @@ while ($i < min($num, $limit))
if (!empty($arrayfields['country.code_iso']['checked']))
{
print '';
- $tmparray = getCountry($obj->fk_pays, 'all');
- print $tmparray['label'];
+ print $socstatic->country;
print ' ';
if (!$i) $totalarray['nbfield']++;
}
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 67b605d657f..4de651a24f9 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -130,14 +130,8 @@ $arrayfields = array(
'cd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
);
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
- {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
- $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 5a93a6ded0b..1c874fd2418 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -261,7 +261,7 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete))
// Remove a line
if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissiontoadd))
{
- if (method_exists('deleteline', $object)) {
+ if (method_exists($object, 'deleteline')) {
$result = $object->deleteline($user, $lineid); // For backward compatibility
} else {
$result = $object->deleteLine($user, $lineid);
diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php
index 6ffce6d781b..5b6130d8eb2 100644
--- a/htdocs/core/boxes/box_funnel_of_prospection.php
+++ b/htdocs/core/boxes/box_funnel_of_prospection.php
@@ -61,9 +61,9 @@ class box_funnel_of_prospection extends ModeleBoxes
$this->db = $db;
- $this->enabled = ($conf->global->MAIN_FEATURES_LEVEL >= 1); // Not enabled by default, still need some work
+ $this->enabled = ($conf->global->MAIN_FEATURES_LEVEL >= 1 ? 1 : 0); // Not enabled by default, still need some work
- $this->hidden = !($user->rights->projet->lire);
+ $this->hidden = empty($user->rights->projet->lire);
}
/**
diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 81e73f4e0c1..2ac81c80d16 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -71,7 +71,7 @@ class box_scheduled_jobs extends ModeleBoxes
*/
public function loadBox($max = 5)
{
- global $user, $langs, $conf;
+ global $user, $langs, $conf, $form;
$langs->load("cron");
$this->info_box_head = array('text' => $langs->trans("BoxScheduledJobs", $max));
@@ -117,7 +117,7 @@ class box_scheduled_jobs extends ModeleBoxes
$cronstatic->getNomUrl(1),
$cronstatic->datelastrun,
$cronstatic->status,
- $cronstatic->getLibStatut(2)
+ $cronstatic->getLibStatut(3)
);
$line++;
}
@@ -135,37 +135,37 @@ class box_scheduled_jobs extends ModeleBoxes
$cronstatic->getNomUrl(1),
$cronstatic->datenextrun,
$cronstatic->status,
- $cronstatic->getLibStatut(2)
+ $cronstatic->getLibStatut(3)
);
}
foreach ($resultarray as $line => $value) {
$this->info_box_contents[$line][] = array(
- 'td' => 'class="left"',
+ 'td' => 'class="tdoverflowmax200"',
'text' => $resultarray[$line][0]
);
$this->info_box_contents[$line][] = array(
- 'td' => 'class="left"',
+ 'td' => 'class="nowraponall"',
'textnoformat' => $resultarray[$line][1]
);
$this->info_box_contents[$line][] = array(
'td' => 'class="right"',
- 'textnoformat' => dol_print_date($resultarray[$line][2], "dayhoursec")
+ 'textnoformat' => (empty($resultarray[$line][2]) ? '' : $form->textwithpicto(dol_print_date($resultarray[$line][2], "dayhoursec"), $langs->trans("CurrentTimeZone")))
);
$this->info_box_contents[$line][] = array(
- 'td' => 'class="right" ',
+ 'td' => 'class="center" ',
'textnoformat' => $resultarray[$line][4]
);
$line++;
}
$this->info_box_contents[$line][] = array(
- 'td' => 'class="left" colspan="2"',
+ 'td' => 'class="tdoverflowmax300" colspan="3"',
'text' => $langs->trans("NumberScheduledJobError")
);
$this->info_box_contents[$line][] = array(
- 'td' => 'class="right" colspan="2"',
- 'textnoformat' => ($nbjobsinerror ? ''.$nbjobsinerror.' '.$langs->trans("None").'')
+ 'td' => 'class="center"',
+ 'textnoformat' => ($nbjobsinerror ? '
0
')
);
} else {
$this->info_box_contents[0][0] = array(
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 1e32a28f25c..9faf45932e2 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -56,7 +56,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
/**
* @var boolean Condition to have widget visible (in most cases, permissions)
*/
- public $hidden = 0;
+ public $hidden = false;
/**
* @var int Box definition database ID
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index d19e6d00a36..561d0527796 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -162,9 +162,9 @@ class Ccountry // extends CommonObject
$sql .= " t.label,";
$sql .= " t.active";
$sql .= " FROM ".MAIN_DB_PREFIX."c_country as t";
- if ($id) $sql .= " WHERE t.rowid = ".$id;
- elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
- elseif ($code_iso) $sql .= " WHERE t.code_iso = '".$this->db->escape($code_iso)."'";
+ if ($id) $sql .= " WHERE t.rowid = ".((int) $id);
+ elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape(strtoupper($code))."'";
+ elseif ($code_iso) $sql .= " WHERE t.code_iso = '".$this->db->escape(strtoupper($code_iso))."'";
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql = $this->db->query($sql);
@@ -174,11 +174,13 @@ class Ccountry // extends CommonObject
{
$obj = $this->db->fetch_object($resql);
- $this->id = $obj->rowid;
- $this->code = $obj->code;
- $this->code_iso = $obj->code_iso;
- $this->label = $obj->label;
- $this->active = $obj->active;
+ if ($obj) {
+ $this->id = $obj->rowid;
+ $this->code = $obj->code;
+ $this->code_iso = $obj->code_iso;
+ $this->label = $obj->label;
+ $this->active = $obj->active;
+ }
$this->db->free($resql);
return 1;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b095712d972..de4f2bc367c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -210,6 +210,11 @@ abstract class CommonObject
*/
public $ref_next;
+ /**
+ * @var string Ref to store on object to save the new ref to use for example when making a validate() of an object
+ */
+ public $newref;
+
/**
* @var int The object's status
* @see setStatut()
@@ -350,7 +355,7 @@ abstract class CommonObject
public $last_main_doc;
/**
- * @var int Bank account ID
+ * @var int Bank account ID sometimes, ID of record into llx_bank sometimes
* @deprecated
* @see $fk_account
*/
@@ -2949,18 +2954,25 @@ abstract class CommonObject
// Special cas
if ($this->table_element == 'product' && $newsuffix == '_private') $newsuffix = '';
-
+ if (in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
+ $fieldusermod = "fk_user_mod";
+ } elseif ($this->table_element == 'ecm_files') {
+ $fieldusermod = "fk_user_m";
+ } else {
+ $fieldusermod = "fk_user_modif";
+ }
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql .= " SET note".$newsuffix." = ".(!empty($note) ? ("'".$this->db->escape($note)."'") : "NULL");
- $sql .= " ,".(in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment')) ? "fk_user_mod" : "fk_user_modif")." = ".$user->id;
+ $sql .= " ,".$fieldusermod." = ".$user->id;
$sql .= " WHERE rowid =".$this->id;
dol_syslog(get_class($this)."::update_note", LOG_DEBUG);
- if ($this->db->query($sql))
- {
- if ($suffix == '_public') $this->note_public = $note;
- elseif ($suffix == '_private') $this->note_private = $note;
- else {
+ if ($this->db->query($sql)) {
+ if ($suffix == '_public') {
+ $this->note_public = $note;
+ } elseif ($suffix == '_private') {
+ $this->note_private = $note;
+ } else {
$this->note = $note; // deprecated
$this->note_private = $note;
}
@@ -3287,7 +3299,7 @@ abstract class CommonObject
/**
* Fetch array of objects linked to current object (object of enabled modules only). Links are loaded into
- * this->linkedObjectsIds array and
+ * this->linkedObjectsIds array +
* this->linkedObjects array if $loadalsoobjects = 1
* Possible usage for parameters:
* - all parameters empty -> we look all link to current object (current object can be source or target)
@@ -3400,6 +3412,7 @@ abstract class CommonObject
{
// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
$module = $element = $subelement = $objecttype;
+ $regs = array();
if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
{
@@ -7154,20 +7167,20 @@ abstract class CommonObject
$dir = $sdir.'/';
$pdir = '/';
- $dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
- $pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/';
+ $dir .= get_exdir(0, 0, 0, 0, $this, $modulepart);
+ $pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart);
// For backward compatibility
- if ($modulepart == 'product' && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
- {
- $dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
- $pdir = '/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
+ if ($modulepart == 'product') {
+ if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+ $dir = $sdir.'/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
+ $pdir = '/'.get_exdir($this->id, 2, 0, 0, $this, $modulepart).$this->id."/photos/";
+ }
}
// Defined relative dir to DOL_DATA_ROOT
$relativedir = '';
- if ($dir)
- {
+ if ($dir) {
$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);
$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
$relativedir = preg_replace('/[\\/]$/', '', $relativedir);
@@ -7189,23 +7202,19 @@ abstract class CommonObject
completeFileArrayWithDatabaseInfo($filearray, $relativedir);
- if (count($filearray))
- {
- if ($sortfield && $sortorder)
- {
+ if (count($filearray)) {
+ if ($sortfield && $sortorder) {
$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
}
- foreach ($filearray as $key => $val)
- {
+ foreach ($filearray as $key => $val) {
$photo = '';
$file = $val['name'];
//if (! utf8_check($file)) $file=utf8_encode($file); // To be sure file is stored in UTF8 in memory
//if (dol_is_file($dir.$file) && image_format_supported($file) >= 0)
- if (image_format_supported($file) >= 0)
- {
+ if (image_format_supported($file) >= 0) {
$nbphoto++;
$photo = $file;
$viewfilename = $file;
@@ -7242,12 +7251,9 @@ abstract class CommonObject
$alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
if ($notitle) $alt = '';
- if ($usesharelink)
- {
- if ($val['share'])
- {
- if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
- {
+ if ($usesharelink) {
+ if ($val['share']) {
+ if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight) {
$return .= '';
$return .= '';
+ $return = '';
$options = array(
'HT'=>$langs->trans("HT"),
'TTC'=>$langs->trans("TTC")
@@ -3635,6 +3634,7 @@ class Form
$return .= '';
}
$return .= ' ';
+ if ($addjscombo) $return .= ajax_combobox('select_'.$htmlname);
return $return;
}
@@ -3939,13 +3939,16 @@ class Form
* @param string $moreattrib To add more attribute on select
* @param int $showcurrency Show currency in label
* @param string $morecss More CSS
+ * @param int $nooutput 1=Return string, do not send to output
* @return int <0 if error, Num of bank account found if OK (0, 1, 2, ...)
*/
- public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '')
+ public function select_comptes($selected = '', $htmlname = 'accountid', $status = 0, $filtre = '', $useempty = 0, $moreattrib = '', $showcurrency = 0, $morecss = '', $nooutput = 0)
{
// phpcs:enable
global $langs, $conf;
+ $out = '';
+
$langs->load("admin");
$num = 0;
@@ -3964,10 +3967,10 @@ class Form
$i = 0;
if ($num)
{
- print '';
+ $out .= '';
if ($useempty == 1 || ($useempty == 2 && $num > 1))
{
- print ' ';
+ $out .= ' ';
}
while ($i < $num)
@@ -3975,26 +3978,30 @@ class Form
$obj = $this->db->fetch_object($result);
if ($selected == $obj->rowid || ($useempty == 2 && $num == 1 && empty($selected)))
{
- print '';
+ $out .= ' ';
} else {
- print ' ';
+ $out .= ' ';
}
- print trim($obj->label);
- if ($showcurrency) print ' ('.$obj->currency_code.')';
- if ($status == 2 && $obj->status == 1) print ' ('.$langs->trans("Closed").')';
- print ' ';
+ $out .= trim($obj->label);
+ if ($showcurrency) $out .= ' ('.$obj->currency_code.')';
+ if ($status == 2 && $obj->status == 1) $out .= ' ('.$langs->trans("Closed").')';
+ $out .= '';
$i++;
}
- print " ";
- print ajax_combobox('select'.$htmlname);
+ $out .= " ";
+ $out .= ajax_combobox('select'.$htmlname);
} else {
- if ($status == 0) print ''.$langs->trans("NoActiveBankAccountDefined").' ';
- else print ''.$langs->trans("NoBankAccountFound").' ';
+ if ($status == 0) $out .= ''.$langs->trans("NoActiveBankAccountDefined").' ';
+ else $out .= ''.$langs->trans("NoBankAccountFound").' ';
}
} else {
dol_print_error($this->db);
}
+ // Output or return
+ if (empty($nooutput)) print $out;
+ else return $out;
+
return $num;
}
@@ -4709,7 +4716,7 @@ class Form
$ret .= '';
$ret .= $this->selectDate($selected, $htmlname, $displayhour, $displaymin, 1, 'form'.$htmlname, 1, 0);
$ret .= ' ';
- $ret .= '
';
} else {
if ($displayhour) $ret .= dol_print_date($selected, 'dayhour');
@@ -6259,12 +6266,6 @@ class Form
$resql = $this->db->query($sql);
if ($resql)
{
- if (!$forcecombo)
- {
- include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
- $out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);
- }
-
// Construct $out and $outarray
$out .= ''."\n";
@@ -6310,6 +6311,11 @@ class Form
}
$out .= ' '."\n";
+
+ if (!$forcecombo) {
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+ $out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);
+ }
} else {
dol_print_error($this->db);
}
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 0b4c4e499e3..26e184eb614 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -1008,4 +1008,44 @@ class FormCompany extends Form
return $out;
}
+
+ /**
+ * Output html select to select third-party type
+ *
+ * @param string $page Page
+ * @param string $selected Id preselected
+ * @param string $htmlname Name of HTML select
+ * @param string $filter optional filters criteras
+ * @param int $nooutput No print output. Return it only.
+ * @return void|string
+ */
+ public function formThirdpartyType($page, $selected = '', $htmlname = 'socid', $filter = '', $nooutput = 0)
+ {
+ // phpcs:enable
+ global $langs;
+
+ $out = '';
+ if ($htmlname != "none")
+ {
+ $out .= '';
+ } else {
+ if ($selected)
+ {
+ $arr = $this->typent_array(0);
+ $typent = $arr[$selected];
+ $out .= $typent;
+ } else {
+ $out .= " ";
+ }
+ }
+
+ if ($nooutput) return $out;
+ else print $out;
+ }
}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 437cef27afc..6836b70fe2d 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1254,7 +1254,7 @@ class FormFile
} else {
print '';
}
- print ' ';
} else print ' ';
print ' ';
@@ -1779,7 +1779,7 @@ class FormFile
print ''."\n";
// Show list of associated links
- print load_fiche_titre($langs->trans("LinkedFiles"), '', 'external-link-square-alt', 0, '', 'table-list-of-links');
+ print load_fiche_titre($langs->trans("LinkedFiles"), '', 'link', 0, '', 'table-list-of-links');
print '
';
}
- $texte .= '';
+ $texte .= '
';
+ // Show list of found files
foreach ($listoffiles as $file) {
- $texte .= $file['name'].'
';
+ $texte .= '- '.$file['name'].'
'.img_picto('', 'listlight').' ';
}
$texte .= '
';
}
diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
index 6e68dd94bea..d2d77cf3b5c 100644
--- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
@@ -23,7 +23,7 @@ if (!empty($extrafieldsobjectkey)) // $extrafieldsobject is the $object->table_e
'label' => $extrafields->attributes[$extrafieldsobjectkey]['label'][$key],
'checked' => (($extrafields->attributes[$extrafieldsobjectkey]['list'][$key] < 0) ? 0 : 1),
'position' => $extrafields->attributes[$extrafieldsobjectkey]['pos'][$key],
- 'enabled' => (abs($extrafields->attributes[$extrafieldsobjectkey]['list'][$key]) != 3 && $extrafields->attributes[$extrafieldsobjectkey]['perms'][$key]),
+ 'enabled' => (abs((int) $extrafields->attributes[$extrafieldsobjectkey]['list'][$key]) != 3 && $extrafields->attributes[$extrafieldsobjectkey]['perms'][$key]),
'langfile' => $extrafields->attributes[$extrafieldsobjectkey]['langfile'][$key],
'help' => $extrafields->attributes[$extrafieldsobjectkey]['help'][$key],
);
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 283f9eeb873..ec098be9db7 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -79,11 +79,16 @@ if ($module == 'propal') {
$permission = $user->rights->expedition->creer;
} elseif ($module == 'product') {
$permission = $user->rights->produit->creer;
+} elseif ($module == 'ecmfiles') {
+ $permission = $user->rights->ecm->setup;
}
//else dol_print_error('','Bad value '.$module.' for param module');
-if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
-else $typeofdata = 'textarea:12:95%';
+if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) {
+ $typeofdata = 'ckeditor:dolibarr_notes:100%:200::1:12:95%:0'; // Rem: This var is for all notes, not only thirdparties note.
+} else {
+ $typeofdata = 'textarea:12:95%';
+}
print ''."\n";
print '
'."\n";
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index b0e5936d326..facb5976f85 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -623,12 +623,12 @@ if (($action == "create") || ($action == "edit"))
print '
';
print $langs->trans('CronDtStart')." ";
- if (!empty($object->datestart)) {print dol_print_date($object->datestart, 'dayhoursec'); }
+ if (!empty($object->datestart)) {print $form->textwithpicto(dol_print_date($object->datestart, 'dayhoursec'), $langs->trans("CurrentTimeZone")); }
print " ";
print $langs->trans('CronDtEnd')." ";
- if (!empty($object->dateend)) {print dol_print_date($object->dateend, 'dayhoursec'); }
+ if (!empty($object->dateend)) {print $form->textwithpicto(dol_print_date($object->dateend, 'dayhoursec'), $langs->trans("CurrentTimeZone")); }
print " ";
@@ -653,7 +653,7 @@ if (($action == "create") || ($action == "edit"))
print ' ('.$langs->trans('CronFrom').')';
print " ";
if (!$object->status) print $langs->trans("Disabled");
- elseif (!empty($object->datenextrun)) { print img_picto('', 'object_calendarday').' '.dol_print_date($object->datenextrun, 'dayhoursec'); } else { print $langs->trans('CronNone'); }
+ elseif (!empty($object->datenextrun)) { print img_picto('', 'object_calendarday').' '.$form->textwithpicto(dol_print_date($object->datenextrun, 'dayhoursec'), $langs->trans("CurrentTimeZone")); } else { print $langs->trans('CronNone'); }
if ($object->status == Cronjob::STATUS_ENABLED)
{
if ($object->maxrun && $object->nbrun >= $object->maxrun) print img_warning($langs->trans("MaxRunReached"));
@@ -672,12 +672,12 @@ if (($action == "create") || ($action == "edit"))
print ' ';
print $langs->trans('CronDtLastLaunch')." ";
- if (!empty($object->datelastrun)) {print dol_print_date($object->datelastrun, 'dayhoursec'); } else {print $langs->trans('CronNone'); }
+ if (!empty($object->datelastrun)) {print $form->textwithpicto(dol_print_date($object->datelastrun, 'dayhoursec'), $langs->trans("CurrentTimeZone")); } else {print $langs->trans('CronNone'); }
print " ';
print $langs->trans('CronDtLastResult')." ";
- if (!empty($object->datelastresult)) {print dol_print_date($object->datelastresult, 'dayhoursec'); } else {print $langs->trans('CronNone'); }
+ if (!empty($object->datelastresult)) {print $form->textwithpicto(dol_print_date($object->datelastresult, 'dayhoursec'), $langs->trans("CurrentTimeZone")); } else {print $langs->trans('CronNone'); }
print " ';
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index c55751e913f..cd3175cdce0 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -443,7 +443,7 @@ if ($action == 'create')
print ' '.$langs->trans('NotePublic').' ';
print '';
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' '.$langs->trans('NotePrivate').' ';
print '';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
print ' ';
}
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index c096bc27869..6392d6f162e 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -150,6 +150,12 @@ class EcmFiles extends CommonObject
*/
public $src_object_id;
+ /**
+ * @var int section_id ID of section = ID of EcmDirectory, directory of manual ECM (not stored into database)
+ */
+ public $section_id;
+
+
/**
* Constructor
@@ -389,6 +395,8 @@ class EcmFiles extends CommonObject
$sql .= " t.tms as date_m,";
$sql .= " t.fk_user_c,";
$sql .= " t.fk_user_m,";
+ $sql .= ' t.note_private,';
+ $sql .= ' t.note_public,';
$sql .= " t.acl,";
$sql .= " t.src_object_type,";
$sql .= " t.src_object_id";
@@ -450,6 +458,8 @@ class EcmFiles extends CommonObject
$this->date_m = $this->db->jdate($obj->date_m);
$this->fk_user_c = $obj->fk_user_c;
$this->fk_user_m = $obj->fk_user_m;
+ $this->note_private = $obj->note_private;
+ $this->note_public = $obj->note_public;
$this->acl = $obj->acl;
$this->src_object_type = $obj->src_object_type;
$this->src_object_id = $obj->src_object_id;
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 496afbf8568..b1c7eb0ec28 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -36,14 +36,15 @@ $action = GETPOST('action', 'aZ09');
$cancel = GETPOST('cancel', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha');
-if (!$user->rights->ecm->setup) accessforbidden();
+if (!$user->rights->ecm->setup) {
+ accessforbidden();
+}
// Get parameters
$socid = GETPOST("socid", "int");
// Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
$action = '';
$socid = $user->socid;
}
@@ -52,22 +53,26 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+ $page = 0;
+} // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "label";
+if (!$sortorder) {
+ $sortorder = "ASC";
+}
+if (!$sortfield) {
+ $sortfield = "label";
+}
$section = GETPOST("section", 'alpha');
-if (!$section)
-{
+if (!$section) {
dol_print_error('', 'Error, section parameter missing');
exit;
}
-$urlfile = GETPOST("urlfile");
-if (!$urlfile)
-{
+$urlfile = (string) dol_sanitizePathName(GETPOST("urlfile"));
+if (!$urlfile) {
dol_print_error('', "ErrorParamNotDefined");
exit;
}
@@ -75,8 +80,7 @@ if (!$urlfile)
// Load ecm object
$ecmdir = new EcmDirectory($db);
$result = $ecmdir->fetch(GETPOST("section", 'alpha'));
-if (!$result > 0)
-{
+if (!$result > 0) {
dol_print_error($db, $ecmdir->error);
exit;
}
@@ -85,13 +89,9 @@ $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
$fullpath = $conf->ecm->dir_output.'/'.$relativepath.$urlfile;
-$file = new stdClass();
-$file->section_id = $ecmdir->id;
-$file->label = $urlfile;
-
$relativetodocument = 'ecm/'.$relativepath; // $relativepath is relative to ECM dir, we need relative to document
-$filepath = $relativepath.$file->label;
-$filepathtodocument = $relativetodocument.$file->label;
+$filepath = $relativepath.$urlfile;
+$filepathtodocument = $relativetodocument.$urlfile;
// Try to load object from index
$object = new ECMFiles($db);
@@ -100,8 +100,7 @@ $extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($object->table_element);
$result = $object->fetch(0, '', $filepathtodocument);
-if ($result < 0)
-{
+if ($result < 0) {
dol_print_error($db, $object->error, $object->errors);
exit;
}
@@ -112,11 +111,9 @@ if ($result < 0)
* Actions
*/
-if ($cancel)
-{
+if ($cancel) {
$action = '';
- if ($backtopage)
- {
+ if ($backtopage) {
header("Location: ".$backtopage);
exit;
} else {
@@ -126,8 +123,7 @@ if ($cancel)
}
// Rename file
-if ($action == 'update')
-{
+if ($action == 'update') {
$error = 0;
$oldlabel = GETPOST('urlfile', 'alpha');
@@ -154,11 +150,9 @@ if ($action == 'update')
// Now we update index of file
$db->begin();
//print $oldfile.' - '.$newfile;
- if ($newlabel != $oldlabel)
- {
+ if ($newlabel != $oldlabel) {
$result = dol_move($oldfile, $newfileformove); // This include update of database
- if (!$result)
- {
+ if (!$result) {
$langs->load('errors');
setEventMessages($langs->trans('ErrorFailToRenameFile', $oldfile, $newfile), null, 'errors');
$error++;
@@ -166,27 +160,25 @@ if ($action == 'update')
// Reload object after the move
$result = $object->fetch(0, '', $newdirrelativetodocument.$newlabel);
- if ($result < 0)
- {
+ if ($result < 0) {
dol_print_error($db, $object->error, $object->errors);
exit;
}
}
- if (!$error)
- {
- if ($shareenabled)
- {
+ if (!$error) {
+ if ($shareenabled) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
$object->share = getRandomPassword(true);
} else {
$object->share = '';
}
- if ($object->id > 0)
- {
+ if ($object->id > 0) {
$ret = $extrafields->setOptionalsFromPost(null, $object);
- if ($ret < 0) $error++;
+ if ($ret < 0) {
+ $error++;
+ }
if (!$error) {
// Actions on extra fields
$result = $object->insertExtraFields();
@@ -197,8 +189,7 @@ if ($action == 'update')
}
// Call update to set the share key
$result = $object->update($user);
- if ($result < 0)
- {
+ if ($result < 0) {
setEventMessages($object->error, $object->errors, 'warnings');
}
} else {
@@ -212,15 +203,13 @@ if ($action == 'update')
$object->description = ''; // indexed content
$object->keyword = ''; // keyword content
$result = $object->create($user);
- if ($result < 0)
- {
+ if ($result < 0) {
setEventMessages($object->error, $object->errors, 'warnings');
}
}
}
- if (!$error)
- {
+ if (!$error) {
$db->commit();
$urlfile = $newlabel;
@@ -246,10 +235,11 @@ $form = new Form($db);
llxHeader();
-$head = ecm_file_prepare_head($file);
+$object->section_id = $ecmdir->id;
+$object->label = $urlfile;
+$head = ecm_file_prepare_head($object);
-if ($action == 'edit')
-{
+if ($action == 'edit') {
print '
';
}
} else {
- if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight)
- {
+ if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight) {
$return .= '';
- $return .= '