';
if ($row[0] == 'tobind') {
- print $langs->trans("Unknown");
+ print ''.$langs->trans("Unknown").' ';
} else {
print length_accountg($row[0]);
}
print ' ';
- print '';
+ print ' ';
if ($row[0] == 'tobind') {
print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
} else {
@@ -344,13 +386,13 @@ print '';
print '';
print '
';
-print ''.$langs->trans("Account").' ';
-print ''.$langs->trans("Label").' ';
+print ''.$langs->trans("Account").' ';
+print ''.$langs->trans("Label").' ';
for ($i = 1; $i <= 12; $i++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
if ($j > 12) {
@@ -404,7 +446,7 @@ if ($resql) {
}
print '';
- print '';
+ print ' ';
if ($row[0] == 'tobind') {
print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
} else {
@@ -436,7 +478,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
print '';
print '
';
- print ''.$langs->trans("TotalVente").' ';
+ print ''.$langs->trans("TotalVente").' ';
for ($i = 1; $i <= 12; $i++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
if ($j > 12) {
@@ -497,7 +539,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
print "';
print '
';
- print ''.$langs->trans("TotalMarge").' ';
+ print ''.$langs->trans("TotalMarge").' ';
for ($i = 1; $i <= 12; $i++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
if ($j > 12) {
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 55700fe8439..1e7c38b2607 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -369,9 +369,9 @@ if ($result) {
print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
print ''.$langs->trans("DescVentilDoneCustomer").' ';
// Line id
- print ''.$objp->rowid.' ';
+ print ''.$facture_static_det->id.' ';
// Ref Invoice
print ''.$facture_static->getNomUrl(1).' ';
- print ''.dol_print_date($db->jdate($objp->datef), 'day').' ';
+ print ''.dol_print_date($db->jdate($facture_static->datef), 'day').' ';
// Ref Product
print '';
if ($product_static->id > 0) {
print $product_static->getNomUrl(1);
}
- if ($objp->product_label) {
- print ''.$objp->product_label.' ';
+ if ($product_static->label) {
+ print ''.$product_static->label.' ';
}
print ' ';
// Description
print '';
- $text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
+ $text = dolGetFirstLineOfText(dol_string_nohtmltag($facture_static_det->desc));
$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
- print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
+ print $form->textwithtooltip(dol_trunc($text, $trunclength), $facture_static_det->desc);
print ' ';
print '';
@@ -692,11 +634,12 @@ if ($result) {
print ' ';
// Vat rate
- if ($objp->vat_tx_l != $objp->vat_tx_p) {
+ $code_vat_differ='';
+ if ($product_static->tva_tx !== $facture_static_det->tva_tx) {
$code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
}
print '';
- print vatrate($objp->tva_tx_line.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : ''));
+ print vatrate($facture_static_det->tva_tx.($facture_static_det->vat_src_code ? ' ('.$facture_static_det->vat_src_code.')' : ''));
print ' ';
// Thirdparty
@@ -713,18 +656,18 @@ if ($result) {
// Found accounts
print '';
- $s = '1. '.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
+ $s = '1. '.(($facture_static_det->product_type == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': ';
$shelp = '';
if ($suggestedaccountingaccountbydefaultfor == 'eec') {
$shelp .= $langs->trans("SaleEEC");
} elseif ($suggestedaccountingaccountbydefaultfor == 'export') {
$shelp .= $langs->trans("SaleExport");
}
- $s .= ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : ''.$langs->trans("NotDefined").' ');
+ $s .= ($code_sell_l > 0 ? length_accountg($code_sell_l) : ''.$langs->trans("NotDefined").' ');
print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
- if ($objp->product_id > 0) {
+ if ($product_static->id > 0) {
print ''.$langs->trans("NotDefined").' ' : length_accountg($objp->code_sell_p));
+ $s .= (empty($code_sell_p) ? ''.$langs->trans("NotDefined").' ' : length_accountg($code_sell_p));
print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
} else {
print ''.$langs->trans("NotDefined").' ');
+ $s .= ($code_sell_t > 0 ? length_accountg($code_sell_t) : ''.$langs->trans("NotDefined").' ');
print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
}
print ' ';
// Suggested accounting account
print '';
- $suggestedid = $objp->aarowid_suggest;
- if (empty($suggestedid) && empty($objp->code_sell_p) && !empty($objp->code_sell_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC)) {
- if (empty($accountingaccount_codetotid_cache[$objp->code_sell_l])) {
- $tmpaccount = new AccountingAccount($db);
- $tmpaccount->fetch(0, $objp->code_sell_l, 1);
- if ($tmpaccount->id > 0) {
- $suggestedid = $tmpaccount->id;
- }
- $accountingaccount_codetotid_cache[$objp->code_sell_l] = $tmpaccount->id;
- } else {
- $suggestedid = $accountingaccount_codetotid_cache[$objp->code_sell_l];
- }
- }
- print $formaccounting->select_account($suggestedid, 'codeventil'.$objp->rowid, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
+ print $formaccounting->select_account($suggestedid, 'codeventil'.$facture_static_det->id, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
print ' ';
// Column with checkbox
print '';
- $ischecked = $objp->aarowid_suggest;
- if ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') {
+ if (!empty($suggestedid) && $suggestedaccountingaccountfor<>'') {
+ $ischecked=1;
+ } elseif ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') {
$ischecked = 0;
}
- print ' ';
print ' ';
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 1544976bb07..a7c926f9dab 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -149,13 +149,13 @@ $y = $year_current;
$buttonbind = ''.$langs->trans("ValidateHistory").' ';
-print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
//print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
print '';
print '
';
-print ''.$langs->trans("Account").' ';
-print ''.$langs->trans("Label").' ';
+print ''.$langs->trans("Account").' ';
+print ''.$langs->trans("Label").' ';
for ($i = 1; $i <= 12; $i++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
if ($j > 12) {
@@ -197,12 +197,12 @@ if ($resql) {
while ($row = $db->fetch_row($resql)) {
print '';
if ($row[0] == 'tobind') {
- print $langs->trans("Unknown");
+ print ''.$langs->trans("Unknown").' ';
} else {
print length_accountg($row[0]);
}
print ' ';
- print '';
+ print ' ';
if ($row[0] == 'tobind') {
print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
} else {
@@ -227,14 +227,14 @@ print '';
print '';
print '
';
-print ''.$langs->trans("Account").' ';
-print ''.$langs->trans("Label").' ';
+print ''.$langs->trans("Account").' ';
+print ''.$langs->trans("Label").' ';
for ($i = 1; $i <= 12; $i++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
if ($j > 12) {
@@ -276,13 +276,13 @@ if ($resql) {
while ($row = $db->fetch_row($resql)) {
print '';
if ($row[0] == 'tobind') {
- print $langs->trans("Unknown");
+ print ''.$langs->trans("Unknown").' ';
} else {
print length_accountg($row[0]);
}
print ' ';
- print '';
+ print ' ';
if ($row[0] == 'tobind') {
print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
} else {
@@ -314,7 +314,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
print '';
print '
';
- print ''.$langs->trans("Total").' ';
+ print ''.$langs->trans("Total").' ';
for ($i = 1; $i <= 12; $i++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
if ($j > 12) {
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 9633157b5b7..96ab150dd24 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -610,7 +610,7 @@ if (empty($action) || $action == 'view') {
$userstatic->id = $tabuser[$key]['id'];
$userstatic->name = $tabuser[$key]['name'];
print "".$userstatic->getNomUrl(0, 'user', 16).' - '.$accountingaccount->label." ";
- print ''.($mt >= 0 ? price($mt) : '')." ";
+ print ''.($mt >= 0 ? price($mt) : '')." ";
print ''.($mt < 0 ? price(-$mt) : '')." ";
print "'.$langs->trans("ValidateHistory").' ';
-print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
//print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
print '';
print '
';
-print ''.$langs->trans("Account").' ';
-print ''.$langs->trans("Label").' ';
+print ''.$langs->trans("Account").' ';
+print ''.$langs->trans("Label").' ';
for ($i = 1; $i <= 12; $i++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
if ($j > 12) {
@@ -309,12 +309,12 @@ if ($resql) {
while ($row = $db->fetch_row($resql)) {
print '';
if ($row[0] == 'tobind') {
- print $langs->trans("Unknown");
+ print ''.$langs->trans("Unknown").' ';
} else {
print length_accountg($row[0]);
}
print ' ';
- print '';
+ print ' ';
if ($row[0] == 'tobind') {
print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
} else {
@@ -339,13 +339,13 @@ print '';
print '';
print '
';
-print ''.$langs->trans("Account").' ';
-print ''.$langs->trans("Label").' ';
+print ''.$langs->trans("Account").' ';
+print ''.$langs->trans("Label").' ';
for ($i = 1; $i <= 12; $i++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
if ($j > 12) {
@@ -393,7 +393,7 @@ if ($resql) {
print length_accountg($row[0]);
}
print '';
- print '';
+ print ' ';
if ($row[0] == 'tobind') {
print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
} else {
@@ -425,7 +425,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
print '';
print '
';
- print ''.$langs->trans("Total").' ';
+ print ''.$langs->trans("Total").' ';
for ($i = 1; $i <= 12; $i++) {
$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
if ($j > 12) {
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index da8bc0cd5e9..61e17ab669c 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -369,9 +369,9 @@ if ($result) {
print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
print ''.$langs->trans("DescVentilDoneSupplier").' '.$langs->trans("NotDefined").' ');
- print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+ if (!empty($conf->global->ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY)) {
+ print ''.$langs->trans("NotDefined").' ');
+ print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
+ }
print '';
// Suggested accounting account
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index ecb0f7a6b09..b595402228e 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -38,10 +38,12 @@ header('Content-Type: text/csv');
include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
$accountancyexport = new AccountancyExport($db);
-if ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$EXPORT_TYPE_FEC && $type_export == "general_ledger") { // Specific filename for FEC model export into the general ledger
+// Specific filename for FEC model export into the general ledger
+if (($accountancyexport->getFormatCode($formatexportset) == 'fec' || $accountancyexport->getFormatCode($formatexportset) == 'fec2')
+ && $type_export == "general_ledger") {
// FEC format is defined here: https://www.legifrance.gouv.fr/affichCodeArticle.do?idArticle=LEGIARTI000027804775&cidTexte=LEGITEXT000006069583&dateTexte=20130802&oldAction=rechCodeArticle
if (empty($search_date_end)) {
- // TODO Get the max date into bookeeping table
+ // TODO Get the max date into bookkeeping table
$search_date_end = dol_now();
}
$datetouseforfilename = $search_date_end;
@@ -58,7 +60,7 @@ if ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$
$endaccountingperiod = dol_print_date(dol_get_last_day($tmparray['year'], $tmparray['mon']), 'dayxcard');
$completefilename = $siren."FEC".$endaccountingperiod.".txt";
-} elseif ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$EXPORT_TYPE_CIEL && $type_export == "general_ledger" && !empty($conf->global->ACCOUNTING_EXPORT_XIMPORT_FORCE_FILENAME)) {
+} elseif ($accountancyexport->getFormatCode($formatexportset) == 'ciel' && $type_export == "general_ledger" && !empty($conf->global->ACCOUNTING_EXPORT_XIMPORT_FORCE_FILENAME)) {
$completefilename = "XIMPORT.TXT";
} else {
$completefilename = ($code ? $code."_" : "").($prefix ? $prefix."_" : "").$filename.($nodateexport ? "" : $date_export).".".$format;
diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index f9b10c3ce3b..0ff0919652d 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -25,7 +25,7 @@
*/
/**
- * \file htdocs/adherents/admin/adherent.php
+ * \file htdocs/adherents/admin/member.php
* \ingroup member
* \brief Page to setup the module Foundation
*/
@@ -205,16 +205,16 @@ print ''.$langs->trans("Description").' ';
print ''.$langs->trans("Value").' ';
print "'.$langs->trans("AdherentLoginRequired").' ';
-print $form->selectyesno('ADHERENT_LOGIN_NOT_REQUIRED', (!empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED) ? 0 : 1), 1);
-print " '.$langs->trans("AdherentMailRequired").' ';
print $form->selectyesno('ADHERENT_MAIL_REQUIRED', (!empty($conf->global->ADHERENT_MAIL_REQUIRED) ? $conf->global->ADHERENT_MAIL_REQUIRED : 0), 1);
print " '.$langs->trans("AdherentLoginRequired").' ';
+print $form->selectyesno('ADHERENT_LOGIN_NOT_REQUIRED', (!empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED) ? 0 : 1), 1);
+print " '.$langs->trans("MemberSendInformationByMailByDefault").' ';
print $form->selectyesno('ADHERENT_DEFAULT_SENDINFOBYMAIL', (!empty($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL) ? $conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL : 0), 1);
@@ -404,13 +404,13 @@ foreach ($dirmodels as $reldir) {
// Active
if (in_array($name, $def)) {
print ' '."\n";
- print '';
+ print ' ';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print ' ';
} else {
print ''."\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -419,7 +419,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->MEMBER_ADDON_PDF == $name) {
print img_picto($langs->trans("Default"), 'on');
} else {
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
}
print '';
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index 87e4538248c..f00fbb6b0de 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -56,7 +56,7 @@ if ($action == 'setMEMBER_ENABLE_PUBLIC') {
if ($action == 'update') {
$public = GETPOST('MEMBER_ENABLE_PUBLIC');
- $amount = GETPOST('MEMBER_NEWFORM_AMOUNT');
+ $amount = price2num(GETPOST('MEMBER_NEWFORM_AMOUNT'), 'MT', 2);
$editamount = GETPOST('MEMBER_NEWFORM_EDITAMOUNT');
$payonline = GETPOST('MEMBER_NEWFORM_PAYONLINE');
$forcetype = GETPOST('MEMBER_NEWFORM_FORCETYPE', 'int');
@@ -205,7 +205,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
print '';
print $langs->trans("DefaultAmount");
print ' ';
- print ' '.$langs->trans("Invoices").': '.count($tmparray['refs']);
+ print ' - '.img_picto($langs->trans("Invoices"), 'bill', 'class="paddingright"').' '.$langs->trans("Invoices").' ('.count($tmparray['refs']).')';
// TODO Add alert if warning on at least one invoice late
print ' ';
}
@@ -1824,7 +1839,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '';
}
- // Login Dolibarr
+ // Login Dolibarr - Link to user
print '';
$editenable = $user->rights->adherent->creer && $user->rights->user->user->creer;
print $form->editfieldkey('LinkedToDolibarrUser', 'login', '', $object, $editenable);
@@ -1892,7 +1907,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Modify
if (!empty($user->rights->adherent->creer)) {
- print ''.$langs->trans("Modify").' '."\n";
+ print ''.$langs->trans("Modify").' '."\n";
} else {
print ''.$langs->trans("Modify").' '."\n";
}
@@ -1937,7 +1952,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
if (!empty($conf->societe->enabled) && !$object->socid) {
if ($user->rights->societe->creer) {
if (Adherent::STATUS_DRAFT != $object->statut) {
- print ''.$langs->trans("CreateDolibarrThirdParty").' '."\n";;
+ print ''.$langs->trans("CreateDolibarrThirdParty").' '."\n";
} else {
print ''.$langs->trans("CreateDolibarrThirdParty").' '."\n";
}
@@ -1950,7 +1965,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
if (!$user->socid && !$object->user_id) {
if ($user->rights->user->user->creer) {
if (Adherent::STATUS_DRAFT != $object->statut) {
- print ''.$langs->trans("CreateDolibarrLogin").' '."\n";
+ print ''.$langs->trans("CreateDolibarrLogin").' '."\n";
} else {
print ''.$langs->trans("CreateDolibarrLogin").' '."\n";
}
@@ -1964,10 +1979,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$isinspip = $mailmanspip->is_in_spip($object);
if ($isinspip == 1) {
- print ''.$langs->trans("DeleteIntoSpip").' '."\n";
+ print ''.$langs->trans("DeleteIntoSpip").' '."\n";
}
if ($isinspip == 0) {
- print ''.$langs->trans("AddIntoSpip").' '."\n";
+ print ''.$langs->trans("AddIntoSpip").' '."\n";
}
}
@@ -2038,7 +2053,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions = new FormActions($db);
- $somethingshown = $formactions->showactions($object, 'member', $socid, 1, 'listactions', $MAX, '', $morehtmlright);
+ $somethingshown = $formactions->showactions($object, $object->element, $socid, 1, 'listactions', $MAX, '', $morehtmlright);
print '';
}
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 78deca61028..0d1d1bae48b 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -574,7 +574,7 @@ class Adherent extends CommonObject
$sql .= ", ".($this->login ? "'".$this->db->escape($this->login)."'" : "null");
$sql .= ", ".($user->id > 0 ? $user->id : "null"); // Can be null because member can be created by a guest or a script
$sql .= ", null, null, '".$this->db->escape($this->morphy)."'";
- $sql .= ", ".$this->typeid;
+ $sql .= ", ".((int) $this->typeid);
$sql .= ", ".$conf->entity;
$sql .= ", ".(!empty($this->import_key) ? "'".$this->db->escape($this->import_key)."'" : "null");
$sql .= ")";
@@ -2185,6 +2185,9 @@ class Adherent extends CommonObject
if (!empty($this->ref)) {
$label .= ''.$langs->trans('Ref').': '.$this->ref;
}
+ if (!empty($this->login)) {
+ $label .= ''.$langs->trans('Login').': '.$this->login;
+ }
if (!empty($this->firstname) || !empty($this->lastname)) {
$label .= ''.$langs->trans('Name').': '.$this->getFullName($langs);
}
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index fd667ad6a2f..d55845b40c1 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -318,6 +318,7 @@ $sql .= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.skype, d.birth, d.p
$sql .= " d.fk_adherent_type as type_id, d.morphy, d.statut, d.datec as date_creation, d.tms as date_update,";
$sql .= " d.note_private, d.note_public,";
$sql .= " s.nom,";
+$sql .= " ".$db->ifsql("d.societe IS NULL", "s.nom", "d.societe")." as companyname,";
$sql .= " t.libelle as type, t.subscription,";
$sql .= " state.code_departement as state_code, state.nom as state_name,";
// Add fields from extrafields
@@ -492,7 +493,7 @@ if (GETPOSTISSET("search_status")) {
if ($search_status == Adherent::STATUS_VALIDATED && $filter == 'outofdate') {
$titre = $langs->trans("MembersListNotUpToDate");
}
- if ($search_status == Adherent::STATUS_RESILIATED) {
+ if ((string) $search_status == (string) Adherent::STATUS_RESILIATED) { // The cast to string is required to have test false when search_status is ''
$titre = $langs->trans("MembersListResiliated");
}
if ($search_status == Adherent::STATUS_EXCLUDED) {
@@ -601,7 +602,7 @@ if ($user->rights->societe->creer) {
if ($user->rights->adherent->creer && $user->rights->user->user->creer) {
$arrayofmassactions['createexternaluser'] = img_picto('', 'user', 'class="pictofixedwidth"').$langs->trans("CreateExternalUser");
}
-if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+if (in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
$arrayofmassactions = array();
}
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -833,7 +834,7 @@ if (!empty($arrayfields['d.gender']['checked'])) {
print_liste_field_titre($arrayfields['d.gender']['label'], $_SERVER['PHP_SELF'], 'd.gender', $param, "", "", $sortfield, $sortorder);
}
if (!empty($arrayfields['d.company']['checked'])) {
- print_liste_field_titre($arrayfields['d.company']['label'], $_SERVER["PHP_SELF"], 'd.societe', '', $param, '', $sortfield, $sortorder);
+ print_liste_field_titre($arrayfields['d.company']['label'], $_SERVER["PHP_SELF"], 'companyname', '', $param, '', $sortfield, $sortorder);
}
if (!empty($arrayfields['d.login']['checked'])) {
print_liste_field_titre($arrayfields['d.login']['label'], $_SERVER["PHP_SELF"], 'd.login', '', $param, '', $sortfield, $sortorder);
@@ -906,6 +907,7 @@ while ($i < min($num, $limit)) {
$memberstatic->id = $obj->rowid;
$memberstatic->ref = $obj->ref;
$memberstatic->civility_id = $obj->civility;
+ $memberstatic->login = $obj->login;
$memberstatic->lastname = $obj->lastname;
$memberstatic->firstname = $obj->firstname;
$memberstatic->gender = $obj->gender;
@@ -920,9 +922,13 @@ while ($i < min($num, $limit)) {
if (!empty($obj->fk_soc)) {
$memberstatic->fetch_thirdparty();
- $companyname = $memberstatic->thirdparty->name;
+ if ($memberstatic->thirdparty->id > 0) {
+ $companyname = $memberstatic->thirdparty->name;
+ $companynametoshow = $memberstatic->thirdparty->getNomUrl(1);
+ }
} else {
$companyname = $obj->company;
+ $companynametoshow = $obj->company;
}
$memberstatic->company = $companyname;
@@ -956,7 +962,8 @@ while ($i < min($num, $limit)) {
// Firstname
if (!empty($arrayfields['d.firstname']['checked'])) {
print ' ';
- print $obj->firstname;
+ print $memberstatic->getNomUrl(0, 0, 'card', 'fistname');
+ //print $obj->firstname;
print " \n";
if (!$i) {
$totalarray['nbfield']++;
@@ -965,7 +972,8 @@ while ($i < min($num, $limit)) {
// Lastname
if (!empty($arrayfields['d.lastname']['checked'])) {
print '';
- print $obj->lastname;
+ print $memberstatic->getNomUrl(0, 0, 'card', 'lastname');
+ //print $obj->lastname;
print " \n";
if (!$i) {
$totalarray['nbfield']++;
@@ -985,7 +993,7 @@ while ($i < min($num, $limit)) {
// Company
if (!empty($arrayfields['d.company']['checked'])) {
print '';
- print $companyname;
+ print $companynametoshow;
print " \n";
}
// Login
@@ -1095,7 +1103,9 @@ while ($i < min($num, $limit)) {
}
// EMail
if (!empty($arrayfields['d.email']['checked'])) {
- print "".dol_print_email($obj->email, 0, 0, 1)." \n";
+ print '';
+ print dol_print_email($obj->email, 0, 0, 1, 64, 1, 1);
+ print " \n";
}
// End of subscription date
$datefin = $db->jdate($obj->datefin);
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 16dfc3ccff6..e751a7b5c65 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -308,7 +308,7 @@ if ($mode) {
print '';
print ''.$val['label'].' ';
if (isset($label2)) {
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 384b00af25e..26a45271801 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -209,7 +209,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && !
// Subscription informations
$datesubscription = 0;
$datesubend = 0;
- $paymentdate = ''; // Do not use 0 here, default value is '' that means not filled where 0 means 1970-01-01
+ $paymentdate = ''; // Do not use 0 here, default value is '' that means not filled where 0 means 1970-01-01
if (GETPOST("reyear", "int") && GETPOST("remonth", "int") && GETPOST("reday", "int")) {
$datesubscription = dol_mktime(0, 0, 0, GETPOST("remonth", "int"), GETPOST("reday", "int"), GETPOST("reyear", "int"));
}
@@ -587,7 +587,7 @@ if ($rowid > 0) {
print $langs->trans("LinkedToDolibarrThirdParty");
print '';
if ($action != 'editthirdparty' && $user->rights->adherent->creer) {
- print 'id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).' id.'">'.img_edit($langs->trans('SetLinkToThirdParty'), 1).'
';
print '
';
@@ -612,7 +612,7 @@ if ($rowid > 0) {
// Show link to invoices
$tmparray = $company->getOutstandingBills('customer');
if (!empty($tmparray['refs'])) {
- print ' - '.img_picto($langs->trans("Invoices"), 'bill', 'class="paddingright"').''.$langs->trans("Invoices").': '.count($tmparray['refs']);
+ print ' - '.img_picto($langs->trans("Invoices"), 'bill', 'class="paddingright"').' '.$langs->trans("Invoices").' ('.count($tmparray['refs']).')';
// TODO Add alert if warning on at least one invoice late
print ' ';
}
@@ -623,7 +623,7 @@ if ($rowid > 0) {
print ' ';
print '';
print $langs->trans("LinkedToDolibarrUser");
@@ -631,7 +631,7 @@ if ($rowid > 0) {
if ($action != 'editlogin' && $user->rights->adherent->creer) {
print ' ';
if ($user->rights->user->user->creer) {
- print 'id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).' ';
+ print 'id.'">'.img_edit($langs->trans('SetLinkToUser'), 1).' ';
}
print ' ';
}
@@ -641,7 +641,9 @@ if ($rowid > 0) {
$form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'userid', '');
} else {
if ($object->user_id) {
- $form->form_users($_SERVER['PHP_SELF'].'?rowid='.$object->id, $object->user_id, 'none');
+ $linkeduser = new User($db);
+ $linkeduser->fetch($object->user_id);
+ print $linkeduser->getNomUrl(-1);
} else {
print ''.$langs->trans("NoDolibarrAccess").' ';
}
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 3f4a3872980..b0a6e40d3ca 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -394,7 +394,7 @@ if ($rowid && $action != 'edit') {
/*
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
$formactions = new FormActions($db);
- $somethingshown = $formactions->showactions($object, 'invoice', $socid, 1);
+ $somethingshown = $formactions->showactions($object, $object->element, $socid, 1);
*/
print '';
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 0414bf20a14..7aa2f39a3ff 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -45,7 +45,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
}
echo '';
echo ''.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').' '.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').' ';
if ($user->rights->adherent->creer) {
- print ''.img_edit().' ';
+ print ''.img_edit().' ';
}
if ($user->rights->adherent->supprimer) {
- print ''.img_picto($langs->trans("Resiliate"), 'disable.png').' ';
+ print ''.img_picto($langs->trans("Resiliate"), 'disable.png').' ';
}
print " ";
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 63ff01584b0..88f45c9c20e 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -185,9 +185,9 @@ print "\n\n";
if ($action == '') {
if ($user->rights->produit->creer || $user->rights->service->creer) {
- print '
'.$langs->trans("Add").' ';
+ print '
'.$langs->trans("Add").' ';
if ($cnt_trans > 0) {
- print '
'.$langs->trans("Update").' ';
+ print '
'.$langs->trans("Update").' ';
}
}
}
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 272da835741..5567e741272 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -41,8 +41,7 @@ if (!$user->admin) {
$langs->loadLangs(array('agenda', 'admin', 'other'));
$def = array();
-$actiontest = GETPOST('test', 'alpha');
-$actionsave = GETPOST('save', 'alpha');
+$action = GETPOST('action', 'alpha');
if (empty($conf->global->AGENDA_EXT_NB)) {
$conf->global->AGENDA_EXT_NB = 5;
@@ -57,14 +56,57 @@ $colorlist = array('BECEDD', 'DDBECE', 'BFDDBE', 'F598B4', 'F68654', 'CBF654', '
* Actions
*/
-if ($actionsave) {
+$error = 0;
+$errors = array();
+
+if (preg_match('/set_(.*)/', $action, $reg)) {
+ $db->begin();
+
+ $code = $reg[1];
+ $value = (GETPOST($code) ? GETPOST($code) : 1);
+
+ $res = dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity);
+ if (!$res > 0) {
+ $error++;
+ $errors[] = $db->lasterror();
+ }
+
+ if ($error) {
+ $db->rollback();
+ setEventMessages('', $errors, 'errors');
+ } else {
+ $db->commit();
+ setEventMessage($langs->trans('SetupSaved'));
+ header('Location: ' . $_SERVER["PHP_SELF"]);
+ exit();
+ }
+} elseif (preg_match('/del_(.*)/', $action, $reg)) {
+ $db->begin();
+
+ $code = $reg[1];
+
+ $res = dolibarr_del_const($db, $code, $conf->entity);
+ if (!$res > 0) {
+ $error++;
+ $errors[] = $db->lasterror();
+ }
+
+ if ($error) {
+ $db->rollback();
+ setEventMessages('', $errors, 'errors');
+ } else {
+ $db->commit();
+ setEventMessage($langs->trans('SetupSaved'));
+ header('Location: ' . $_SERVER["PHP_SELF"]);
+ exit();
+ }
+} elseif ($action == 'save') {
$db->begin();
$disableext = GETPOST('AGENDA_DISABLE_EXT', 'alpha');
$res = dolibarr_set_const($db, 'AGENDA_DISABLE_EXT', $disableext, 'chaine', 0, '', $conf->entity);
$i = 1; $errorsaved = 0;
- $error = 0;
// Save agendas
while ($i <= $MAXAGENDA) {
@@ -159,6 +201,10 @@ print dol_get_fiche_head($head, 'extsites', $langs->trans("Agenda"), -1, 'action
print '
'.$langs->trans("AgendaExtSitesDesc")." \n";
print "
\n";
+
+$selectedvalue=$conf->global->AGENDA_DISABLE_EXT;
+if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1;
+
print "
";
print "";
@@ -203,31 +249,44 @@ print "".$langs->trans("Name")." ";
print "".$langs->trans("ExtSiteUrlAgenda")." (".$langs->trans("Example").': http://yoursite/agenda/agenda.ics) ';
print "".$form->textwithpicto($langs->trans("FixTZ"), $langs->trans("FillFixTZOnlyIfRequired"), 1).' ';
print ''.$langs->trans("Color").' ';
+print ''.$langs->trans("ActiveByDefault").' ';
print " ";
$i = 1;
while ($i <= $MAXAGENDA) {
$key = $i;
- $name = 'AGENDA_EXT_NAME'.$key;
- $src = 'AGENDA_EXT_SRC'.$key;
- $offsettz = 'AGENDA_EXT_OFFSETTZ'.$key;
- $color = 'AGENDA_EXT_COLOR'.$key;
- $enabled = 'AGENDA_EXT_ENABLED'.$key;
-
+ $name = 'AGENDA_EXT_NAME' . $key;
+ $src = 'AGENDA_EXT_SRC' . $key;
+ $offsettz = 'AGENDA_EXT_OFFSETTZ' . $key;
+ $color = 'AGENDA_EXT_COLOR' . $key;
+ $enabled = 'AGENDA_EXT_ENABLED' . $key;
+ $default = 'AGENDA_EXT_ACTIVEBYDEFAULT' . $key;
print '';
// Nb
- print ''.$langs->trans("AgendaExtNb", $key)." ";
+ print '' . $langs->trans("AgendaExtNb", $key) . " ";
// Name
- print '';
//print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist);
- print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR".$key) ?GETPOST("AGENDA_EXT_COLOR".$key) : getDolGlobalString($color)), "AGENDA_EXT_COLOR".$key, 'extsitesconfig', 1, '', 'hideifnotset');
+ print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR" . $key) ? GETPOST("AGENDA_EXT_COLOR" . $key) : getDolGlobalString($color)), "AGENDA_EXT_COLOR" . $key, 'extsitesconfig', 1, '', 'hideifnotset');
+ print ' ';
+ // Calendar active by default
+ print '';
+ if ($conf->use_javascript_ajax) {
+ print ajax_constantonoff('AGENDA_EXT_ACTIVEBYDEFAULT' . $key);
+ } else {
+ if (empty($conf->global->{$default})) {
+ print '' . img_picto($langs->trans("Enabled"), 'on') . ' ';
+ } else {
+ print '' . img_picto($langs->trans("Disabled"), 'off') . ' ';
+ }
+ }
print ' ';
print " ";
$i++;
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 463df5475f9..8060398574c 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -260,7 +260,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
if (in_array($name, $def)) {
print ''."\n";
if ($conf->global->ACTION_EVENT_ADDON_PDF != "$name") {
- print 'scandir.'&label='.urlencode($module->name).'&type=action">';
+ print ' scandir.'&label='.urlencode($module->name).'&type=action">';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
} else {
@@ -269,7 +269,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
print " ";
} else {
print ''."\n";
- print 'scandir.'&label='.urlencode($module->name).'&type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir.'&label='.urlencode($module->name).'&type=action">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -278,7 +278,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
if ($conf->global->ACTION_EVENT_ADDON_PDF == "$name") {
print img_picto($langs->trans("Default"), 'on');
} else {
- print 'scandir.'&label='.urlencode($module->name).'&type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'&type=action"" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
}
print '';
@@ -324,9 +324,9 @@ print ' '."\n";
print ''."\n";
//print ajax_constantonoff('AGENDA_USE_EVENT_TYPE'); Do not use ajax here, we need to reload page to change other combo list
if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
} else {
- print ''.img_picto($langs->trans("Enabled"), 'switch_on').' ';
+ print ''.img_picto($langs->trans("Enabled"), 'switch_on').' ';
}
print ' '."\n";
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 2b2da673202..1d8cd8f723c 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -174,14 +174,14 @@ if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
$langs->load("errors");
print img_warning($langs->trans("WarningAvailableOnlyForHTTPSServers"), '', 'valignmiddle size15x').' ';
}
- print ''.img_picto($langs->trans('Disabled'), 'switch_off').' ';
+ print ''.img_picto($langs->trans('Disabled'), 'switch_off').' ';
print ''."\n";
} else {
if (!isHTTPS()) {
$langs->load("errors");
print img_warning($langs->trans("WarningAvailableOnlyForHTTPSServers"), '', 'valignmiddle size15x').' ';
}
- print ''.img_picto($langs->trans('Enabled'), 'switch_on').' ';
+ print ''.img_picto($langs->trans('Enabled'), 'switch_on').' ';
print ''."\n";
print ''."\n";
@@ -190,9 +190,9 @@ if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
print ''."\n";
if (empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
- print ''.img_picto($langs->trans('Disabled'), 'switch_off').' ';
+ print ''.img_picto($langs->trans('Disabled'), 'switch_off').' ';
} else {
- print ''.img_picto($langs->trans('Enabled'), 'switch_on').' ';
+ print ''.img_picto($langs->trans('Enabled'), 'switch_on').' ';
}
print ' '."\n";
@@ -221,7 +221,7 @@ if (empty($conf->cron->enabled)) {
print ''.$langs->trans("WarningModuleNotActive", $langs->transnoentitiesnoconv("Module2300Name")).' ';
} else {
if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
- print ''.img_picto($langs->trans('Disabled'), 'switch_off').' ';
+ print ''.img_picto($langs->trans('Disabled'), 'switch_off').' ';
} else {
// Get the max frequency of reminder
if ($job->id > 0) {
@@ -229,7 +229,7 @@ if (empty($conf->cron->enabled)) {
$langs->load("cron");
print ''.$langs->trans("JobXMustBeEnabled", $langs->transnoentitiesnoconv("sendEmailsReminder")).' ';
} else {
- print ''.img_picto($langs->trans('Enabled'), 'switch_on').' ';
+ print ''.img_picto($langs->trans('Enabled'), 'switch_on').' ';
}
}
}
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index fb937dc1dbe..6580db4e8f3 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -258,7 +258,7 @@ while ($i < $nbofbank) {
print img_picto($langs->trans("Activated"), 'on');
print '';
} else {
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'off');
print ' '."\n";
- print '';
+ print ' ';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print ' ';
} else {
print ''."\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -369,7 +369,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->BANKADDON_PDF == $name) {
print img_picto($langs->trans("Default"), 'on');
} else {
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
}
print '';
@@ -428,13 +428,13 @@ print "";
// Active
if ($conf->global->BANK_COLORIZE_MOVEMENT) {
print ''."\n";
- print '';
+ print ' ';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print ' ';
} else {
print ''."\n";
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -499,7 +499,7 @@ print "\n";
print '
';
print dol_get_fiche_end();
-$form->buttonsSaveCancel("Save", '');
+print $form->buttonsSaveCancel("Save", '');
print "\n";
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index b0eb36d81ac..5b48301c30d 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -373,12 +373,12 @@ if ($conf->product->enabled) {
print '';
print '
'.$modBarCode->getExample($langs)." \n";
- if ($conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file") {
- print '
';
+ if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM) && $conf->global->BARCODE_PRODUCT_ADDON_NUM == "$file") {
+ print ' ';
print img_picto($langs->trans("Activated"), 'switch_on');
print ' ';
} else {
- print '
';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index 021233ef449..a36c3698306 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -225,7 +225,7 @@ foreach ($dirmodels as $reldir) {
$langs->load("errors");
print '
'.$langs->trans($tmp).'
';
} elseif ($tmp == 'NotConfigured') {
- print $langs->trans($tmp);
+ print '
'.$langs->trans($tmp).' ';
} else {
print $tmp;
}
@@ -235,7 +235,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->BOM_ADDON == $file) {
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
- print '
';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
@@ -362,13 +362,13 @@ foreach ($dirmodels as $reldir) {
// Active
if (in_array($name, $def)) {
print '
'."\n";
- print '';
+ print ' ';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print ' ';
} else {
print '
'."\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -377,7 +377,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->BOM_ADDON_PDF == $name) {
print img_picto($langs->trans("Default"), 'on');
} else {
- print '
scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print '
scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
}
print '';
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index c4e697bfe00..2e4226e89d5 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -423,8 +423,8 @@ foreach ($boxactivated as $key => $box) {
$hasprevious = ($key != 0);
print '
'.($key + 1).' ';
print '
';
- print ($hasnext ? ''.img_down().' ' : '');
- print ($hasprevious ? ''.img_up().' ' : '');
+ print ($hasnext ? ''.img_down().' ' : '');
+ print ($hasprevious ? ''.img_up().' ' : '');
print ' ';
print '
';
print ''.img_delete().' ';
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 837d8d997b2..3ba8c3b854a 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -174,7 +174,7 @@ foreach ($dirmodels as $reldir) {
$langs->load("errors");
print ''.$langs->trans($tmp).'
';
} elseif ($tmp == 'NotConfigured') {
- print $langs->trans($tmp);
+ print ''.$langs->trans($tmp).' ';
} else {
print $tmp;
}
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index c10fdd5bbdf..1e977fb48df 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -289,7 +289,7 @@ foreach ($dirmodels as $reldir) {
$langs->load("errors");
print ''.$langs->trans($tmp).'
';
} elseif ($tmp == 'NotConfigured') {
- print $langs->trans($tmp);
+ print ''.$langs->trans($tmp).' ';
} else {
print $tmp;
}
@@ -299,7 +299,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->COMMANDE_ADDON == $file) {
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
@@ -424,13 +424,13 @@ foreach ($dirmodels as $reldir) {
// Active
if (in_array($name, $def)) {
print ' '."\n";
- print '';
+ print ' ';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print ' ';
} else {
print '
'."\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -439,7 +439,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->COMMANDE_ADDON_PDF == $name) {
print img_picto($langs->trans("Default"), 'on');
} else {
- print '
scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print '
scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
}
print '';
@@ -655,10 +655,10 @@ print '
'.$langs->trans("ShippableOrderIconInList").' ';
print '
';
print '
';
if (!empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {
- print '';
+ print ' ';
print img_picto($langs->trans("Activated"),'switch_on');
} else {
- print ' ';
+ print ' ';
print img_picto($langs->trans("Disabled"),'switch_off');
}
print ' ';
@@ -676,9 +676,9 @@ if ($conf->banque->enabled) {
print ajax_constantonoff('BANK_ASK_PAYMENT_BANK_DURING_ORDER');
} else {
if (empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER)) {
- print '
'.img_picto($langs->trans("Disabled"),'switch_off').' ';
+ print '
'.img_picto($langs->trans("Disabled"),'switch_off').' ';
} else {
- print '
'.img_picto($langs->trans("Enabled"),'switch_on').' ';
+ print '
'.img_picto($langs->trans("Enabled"),'switch_on').' ';
}
}
print '';
@@ -696,9 +696,9 @@ if ($conf->stock->enabled) {
print ajax_constantonoff('WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER');
} else {
if (empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
- print '
'.img_picto($langs->trans("Disabled"),'switch_off').' ';
+ print '
'.img_picto($langs->trans("Disabled"),'switch_off').' ';
} else {
- print '
'.img_picto($langs->trans("Enabled"),'switch_on').' ';
+ print '
'.img_picto($langs->trans("Enabled"),'switch_on').' ';
}
}
print '';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 7420aa17ce9..5e0ab61c3ee 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -696,7 +696,7 @@ $tooltiphelp = '';
if ($mysoc->country_code == 'FR') {
$tooltiphelp = '
'.$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")." ";
}
-print "
".$form->textwithpicto($langs->trans("VATIsUsedDesc"), $tooltiphelp)." ";
+print '
'.$form->textwithpicto($langs->trans("VATIsUsedDesc"), $tooltiphelp)." ";
print "\n";
@@ -706,7 +706,7 @@ $tooltiphelp = '';
if ($mysoc->country_code == 'FR') {
$tooltiphelp = "
".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")." \n";
}
-print "
".$form->textwithpicto($langs->trans("VATIsNotUsedDesc"), $tooltiphelp)." ";
+print '
'.$form->textwithpicto($langs->trans("VATIsNotUsedDesc"), $tooltiphelp)." ";
print "\n";
print "
";
@@ -721,12 +721,12 @@ print " '.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code)." ';
print '';
$tooltiphelp = $langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code);
$tooltiphelp = ($tooltiphelp != "LocalTax1IsUsedExample" ? "".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code)." \n" : "");
- print ''.$form->textwithpicto($langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code), $tooltiphelp)." ";
+ print $form->textwithpicto($langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code), $tooltiphelp);
if (!isOnlyOneLocalTax(1)) {
print ''.$langs->trans("LTRate").' : ';
$formcompany->select_localtax(1, $conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1");
@@ -739,11 +739,11 @@ if ($mysoc->useLocalTax(1)) {
print "
";
print " '.$langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code)." ';
$tooltiphelp = $langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code);
$tooltiphelp = ($tooltiphelp != "LocalTax1IsNotUsedExample" ? "".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code)." \n" : "");
- print "".$form->textwithpicto($langs->transcountry("LocalTax1IsNotUsedDesc", $mysoc->country_code), $tooltiphelp)." ";
+ print $form->textwithpicto($langs->transcountry("LocalTax1IsNotUsedDesc", $mysoc->country_code), $tooltiphelp);
print " '.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)." ';
print '';
print ''.$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)." ";
@@ -780,7 +780,7 @@ if ($mysoc->useLocalTax(2)) {
print "
";
print " '.$langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code)." ';
print "";
$tooltiphelp = $langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code);
@@ -803,7 +803,7 @@ print "
";
print '
';
print '
';
print '';
-print ''.$form->textwithpicto($langs->trans("RevenueStamp"), $langs->trans("RevenueStampDesc")).' '.$langs->trans("Description").' ';
+print ''.$form->textwithpicto($langs->trans("RevenueStamp"), $langs->trans("RevenueStampDesc")).' '.$langs->trans("Description").' ';
print ' ';
print " \n";
if ($mysoc->useRevenueStamp()) {
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index ea8a80b17d6..1c6a0ec0458 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -220,7 +220,7 @@ foreach ($dirmodels as $reldir) {
$langs->load("errors");
print ''.$langs->trans($tmp).'
';
} elseif ($tmp == 'NotConfigured') {
- print $langs->trans($tmp);
+ print ''.$langs->trans($tmp).' ';
} else {
print $tmp;
}
@@ -230,7 +230,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->CONTRACT_ADDON == "$file") {
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
@@ -353,13 +353,13 @@ foreach ($dirmodels as $reldir) {
// Active
if (in_array($name, $def)) {
print ''."\n";
- print '';
+ print ' ';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print ' ';
} else {
print ''."\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -368,7 +368,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->CONTRACT_ADDON_PDF == $name) {
print img_picto($langs->trans("Default"), 'on');
} else {
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
}
print '';
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index df14ef4c1b0..fab1787f5b9 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -145,7 +145,7 @@ if ($action == 'edit') {
print '
';
print '
';
}
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 19a440520b1..3e878b9398b 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -90,7 +90,7 @@ print '
';
print '
';
print '';
print ''.$langs->trans("Parameter").' '.$langs->trans("Value").' ';
-print ' \n";
print ''.$langs->trans("DEBUGBAR_LOGS_LINES_NUMBER").' ';
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index e74a8df069c..026a4315c83 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -206,12 +206,12 @@ $param = '&mode='.$mode;
$enabledisablehtml = $langs->trans("EnableDefaultValues").' ';
if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) {
// Button off, click to enable
- $enabledisablehtml .= '';
+ $enabledisablehtml .= ' ';
$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
$enabledisablehtml .= ' ';
} else {
// Button on, click to disable
- $enabledisablehtml .= '';
+ $enabledisablehtml .= ' ';
$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
$enabledisablehtml .= ' ';
}
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 2c6f9dc17c9..229fb3e2291 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -452,7 +452,7 @@ if ($action == 'edit') {
print '';
} else {
print ''.$langs->trans("Modify").' ';
}
// End of page
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index 04d52c491b2..8e60b02a5bf 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -225,7 +225,7 @@ foreach ($dirmodels as $reldir) {
$langs->load("errors");
print ''.$langs->trans($tmp).'
';
} elseif ($tmp == 'NotConfigured') {
- print $langs->trans($tmp);
+ print ''.$langs->trans($tmp).' ';
} else {
print $tmp;
}
@@ -235,7 +235,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->DELIVERY_ADDON_NUMBER == "$file") {
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
}
print '';
@@ -357,13 +357,13 @@ foreach ($dirmodels as $reldir) {
// Active
if (in_array($name, $def)) {
print "\n";
- print 'scandir.'&label='.urlencode($module->name).'">';
+ print ' scandir).'&label='.urlencode($module->name).'">';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print " ";
} else {
print "\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -372,7 +372,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->DELIVERY_ADDON_PDF == "$name") {
print img_picto($langs->trans("Default"), 'on');
} else {
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
}
print '';
diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index bfcb751f9a9..5e7a229fee3 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -217,15 +217,15 @@ class Dolistore
for ($i = 0; $i < $nbofcateg; $i++) {
$cat = $this->categories[$i];
if ($cat->is_root_category == 1 && $parent == 0) {
- $html .= '';
+ $html .= ' ';
$html .= self::get_categories($cat->id);
$html .= " \n";
} elseif (trim($cat->id_parent) == $parent && $cat->active == 1 && trim($cat->id_parent) != 0) { // si cat est de ce niveau
$select = ($cat->id == $this->categorie) ? ' selected' : '';
- $html .= 'description->language[$this->lang - 1])).'" ';
- $html .= '>'.$cat->name->language[$this->lang - 1].' '.$cat->nb_products_recursive.' ';
+ $html .= '>'.dol_escape_htmltag($cat->name->language[$this->lang - 1]).' '.dol_escape_htmltag($cat->nb_products_recursive).' ';
$html .= self::get_categories($cat->id);
$html .= "';
- $images .= ' ';
+ $image_url = DOL_URL_ROOT.'/admin/dolistore/ajax/image.php?id_product='.((int) $product->id).'&id_image='.((int) $product->id_default_image);
+ $images = '';
+ $images .= ' ';
} else {
$images = ''.price(price2num($product->price, 'MT'), 0, $langs, 1, -1, -1, 'EUR').' '.$langs->trans("HT").' ';
- $download_link = ''.$langs->trans('Free').' ';
- $download_link = ''.$langs->trans("SeeInMarkerPlace").'
- '.$newapp.$images.'
'.$product->name->language[$this->lang - 1]
- .''.$version.'
- '.dol_print_date(dol_stringtotime($product->date_upd), 'dayhour').' - '.$langs->trans('Ref').': '.$product->reference.' - '.$langs->trans('Id').': '.$product->id.'
+ '.dol_escape_htmltag($newapp.$images).'
'.dol_escape_htmltag($product->name->language[$this->lang - 1])
+ .''.dol_escape_htmltag($version).'
+ '.dol_print_date(dol_stringtotime($product->date_upd), 'dayhour').' - '.$langs->trans('Ref').': '.dol_escape_htmltag($product->reference).' - '.dol_escape_htmltag($langs->trans('Id')).': '.((int) $product->id).' '.$product->description->language[$this->lang - 1].' ';
- $html .= ''.$price.' ';
+ $html .= ''.dol_escape_htmltag($price).' ';
$html .= ''.$download_link.' ';
$html .= ' ';
}
@@ -343,7 +343,7 @@ class Dolistore
public function get_previous_link($text = '<<')
{
// phpcs:enable
- return ''.$text.' ';
+ return ''.dol_escape_htmltag($text).' ';
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -356,7 +356,7 @@ class Dolistore
public function get_next_link($text = '>>')
{
// phpcs:enable
- return ''.$text.' ';
+ return ''.dol_escape_htmltag($text).' ';
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index 52badf366ca..44df7f74189 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -93,9 +93,9 @@ if ($conf->use_javascript_ajax) {
print ajax_constantonoff('ECM_AUTO_TREE_ENABLED');
} else {
if (empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
- print ''.img_picto($langs->trans("Disabled"), 'off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'off').' ';
} elseif (!empty($conf->global->USER_MAIL_REQUIRED)) {
- print ''.img_picto($langs->trans("Enabled"), 'on').' ';
+ print ''.img_picto($langs->trans("Enabled"), 'on').' ';
}
}
print '';
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index fe1a61c686c..be3ab2d63c1 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -356,7 +356,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Object card
// ------------------------------------------------------------
- $linkback = ''.$langs->trans("BackToList").' ';
+ $linkback = ''.$langs->trans("BackToList").' ';
$morehtmlref = '
';
print '
';
@@ -451,7 +451,7 @@ if ($action == 'create') { // Create. Seems to no be used
print $langs->trans('IncotermLabel');
print ' ';
if ($user->rights->expedition->delivery->creer) {
- print ''.img_edit().' ';
+ print ''.img_edit().' ';
} else {
print ' ';
}
@@ -651,9 +651,9 @@ if ($action == 'create') { // Create. Seems to no be used
if ($user->rights->expedition->delivery->supprimer) {
if ($conf->expedition_bon->enabled) {
- print ''.$langs->trans("Delete").' ';
+ print ''.$langs->trans("Delete").' ';
} else {
- print ''.$langs->trans("Delete").' ';
+ print ''.$langs->trans("Delete").' ';
}
}
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index de991d50f4e..60c134661ce 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -166,11 +166,11 @@ class Delivery extends CommonObject
$sql .= ", fk_incoterms, location_incoterms";
$sql .= ") VALUES (";
$sql .= "'(PROV)'";
- $sql .= ", ".$conf->entity;
- $sql .= ", ".$this->socid;
+ $sql .= ", ".((int) $conf->entity);
+ $sql .= ", ".((int) $this->socid);
$sql .= ", '".$this->db->escape($this->ref_customer)."'";
$sql .= ", '".$this->db->idate($now)."'";
- $sql .= ", ".$user->id;
+ $sql .= ", ".((int) $user->id);
$sql .= ", ".($this->date_delivery ? "'".$this->db->idate($this->date_delivery)."'" : "null");
$sql .= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index d8b06285be4..c56effea73a 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -251,12 +251,12 @@ if (is_resource($handle)) {
print ' ';
} else {
print "\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"), 'switch_on').' ';
+ print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"), 'switch_on').' ';
print ' ';
}
} else {
print "\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -267,7 +267,7 @@ if (is_resource($handle)) {
print '';
} else {
print "";
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
print ' ';
}
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index c0c81d71aa8..8ff0fa62e6c 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -84,259 +84,284 @@ if ($reshook < 0) {
setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
}
-// Action reopen object
-if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
- $object->fetch($id);
+if (empty($reshook)) {
+ $backurlforlist = DOL_URL_ROOT.'/don/list.php';
- $result = $object->reopen($user);
- if ($result >= 0) {
- // Define output language
- if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
- if (method_exists($object, 'generateDocument')) {
- $outputlangs = $langs;
- $newlang = '';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
- $newlang = GETPOST('lang_id', 'aZ09');
- }
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
- $newlang = $object->thirdparty->default_lang;
- }
- if (!empty($newlang)) {
- $outputlangs = new Translate("", $conf);
- $outputlangs->setDefaultLang($newlang);
- }
- $model = $object->model_pdf;
- $ret = $object->fetch($id); // Reload to get new records
-
- $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+ if (empty($backtopage) || ($cancel && empty($id))) {
+ if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+ if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+ $backtopage = $backurlforlist;
+ } else {
+ $backtopage = DOL_URL_ROOT.'/don/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
}
}
-
- header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
- exit;
- } else {
- setEventMessages($object->error, $object->errors, 'errors');
- }
-}
-
-
-// Action update object
-if ($action == 'update') {
- if (!empty($cancel)) {
- header("Location: ".$_SERVER['PHP_SELF']."?id=".urlencode($id));
- exit;
}
- $error = 0;
-
- if (empty($donation_date)) {
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
- $action = "create";
- $error++;
- }
-
- if (empty($amount)) {
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
- $action = "create";
- $error++;
- }
-
- if (!$error) {
- $object->fetch($id);
-
- $object->firstname = (string) GETPOST("firstname", 'alpha');
- $object->lastname = (string) GETPOST("lastname", 'alpha');
- $object->societe = (string) GETPOST("societe", 'alpha');
- $object->address = (string) GETPOST("address", 'alpha');
- $object->amount = price2num(GETPOST("amount", 'alpha'));
- $object->town = (string) GETPOST("town", 'alpha');
- $object->zip = (string) GETPOST("zipcode", 'alpha');
- $object->country_id = (int) GETPOST('country_id', 'int');
- $object->email = (string) GETPOST("email", 'alpha');
- $object->date = $donation_date;
- $object->public = $public_donation;
- $object->fk_project = (int) GETPOST("fk_project", 'int');
- $object->note_private = (string) GETPOST("note_private", 'restricthtml');
- $object->note_public = (string) GETPOST("note_public", 'restricthtml');
- $object->modepaymentid = (int) GETPOST('modepayment', 'int');
-
- // Fill array 'array_options' with data from add form
- $ret = $extrafields->setOptionalsFromPost(null, $object);
- if ($ret < 0) {
- $error++;
- }
-
- if ($object->update($user) > 0) {
- header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ if ($cancel) {
+ if (!empty($backtopageforcancel)) {
+ header("Location: ".$backtopageforcancel);
+ exit;
+ } elseif (!empty($backtopage)) {
+ header("Location: ".$backtopage);
exit;
}
- }
-}
-
-
-// Action add/create object
-if ($action == 'add') {
- if (!empty($cancel)) {
- header("Location: index.php");
- exit;
+ $action = '';
}
- $error = 0;
+ // Action reopen object
+ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
+ $object->fetch($id);
- if (!empty($conf->societe->enabled) && !empty($conf->global->DONATION_USE_THIRDPARTIES) && !(GETPOST("socid", 'int') > 0)) {
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
- $action = "create";
- $error++;
- }
- if (empty($donation_date)) {
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
- $action = "create";
- $error++;
- }
+ $result = $object->reopen($user);
+ if ($result >= 0) {
+ // Define output language
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+ if (method_exists($object, 'generateDocument')) {
+ $outputlangs = $langs;
+ $newlang = '';
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+ $newlang = GETPOST('lang_id', 'aZ09');
+ }
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+ $newlang = $object->thirdparty->default_lang;
+ }
+ if (!empty($newlang)) {
+ $outputlangs = new Translate("", $conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+ $model = $object->model_pdf;
+ $ret = $object->fetch($id); // Reload to get new records
- if (empty($amount)) {
- setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
- $action = "create";
- $error++;
- }
+ $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+ }
+ }
- if (!$error) {
- $object->socid = (int) GETPOST("socid", 'int');
- $object->firstname = (string) GETPOST("firstname", 'alpha');
- $object->lastname = (string) GETPOST("lastname", 'alpha');
- $object->societe = (string) GETPOST("societe", 'alpha');
- $object->address = (string) GETPOST("address", 'alpha');
- $object->amount = price2num(GETPOST("amount", 'alpha'));
- $object->zip = (string) GETPOST("zipcode", 'alpha');
- $object->town = (string) GETPOST("town", 'alpha');
- $object->country_id = (int) GETPOST('country_id', 'int');
- $object->email = (string) GETPOST('email', 'alpha');
- $object->date = $donation_date;
- $object->note_private = (string) GETPOST("note_private", 'restricthtml');
- $object->note_public = (string) GETPOST("note_public", 'restricthtml');
- $object->public = $public_donation;
- $object->fk_project = (int) GETPOST("fk_project", 'int');
- $object->modepaymentid = (int) GETPOST('modepayment', 'int');
-
- // Fill array 'array_options' with data from add form
- $ret = $extrafields->setOptionalsFromPost(null, $object);
- if ($ret < 0) {
- $error++;
- }
-
- $res = $object->create($user);
- if ($res > 0) {
- header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
+ header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
} else {
setEventMessages($object->error, $object->errors, 'errors');
}
}
-}
-// Action delete object
-if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer) {
- $object->fetch($id);
- $result = $object->delete($user);
- if ($result > 0) {
- header("Location: index.php");
- exit;
- } else {
- dol_syslog($object->error, LOG_DEBUG);
- setEventMessages($object->error, $object->errors, 'errors');
+
+ // Action update object
+ if ($action == 'update') {
+ if (!empty($cancel)) {
+ header("Location: ".$_SERVER['PHP_SELF']."?id=".urlencode($id));
+ exit;
+ }
+
+ $error = 0;
+
+ if (empty($donation_date)) {
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+ $action = "create";
+ $error++;
+ }
+
+ if (empty($amount)) {
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
+ $action = "create";
+ $error++;
+ }
+
+ if (!$error) {
+ $object->fetch($id);
+
+ $object->firstname = (string) GETPOST("firstname", 'alpha');
+ $object->lastname = (string) GETPOST("lastname", 'alpha');
+ $object->societe = (string) GETPOST("societe", 'alpha');
+ $object->address = (string) GETPOST("address", 'alpha');
+ $object->amount = price2num(GETPOST("amount", 'alpha'));
+ $object->town = (string) GETPOST("town", 'alpha');
+ $object->zip = (string) GETPOST("zipcode", 'alpha');
+ $object->country_id = (int) GETPOST('country_id', 'int');
+ $object->email = (string) GETPOST("email", 'alpha');
+ $object->date = $donation_date;
+ $object->public = $public_donation;
+ $object->fk_project = (int) GETPOST("fk_project", 'int');
+ $object->note_private = (string) GETPOST("note_private", 'restricthtml');
+ $object->note_public = (string) GETPOST("note_public", 'restricthtml');
+ $object->modepaymentid = (int) GETPOST('modepayment', 'int');
+
+ // Fill array 'array_options' with data from add form
+ $ret = $extrafields->setOptionalsFromPost(null, $object);
+ if ($ret < 0) {
+ $error++;
+ }
+
+ if ($object->update($user) > 0) {
+ header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ }
}
-}
-// Action validation
-if ($action == 'valid_promesse') {
- $object->fetch($id);
- if ($object->valid_promesse($id, $user->id) >= 0) {
- setEventMessages($langs->trans("DonationValidated", $object->ref), null);
- $action = '';
- } else {
- setEventMessages($object->error, $object->errors, 'errors');
+
+ // Action add/create object
+ if ($action == 'add') {
+ if (!empty($cancel)) {
+ header("Location: index.php");
+ exit;
+ }
+
+ $error = 0;
+
+ if (!empty($conf->societe->enabled) && !empty($conf->global->DONATION_USE_THIRDPARTIES) && !(GETPOST("socid", 'int') > 0)) {
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
+ $action = "create";
+ $error++;
+ }
+ if (empty($donation_date)) {
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+ $action = "create";
+ $error++;
+ }
+
+ if (empty($amount)) {
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
+ $action = "create";
+ $error++;
+ }
+
+ if (!$error) {
+ $object->socid = (int) GETPOST("socid", 'int');
+ $object->firstname = (string) GETPOST("firstname", 'alpha');
+ $object->lastname = (string) GETPOST("lastname", 'alpha');
+ $object->societe = (string) GETPOST("societe", 'alpha');
+ $object->address = (string) GETPOST("address", 'alpha');
+ $object->amount = price2num(GETPOST("amount", 'alpha'));
+ $object->zip = (string) GETPOST("zipcode", 'alpha');
+ $object->town = (string) GETPOST("town", 'alpha');
+ $object->country_id = (int) GETPOST('country_id', 'int');
+ $object->email = (string) GETPOST('email', 'alpha');
+ $object->date = $donation_date;
+ $object->note_private = (string) GETPOST("note_private", 'restricthtml');
+ $object->note_public = (string) GETPOST("note_public", 'restricthtml');
+ $object->public = $public_donation;
+ $object->fk_project = (int) GETPOST("fk_project", 'int');
+ $object->modepaymentid = (int) GETPOST('modepayment', 'int');
+
+ // Fill array 'array_options' with data from add form
+ $ret = $extrafields->setOptionalsFromPost(null, $object);
+ if ($ret < 0) {
+ $error++;
+ }
+
+ $res = $object->create($user);
+ if ($res > 0) {
+ header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
+ exit;
+ } else {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
}
-}
-// Action cancel
-if ($action == 'set_cancel') {
- $object->fetch($id);
- if ($object->set_cancel($id) >= 0) {
- $action = '';
- } else {
- setEventMessages($object->error, $object->errors, 'errors');
+ // Action delete object
+ if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer) {
+ $object->fetch($id);
+ $result = $object->delete($user);
+ if ($result > 0) {
+ header("Location: index.php");
+ exit;
+ } else {
+ dol_syslog($object->error, LOG_DEBUG);
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
}
-}
-// Action set paid
-if ($action == 'set_paid') {
- $object->fetch($id);
- if ($object->setPaid($id, $modepayment) >= 0) {
- $action = '';
- } else {
- setEventMessages($object->error, $object->errors, 'errors');
+ // Action validation
+ if ($action == 'valid_promesse') {
+ $object->fetch($id);
+ if ($object->valid_promesse($id, $user->id) >= 0) {
+ setEventMessages($langs->trans("DonationValidated", $object->ref), null);
+ $action = '';
+ } else {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
+
+ // Action cancel
+ if ($action == 'set_cancel') {
+ $object->fetch($id);
+ if ($object->set_cancel($id) >= 0) {
+ $action = '';
+ } else {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ }
+
+ // Action set paid
+ if ($action == 'set_paid') {
+ $object->fetch($id);
+ if ($object->setPaid($id, $modepayment) >= 0) {
+ $action = '';
+ } else {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ } elseif ($action == 'classin' && $user->rights->don->creer) {
+ $object->fetch($id);
+ $object->setProject($projectid);
}
-} elseif ($action == 'classin' && $user->rights->don->creer) {
- $object->fetch($id);
- $object->setProject($projectid);
-}
-// Actions to build doc
-include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+ // Actions to build doc
+ include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-// Remove file in doc form
-/*if ($action == 'remove_file')
-{
- $object = new Don($db, 0, GETPOST('id', 'int'));
- if ($object->fetch($id))
+ // Remove file in doc form
+ /*if ($action == 'remove_file')
{
- require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ $object = new Don($db, 0, GETPOST('id', 'int'));
+ if ($object->fetch($id))
+ {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $object->fetch_thirdparty();
+ $object->fetch_thirdparty();
- $langs->load("other");
- $upload_dir = $conf->don->dir_output;
- $file = $upload_dir . '/' . GETPOST('file');
- $ret=dol_delete_file($file,0,0,0,$object);
- if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
- else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
- $action='';
+ $langs->load("other");
+ $upload_dir = $conf->don->dir_output;
+ $file = $upload_dir . '/' . GETPOST('file');
+ $ret=dol_delete_file($file,0,0,0,$object);
+ if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+ else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+ $action='';
+ }
}
-}
-*/
+ */
-/*
- * Build doc
- */
-/*
-if ($action == 'builddoc')
-{
- $object = new Don($db);
- $result=$object->fetch($id);
-
- // Save last template used to generate document
- if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
-
- // Define output language
- $outputlangs = $langs;
- $newlang='';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
- if (! empty($newlang))
+ /*
+ * Build doc
+ */
+ /*
+ if ($action == 'builddoc')
{
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
- $result=don_create($db, $object->id, '', $object->model_pdf, $outputlangs);
- if ($result <= 0)
- {
- dol_print_error($db,$result);
- exit;
+ $object = new Don($db);
+ $result=$object->fetch($id);
+
+ // Save last template used to generate document
+ if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
+
+ // Define output language
+ $outputlangs = $langs;
+ $newlang='';
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->thirdparty->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+ $result=don_create($db, $object->id, '', $object->model_pdf, $outputlangs);
+ if ($result <= 0)
+ {
+ dol_print_error($db,$result);
+ exit;
+ }
}
+ */
}
-*/
/*
@@ -675,7 +700,7 @@ if (!empty($id) && $action != 'edit') {
$morehtmlref .= $langs->trans('Project').' ';
if ($user->rights->don->creer) {
if ($action != 'classify') {
- $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
@@ -830,7 +855,7 @@ if (!empty($id) && $action != 'edit') {
print ''.$langs->trans("ReOpen").' ';
}
- print '';
+ print '';
if ($object->statut == $object::STATUS_DRAFT) {
print '';
@@ -845,13 +870,13 @@ if (!empty($id) && $action != 'edit') {
if ($remaintopay == 0) {
print ''.$langs->trans('DoPayment').'
';
} else {
- print '';
+ print '';
}
}
// Classify 'paid'
if ($object->statut == $object::STATUS_VALIDATED && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer) {
- print '";
+ print '";
}
// Delete
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 85a95905073..792edbcc928 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -381,7 +381,7 @@ class Don extends CommonObject
$sql .= ", phone_mobile";
$sql .= ") VALUES (";
$sql .= "'".$this->db->idate($this->date ? $this->date : $now)."'";
- $sql .= ", ".$conf->entity;
+ $sql .= ", ".((int) $conf->entity);
$sql .= ", ".price2num($this->amount);
$sql .= ", ".($this->modepaymentid ? $this->modepaymentid : "null");
$sql .= ", ".($this->socid > 0 ? $this->socid : "null");
@@ -396,7 +396,7 @@ class Don extends CommonObject
$sql .= ", ".($this->fk_project > 0 ? (int) $this->fk_project : "null");
$sql .= ", ".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
$sql .= ", ".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
- $sql .= ", ".$user->id;
+ $sql .= ", ".((int) $user->id);
$sql .= ", null";
$sql .= ", '".$this->db->idate($this->date)."'";
$sql .= ", '".$this->db->escape(trim($this->email))."'";
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index 374306bc7b0..52e33a26cb4 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -132,7 +132,7 @@ if ($object->id) {
$morehtmlref .= $langs->trans('Project').' ';
if ($user->rights->don->creer) {
if ($action != 'classify') {
- // $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ // $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index 8d8f4065dda..431783e873a 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -82,7 +82,7 @@ if (!empty($conf->projet->enabled)) {
$morehtmlref .= $langs->trans('Project').' ';
if ($user->rights->don->creer) {
if ($action != 'classify') {
- // $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ // $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 13f9b1d4a96..9dca36bd1a0 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -105,7 +105,7 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref .= $langs->trans('Project').' ';
if ($user->rights->don->creer) {
if ($action != 'classify') {
- // $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ // $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 40cf0298895..363ef6d34ef 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -213,7 +213,7 @@ print '';
if (empty($action)) {
if ($user->rights->don->supprimer) {
if (!$disable_delete) {
- print '
'.$langs->trans('Delete').' ';
+ print '
'.$langs->trans('Delete').' ';
} else {
print '
'.$langs->trans('Delete').' ';
}
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 3c7af135922..aed93b51f6f 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -144,7 +144,6 @@ class EcmDirectory extends CommonObject
// Clean parameters
$this->label = dol_sanitizeFileName(trim($this->label));
- $this->fk_parent = trim($this->fk_parent);
$this->description = trim($this->description);
$this->date_c = $now;
$this->fk_user_c = $user->id;
@@ -155,7 +154,7 @@ class EcmDirectory extends CommonObject
// Check if same directory does not exists with this name
$relativepath = $this->label;
- if ($this->fk_parent) {
+ if ($this->fk_parent > 0) {
$parent = new EcmDirectory($this->db);
$parent->fetch($this->fk_parent);
$relativepath = $parent->getRelativePath().$relativepath;
@@ -194,11 +193,11 @@ class EcmDirectory extends CommonObject
$sql .= ") VALUES (";
$sql .= " '".$this->db->escape($this->label)."',";
$sql .= " '".$this->db->escape($conf->entity)."',";
- $sql .= " '".$this->db->escape($this->fk_parent)."',";
+ $sql .= " ".($this->fk_parent > 0 ? ((int) $this->fk_parent) : "null").",";
$sql .= " '".$this->db->escape($this->description)."',";
$sql .= " ".((int) $this->cachenbofdoc).",";
$sql .= " '".$this->db->idate($this->date_c)."',";
- $sql .= " '".$this->db->escape($this->fk_user_c)."'";
+ $sql .= " ".($this->fk_user_c > 0 ? ((int) $this->fk_user_c) : "null").",";
$sql .= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -249,20 +248,19 @@ class EcmDirectory extends CommonObject
// Clean parameters
$this->label = trim($this->label);
- $this->fk_parent = trim($this->fk_parent);
$this->description = trim($this->description);
-
- // Check parameters
- // Put here code to add control on parameters values
+ if ($this->fk_parent <= 0) {
+ $this->fk_parent = 0;
+ }
$this->db->begin();
// Update request
$sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET";
- $sql .= " label='".$this->db->escape($this->label)."',";
- $sql .= " fk_parent='".$this->db->escape($this->fk_parent)."',";
- $sql .= " description='".$this->db->escape($this->description)."'";
- $sql .= " WHERE rowid=".((int) $this->id);
+ $sql .= " label = '".$this->db->escape($this->label)."',";
+ $sql .= " fk_parent = ".($this->fk_parent > 0 ? ((int) $this->fk_parent) : "null").",";
+ $sql .= " description = '".$this->db->escape($this->description)."'";
+ $sql .= " WHERE rowid = ".((int) $this->id);
dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
@@ -731,10 +729,10 @@ class EcmDirectory extends CommonObject
// We count number of _ to have level (we use strlen that is faster than dol_strlen)
$this->cats[$id_categ]['level'] = strlen(preg_replace('/([^_])/i', '', $this->cats[$id_categ]['fullpath']));
- // Traite ces enfants
+ // Process children
$protection++;
if ($protection > 20) {
- return; // On ne traite pas plus de 20 niveaux
+ return; // We never go more than 20 levels
}
if (isset($this->cats[$id_categ]['id_children']) && is_array($this->cats[$id_categ]['id_children'])) {
foreach ($this->cats[$id_categ]['id_children'] as $key => $val) {
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 15cfba4c03e..6c2b8fc4023 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -542,7 +542,7 @@ class EcmFiles extends CommonObject
$sql .= " AND entity IN (" . getEntity('ecmfiles') . ")";
}*/
if (count($sqlwhere) > 0) {
- $sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
+ $sql .= ' AND '.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
}
if (!empty($sortfield)) {
$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 4b9d0a847f2..623d626935d 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -55,9 +55,10 @@ class FormEcm
* @param int $selected Id of preselected section
* @param string $select_name Name of HTML select component
* @param string $module Module ('ecm', 'medias', ...)
+ * @param array $ids_to_ignore Array of id to ignore
* @return string String with HTML select
*/
- public function selectAllSections($selected = 0, $select_name = '', $module = 'ecm')
+ public function selectAllSections($selected = 0, $select_name = '', $module = 'ecm', $ids_to_ignore = array())
{
global $conf, $langs;
$langs->load("ecm");
@@ -65,6 +66,9 @@ class FormEcm
if ($select_name == '') {
$select_name = "catParent";
}
+ if (!is_array($ids_to_ignore)) {
+ $ids_to_ignore = array($ids_to_ignore);
+ }
$cate_arbo = null;
if ($module == 'ecm') {
@@ -83,13 +87,15 @@ class FormEcm
} else {
$output .= '
';
foreach ($cate_arbo as $key => $value) {
- $valueforoption = empty($cate_arbo[$key]['id']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['id'];
- if ($selected && $valueforoption == $selected) {
- $add = 'selected ';
- } else {
- $add = '';
+ if (!in_array($cate_arbo[$key]['id'], $ids_to_ignore)) {
+ $valueforoption = empty($cate_arbo[$key]['id']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['id'];
+ if ($selected && $valueforoption == $selected) {
+ $add = 'selected ';
+ } else {
+ $add = '';
+ }
+ $output .= '
'.(empty($cate_arbo[$key]['fulllabel']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['fulllabel']).' ';
}
- $output .= '
'.(empty($cate_arbo[$key]['fulllabel']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['fulllabel']).' ';
}
}
}
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index fec8151728e..0b42fc17a02 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/ecm.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/ecm/class/htmlecm.form.class.php';
// Load translation files required by page
$langs->loadLangs(array('ecm', 'companies', 'other'));
@@ -204,6 +205,12 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha') && $permtoadd) {
// Fetch was already done
$ecmdir->label = dol_sanitizeFileName(GETPOST("label"));
+ $fk_parent = GETPOST("catParent", 'int');
+ if ($fk_parent == "-1") {
+ $ecmdir->fk_parent = "0";
+ } else {
+ $ecmdir->fk_parent = $fk_parent;
+ }
$ecmdir->description = GETPOST("description");
$ret = $extrafields->setOptionalsFromPost(null, $ecmdir);
if ($ret < 0) {
@@ -219,8 +226,10 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha') && $permtoadd) {
}
$result = $ecmdir->update($user);
if ($result > 0) {
+ $newdir = $ecmdir->getRelativePath(1);
+ $newdir = $conf->ecm->dir_output.'/'.$newdir;
// Try to rename file if changed
- if ($oldlabel != $ecmdir->label && file_exists($olddir)) {
+ if (($oldlabel != $ecmdir->label && file_exists($olddir)) || ($olddir != $newdir && file_exists($olddir))) {
$newdir = $ecmdir->getRelativePath(1); // return "xxx/zzz/" from ecm directory
$newdir = $conf->ecm->dir_output.'/'.$newdir;
//print $olddir.'-'.$newdir;
@@ -270,6 +279,7 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha') && $permtoadd) {
*/
$form = new Form($db);
+$formecm = new FormEcm($db);
$object = new EcmDirectory($db); // Need to create a new one instance
$extrafields = new ExtraFields($db);
@@ -317,11 +327,7 @@ if ($module == 'ecm') {
$tmpecmdir->fetch($ecmdir->id);
while ($tmpecmdir && $result > 0) {
$tmpecmdir->ref = $tmpecmdir->label;
- if ($i == 0 && $action == 'edit') {
- $s = '
';
- } else {
- $s = $tmpecmdir->getNomUrl(1).$s;
- }
+ $s = $tmpecmdir->getNomUrl(1).$s;
if ($tmpecmdir->fk_parent) {
$s = ' -> '.$s;
$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
@@ -371,6 +377,16 @@ print img_picto('','object_dir').'
'.$l
print $s;
print ' '.$langs->trans("ECMDirName").' ';
+ print ' '.$langs->trans("ECMParentDirectory").' ';
+ print $formecm->selectAllSections($ecmdir->fk_parent, '', 'ecm', array($ecmdir->id));
+ print ' ';
+ print ' '.$langs->trans("Description").' ';
if ($action == 'edit') {
print '".$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Name"))." ";
- }
+ print '';
-print '
';
+print '
';
+print '
';
print '
';
// Type
$type = ($object->format == "A") ? 'classic' : 'date';
-print ''.$langs->trans("Type").' ';
+print ' '.$langs->trans("Type").' ';
print img_picto('', dol_buildpath('/opensurvey/img/'.($type == 'classic' ? 'chart-32.png' : 'calendar-32.png'), 1), 'width="16"', 1);
print ' '.$langs->trans($type == 'classic' ? "TypeClassic" : "TypeDate").' ';
$adresseadmin = $object->mail_admin;
-print $langs->trans("Title").' ';
+print $langs->trans("Title").' ';
if ($action == 'edit') {
print ' '.$langs->trans("Description").' ';
+if ($action == 'edit') {
+ $doleditor = new DolEditor('nouveauxcommentaires', $object->description, '', 120, 'dolibarr_notes', 'In', 1, 1, 1, ROWS_7, '90%');
+ $doleditor->Create(0, '');
+} else {
+ print (dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true));
+}
+print ' '.$langs->trans("EMail").' ';
+ if ($action == 'edit') {
+ print '
';
+
+print '
';
+print '
';
+print '
';
+
+print '
';
+
+
// Expire date
-print ''.$langs->trans('ExpireDate').' ';
+print ' '.$langs->trans('ExpireDate').' ';
if ($action == 'edit') {
print $form->selectDate($expiredate ? $expiredate : $object->date_fin, 'expire', 0, 0, 0, '', 1, 0);
} else {
@@ -490,7 +522,7 @@ print ' ';
-print $langs->trans("Author").' ';
+print $langs->trans("Author").' ';
if ($object->fk_user_creat) {
print $userstatic->getLoginUrl(1);
} else {
@@ -499,7 +531,7 @@ if ($object->fk_user_creat) {
print ' '.img_picto('', 'globe').' '.$langs->trans("UrlForSurvey", '').' ';
+print ' '.img_picto('', 'globe').' '.$langs->trans("UrlForSurvey", '').' ';
// Define $urlwithroot
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -521,8 +553,10 @@ if ($action != 'edit') {
print '
';
+print '
';
print '
';
print dol_get_fiche_end();
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 25567b137db..100dc7027a3 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -65,8 +65,10 @@ if ($action == 'setting') {
$error += $partnership->delete_menus();
$error += $partnership->insert_menus();
- if (GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", 'int'))
+ if (GETPOSTISSET("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL")) {
dolibarr_set_const($db, "PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", GETPOST("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL", 'int'), 'chaine', 0, '', $conf->entity);
+ }
+
dolibarr_set_const($db, "PARTNERSHIP_BACKLINKS_TO_CHECK", GETPOST("PARTNERSHIP_BACKLINKS_TO_CHECK"), 'chaine', 0, '', $conf->entity);
}
@@ -131,16 +133,16 @@ print ' '.$langs->trans("partnershipforthirdparty
print ' '.$langs->trans("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL").' ';
- print '';
- $dnbdays = '15';
- $backlinks = (!empty($conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL)) ? $conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL : $dnbdays;
- print ' ';
- print ''.$dnbdays.' '.$langs->trans("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL").' ';
+print '';
+$dnbdays = '30';
+$backlinks = (!empty($conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL)) ? $conf->global->PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL : $dnbdays;
+print ' ';
+print ''.$dnbdays.'
';
print '
'.$langs->trans('Ref').': '.$this->ref;
- $url = dol_buildpath('/partnership/partnership_card.php', 1).'?id='.$this->id;
+ $url = DOL_URL_ROOT.'/partnership/partnership_card.php?id='.$this->id;
if ($option != 'nolink') {
// Add param to save lastsearch_values or not
@@ -1157,7 +1158,7 @@ class Partnership extends CommonObject
$this->lines = array();
$objectline = new PartnershipLine($this->db);
- $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_partnership = '.$this->id));
+ $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_partnership = '.((int) $this->id)));
if (is_numeric($result)) {
$this->error = $this->error;
diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index 799aadd24cd..f154e1b9f5b 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -154,7 +154,7 @@ if ($object->id > 0) {
$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
}
$morehtmlref.=' : ';
if ($action == 'classify') {
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index bf980ab9cda..2a281931046 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -412,7 +412,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$langs->load("projects");
$morehtmlref .= '' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' ';
+ //if ($action != 'classify') $morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' ';
$morehtmlref .= ' : ';
if ($action == 'classify') {
//$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
@@ -556,7 +556,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if (empty($reshook)) {
// Send
if (empty($user->socid)) {
- print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle');
+ print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
}
if ($object->status == $object::STATUS_DRAFT) {
@@ -643,14 +643,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$MAXEVENT = 10;
- $morehtmlright = '';
+ $morehtmlright = ' ';
$morehtmlright .= $langs->trans("SeeAll");
$morehtmlright .= ' ';
// List of actions on element
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
$formactions = new FormActions($db);
- $somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+ $somethingshown = $formactions->showactions($object, $object->element, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
print '';
}
diff --git a/htdocs/partnership/partnership_contact.php b/htdocs/partnership/partnership_contact.php
index 1c416cf690c..a4a61c6e907 100644
--- a/htdocs/partnership/partnership_contact.php
+++ b/htdocs/partnership/partnership_contact.php
@@ -140,7 +140,7 @@ if ($object->id) {
if ($permissiontoadd)
{
if ($action != 'classify')
- //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref.=' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index e7fae7ee7ff..79b7be0057a 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -137,7 +137,7 @@ if ($object->id) {
if ($permissiontoadd)
{
if ($action != 'classify')
- //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref.=' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index cc97eac5515..67f963b155e 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -110,7 +110,7 @@ if ($id > 0 || !empty($ref)) {
if ($permissiontoadd)
{
if ($action != 'classify')
- //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref.=' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index 2b86efa507c..a0849f082e8 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -274,13 +274,13 @@ if ($mode == 'config' && $user->admin) {
print ajax_constantonoff($printer->active);
} else {
if (empty($conf->global->{$printer->conf})) {
- print ''.img_picto($langs->trans("Disabled"), 'off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'off').' ';
} else {
- print ''.img_picto($langs->trans("Enabled"), 'on').' ';
+ print ''.img_picto($langs->trans("Enabled"), 'on').' ';
}
}
- print ''.img_picto('', 'setup').' '.img_picto('', 'setup').' '.img_picto('', 'setup').' '.img_picto('', 'setup').' ';
if (!$disabled) {
- print '';
+ print ' ';
}
print img_picto($langs->trans("Disabled"), 'switch_off');
if (!$disabled) {
@@ -448,13 +448,13 @@ foreach ($dirmodels as $reldir) {
// Active
if (in_array($name, $def)) {
print ' '."\n";
- print '';
+ print ' ';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print ' ';
} else {
print ''."\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -463,7 +463,7 @@ foreach ($dirmodels as $reldir) {
if ($conf->global->PRODUCT_ADDON_PDF == $name) {
print img_picto($langs->trans("Default"), 'on');
} else {
- print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
}
print '';
@@ -762,10 +762,10 @@ if (!empty($conf->global->PRODUCT_CANVAS_ABILITY)) {
if ($conf->global->$const) {
print img_picto($langs->trans("Active"), 'tick');
print '';
- print ''.$langs->trans("Disable").' ';
+ print ''.$langs->trans("Disable").' ';
} else {
print ' ';
- print ''.$langs->trans("Activate").' ';
+ print ''.$langs->trans("Activate").' ';
}
print ' ';
diff --git a/htdocs/product/admin/product_lot.php b/htdocs/product/admin/product_lot.php
index 3f4fd636de4..24f515fa0bc 100644
--- a/htdocs/product/admin/product_lot.php
+++ b/htdocs/product/admin/product_lot.php
@@ -161,7 +161,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
if ($conf->global->PRODUCTBATCH_LOT_ADDON == $file) {
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
@@ -253,7 +253,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
if ($conf->global->PRODUCTBATCH_SN_ADDON == $file) {
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
- print '';
+ print ' ';
print img_picto($langs->trans("Disabled"), 'switch_off');
print ' ';
}
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 77acafbbd55..9ba8d9cec09 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -91,7 +91,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
$outtype = $object->type;
$outqty = 1;
$outdiscount = 0;
-
+ $mandatory_period = $object->mandatory_period;
$found = false;
$price_level = 1;
@@ -203,6 +203,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
'tva_tx' => $outtva_tx,
'qty' => $outqty,
'discount' => $outdiscount,
+ 'mandatory_period' => $mandatory_period,
'array_options'=>$object->array_options);
}
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 44c7fd9ca51..80378bd1b2a 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -105,6 +105,7 @@ $accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
$accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
$accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
+$checkmandatory = GETPOST('accountancy_code_buy_export', 'alpha');
// by default 'alphanohtml' (better security); hidden conf MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML allows basic html
$label_security_check = empty($conf->global->MAIN_SECURITY_ALLOW_UNSECURED_LABELS_WITH_HTML) ? 'alphanohtml' : 'restricthtml';
@@ -131,7 +132,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
if ($id > 0 || !empty($ref)) {
$result = $object->fetch($id, $ref);
-
+ if ($result < 0) {
+ dol_print_error($db, $object->error, $object->errors);
+ }
if (!empty($conf->product->enabled)) {
$upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);
} elseif (!empty($conf->service->enabled)) {
@@ -201,6 +204,29 @@ if ($reshook < 0) {
}
if (empty($reshook)) {
+ $backurlforlist = DOL_URL_ROOT.'/product/list.php?type='.$type;
+
+ if (empty($backtopage) || ($cancel && empty($id))) {
+ if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+ if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+ $backtopage = $backurlforlist;
+ } else {
+ $backtopage = DOL_URL_ROOT.'/product/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+ }
+ }
+ }
+
+ if ($cancel) {
+ if (!empty($backtopageforcancel)) {
+ header("Location: ".$backtopageforcancel);
+ exit;
+ } elseif (!empty($backtopage)) {
+ header("Location: ".$backtopage);
+ exit;
+ }
+ $action = '';
+ }
+
// Type
if ($action == 'setfk_product_type' && $usercancreate) {
$result = $object->setValueFrom('fk_product_type', GETPOST('fk_product_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');
@@ -275,7 +301,7 @@ if (empty($reshook)) {
$object->ref = $ref;
$object->label = GETPOST('label', $label_security_check);
$object->price_base_type = GETPOST('price_base_type', 'aZ09');
-
+ $object->mandatory_period = !empty(GETPOST("mandatoryperiod", 'alpha')) ? 1 : 0;
if ($object->price_base_type == 'TTC') {
$object->price_ttc = GETPOST('price');
} else {
@@ -458,7 +484,7 @@ if (empty($reshook)) {
$object->setCategories($categories);
if (!empty($backtopage)) {
- $backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
+ $backtopage = preg_replace('/__ID__/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
if (preg_match('/\?/', $backtopage)) {
$backtopage .= '&socid='.$object->id; // Old method
}
@@ -576,7 +602,7 @@ if (empty($reshook)) {
$accountancy_code_buy = GETPOST('accountancy_code_buy', 'alpha');
$accountancy_code_buy_intra = GETPOST('accountancy_code_buy_intra', 'alpha');
$accountancy_code_buy_export = GETPOST('accountancy_code_buy_export', 'alpha');
-
+ $checkmandatory = GETPOST('mandatoryperiod', 'alpha');
if (empty($accountancy_code_sell) || $accountancy_code_sell == '-1') {
$object->accountancy_code_sell = '';
} else {
@@ -607,6 +633,11 @@ if (empty($reshook)) {
} else {
$object->accountancy_code_buy_export = $accountancy_code_buy_export;
}
+ if ($object->isService()) {
+ $object->mandatory_period = (!empty($checkmandatory)) ? 1 : 0 ;
+ }
+
+
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -845,7 +876,7 @@ if (empty($reshook)) {
if (GETPOST('propalid') > 0) {
// Define cost price for margin calculation
$buyprice = 0;
- if (($result = $propal->defineBuyPrice($pu_ht, price2num(GETPOST('remise_percent'), 2), $object->id)) < 0) {
+ if (($result = $propal->defineBuyPrice($pu_ht, price2num(GETPOST('remise_percent'), '', 2), $object->id)) < 0) {
dol_syslog($langs->trans('FailedToGetCostPrice'));
setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
} else {
@@ -860,7 +891,7 @@ if (empty($reshook)) {
$localtax1_tx, // localtax1
$localtax2_tx, // localtax2
$object->id,
- price2num(GETPOST('remise_percent'), 2),
+ price2num(GETPOST('remise_percent'), '', 2),
$price_base_type,
$pu_ttc,
0,
@@ -885,7 +916,7 @@ if (empty($reshook)) {
} elseif (GETPOST('commandeid') > 0) {
// Define cost price for margin calculation
$buyprice = 0;
- if (($result = $commande->defineBuyPrice($pu_ht, GETPOST('remise_percent', 2), $object->id)) < 0) {
+ if (($result = $commande->defineBuyPrice($pu_ht, price2num(GETPOST('remise_percent'), '', 2), $object->id)) < 0) {
dol_syslog($langs->trans('FailedToGetCostPrice'));
setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
} else {
@@ -900,7 +931,7 @@ if (empty($reshook)) {
$localtax1_tx, // localtax1
$localtax2_tx, // localtax2
$object->id,
- price2num(GETPOST('remise_percent'), 2),
+ price2num(GETPOST('remise_percent'), '', 2),
'',
'',
$price_base_type,
@@ -919,13 +950,13 @@ if (empty($reshook)) {
);
if ($result > 0) {
- header("Location: ".DOL_URL_ROOT."/commande/card.php?id=".$commande->id);
+ header("Location: ".DOL_URL_ROOT."/commande/card.php?id=".urlencode($commande->id));
exit;
}
} elseif (GETPOST('factureid') > 0) {
// Define cost price for margin calculation
$buyprice = 0;
- if (($result = $facture->defineBuyPrice($pu_ht, GETPOST('remise_percent', 2), $object->id)) < 0) {
+ if (($result = $facture->defineBuyPrice($pu_ht, price2num(GETPOST('remise_percent'), '', 2), $object->id)) < 0) {
dol_syslog($langs->trans('FailedToGetCostPrice'));
setEventMessages($langs->trans('FailedToGetCostPrice'), null, 'errors');
} else {
@@ -940,7 +971,7 @@ if (empty($reshook)) {
$localtax1_tx,
$localtax2_tx,
$object->id,
- price2num(GETPOST('remise_percent'), 2),
+ price2num(GETPOST('remise_percent'), '', 2),
'',
'',
'',
@@ -1213,7 +1244,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
// Description (used in invoice, propal...)
print ''.$langs->trans("Description").' ';
- $doleditor = new DolEditor('desc', GETPOST('desc', 'restricthtml'), '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+ $doleditor = new DolEditor('desc', GETPOST('desc', 'restricthtml'), '', 160, 'dolibarr_details', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_4, '90%');
$doleditor->Create();
print " '.$langs->trans("DefaultWarehouse").' ';
print img_picto($langs->trans("DefaultWarehouse"), 'stock', 'class="pictofixedwidth"');
print $formproduct->selectWarehouses(GETPOST('fk_default_warehouse', 'int'), 'fk_default_warehouse', 'warehouseopen', 1, 0, 0, '', 0, 0, array(), 'minwidth300 widthcentpercentminusxx maxwidth500');
- print ' ';
+ print ' ';
print ' ';
print ' ';
@@ -1261,6 +1292,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print ''.$langs->trans("Duration").' ';
print '';
+ $htmltooltip = $langs->trans("mandatoryHelper");
+ print $form->textwithpicto($langs->trans("mandatoryperiod"), $htmltooltip, 1, 0);
+ print ' ';
+
print ' '.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).' ';
- $statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
- print $form->selectarray('finished', $statutarray, GETPOST('finished', 'alpha'), 1);
+ print $formproduct->selectProductNature('finished', $object->finished);
print ' '.$langs->trans("NoteNotVisibleOnBill").' ';
// We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.
- $doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_8, '90%');
+ $doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 140, 'dolibarr_details', '', false, true, getDolGlobalString('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_8, '90%');
$doleditor->Create();
print " '.$langs->trans("Categories").' ';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
@@ -1401,6 +1440,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$defaultva = get_default_tva($mysoc, $mysoc);
print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);
print '
';
print '
';
@@ -1798,6 +1838,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '
'.$langs->trans("Duration").' ';
print '';
+ $htmltooltip = $langs->trans("mandatoryHelper");
+ print $form->textwithpicto($langs->trans("mandatoryperiod"), $htmltooltip, 1, 0);
+ print ' ';
+
print ' ';
} else {
if (empty($conf->global->PRODUCT_DISABLE_NATURE)) {
@@ -2279,13 +2328,22 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
if ($object->isService()) {
// Duration
- print '
'.$langs->trans("Duration").' '.$object->duration_value.' ';
+ print ' '.$langs->trans("Duration").' ';
+ print $object->duration_value;
if ($object->duration_value > 1) {
$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hours"), "d"=>$langs->trans("Days"), "w"=>$langs->trans("Weeks"), "m"=>$langs->trans("Months"), "y"=>$langs->trans("Years"));
} elseif ($object->duration_value > 0) {
$dur = array("i"=>$langs->trans("Minute"), "h"=>$langs->trans("Hour"), "d"=>$langs->trans("Day"), "w"=>$langs->trans("Week"), "m"=>$langs->trans("Month"), "y"=>$langs->trans("Year"));
}
- print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')." ";
+ print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? " ".$langs->trans($dur[$object->duration_unit])." " : '');
+
+ // Mandatory period
+ if ($object->duration_value > 0) {
+ print ' ';
+ }
+ $htmltooltip = $langs->trans("mandatoryHelper");
+ print ' ';
} else {
@@ -2485,14 +2543,14 @@ if ($action != 'create' && $action != 'edit') {
if (empty($reshook)) {
if ($usercancreate) {
if (!isset($object->no_button_edit) || $object->no_button_edit <> 1) {
- print '
id.'">'.$langs->trans("Modify").' ';
+ print '
id.'">'.$langs->trans("Modify").' ';
}
if (!isset($object->no_button_copy) || $object->no_button_copy <> 1) {
if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {
print '
'.$langs->trans('ToClone').' '."\n";
} else {
- print '
id.'">'.$langs->trans("ToClone").' ';
+ print '
id.'">'.$langs->trans("ToClone").' ';
}
}
}
@@ -2503,7 +2561,7 @@ if ($action != 'create' && $action != 'edit') {
if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {
print '
'.$langs->trans('Delete').' '."\n";
} else {
- print '
id.'">'.$langs->trans("Delete").' ';
+ print '
id.'">'.$langs->trans("Delete").' ';
}
} else {
print '
'.$langs->trans("Delete").' ';
@@ -2516,8 +2574,9 @@ if ($action != 'create' && $action != 'edit') {
print "\n
'.$langs->trans("Back").' ';
if ($eid == 0) {
print ''.$langs->trans('Delete').'
'."\n";
} else {
- print '';
+ print '';
}
print '';
@@ -204,7 +204,7 @@ print '
@@ -712,10 +748,9 @@ END;
print ' '.$langs->trans("DiscountQtyMin").' ';
- print '' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ $morehtmlref .= '' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
if ($action == 'classify') {
//$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
$morehtmlref .= '
';
print '
';
@@ -1565,7 +1579,7 @@ if ($action == 'create') {
print $langs->trans('IncotermLabel');
print ' ';
if ($user->rights->reception->creer) {
- print ''.img_edit().' ';
+ print ''.img_edit().' ';
} else {
print ' ';
}
@@ -1920,10 +1934,10 @@ if ($action == 'create') {
} elseif ($object->statut == Reception::STATUS_DRAFT) {
// edit-delete buttons
print ' ';
- print 'id.'">'.img_edit().' ';
+ print 'id.'">'.img_edit().' ';
print ' ';
print '';
- print 'id.'">'.img_delete().' ';
+ print 'id.'">'.img_delete().' ';
print ' ';
// Display lines extrafields
@@ -1990,9 +2004,9 @@ if ($action == 'create') {
// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
if ($object->statut == Reception::STATUS_CLOSED && $user->rights->reception->creer) {
if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)) { // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
- print ''.$langs->trans("ClassifyUnbilled").' ';
+ print ''.$langs->trans("ClassifyUnbilled").' ';
} else {
- print ''.$langs->trans("ReOpen").' ';
+ print ''.$langs->trans("ReOpen").' ';
}
}
@@ -2026,12 +2040,12 @@ if ($action == 'create') {
$label = "ClassifyBilled";
$paramaction = 'classifybilled';
}
- print ''.$langs->trans($label).' ';
+ print ''.$langs->trans($label).' ';
}
}
if ($user->rights->reception->supprimer) {
- print ''.$langs->trans("Delete").' ';
+ print ''.$langs->trans("Delete").' ';
}
}
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 6a4301d86df..278263669ea 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -256,22 +256,22 @@ class Reception extends CommonObject
$sql .= ", fk_incoterms, location_incoterms";
$sql .= ") VALUES (";
$sql .= "'(PROV)'";
- $sql .= ", ".$conf->entity;
+ $sql .= ", ".((int) $conf->entity);
$sql .= ", ".($this->ref_supplier ? "'".$this->db->escape($this->ref_supplier)."'" : "null");
$sql .= ", '".$this->db->idate($now)."'";
- $sql .= ", ".$user->id;
+ $sql .= ", ".((int) $user->id);
$sql .= ", ".($this->date_reception > 0 ? "'".$this->db->idate($this->date_reception)."'" : "null");
$sql .= ", ".($this->date_delivery > 0 ? "'".$this->db->idate($this->date_delivery)."'" : "null");
- $sql .= ", ".$this->socid;
- $sql .= ", ".$this->fk_project;
- $sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : "null");
+ $sql .= ", ".((int) $this->socid);
+ $sql .= ", ".((int) $this->fk_project);
+ $sql .= ", ".($this->shipping_method_id > 0 ? ((int) $this->shipping_method_id) : "null");
$sql .= ", '".$this->db->escape($this->tracking_number)."'";
- $sql .= ", ".$this->weight;
- $sql .= ", ".$this->sizeS; // TODO Should use this->trueDepth
- $sql .= ", ".$this->sizeW; // TODO Should use this->trueWidth
- $sql .= ", ".$this->sizeH; // TODO Should use this->trueHeight
- $sql .= ", ".$this->weight_units;
- $sql .= ", ".$this->size_units;
+ $sql .= ", ".((double) $this->weight);
+ $sql .= ", ".((double) $this->sizeS); // TODO Should use this->trueDepth
+ $sql .= ", ".((double) $this->sizeW); // TODO Should use this->trueWidth
+ $sql .= ", ".((double) $this->sizeH); // TODO Should use this->trueHeight
+ $sql .= ", ".((double) $this->weight_units);
+ $sql .= ", ".((double) $this->size_units);
$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
@@ -561,7 +561,8 @@ class Reception extends CommonObject
// TODO in future, reception lines may not be linked to order line
$sql = "SELECT cd.fk_product, cd.subprice,";
$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
- $sql .= " ed.eatby, ed.sellby, ed.batch";
+ $sql .= " ed.eatby, ed.sellby, ed.batch,";
+ $sql .= " ed.cost_price";
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
$sql .= " WHERE ed.fk_reception = ".((int) $this->id);
@@ -589,7 +590,11 @@ class Reception extends CommonObject
// line without batch detail
// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
- $result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr", $numref));
+ if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION || $conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
+ $result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->cost_price, $langs->trans("ReceptionValidatedInDolibarr", $numref));
+ } else {
+ $result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr", $numref));
+ }
if ($result < 0) {
$error++;
$this->errors[] = $mouvS->error;
@@ -601,7 +606,11 @@ class Reception extends CommonObject
// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
// Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
- $result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
+ if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION || $conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
+ $result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->cost_price, $langs->trans("ReceptionValidatedInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
+ } else {
+ $result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch);
+ }
if ($result < 0) {
$error++;
$this->errors[] = $mouvS->error;
@@ -704,9 +713,10 @@ class Reception extends CommonObject
* @param integer $eatby eat-by date
* @param integer $sellby sell-by date
* @param string $batch Lot number
+ * @param double $cost_price Line cost
* @return int <0 if KO, index of line if OK
*/
- public function addline($entrepot_id, $id, $qty, $array_options = 0, $comment = '', $eatby = '', $sellby = '', $batch = '')
+ public function addline($entrepot_id, $id, $qty, $array_options = 0, $comment = '', $eatby = '', $sellby = '', $batch = '', $cost_price = 0)
{
global $conf, $langs, $user;
@@ -746,8 +756,8 @@ class Reception extends CommonObject
$line->eatby = $eatby;
$line->sellby = $sellby;
$line->status = 1;
+ $line->cost_price = $cost_price;
$line->fk_reception = $this->id;
-
$this->lines[$num] = $line;
return $num;
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index ddc28c72896..498b67d1593 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -152,7 +152,7 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
if ($action == 'classify') {
// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 33a32cea0a8..b7f3f577ce2 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -85,7 +85,7 @@ $extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extrafields->fetch_name_optionals_label($object->table_element);
-$search_array_options = (array) $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
@@ -543,21 +543,7 @@ if ($sall) {
}
// Add where from extra fields
-foreach ($search_array_options as $key => $val) {
- $crit = $val;
- $tmpkey = preg_replace('/search_options_/', '', $key);
- $typ = $extrafields->attributes[$object->table_element]['type'][$tmpkey];
- $mode = 0;
- if (in_array($typ, array('int', 'double', 'real'))) {
- $mode = 1; // Search on a numeric
- }
- if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') {
- $mode = 2; // Search on a foreign key int
- }
- if ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0')) {
- $sql .= natural_search("ef.".$tmpkey, $crit, $mode);
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
// Add where from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
@@ -593,43 +579,43 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
$param .= '&limit='.urlencode($limit);
}
if ($sall) {
- $param .= "&sall=".urlencode($sall);
+ $param .= "&sall=".urlencode($sall);
}
if ($search_ref_rcp) {
- $param .= "&search_ref_rcp=".urlencode($search_ref_rcp);
+ $param .= "&search_ref_rcp=".urlencode($search_ref_rcp);
}
if ($search_ref_liv) {
- $param .= "&search_ref_liv=".urlencode($search_ref_liv);
+ $param .= "&search_ref_liv=".urlencode($search_ref_liv);
}
if ($search_company) {
- $param .= "&search_company=".urlencode($search_company);
+ $param .= "&search_company=".urlencode($search_company);
}
if ($optioncss != '') {
- $param .= '&optioncss='.urlencode($optioncss);
+ $param .= '&optioncss='.urlencode($optioncss);
}
if ($search_billed != '' && $search_billed >= 0) {
- $param .= "&search_billed=".urlencode($search_billed);
+ $param .= "&search_billed=".urlencode($search_billed);
}
if ($search_town) {
- $param .= "&search_town=".urlencode($search_town);
+ $param .= "&search_town=".urlencode($search_town);
}
if ($search_zip) {
- $param .= "&search_zip=".urlencode($search_zip);
+ $param .= "&search_zip=".urlencode($search_zip);
}
if ($search_state) {
- $param .= "&search_state=".urlencode($search_state);
+ $param .= "&search_state=".urlencode($search_state);
}
if ($search_status != '') {
- $param .= "&search_status=".urlencode($search_status);
+ $param .= "&search_status=".urlencode($search_status);
}
if ($search_country) {
- $param .= "&search_country=".urlencode($search_country);
+ $param .= "&search_country=".urlencode($search_country);
}
if ($search_type_thirdparty) {
- $param .= "&search_type_thirdparty=".urlencode($search_type_thirdparty);
+ $param .= "&search_type_thirdparty=".urlencode($search_type_thirdparty);
}
if ($search_ref_supplier) {
- $param .= "&search_ref_supplier=".urlencode($search_ref_supplier);
+ $param .= "&search_ref_supplier=".urlencode($search_ref_supplier);
}
// Add $param from extra fields
foreach ($search_array_options as $key => $val) {
@@ -905,7 +891,7 @@ while ($i < min($num, $limit)) {
// Ref
if (!empty($arrayfields['e.ref']['checked'])) {
- print "";
+ print ' ';
print $reception->getNomUrl(1);
$filename = dol_sanitizeFileName($reception->ref);
$filedir = $conf->reception->dir_output.'/'.dol_sanitizeFileName($reception->ref);
@@ -918,10 +904,10 @@ while ($i < min($num, $limit)) {
}
}
- // Ref customer
+ // Ref supplier
if (!empty($arrayfields['e.ref_supplier']['checked'])) {
- print " ";
- print $obj->ref_supplier;
+ print ' ';
+ print dol_escape_htmltag($obj->ref_supplier);
print " \n";
if (!$i) {
$totalarray['nbfield']++;
@@ -930,7 +916,7 @@ while ($i < min($num, $limit)) {
// Third party
if (!empty($arrayfields['s.nom']['checked'])) {
- print '';
+ print ' ';
print $companystatic->getNomUrl(1);
print ' ';
if (!$i) {
@@ -939,8 +925,8 @@ while ($i < min($num, $limit)) {
}
// Town
if (!empty($arrayfields['s.town']['checked'])) {
- print '';
- print $obj->town;
+ print ' ';
+ print dol_escape_htmltag($obj->town);
print ' ';
if (!$i) {
$totalarray['nbfield']++;
@@ -948,8 +934,8 @@ while ($i < min($num, $limit)) {
}
// Zip
if (!empty($arrayfields['s.zip']['checked'])) {
- print '';
- print $obj->zip;
+ print ' ';
+ print dol_escape_htmltag($obj->zip);
print ' ';
if (!$i) {
$totalarray['nbfield']++;
@@ -957,7 +943,7 @@ while ($i < min($num, $limit)) {
}
// State
if (!empty($arrayfields['state.nom']['checked'])) {
- print "".$obj->state_name." \n";
+ print "".dol_escape_htmltag($obj->state_name)." \n";
if (!$i) {
$totalarray['nbfield']++;
}
@@ -966,7 +952,7 @@ while ($i < min($num, $limit)) {
if (!empty($arrayfields['country.code_iso']['checked'])) {
print '';
$tmparray = getCountry($obj->fk_pays, 'all');
- print $tmparray['label'];
+ print dol_escape_htmltag($tmparray['label']);
print ' ';
if (!$i) {
$totalarray['nbfield']++;
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index bbf2c80be2f..a75dd432082 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -129,7 +129,7 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
if ($action == 'classify') {
// $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index 39a5a24347d..41ebc02747f 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php
@@ -69,7 +69,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
// For now, receptions must stay linked to order, so link is not deletable
if ($object->element != 'order_supplier') {
?>
- ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
+ ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?>
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 6da39445f7f..b6f03d38b76 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -255,7 +255,7 @@ if ($action == 'edit') {
print '
';
print '
';
}
}
@@ -459,13 +459,13 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
// Active
if (in_array($name, $def)) {
print '
'."\n";
- print '';
+ print ' ';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print ' ';
} else {
print '
'."\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -475,9 +475,9 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
if ($conf->global->$constforvar == $name) {
//print img_picto($langs->trans("Default"), 'on');
// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
- print '
scandir.'&label='.urlencode($module->name).'&type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').' ';
+ print '
scandir).'&label='.urlencode($module->name).'&type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').' ';
} else {
- print '
scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print '
scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
}
print '';
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index 2bcddf58964..60bd0494ebc 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -252,7 +252,7 @@ if ($action == 'edit') {
print '
';
print '
';
}
}
@@ -457,13 +457,13 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
// Active
if (in_array($name, $def)) {
print '
'."\n";
- print '';
+ print ' ';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print ' ';
} else {
print '
'."\n";
- print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print 'scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -473,9 +473,9 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
if ($conf->global->$constforvar == $name) {
//print img_picto($langs->trans("Default"), 'on');
// Even if choice is the default value, we allow to disable it. Replace this with previous line if you need to disable unset
- print '
scandir.'&label='.urlencode($module->name).'&type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').' ';
+ print '
scandir).'&label='.urlencode($module->name).'&type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').' ';
} else {
- print '
scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
+ print '
scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
}
print '';
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index e0008d1a694..fa7df34af14 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -388,7 +388,7 @@ class RecruitmentCandidature extends CommonObject
}
}
if (count($sqlwhere) > 0) {
- $sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+ $sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
}
if (!empty($sortfield)) {
@@ -893,7 +893,7 @@ class RecruitmentCandidature extends CommonObject
$this->lines = array();
$objectline = new RecruitmentCandidatureLine($this->db);
- $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_recruitmentcandidature = '.$this->id));
+ $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_recruitmentcandidature = '.((int) $this->id)));
if (is_numeric($result)) {
$this->error = $this->error;
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 94ce1f8683d..cbfd11fd431 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -397,7 +397,7 @@ class RecruitmentJobPosition extends CommonObject
}
}
if (count($sqlwhere) > 0) {
- $sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+ $sql .= ' AND ('.implode(' '.$this->db->escape($filtermode).' ', $sqlwhere).')';
}
if (!empty($sortfield)) {
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
index 192d1d4c526..ce96d1cd67b 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_standard.php
@@ -36,7 +36,7 @@ class mod_recruitmentcandidature_standard extends ModeleNumRefRecruitmentCandida
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
- public $prefix = 'JOC';
+ public $prefix = 'JOA';
/**
* @var string Error code (or message)
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 01ac72065ea..79795472b4e 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -186,7 +186,7 @@ if ($object->id > 0) {
if ($permissiontoadd)
{
if ($action != 'classify')
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref .=' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index db51171a04a..0406c5bc65c 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -482,7 +482,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$morehtmlref .= '
'.$langs->trans('Project') . ' ';
if ($permissiontoadd)
{
- //if ($action != 'classify') $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' ';
+ //if ($action != 'classify') $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' ';
$morehtmlref .= ' : ';
if ($action == 'classify') {
//$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
@@ -558,7 +558,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Modify
if ($permissiontoadd) {
- print '
'.$langs->trans("Modify").' '."\n";
+ print '
'.$langs->trans("Modify").' '."\n";
} else {
print '
'.$langs->trans('Modify').' '."\n";
}
@@ -567,7 +567,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if ($object->status == $object::STATUS_DRAFT) {
if ($permissiontoadd) {
if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
- print '
'.$langs->trans("Validate").' ';
+ print '
'.$langs->trans("Validate").' ';
} else {
$langs->load("errors");
print '
'.$langs->trans("Validate").' ';
@@ -620,7 +620,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Delete (need delete permission, or if draft, just need create/modify permission)
if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd)) {
- print '
'.$langs->trans('Delete').' '."\n";
+ print '
'.$langs->trans('Delete').' '."\n";
} else {
print '
'.$langs->trans('Delete').' '."\n";
}
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index 2e8c29cf2fe..dcd29c88118 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -167,7 +167,7 @@ if ($object->id) {
if ($permissiontoadd)
{
if ($action != 'classify')
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref .=' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 70b5366aec7..d2315b1f756 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -338,7 +338,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
$obj = $db->fetch_object($resql);
$id = $obj->rowid;
- header("Location: ".dol_buildpath('/recruitment/recruitmentcandidature_card.php', 1).'?id='.$id);
+ header("Location: ".DOL_URL_ROOT.'/recruitment/recruitmentcandidature_card.php?id='.$id);
exit;
}
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index 19808ca1b59..ead2df3c973 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -140,7 +140,7 @@ if ($id > 0 || !empty($ref)) {
if ($permissiontoadd)
{
if ($action != 'classify')
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref .=' : ';
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index 253bf2a7e0c..4c3e642a224 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -184,7 +184,7 @@ if ($object->id > 0) {
$morehtmlref .= $langs->trans('Project').' ';
if ($permissiontoadd) {
if ($action != 'classify') {
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref .= ' : ';
}
if ($action == 'classify') {
diff --git a/htdocs/recruitment/recruitmentjobposition_applications.php b/htdocs/recruitment/recruitmentjobposition_applications.php
index e5740fb203c..4295ce73284 100644
--- a/htdocs/recruitment/recruitmentjobposition_applications.php
+++ b/htdocs/recruitment/recruitmentjobposition_applications.php
@@ -148,14 +148,14 @@ if ($reshook < 0) {
if (empty($reshook)) {
$error = 0;
- $backurlforlist = dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1);
+ $backurlforlist = DOL_URL_ROOT.'/recruitment/recruitmentjobposition_list.php';
if (empty($backtopage) || ($cancel && empty($id))) {
if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
$backtopage = $backurlforlist;
} else {
- $backtopage = dol_buildpath('/recruitment/recruitmentjobposition_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+ $backtopage = DOL_URL_ROOT.'/recruitment/recruitmentjobposition_card.php?id='.($id > 0 ? $id : '__ID__');
}
}
}
@@ -352,7 +352,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$morehtmlref .= $langs->trans('Project').' ';
if ($permissiontoadd) {
if ($action != 'classify') {
- $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
+ $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
}
$morehtmlref .= ' : ';
if ($action == 'classify') {
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index e2a848e9760..3fa7617f55c 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -379,7 +379,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$morehtmlref .= $langs->trans('Project').' ';
if ($permissiontoadd) {
if ($action != 'classify') {
- $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
+ $morehtmlref .= '
'.img_edit($langs->transnoentitiesnoconv('SetProject')).' ';
}
$morehtmlref .= ' : ';
if ($action == 'classify') {
@@ -457,7 +457,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Modify
if ($permissiontoadd) {
- print '
'.$langs->trans("Modify").' '."\n";
+ print '
'.$langs->trans("Modify").' '."\n";
} else {
print '
'.$langs->trans('Modify').' '."\n";
}
@@ -466,7 +466,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if ($object->status == $object::STATUS_DRAFT) {
if ($permissiontoadd) {
if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
- print '
'.$langs->trans("Validate").' ';
+ print '
'.$langs->trans("Validate").' ';
} else {
$langs->load("errors");
print '
'.$langs->trans("Validate").' ';
@@ -505,7 +505,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
// Delete (need delete permission, or if draft, just need create/modify permission)
if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd)) {
- print '
'.$langs->trans('Delete').' '."\n";
+ print '
'.$langs->trans('Delete').' '."\n";
} else {
print '
'.$langs->trans('Delete').' '."\n";
}
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index 43d80901f3d..14355aeb0e3 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -165,7 +165,7 @@ if ($object->id) {
$morehtmlref .= $langs->trans('Project').' ';
if ($permissiontoadd) {
if ($action != 'classify') {
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref .= ' : ';
}
if ($action == 'classify') {
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 8f45caed040..0544cdb160f 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -359,7 +359,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
$obj = $db->fetch_object($resql);
$id = $obj->rowid;
- header("Location: ".dol_buildpath('/recruitment/recruitmentjobposition_card.php', 1).'?id='.$id);
+ header("Location: ".DOL_URL_ROOT.'/recruitment/recruitmentjobposition_card.php?id='.$id);
exit;
}
diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
index dc7cdaef4ae..2645980f7bb 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -143,7 +143,7 @@ if ($id > 0 || !empty($ref)) {
$morehtmlref .= $langs->trans('Project').' ';
if ($permissiontoadd) {
if ($action != 'classify') {
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref .= ' : ';
}
if ($action == 'classify') {
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 88b3d0fdb03..989aa4ccf91 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -339,7 +339,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
// Edit resource
if ($user->rights->resource->write) {
print '
';
}
}
@@ -347,7 +347,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
// Delete resource
if ($user->rights->resource->delete) {
print '
';
}
}
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 7020beced48..a0f80d7b27c 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -974,7 +974,7 @@ class Dolresource extends CommonObject
$linkstart = '
';
$linkend = ' ';
- /*$linkstart = '
';
+ /*$linkstart = ' ';
$linkend = ' ';*/
$result .= $linkstart;
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index 4d0736c5f64..4a51f1dfbb3 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -502,7 +502,7 @@ if (!$ret) {
$morehtmlref .= '
'.$langs->trans('Project').' ';
if ($user->rights->commande->creer) {
if ($action != 'classify') {
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
+ //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
$morehtmlref .= ' : ';
}
if ($action == 'classify') {
diff --git a/htdocs/salaries/admin/salaries_extrafields.php b/htdocs/salaries/admin/salaries_extrafields.php
index 38303518ac4..2354da8048a 100644
--- a/htdocs/salaries/admin/salaries_extrafields.php
+++ b/htdocs/salaries/admin/salaries_extrafields.php
@@ -42,7 +42,7 @@ foreach ($tmptype2label as $key => $val) {
$action = GETPOST('action', 'aZ09');
$attrname = GETPOST('attrname', 'alpha');
-$elementtype = 'payment_salary'; //Must be the $table_element of the class that manage extrafield
+$elementtype = 'salary'; //Must be the $table_element of the class that manage extrafield
if (!$user->admin) {
accessforbidden();
diff --git a/htdocs/salaries/ajax/ajaxsalaries.php b/htdocs/salaries/ajax/ajaxsalaries.php
new file mode 100644
index 00000000000..dc7715ff6ba
--- /dev/null
+++ b/htdocs/salaries/ajax/ajaxsalaries.php
@@ -0,0 +1,73 @@
+
+ * Copyright (C) 2005-2009 Regis Houssin
+ * Copyright (C) 2007-2010 Laurent Destailleur
+ * Copyright (C) 2010 Cyrille de Lambert
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see ';
print $form->editfieldkey('Amount', 'amount', '', $object, 0, 'string', '', 1).' ';
- print ' '.$langs->trans('UpdateAmountWithLastSalary').'';
+ print '';
+ print ' '.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
}
if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
$morehtmlref .= '';
} else {
@@ -738,7 +815,7 @@ if ($id) {
print $langs->trans('DefaultPaymentMode');
print '';
if ($action != 'editmode')
- print 'id.'">'.img_edit($langs->trans('SetMode'), 1).' id.'">'.img_edit($langs->trans('SetMode'), 1).'
';
print '
';
@@ -756,7 +833,7 @@ if ($id) {
print $langs->trans('DefaultBankAccount');
print ' ';
if ($action != 'editbankaccount' && $user->rights->salaries->write) {
- print ' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).' id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'
';
print '
';
@@ -901,17 +978,17 @@ if ($id) {
if ($action != 'edit') {
// Reopen
if ($object->paye && $user->rights->salaries->write) {
- print "";
+ print '";
}
// Edit
if ($object->paye == 0 && $user->rights->salaries->write) {
- print "";
+ print '";
}
// Emit payment
if ($object->paye == 0 && ((price2num($object->amount) < 0 && price2num($resteapayer, 'MT') < 0) || (price2num($object->amount) > 0 && price2num($resteapayer, 'MT') > 0)) && $user->rights->salaries->write) {
- print "";
+ print '";
}
// Classify 'paid'
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 8fdd741efee..5c87b3c53b9 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -406,11 +406,11 @@ class Salary extends CommonObject
$sql .= "'".$this->db->escape($this->fk_user)."'";
//$sql .= ", '".$this->db->idate($this->datep)."'";
//$sql .= ", '".$this->db->idate($this->datev)."'";
- $sql .= ", ".$this->amount;
- $sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 0);
- $sql .= ", ".($this->salary > 0 ? $this->salary : "null");
- $sql .= ", ".($this->type_payment > 0 ? $this->type_payment : 0);
- $sql .= ", ".($this->accountid > 0 ? $this->accountid : "null");
+ $sql .= ", ".((double) $this->amount);
+ $sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : 0);
+ $sql .= ", ".($this->salary > 0 ? ((double) $this->salary) : "null");
+ $sql .= ", ".($this->type_payment > 0 ? ((int) $this->type_payment) : 0);
+ $sql .= ", ".($this->accountid > 0 ? ((int) $this->accountid) : "null");
if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
$sql .= ", '".$this->db->escape($this->label)."'";
$sql .= ", '".$this->db->idate($this->datesp)."'";
@@ -418,7 +418,7 @@ class Salary extends CommonObject
$sql .= ", '".$this->db->escape($user->id)."'";
$sql .= ", '".$this->db->idate($now)."'";
$sql .= ", NULL";
- $sql .= ", ".$conf->entity;
+ $sql .= ", ".((int) $conf->entity);
$sql .= ")";
dol_syslog(get_class($this)."::create", LOG_DEBUG);
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index ea21b49159c..4f49858eb7a 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -35,6 +35,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
+if (!empty($conf->projet->enabled)) {
+ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
// Load translation files required by the page
$langs->loadLangs(array("compta", "bills", "users", "salaries", "hrm"));
@@ -44,6 +48,9 @@ $ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'aZ09');
$confirm = GETPOST('confirm', 'alpha');
+$label = GETPOST('label', 'alphanohtml');
+$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : GETPOST('fk_project', 'int'));
+
// Get parameters
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -62,9 +69,29 @@ if (!$sortfield) {
$sortfield = "name";
}
+$object = new Salary($db);
+$extrafields = new ExtraFields($db);
+
+$childids = $user->getAllChildIds(1);
+
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
$object = new Salary($db);
if ($id > 0 || !empty($ref)) {
$object->fetch($id, $ref);
+
+ // Check current user can read this salary
+ $canread = 0;
+ if (!empty($user->rights->salaries->readall)) {
+ $canread = 1;
+ }
+ if (!empty($user->rights->salaries->read) && $object->fk_user > 0 && in_array($object->fk_user, $childids)) {
+ $canread = 1;
+ }
+ if (!$canread) {
+ accessforbidden();
+ }
}
$upload_dir = $conf->salaries->dir_output.'/'.dol_sanitizeFileName($object->id);
@@ -84,12 +111,26 @@ restrictedArea($user, 'salaries', $object->id, 'salary', '');
include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+// Link to a project
+if ($action == 'classin' && $user->rights->banque->modifier) {
+ $object->fetch($id);
+ $object->setProject($projectid);
+}
+
+// set label
+if ($action == 'setlabel' && $user->rights->salaries->write) {
+ $object->fetch($id);
+ $object->label = $label;
+ $object->update($user);
+}
+
/*
* View
*/
$form = new Form($db);
+if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
$title = $langs->trans('Salary')." - ".$langs->trans('Documents');
$help_url = "";
@@ -116,7 +157,53 @@ if ($object->id) {
$userstatic = new User($db);
$userstatic->fetch($object->fk_user);
- $morehtmlref .= $langs->trans('Employee').' : '.$userstatic->getNomUrl(1);
+ // Label
+ if ($action != 'editlabel') {
+ $morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->salaries->write, 'string', '', 0, 1);
+ $morehtmlref .= $object->label;
+ } else {
+ $morehtmlref .= $langs->trans('Label').' : ';
+ $morehtmlref .= '';
+ }
+
+ $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : ';
+ }
+ if ($action == 'classify') {
+ //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+ $morehtmlref .= '';
+ } else {
+ $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+ }
+ } else {
+ if (!empty($object->fk_project)) {
+ $proj = new Project($db);
+ $proj->fetch($object->fk_project);
+ $morehtmlref .= '';
+ $morehtmlref .= $proj->ref;
+ $morehtmlref .= ' ';
+ } else {
+ $morehtmlref .= '';
+ }
+ }
+ }
+
$morehtmlref .= '';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
@@ -136,7 +223,7 @@ if ($object->id) {
print dol_print_date($object->dateep, 'day');
print ' 
';
}
@@ -277,11 +277,11 @@ class Dolistore
// free or pay ?
if ($product->price > 0) {
$price = '
