| '; + $searchpicto = $form->showFilterButtons(); + print $searchpicto; + print ' | '; + } + print ''; print ' | '; @@ -404,13 +414,18 @@ if ($action != 'export_csv') { print $hookmanager->resPrint; // Action column - print ''; - $searchpicto = $form->showFilterButtons(); - print $searchpicto; - print ' | '; + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + $searchpicto = $form->showFilterButtons(); + print $searchpicto; + print ' | '; + } print '||
| '; + print $link; + print ' | '; + } + // Accounting account if ($type == 'sub') { print ''.$line->subledger_account.' ('.$line->subledger_label.') | '; @@ -581,9 +606,14 @@ if ($action != 'export_csv') { } else { print ''.price(price2num($line->debit - $line->credit, 'MT')).' | '; } - print ''; - print $link; - print ' | '; + + // Action column + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print ''; + print $link; + print ' | '; + } + print "|
| '.$langs->trans("SubTotal").': | '; + print '|||||
| \n"; + } + print ' | '.$langs->trans("SubTotal").': | '; if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) { print ''.price(price2num($sous_total_opening_balance, 'MT')).' | '; } @@ -604,11 +639,19 @@ if ($action != 'export_csv') { } else { print '' . price(price2num($sous_total_debit - $sous_total_credit, 'MT')) . ' | '; } - print "\n"; + // Action column + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print " | \n"; + } print ' |
| '.$langs->trans("AccountBalance").': | '; + print '|||||
| \n"; + } + print ' | '.$langs->trans("AccountBalance").': | '; if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) { print ''.price(price2num($total_opening_balance, 'MT')).' | '; } @@ -619,7 +662,10 @@ if ($action != 'export_csv') { } else { print '' . price(price2num($total_debit - $total_credit, 'MT')) . ' | '; } - print "\n"; + // Action column + if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { + print " | \n"; + } print ' | ".$invoicestatic->getNomUrl(1)." | "; // Account print ""; - $accountoshow = length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER); + $accountoshow = length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER')); if (($accountoshow == "") || $accountoshow == 'NotDefined') { print ''.$langs->trans("MainAccountForSuppliersNotDefined").''; } else { @@ -1067,7 +1068,7 @@ if (empty($action) || $action == 'view') { print " | "; // Subledger account print "";
- if (!empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT)) {
+ if (getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT')) {
if ($k == getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT')) {
print length_accounta($tabcompany[$key]['code_compta']);
}
@@ -1097,7 +1098,7 @@ if (empty($action) || $action == 'view') {
}
// VAT Reverse charge
- if ($mysoc->country_code == 'FR' || !empty($conf->global->ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE)) {
+ if ($mysoc->country_code == 'FR' || getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
$has_vat = false;
foreach ($arrayofvat[$key] as $k => $mt) {
if ($mt) {
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index e8178ad63d3..3f7b4ecdeb5 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -109,7 +109,7 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
$sql = "SELECT f.rowid, f.ref, f.type, f.situation_cycle_ref, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code, f.retained_warranty,";
$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code, fd.info_bits,";
$sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur,";
-if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
$sql .= " spe.accountancy_code_customer as code_compta,";
$sql .= " spe.accountancy_code_supplier as code_compta_fournisseur,";
} else {
@@ -117,26 +117,26 @@ if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
$sql .= " s.code_compta_fournisseur,";
}
$sql .= " p.rowid as pid, p.ref as pref, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte,";
-if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
$sql .= " ppe.accountancy_code_sell";
} else {
$sql .= " p.accountancy_code_sell";
}
$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
-if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
+if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
}
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
$sql .= " JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
$sql .= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
-if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
+if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
}
$sql .= " WHERE fd.fk_code_ventilation > 0";
$sql .= " AND f.entity IN (".getEntity('invoice', 0).')'; // We don't share object for accountancy, we use source object sharing
$sql .= " AND f.fk_statut > 0";
-if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { // Non common setup
+if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) { // Non common setup
$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
} else {
$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
@@ -146,8 +146,8 @@ if ($date_start && $date_end) {
$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
}
// Define begin binding date
-if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
- $sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
+if (getDolGlobalString('ACCOUNTING_DATE_START_BINDING')) {
+ $sql .= " AND f.datef >= '".$db->idate(getDolGlobalString('ACCOUNTING_DATE_START_BINDING'))."'";
}
// Already in bookkeeping or not
if ($in_bookkeeping == 'already') {
@@ -177,8 +177,8 @@ if ($result) {
$num = $db->num_rows($result);
// Variables
- $cptcli = (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "")) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined';
- $cpttva = (!empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : 'NotDefined';
+ $cptcli = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER', 'NotDefined');
+ $cpttva = getDolGlobalString('ACCOUNTING_VAT_SOLD_ACCOUNT', 'NotDefined');
$i = 0;
while ($i < $num) {
@@ -190,9 +190,9 @@ if ($result) {
$compta_prod = $obj->compte;
if (empty($compta_prod)) {
if ($obj->product_type == 0) {
- $compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : 'NotDefined';
+ $compta_prod = getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_ACCOUNT', 'NotDefined');
} else {
- $compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : 'NotDefined';
+ $compta_prod = getDolGlobalString('ACCOUNTING_SERVICE_SOLD_ACCOUNT', 'NotDefined');
}
}
@@ -257,7 +257,7 @@ if ($result) {
// It also seems that credit notes on situation invoices are correctly saved (but it depends on the version used in fact).
// For credit notes, we hope to have situation_ratio = 1 so the compensation has no effect to avoid introducing troubles with credit notes.
$total_ttc = $obj->total_ttc * $situation_ratio;
- if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY) && $obj->retained_warranty > 0) {
+ if (getDolGlobalString('INVOICE_USE_RETAINED_WARRANTY') && $obj->retained_warranty > 0) {
$retained_warranty = (double) price2num($total_ttc * $obj->retained_warranty / 100, 'MT');
$tabwarranty[$obj->rowid][$compta_soc] += $retained_warranty;
$total_ttc -= $retained_warranty;
@@ -315,11 +315,11 @@ if ($action == 'writebookkeeping') {
$invoicestatic = new Facture($db);
$accountingaccountcustomer = new AccountingAccount($db);
- $accountingaccountcustomer->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER, true);
+ $accountingaccountcustomer->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'), true);
$accountingaccountcustomerwarranty = new AccountingAccount($db);
- $accountingaccountcustomerwarranty->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY, true);
+ $accountingaccountcustomerwarranty->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY'), true);
foreach ($tabfac as $key => $val) { // Loop on each invoice
$errorforline = 0;
@@ -381,7 +381,7 @@ if ($action == 'writebookkeeping') {
$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
$bookkeeping->subledger_label = $tabcompany[$key]['name'];
- $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY;
+ $bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY');
$bookkeeping->label_compte = $accountingaccountcustomerwarranty->label;
$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$langs->trans("Retainedwarranty");
@@ -430,7 +430,7 @@ if ($action == 'writebookkeeping') {
$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
$bookkeeping->subledger_label = $tabcompany[$key]['name'];
- $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+ $bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER');
$bookkeeping->label_compte = $accountingaccountcustomer->label;
$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$langs->trans("SubledgerAccount");
@@ -488,7 +488,7 @@ if ($action == 'writebookkeeping') {
$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
$bookkeeping->thirdparty_code = $companystatic->code_client;
- if (!empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT)) {
+ if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT')) {
if ($k == getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT')) {
$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
$bookkeeping->subledger_label = $tabcompany[$key]['name'];
@@ -657,7 +657,7 @@ $form = new Form($db);
// Export
if ($action == 'exportcsv') { // ISO and not UTF8 !
- $sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
+ $sep = getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV');
$filename = 'journal';
$type_export = 'journal';
@@ -704,7 +704,7 @@ if ($action == 'exportcsv') { // ISO and not UTF8 !
print '"'.$val["ref"].'"'.$sep;
print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
- print '"'.length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY).'"'.$sep;
+ print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY')).'"'.$sep;
print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
print '"'.$langs->trans("Thirdparty").'"'.$sep;
print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$invoicestatic->ref.' - '.$langs->trans("Retainedwarranty").'"'.$sep;
@@ -723,7 +723,7 @@ if ($action == 'exportcsv') { // ISO and not UTF8 !
print '"'.$val["ref"].'"'.$sep;
print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
- print '"'.length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER).'"'.$sep;
+ print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER')).'"'.$sep;
print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
print '"'.$langs->trans("Thirdparty").'"'.$sep;
print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$invoicestatic->ref.' - '.$langs->trans("Thirdparty").'"'.$sep;
@@ -800,7 +800,7 @@ if (empty($action) || $action == 'view') {
$exportlink = '';
$builddate = dol_now();
$description = $langs->trans("DescJournalOnlyBindedVisible").' '; - if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { + if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) { $description .= $langs->trans("DepositsAreNotIncluded"); } else { $description .= $langs->trans("DepositsAreIncluded"); @@ -815,7 +815,8 @@ if (empty($action) || $action == 'view') { journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink); // Button to write into Ledger - if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') { + $acctCustomerNotConfigured = in_array(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'), ['','-1']); + if ($acctCustomerNotConfigured) { print ' '.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
$desc = ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '{link}');
$desc = str_replace('{link}', ''.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'', $desc);
@@ -823,10 +824,10 @@ if (empty($action) || $action == 'view') {
print ' ';
}
print '';
- if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
+ if (getDolGlobalString('ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL') && $in_bookkeeping == 'notyet') {
print '';
}
- if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
+ if ($acctCustomerNotConfigured) {
print '';
} else {
if ($in_bookkeeping == 'notyet') {
@@ -950,7 +951,7 @@ if (empty($action) || $action == 'view') {
print " ".$invoicestatic->getNomUrl(1)." | ";
// Account
print "";
- $accountoshow = length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY);
+ $accountoshow = length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY'));
if (($accountoshow == "") || $accountoshow == 'NotDefined') {
print ''.$langs->trans("MainAccountForCustomersNotDefined").'';
} else {
@@ -980,7 +981,7 @@ if (empty($action) || $action == 'view') {
print " | ".$invoicestatic->getNomUrl(1)." | ";
// Account
print "";
- $accountoshow = length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER);
+ $accountoshow = length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'));
if (($accountoshow == "") || $accountoshow == 'NotDefined') {
print ''.$langs->trans("MainAccountForCustomersNotDefined").'';
} else {
@@ -1024,7 +1025,7 @@ if (empty($action) || $action == 'view') {
print " | ";
// Subledger account
print "";
- if (!empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT)) {
+ if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT')) {
if ($k == getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT')) {
print length_accounta($tabcompany[$key]['code_compta']);
}
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 306b88d11ea..b393c0f54ce 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -57,7 +57,7 @@ if (empty($user->rights->accounting->mouvements->lire)) {
* Actions
*/
-if ($action == 'ventil' && $user->rights->accounting->bind->write) {
+if ($action == 'ventil' && $user->hasRight('accounting', 'bind', 'write')) {
if (!$cancel) {
if ($codeventil < 0) {
$codeventil = 0;
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 5d212e57ccf..d6df336d979 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -91,7 +91,7 @@ if (empty($user->rights->accounting->mouvements->lire)) {
* Actions
*/
-if (($action == 'clean' || $action == 'validatehistory') && $user->rights->accounting->bind->write) {
+if (($action == 'clean' || $action == 'validatehistory') && $user->hasRight('accounting', 'bind', 'write')) {
// Clean database
$db->begin();
$sql1 = "UPDATE ".$db->prefix()."facture_fourn_det as fd";
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 2c4fece83f0..06fd0369f03 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -133,7 +133,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_tvaintra = '';
}
-if (is_array($changeaccount) && count($changeaccount) > 0 && $user->rights->accounting->bind->write) {
+if (is_array($changeaccount) && count($changeaccount) > 0 && $user->hasRight('accounting', 'bind', 'write')) {
$error = 0;
if (!(GETPOST('account_parent', 'int') >= 0)) {
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 2b8fea60e51..8d227b7ce1b 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -169,7 +169,7 @@ if (empty($reshook)) {
}
-if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
+if ($massaction == 'ventil' && $user->hasRight('accounting', 'bind', 'write')) {
$msg = '';
if (!empty($mesCasesCochees)) {
@@ -453,7 +453,7 @@ if ($result) {
//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
);
- //if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+ //if ($user->hasRight('mymodule', 'supprimer')) $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
if ($massaction !== 'set_default_account') {
$massactionbutton = $form->selectMassAction('ventil', $arrayofmassactions, 1);
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index 74330c65ccd..84ae98ac3c5 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -216,7 +216,7 @@ abstract class ActionsAdherentCardCommon
$this->tpl['visibility'] = $this->object->getmorphylib($this->object->morphy);
- $this->tpl['note'] = nl2br($this->object->note);
+ $this->tpl['note'] = $this->object->note_private;
}
if ($action == 'create_user') {
@@ -251,7 +251,8 @@ abstract class ActionsAdherentCardCommon
$this->object->old_name = GETPOST("old_name");
$this->object->old_firstname = GETPOST("old_firstname");
- $this->object->fk_soc = GETPOST("fk_soc");
+ $this->object->fk_soc = GETPOST("fk_soc", 'int');
+ $this->object->socid = GETPOST("fk_soc", 'int');
$this->object->lastname = GETPOST("lastname");
$this->object->firstname = GETPOST("firstname");
$this->object->civility_id = GETPOST("civility_id");
@@ -262,8 +263,8 @@ abstract class ActionsAdherentCardCommon
$this->object->state_id = GETPOST("state_id", 'int');
$this->object->phone_perso = GETPOST("phone_perso");
$this->object->phone_mobile = GETPOST("phone_mobile");
- $this->object->email = GETPOST("email", 'alphawithlgt');
- $this->object->note = GETPOST("note", 'restricthtml');
+ $this->object->email = GETPOST("email", 'alphawithlgt');
+ $this->object->note_private = GETPOST("note", 'restricthtml');
$this->object->canvas = GETPOST("canvas");
// We set country_id, and country_code label of the chosen country
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 5816c5c4ea1..820e9455efb 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -316,7 +316,7 @@ if (empty($reshook)) {
$object->birth = $birthdate;
$object->default_lang = GETPOST('default_lang', 'alpha');
$object->typeid = GETPOST("typeid", 'int');
- //$object->note = trim(GETPOST("comment","alpha"));
+ //$object->note = trim(GETPOST("comment", "restricthtml"));
$object->morphy = GETPOST("morphy", 'alpha');
if (GETPOST('deletephoto', 'alpha')) {
@@ -1336,7 +1336,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
if (!$value['active']) {
break;
}
- print ' | '.$langs->trans($value['label']).' | '.$langs->trans($value['label']).' | '.$langs->trans("Amount").' | '.price($object->amount).' | '.$langs->trans("Label").' | '.$object->note.' | '.$langs->trans("Label").' | '.dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private)).' | rowid.'">'.img_edit().' | ';
}
}
@@ -374,7 +374,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
print ''.yn($objp->vote).' | ';
print ''.$membertype->getLibStatut(5).' | ';
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
- if ($user->rights->adherent->configurer) {
+ if ($user->hasRight('adherent', 'configurer')) {
print 'rowid.'">'.img_edit().' | ';
}
}
@@ -537,10 +537,12 @@ if ($rowid > 0) {
print ''.$langs->trans("Description").' | ';
- print nl2br($object->note)." | | ";
print '
| '.$langs->trans("WelcomeEMail").' | '; - print nl2br($object->mail_valid)." | ||||
| '.$langs->trans("Description").' | '; + print ' | ||||
| '.$langs->trans("Description").' | '; print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private)); print ' | ' . $langs->trans('AmountTTC') . ' | '; print '' . price($object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . ' | '; if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { - print '' . price($object->total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' | '; + print '' . price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' | '; } print ''; diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index b3f3d387df3..d7fb02e14f3 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -3721,6 +3721,7 @@ class Propal extends CommonObject { global $conf, $langs, $user; + $langs->load('propal'); $datas = []; $nofetch = !empty($params['nofetch']); diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index ace4556fb62..36eb458f252 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -68,7 +68,8 @@ $usercancreate = $user->hasRight("propal", "creer"); $permissionnote = $user->rights->propal->creer; // Used by the include of actions_setnotes.inc.php -$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks +$parameters = array(); +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index c9ca03380a0..e7d386e348a 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -68,7 +68,7 @@ if (GETPOST('cancel', 'alpha') && !empty($backtopage)) { if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes' && $permissiontocreate) { //if ($user->rights->societe->creer) - //if ($user->rights->facture->creer) + //if ($user->hasRight('facture', 'creer')) $amount_ttc_1 = GETPOST('amount_ttc_1', 'alpha'); $amount_ttc_1 = price2num($amount_ttc_1); @@ -159,7 +159,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes' && $permi if ($action == 'setremise' && $permissiontocreate) { //if ($user->rights->societe->creer) - //if ($user->rights->facture->creer) + //if ($user->hasRight('facture', 'creer')) $amount = price2num(GETPOST('amount', 'alpha'), '', 2); $desc = GETPOST('desc', 'alpha'); @@ -199,7 +199,7 @@ if ($action == 'setremise' && $permissiontocreate) { if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes' && $permissiontocreate) { //if ($user->rights->societe->creer) - //if ($user->rights->facture->creer) + //if ($user->hasRight('facture', 'creer')) $db->begin(); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 778df650514..2736bf80d64 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2742,7 +2742,7 @@ if ($action == 'create' && $usercancreate) { print '' . price($object->total_ttc, 1, '', 1, -1, -1, $conf->currency) . ' | '; if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) { // Multicurrency Amount TTC - print '' . price($object->total_ttc, 1, '', 1, -1, -1, $object->multicurrency_code) . ' | '; + print '' . price($object->multicurrency_total_ttc, 1, '', 1, -1, -1, $object->multicurrency_code) . ' | '; } print ''; diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 2f58c5576c7..4036eca225c 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3753,7 +3753,7 @@ class Commande extends CommonOrder if ($user->hasRight('commande', 'lire')) { $datas['picto'] = img_picto('', $this->picto).' '.$langs->trans("Order").''; if (isset($this->statut)) { - $datas[] = ' '.$this->getLibStatut(5); + $datas['status'] = ' '.$this->getLibStatut(5); } $datas['Ref'] = '';
if (!empty($show_shippable_command) && !empty($conf->stock->enabled)) {
if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) {
- $generic_commande->getLinesArray(); // Load array ->lines
$generic_commande->loadExpeditions(); // Load array ->expeditions
- $numlines = count($generic_commande->lines); // Loop on each line of order
- for ($lig = 0; $lig < $numlines; $lig++) {
- if (isset($generic_commande->expeditions[$generic_commande->lines[$lig]->id])) {
- $reliquat = $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id];
+ if (isset($generic_commande->expeditions[$obj->rowid])) {
+ $reliquat = $obj->qty - $generic_commande->expeditions[$obj->rowid];
+ } else {
+ $reliquat = $obj->qty;
+ }
+ if ($obj->product_type == 0 && $obj->fk_product > 0) { // If line is a product and not a service
+ $nbprod++; // order contains real products
+ $generic_product->id = $obj->fk_product;
+
+ // Get local and virtual stock and store it into cache
+ if (empty($productstat_cache[$obj->fk_product])) {
+ $generic_product->load_stock('nobatch'); // ->load_virtual_stock() is already included into load_stock()
+ $productstat_cache[$obj->fk_product]['stock_reel'] = $generic_product->stock_reel;
+ $productstat_cachevirtual[$obj->fk_product]['stock_reel'] = $generic_product->stock_theorique;
} else {
- $reliquat = $generic_commande->lines[$lig]->qty;
+ $generic_product->stock_reel = $productstat_cache[$obj->fk_product]['stock_reel'];
+ $generic_product->stock_theorique = $productstat_cachevirtual[$obj->fk_product]['stock_reel'] = $generic_product->stock_theorique;
}
- if ($generic_commande->lines[$lig]->product_type == 0 && $generic_commande->lines[$lig]->fk_product > 0) { // If line is a product and not a service
- $nbprod++; // order contains real products
- $generic_product->id = $generic_commande->lines[$lig]->fk_product;
- // Get local and virtual stock and store it into cache
- if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product])) {
- $generic_product->load_stock('nobatch'); // ->load_virtual_stock() is already included into load_stock()
- $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_reel;
- $productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;
- } else {
- $generic_product->stock_reel = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'];
- $generic_product->stock_theorique = $productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;
- }
-
- if ($reliquat > $generic_product->stock_reel) {
- $notshippable++;
- }
- if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) { // Default code. Default should be this case.
- $text_info .= $reliquat.' x '.$generic_commande->lines[$lig]->product_ref.' '.dol_trunc($generic_commande->lines[$lig]->product_label, 20);
- $text_info .= ' - '.$langs->trans("Stock").': '.$generic_product->stock_reel.'';
- $text_info .= ' - '.$langs->trans("VirtualStock").': '.$generic_product->stock_theorique.'';
- $text_info .= ($reliquat != $generic_commande->lines[$lig]->qty ? ' ('.$langs->trans("QtyInOtherShipments").' '.($generic_commande->lines[$lig]->qty - $reliquat).')' : '');
- $text_info .= ' '; - } else { // BUGGED CODE. - // DOES NOT TAKE INTO ACCOUNT MANUFACTURING. THIS CODE SHOULD BE USELESS. PREVIOUS CODE SEEMS COMPLETE. - // COUNT STOCK WHEN WE SHOULD ALREADY HAVE VALUE - // Detailed virtual stock, looks bugged, uncomplete and need heavy load. - // stock order and stock order_supplier - $stock_order = 0; - $stock_order_supplier = 0; - if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) { // What about other options ? - if (!empty($conf->commande->enabled)) { - if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'])) { - $generic_product->load_stats_commande(0, '1,2'); - $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'] = $generic_product->stats_commande['qty']; - } else { - $generic_product->stats_commande['qty'] = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer']; - } - $stock_order = $generic_product->stats_commande['qty']; + if ($reliquat > $generic_product->stock_reel) { + $notshippable++; + } + if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) { // Default code. Default should be this case. + $text_info .= $reliquat.' x '.$obj->product_ref.' '.dol_trunc($obj->product_label, 20); + $text_info .= ' - '.$langs->trans("Stock").': '.$generic_product->stock_reel.''; + $text_info .= ' - '.$langs->trans("VirtualStock").': '.$generic_product->stock_theorique.''; + $text_info .= ($reliquat != $obj->qty ? ' ('.$langs->trans("QtyInOtherShipments").' '.($obj->qty - $reliquat).')' : ''); + $text_info .= ' '; + } else { // BUGGED CODE. + // DOES NOT TAKE INTO ACCOUNT MANUFACTURING. THIS CODE SHOULD BE USELESS. PREVIOUS CODE SEEMS COMPLETE. + // COUNT STOCK WHEN WE SHOULD ALREADY HAVE VALUE + // Detailed virtual stock, looks bugged, uncomplete and need heavy load. + // stock order and stock order_supplier + $stock_order = 0; + $stock_order_supplier = 0; + if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) { // What about other options ? + if (!empty($conf->commande->enabled)) { + if (empty($productstat_cache[$obj->fk_product]['stats_order_customer'])) { + $generic_product->load_stats_commande(0, '1,2'); + $productstat_cache[$obj->fk_product]['stats_order_customer'] = $generic_product->stats_commande['qty']; + } else { + $generic_product->stats_commande['qty'] = $productstat_cache[$obj->fk_product]['stats_order_customer']; } - if (isModEnabled('supplier_order')) { - if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'])) { - $generic_product->load_stats_commande_fournisseur(0, '3'); - $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier'] = $generic_product->stats_commande_fournisseur['qty']; - } else { - $generic_product->stats_commande_fournisseur['qty'] = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_supplier']; - } - $stock_order_supplier = $generic_product->stats_commande_fournisseur['qty']; - } - } - $text_info .= $reliquat.' x '.$generic_commande->lines[$lig]->ref.' '.dol_trunc($generic_commande->lines[$lig]->product_label, 20); - $text_stock_reel = $generic_product->stock_reel.'/'.$stock_order; - if ($stock_order > $generic_product->stock_reel && !($generic_product->stock_reel < $generic_commande->lines[$lig]->qty)) { - $warning++; - $text_warning .= ''.$langs->trans('Available').' : '.$text_stock_reel.''; - } - if ($reliquat > $generic_product->stock_reel) { - $text_info .= ''.$langs->trans('Available').' : '.$text_stock_reel.''; - } else { - $text_info .= ''.$langs->trans('Available').' : '.$text_stock_reel.''; + $stock_order = $generic_product->stats_commande['qty']; } if (isModEnabled('supplier_order')) { - $text_info .= ' '.$langs->trans('SupplierOrder').' : '.$stock_order_supplier; + if (empty($productstat_cache[$obj->fk_product]['stats_order_supplier'])) { + $generic_product->load_stats_commande_fournisseur(0, '3'); + $productstat_cache[$obj->fk_product]['stats_order_supplier'] = $generic_product->stats_commande_fournisseur['qty']; + } else { + $generic_product->stats_commande_fournisseur['qty'] = $productstat_cache[$obj->fk_product]['stats_order_supplier']; + } + $stock_order_supplier = $generic_product->stats_commande_fournisseur['qty']; } - $text_info .= ($reliquat != $generic_commande->lines[$lig]->qty ? ' ('.$langs->trans("QtyInOtherShipments").' '.($generic_commande->lines[$lig]->qty - $reliquat).')' : ''); - $text_info .= ' '; } + $text_info .= $reliquat.' x '.$obj->product_ref.' '.dol_trunc($obj->product_label, 20); + $text_stock_reel = $generic_product->stock_reel.'/'.$stock_order; + if ($stock_order > $generic_product->stock_reel && !($generic_product->stock_reel < $obj->qty)) { + $warning++; + $text_warning .= ''.$langs->trans('Available').' : '.$text_stock_reel.''; + } + if ($reliquat > $generic_product->stock_reel) { + $text_info .= ''.$langs->trans('Available').' : '.$text_stock_reel.''; + } else { + $text_info .= ''.$langs->trans('Available').' : '.$text_stock_reel.''; + } + if (isModEnabled('supplier_order')) { + $text_info .= ' '.$langs->trans('SupplierOrder').' : '.$stock_order_supplier; + } + $text_info .= ($reliquat != $obj->qty ? ' ('.$langs->trans("QtyInOtherShipments").' '.($obj->qty - $reliquat).')' : ''); + $text_info .= ' '; } } if ($notshippable == 0) { diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index 57eb073bba3..edcd2a14f16 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -68,7 +68,8 @@ if (!$object->fetch($id, $ref) > 0) { * Actions */ -$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks +$parameters = array(); +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) { setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); } diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php index 8e7ccc4183f..33342098dbc 100644 --- a/htdocs/compta/bank/class/paymentvarious.class.php +++ b/htdocs/compta/bank/class/paymentvarious.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2018-2020 Frédéric France '.$langs->trans('Project').' '; - if ($user->rights->facture->creer) { + if ($user->hasRight('facture', 'creer')) { if ($action != 'classify') { $morehtmlref .= ''.img_edit($langs->transnoentitiesnoconv('SetProject')).' : '; } @@ -1684,7 +1684,7 @@ if ($action == 'create') { ), ); if (empty($object->suspended)) { - if ($user->rights->facture->creer) { + if ($user->hasRight('facture', 'creer')) { if (!empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max)) { print ''; } else { @@ -1699,7 +1699,7 @@ if ($action == 'create') { } } - if ($user->rights->facture->creer) { + if ($user->hasRight('facture', 'creer')) { if (empty($object->suspended)) { print ''; } else { diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 3580fa33e30..f1f69b76969 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -4801,7 +4801,6 @@ if ($action == 'create') { if (!empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE_SCREEN) && $object->type == $object::TYPE_CREDIT_NOTE) { $sign = -1; // We invert sign for output } - print ' ' . $langs->trans('AmountHT') . ' | ';
@@ -4849,7 +4848,7 @@ if ($action == 'create') {
print '' . price($sign * $object->total_ttc, '', $langs, 0, -1, -1, $conf->currency) . ' | ';
if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
// Multicurrency Amount TTC
- print '' . price($sign * $object->total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' | ';
+ print '' . price($sign * $object->multicurrency_total_ttc, '', $langs, 0, -1, -1, $object->multicurrency_code) . ' | ';
}
print '';
- if ($user->rights->facture->creer && empty($invoicerectmp->suspended)) {
+ if ($user->hasRight('facture', 'creer') && empty($invoicerectmp->suspended)) {
if ($invoicerectmp->isMaxNbGenReached()) {
print $langs->trans("MaxNumberOfGenerationReached");
} elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today) {
@@ -1044,7 +1044,7 @@ while ($i < $imaxinloop) {
// Action column
if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print ' | ';
- if ($user->rights->facture->creer && empty($invoicerectmp->suspended)) {
+ if ($user->hasRight('facture', 'creer') && empty($invoicerectmp->suspended)) {
if ($invoicerectmp->isMaxNbGenReached()) {
print $langs->trans("MaxNumberOfGenerationReached");
} elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today) {
diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
index c3c774b79e7..84d9db320ef 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
@@ -51,7 +51,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
|
| date_when, 'day'); ?> |
rights->facture->lire) {
+ if ($user->hasRight('facture', 'lire')) {
$total = $total + $objectlink->total_ht;
echo price($objectlink->total_ht);
}
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 865ce719291..69aa54365cf 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -537,7 +537,7 @@ print ' | ';
if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
if ($user->socid == 0 && $object->statut == 0 && $action == '') {
- if ($user->rights->facture->paiement) {
+ if ($user->hasRight('facture', 'paiement')) {
print ''.$langs->trans('Valid').'';
}
}
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 7df61ebefcb..d8d538c8d7a 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -306,6 +306,7 @@ class Paiement extends CommonObject
if (!empty($currencyofpayment)) {
// We must check that the currency of invoices is the same than the currency of the bank
+ include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$bankaccount = new Account($this->db);
$bankaccount->fetch($this->fk_account);
$bankcurrencycode = empty($bankaccount->currency_code) ? $conf->currency : $bankaccount->currency_code;
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 11f7f1e454f..4a1d44b6c92 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -55,7 +55,7 @@ if ($id > 0) {
}
}
-$result = restrictedArea($user, 'payment_sc', $id, '');
+$result = restrictedArea($user, 'payment_sc', $object, '');
/*
@@ -130,26 +130,20 @@ print '';
print '
';
$tmptitle = $langs->trans('IncludingProductWithTag');
@@ -701,7 +701,7 @@ if (isModEnabled('categorie') && $user->rights->categorie->lire && ($user->right
$moreforfilter .= ' ';
}
// Filter on customer categories
-if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_CONTRACT_LIST) && isModEnabled("categorie") && $user->rights->categorie->lire) {
+if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_CONTRACT_LIST) && isModEnabled("categorie") && $user->hasRight('categorie', 'lire')) {
$moreforfilter .= '';
$tmptitle = $langs->transnoentities('CustomersProspectsCategoriesShort');
$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
@@ -974,7 +974,7 @@ while ($i < $imaxinloop) {
$socstatic->name_alias = $obj->name_alias;
$socstatic->email = $obj->email;
$socstatic->status = $obj->company_status;
- $socstatic->logo = $obj->logo;
+ $socstatic->logo = $obj->company_logo;
$socstatic->country_id = $obj->country_id;
$socstatic->country_code = '';
$socstatic->country = '';
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 6c5ac91c9bb..b680a81521c 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -92,7 +92,27 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC) && !emp
if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://' && substr($link, 0, 7) != 'davs://') {
$link = 'http://'.$link;
}
- dol_add_file_process($upload_dir, 0, 1, 'userfile', null, $link, '', 0);
+
+ // Parse $newUrl
+ $newUrlArray = parse_url($link);
+
+ // Check URL is external
+ if (!getDolGlobalString('MAIN_ALLOW_SVG_FILES_AS_EXTERNAL_LINKS')) {
+ if (!empty($newUrlArray['path']) && preg_match('/\.svg$/i', $newUrlArray['path'])) {
+ $error++;
+ $langs->load("errors");
+ setEventMessages($langs->trans('ErrorSVGFilesNotAllowedAsLinksWithout', 'MAIN_ALLOW_SVG_FILES_AS_EXTERNAL_LINKS'), null, 'errors');
+ }
+ }
+ // Alow external links to svg ?
+ if (!getDolGlobalString('MAIN_ALLOW_LOCAL_LINKS_AS_EXTERNAL_LINKS')) {
+ // Test $newUrlAray['host'] to check link is external using isIPAllowed()
+ // TODO
+ }
+
+ if (!$error) {
+ dol_add_file_process($upload_dir, 0, 1, 'userfile', null, $link, '', 0);
+ }
}
}
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index f051fe5ade3..47ad55399ad 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -85,7 +85,7 @@ class box_contacts extends ModeleBoxes
$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedContacts", $max));
- if ($user->hasRight('societe', 'lire') && $user->rights->societe->contact->lire) {
+ if ($user->hasRight('societe', 'lire') && $user->hasRight('societe', 'contact', 'lire')) {
$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
$sql .= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile, sp.email as spemail";
diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
index 17544d90299..4587e026968 100644
--- a/htdocs/core/boxes/box_dolibarr_state_board.php
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -78,9 +78,10 @@ class box_dolibarr_state_board extends ModeleBoxes
if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS)) {
$hookmanager = new HookManager($this->db);
$hookmanager->initHooks(array('index'));
- $object = new stdClass;
+ $object = new stdClass();
$action = '';
- $hookmanager->executeHooks('addStatisticLine', array(), $object, $action);
+ $parameters =array();
+ $hookmanager->executeHooks('addStatisticLine', $parameters, $object, $action);
$boxstatItems = array();
$boxstatFromHook = '';
$boxstatFromHook = $hookmanager->resPrint;
@@ -300,7 +301,7 @@ class box_dolibarr_state_board extends ModeleBoxes
$this->info_box_contents[0][0] = array(
'tr' => 'class="nohover"',
- 'td' => '',
+ 'td' => 'class="tdwidgetstate"',
'textnoformat' => $boxstat
);
}
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 6a59c6f0d56..a724f26c0c3 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -87,7 +87,7 @@ class box_factures extends ModeleBoxes
'limit'=> dol_strlen($text)
);
- if ($user->rights->facture->lire) {
+ if ($user->hasRight('facture', 'lire')) {
$sql = "SELECT f.rowid as facid";
$sql .= ", f.ref, f.type, f.total_ht";
$sql .= ", f.total_tva";
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 06124d4ab35..ac05d51e607 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -84,7 +84,7 @@ class box_factures_fourn extends ModeleBoxes
'text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."SupplierBills", $max)
);
- if ($user->rights->fournisseur->facture->lire) {
+ if ($user->hasRight('fournisseur', 'facture', 'lire')) {
$langs->load("bills");
$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index ad6c6c97c27..15411e65bc8 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -20,7 +20,7 @@
/**
* \file htdocs/core/boxes/box_factures_fourn_imp.php
* \ingroup fournisseur
- * \brief Fichier de gestion d'une box des factures fournisseurs impayees
+ * \brief Widget to show remain to get on purchase invoices
*/
include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
@@ -72,73 +72,83 @@ class box_factures_fourn_imp extends ModeleBoxes
global $conf, $user, $langs;
$this->max = $max;
+ //$this->max = 1000;
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
- $facturestatic = new FactureFournisseur($this->db);
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+
+ $facturestatic = new FactureFournisseur($this->db);
$thirdpartystatic = new Fournisseur($this->db);
- $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidSupplierBills", $max));
+ $langs->load("bills");
- if ($user->rights->fournisseur->facture->lire) {
- $langs->load("bills");
+ $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidSupplierBills", $this->max));
- $sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
- $sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
- $sql .= ", s.logo, s.email, s.entity";
- $sql .= ", f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite";
- $sql .= ", f.datef as df";
- $sql .= ", f.total_ht as total_ht";
- $sql .= ", f.tva as total_tva";
- $sql .= ", f.total_ttc";
- $sql .= ", f.paye, f.fk_statut as status, f.type";
- $sql .= ", f.tms";
- $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
- $sql .= ",".MAIN_DB_PREFIX."facture_fourn as f";
+ if ($user->hasRight('fournisseur', 'facture', 'lire')) {
+ $sql1 = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
+ $sql1 .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+ $sql1 .= ", s.logo, s.email, s.entity, s.tva_intra, s.siren, s.siret, s.ape, s.idprof4, s.idprof5, s.idprof6";
+ $sql1 .= ", f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite";
+ $sql1 .= ", f.datef as df";
+ $sql1 .= ", f.total_ht";
+ $sql1 .= ", f.total_tva";
+ $sql1 .= ", f.total_ttc";
+ $sql1 .= ", f.paye, f.fk_statut as status, f.type";
+ $sql1 .= ", f.tms";
+ $sql1 .= ", SUM(pf.amount) as am";
+ $sql2 .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql2 .= ",".MAIN_DB_PREFIX."facture_fourn as f";
+ $sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf ON f.rowid = pf.fk_facturefourn";
if (empty($user->rights->societe->client->voir) && !$user->socid) {
- $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql2 .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
}
- $sql .= " WHERE f.fk_soc = s.rowid";
- $sql .= " AND f.entity = ".$conf->entity;
- $sql .= " AND f.paye = 0";
- $sql .= " AND fk_statut = 1";
+ $sql2 .= " WHERE f.fk_soc = s.rowid";
+ $sql2 .= " AND f.entity IN (".getEntity('supplier_invoice').")";
+ $sql2 .= " AND f.paye = 0";
+ $sql2 .= " AND fk_statut = 1";
if (empty($user->rights->societe->client->voir) && !$user->socid) {
- $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+ $sql2 .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
}
if ($user->socid) {
- $sql .= " AND s.rowid = ".((int) $user->socid);
+ $sql2 .= " AND s.rowid = ".((int) $user->socid);
}
- $sql .= " ORDER BY datelimite DESC, f.ref_supplier DESC ";
- $sql .= $this->db->plimit($max, 0);
+ $sql3 .= " GROUP BY s.rowid, s.nom, s.name_alias, s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur, s.logo, s.email, s.entity, s.tva_intra, s.siren, s.siret, s.ape, s.idprof4, s.idprof5, s.idprof6,";
+ $sql3 .= " f.rowid, f.ref, f.ref_supplier, f.date_lim_reglement,";
+ $sql3 .= " f.type, f.datef, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.fk_statut, f.tms";
+ $sql3 .= " ORDER BY datelimite DESC, f.ref_supplier DESC ";
+ $sql3 .= $this->db->plimit($this->max + 1, 0);
+
+ $sql = $sql1.$sql2.$sql3;
$result = $this->db->query($sql);
if ($result) {
$num = $this->db->num_rows($result);
$line = 0;
- $l_due_date = $langs->trans('Late').' ('.$langs->trans('DateDue').': %s)';
+ $l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateDue')).': %s)';
- $facturestatic = new FactureFournisseur($this->db);
-
- while ($line < $num) {
+ while ($line < min($num, $this->max)) {
$objp = $this->db->fetch_object($result);
+
$datelimite = $this->db->jdate($objp->datelimite);
$date = $this->db->jdate($objp->df);
$datem = $this->db->jdate($objp->tms);
$facturestatic->id = $objp->facid;
$facturestatic->ref = $objp->ref;
+ $facturestatic->type = $objp->type;
$facturestatic->total_ht = $objp->total_ht;
$facturestatic->total_tva = $objp->total_tva;
$facturestatic->total_ttc = $objp->total_ttc;
- $facturestatic->date_echeance = $datelimite;
$facturestatic->date = $date;
+ $facturestatic->date_echeance = $datelimite;
$facturestatic->statut = $objp->status;
$facturestatic->status = $objp->status;
- $alreadypaid = $facturestatic->getSommePaiement();
+ //$alreadypaid = $facturestatic->getSommePaiement();
- $facturestatic->alreadypaid = $alreadypaid ? $alreadypaid : 0;
+ $facturestatic->paye = $objp->paye;
+ $facturestatic->alreadypaid = $objp->am;
$thirdpartystatic->id = $objp->socid;
$thirdpartystatic->name = $objp->name;
@@ -149,6 +159,13 @@ class box_factures_fourn_imp extends ModeleBoxes
$thirdpartystatic->logo = $objp->logo;
$thirdpartystatic->email = $objp->email;
$thirdpartystatic->entity = $objp->entity;
+ $thirdpartystatic->tva_intra = $objp->tva_intra;
+ $thirdpartystatic->idprof1 = $objp->idprof1;
+ $thirdpartystatic->idprof2 = $objp->idprof2;
+ $thirdpartystatic->idprof3 = $objp->idprof3;
+ $thirdpartystatic->idprof4 = $objp->idprof4;
+ $thirdpartystatic->idprof5 = $objp->idprof5;
+ $thirdpartystatic->idprof6 = $objp->idprof6;
$late = '';
if ($facturestatic->hasDelay()) {
@@ -161,12 +178,12 @@ class box_factures_fourn_imp extends ModeleBoxes
'td' => 'class="nowraponall"',
'text' => $facturestatic->getNomUrl(1),
'text2'=> $late,
- 'asis' => 1
+ 'asis' => 1,
);
$this->info_box_contents[$line][] = array(
'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
- 'text' => $thirdpartystatic->getNomUrl(1, '', 40),
+ 'text' => $thirdpartystatic->getNomUrl(1, '', 44),
'asis' => 1,
);
@@ -182,19 +199,52 @@ class box_factures_fourn_imp extends ModeleBoxes
$this->info_box_contents[$line][] = array(
'td' => 'class="right" width="18"',
- 'text' => $facturestatic->LibStatut($objp->paye, $objp->status, 3, $alreadypaid, $objp->type),
+ 'text' => $facturestatic->LibStatut($objp->paye, $objp->status, 3, $objp->am, $objp->type),
);
$line++;
}
+ if ($this->max < $num) {
+ $this->info_box_contents[$line][] = array('td' => 'colspan="6"', 'text' => '...');
+ $line++;
+ }
if ($num == 0) {
$this->info_box_contents[$line][0] = array(
- 'td' => 'class="center"',
+ 'td' => 'class="center opacitymedium"',
'text'=>$langs->trans("NoUnpaidSupplierBills"),
);
}
+ $sql = "SELECT SUM(f.total_ht) as total_ht ".$sql2;
+
+ $result = $this->db->query($sql);
+ $objp = $this->db->fetch_object($result);
+ $totalamount = $objp->total_ht;
+
+ // Add the sum à the bottom of the boxes
+ $this->info_box_contents[$line][] = array(
+ 'tr' => 'class="liste_total_wrap"',
+ 'td' => 'class="liste_total"',
+ 'text' => $langs->trans("Total"),
+ );
+ $this->info_box_contents[$line][] = array(
+ 'td' => 'class="liste_total"',
+ 'text' => " ",
+ );
+ $this->info_box_contents[$line][] = array(
+ 'td' => 'class="right liste_total" ',
+ 'text' => price($totalamount, 0, $langs, 0, -1, -1, $conf->currency),
+ );
+ $this->info_box_contents[$line][] = array(
+ 'td' => 'class="liste_total"',
+ 'text' => " ",
+ );
+ $this->info_box_contents[$line][] = array(
+ 'td' => 'class="liste_total"',
+ 'text' => " ",
+ );
+
$this->db->free($result);
} else {
$this->info_box_contents[0][0] = array(
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index a6103c26257..29b6b2dc483 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/core/boxes/box_factures_imp.php
* \ingroup factures
- * \brief Module de generation de l'affichage de la box factures impayees
+ * \brief Widget to show remain to get on sale invoices
*/
require_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
/**
- * Class to manage the box to show last invoices
+ * Class to manage the box to show not paid sales invoices
*/
class box_factures_imp extends ModeleBoxes
{
@@ -61,7 +61,7 @@ class box_factures_imp extends ModeleBoxes
$this->db = $db;
- $this->hidden = empty($user->rights->facture->lire);
+ $this->hidden = !($user->hasRight('facture', 'lire'));
}
/**
@@ -75,6 +75,7 @@ class box_factures_imp extends ModeleBoxes
global $conf, $user, $langs;
$this->max = $max;
+ //$this->max = 1000;
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -84,66 +85,66 @@ class box_factures_imp extends ModeleBoxes
$langs->load("bills");
- $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills", $max));
+ $textHead = $langs->trans("BoxTitleOldestUnpaidCustomerBills");
+ $this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills", $this->max), 'limit'=> dol_strlen($textHead));
- if ($user->rights->facture->lire) {
- $sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
- $sql .= ", s.code_client, s.client";
+ if ($user->hasRight('facture', 'lire')) {
+ $sql1 = "SELECT s.rowid as socid, s.nom as name, s.name_alias, s.code_client, s.client";
if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
- $sql .= ", spe.accountancy_code_customer as code_compta";
+ $sql1 .= ", spe.accountancy_code_customer as code_compta";
} else {
- $sql .= ", s.code_compta";
+ $sql1 .= ", s.code_compta";
}
- $sql .= ", s.logo, s.email, s.entity";
- $sql .= ", s.tva_intra, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
- $sql .= ", f.ref, f.date_lim_reglement as datelimite";
- $sql .= ", f.type";
- $sql .= ", f.datef as date";
- $sql .= ", f.total_ht";
- $sql .= ", f.total_tva";
- $sql .= ", f.total_ttc";
- $sql .= ", f.paye, f.fk_statut as status, f.rowid as facid";
- $sql .= ", sum(pf.amount) as am";
- $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+ $sql1 .= ", s.logo, s.email, s.entity";
+ $sql1 .= ", s.tva_intra, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
+ $sql1 .= ", f.ref, f.date_lim_reglement as datelimite";
+ $sql1 .= ", f.type";
+ $sql1 .= ", f.datef as date";
+ $sql1 .= ", f.total_ht";
+ $sql1 .= ", f.total_tva";
+ $sql1 .= ", f.total_ttc";
+ $sql1 .= ", f.paye, f.fk_statut as status, f.rowid as facid";
+ $sql1 .= ", SUM(pf.amount) as am";
+ $sql2 .= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+ $sql2 .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
}
if (empty($user->rights->societe->client->voir) && !$user->socid) {
- $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+ $sql2 .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
}
- $sql .= ", ".MAIN_DB_PREFIX."facture as f";
- $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
- $sql .= " WHERE f.fk_soc = s.rowid";
- $sql .= " AND f.entity IN (".getEntity('invoice').")";
- $sql .= " AND f.paye = 0";
- $sql .= " AND fk_statut = 1";
+ $sql2 .= ", ".MAIN_DB_PREFIX."facture as f";
+ $sql2 .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
+ $sql2 .= " WHERE f.fk_soc = s.rowid";
+ $sql2 .= " AND f.entity IN (".getEntity('invoice').")";
+ $sql2 .= " AND f.paye = 0";
+ $sql2 .= " AND fk_statut = 1";
if (empty($user->rights->societe->client->voir) && !$user->socid) {
- $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+ $sql2 .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
}
if ($user->socid) {
- $sql .= " AND s.rowid = ".((int) $user->socid);
+ $sql2 .= " AND s.rowid = ".((int) $user->socid);
}
- $sql .= " GROUP BY s.rowid, s.nom, s.name_alias, s.code_client, s.client, s.logo, s.email, s.entity, s.tva_intra, s.siren, s.siret, s.ape, s.idprof4, s.idprof5, s.idprof6,";
+ $sql3 .= " GROUP BY s.rowid, s.nom, s.name_alias, s.code_client, s.client, s.logo, s.email, s.entity, s.tva_intra, s.siren, s.siret, s.ape, s.idprof4, s.idprof5, s.idprof6,";
if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
- $sql .= " spe.accountancy_code_customer as code_compta,";
+ $sql3 .= " spe.accountancy_code_customer as code_compta,";
} else {
- $sql .= " s.code_compta,";
+ $sql3 .= " s.code_compta,";
}
- $sql .= " f.ref, f.date_lim_reglement,";
- $sql .= " f.type, f.datef, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
- //$sql.= " ORDER BY f.datef DESC, f.ref DESC ";
- $sql .= " ORDER BY datelimite ASC, f.ref ASC ";
- $sql .= $this->db->plimit($max, 0);
+ $sql3 .= " f.rowid, f.ref, f.date_lim_reglement,";
+ $sql3 .= " f.type, f.datef, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.fk_statut";
+ $sql3 .= " ORDER BY datelimite ASC, f.ref ASC ";
+ $sql3 .= $this->db->plimit($this->max + 1, 0);
+
+ $sql = $sql1.$sql2.$sql3;
$result = $this->db->query($sql);
if ($result) {
$num = $this->db->num_rows($result);
- $now = dol_now();
$line = 0;
$l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateDue')).': %s)';
- while ($line < $num) {
+ while ($line < min($num, $this->max)) {
$objp = $this->db->fetch_object($result);
$datelimite = $this->db->jdate($objp->datelimite);
@@ -158,7 +159,9 @@ class box_factures_imp extends ModeleBoxes
$facturestatic->status = $objp->status;
$facturestatic->date = $this->db->jdate($objp->date);
$facturestatic->date_lim_reglement = $this->db->jdate($objp->datelimite);
- $facturestatic->alreadypaid = $objp->paye;
+
+ $facturestatic->paye = $objp->paye;
+ $facturestatic->alreadypaid = $objp->am;
$societestatic->id = $objp->socid;
$societestatic->name = $objp->name;
@@ -212,14 +215,47 @@ class box_factures_imp extends ModeleBoxes
$line++;
}
+ if ($this->max < $num) {
+ $this->info_box_contents[$line][] = array('td' => 'colspan="6"', 'text' => '...');
+ $line++;
+ }
if ($num == 0) {
$this->info_box_contents[$line][0] = array(
- 'td' => 'class="center opacitymedium"',
- 'text'=>$langs->trans("NoUnpaidCustomerBills")
+ 'td' => 'class="center opacitymedium"',
+ 'text'=>$langs->trans("NoUnpaidCustomerBills")
);
}
+ $sql = "SELECT SUM(f.total_ht) as total_ht ".$sql2;
+
+ $result = $this->db->query($sql);
+ $objp = $this->db->fetch_object($result);
+ $totalamount = $objp->total_ht;
+
+ // Add the sum à the bottom of the boxes
+ $this->info_box_contents[$line][] = array(
+ 'tr' => 'class="liste_total_wrap"',
+ 'td' => 'class="liste_total"',
+ 'text' => $langs->trans("Total"),
+ );
+ $this->info_box_contents[$line][] = array(
+ 'td' => 'class="liste_total"',
+ 'text' => " ",
+ );
+ $this->info_box_contents[$line][] = array(
+ 'td' => 'class="right liste_total" ',
+ 'text' => price($totalamount, 0, $langs, 0, -1, -1, $conf->currency),
+ );
+ $this->info_box_contents[$line][] = array(
+ 'td' => 'class="liste_total"',
+ 'text' => " ",
+ );
+ $this->info_box_contents[$line][] = array(
+ 'td' => 'class="liste_total"',
+ 'text' => " ",
+ );
+
$this->db->free($result);
} else {
$this->info_box_contents[0][0] = array(
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 34dc015a1db..96b9fc63d84 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -103,7 +103,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
}
- if ($user->rights->facture->lire) {
+ if ($user->hasRight('facture', 'lire')) {
$mesg = '';
$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
diff --git a/htdocs/core/boxes/box_graph_invoices_peryear.php b/htdocs/core/boxes/box_graph_invoices_peryear.php
index 0f2c7bdb92f..915fb0336fe 100644
--- a/htdocs/core/boxes/box_graph_invoices_peryear.php
+++ b/htdocs/core/boxes/box_graph_invoices_peryear.php
@@ -95,7 +95,7 @@ class box_graph_invoices_peryear extends ModeleBoxes
if ($user->socid) $socid = $user->socid;
if (empty($user->rights->societe->client->voir) || $socid) $prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
- if ($user->rights->facture->lire) {
+ if ($user->hasRight('facture', 'lire')) {
$mesg = '';
$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index 87952f008c8..b92862d5089 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -102,7 +102,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
}
- if ($user->rights->fournisseur->facture->lire) {
+ if ($user->hasRight('fournisseur', 'facture', 'lire')) {
$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
$param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
$param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
diff --git a/htdocs/core/boxes/box_members_by_tags.php b/htdocs/core/boxes/box_members_by_tags.php
index e9404254b0a..efee61607ba 100644
--- a/htdocs/core/boxes/box_members_by_tags.php
+++ b/htdocs/core/boxes/box_members_by_tags.php
@@ -93,7 +93,7 @@ class box_members_by_tags extends ModeleBoxes
$this->info_box_head = array('text' => $langs->trans("BoxTitleMembersByTags").($numberyears ? ' ('.($year - $numberyears).' - '.$year.')' : ''));
- if ($user->rights->adherent->lire) {
+ if ($user->hasRight('adherent', 'lire')) {
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php';
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
$stats = new AdherentStats($this->db, $user->socid, $user->id);
diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php
index 046c7031ece..72db5ec4f92 100644
--- a/htdocs/core/boxes/box_members_by_type.php
+++ b/htdocs/core/boxes/box_members_by_type.php
@@ -94,7 +94,7 @@ class box_members_by_type extends ModeleBoxes
$this->info_box_head = array('text' => $langs->trans("BoxTitleMembersByType").($numberyears ? ' ('.($year-$numberyears).' - '.$year.')' : ''));
- if ($user->rights->adherent->lire) {
+ if ($user->hasRight('adherent', 'lire')) {
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherentstats.class.php';
$stats = new AdherentStats($this->db, $user->socid, $user->id);
// Show array
diff --git a/htdocs/core/boxes/box_members_last_modified.php b/htdocs/core/boxes/box_members_last_modified.php
index 5c6082f1032..788695a1d36 100644
--- a/htdocs/core/boxes/box_members_last_modified.php
+++ b/htdocs/core/boxes/box_members_last_modified.php
@@ -90,7 +90,7 @@ class box_members_last_modified extends ModeleBoxes
$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers", $max));
- if ($user->rights->adherent->lire) {
+ if ($user->hasRight('adherent', 'lire')) {
$sql = "SELECT a.rowid, a.ref, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
$sql .= " a.datec, a.tms as datem, a.statut as status, a.datefin as date_end_subscription,";
$sql .= ' a.photo, a.email, a.gender, a.morphy,';
diff --git a/htdocs/core/boxes/box_members_last_subscriptions.php b/htdocs/core/boxes/box_members_last_subscriptions.php
index e7f1d99137d..324d0df218d 100644
--- a/htdocs/core/boxes/box_members_last_subscriptions.php
+++ b/htdocs/core/boxes/box_members_last_subscriptions.php
@@ -92,7 +92,7 @@ class box_members_last_subscriptions extends ModeleBoxes
$this->info_box_head = array('text' => $langs->trans("LastSubscriptionsModified", $max));
- if ($user->rights->adherent->lire) {
+ if ($user->hasRight('adherent', 'lire')) {
$sql = "SELECT a.rowid, a.statut as status, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
$sql .= " a.gender, a.email, a.photo, a.morphy,";
$sql .= " a.datefin as date_end_subscription,";
diff --git a/htdocs/core/boxes/box_members_subscriptions_by_year.php b/htdocs/core/boxes/box_members_subscriptions_by_year.php
index fe406ad29a3..f42ba94e688 100644
--- a/htdocs/core/boxes/box_members_subscriptions_by_year.php
+++ b/htdocs/core/boxes/box_members_subscriptions_by_year.php
@@ -90,7 +90,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
$this->info_box_head = array('text' => $langs->trans("BoxTitleMembersSubscriptionsByYear", $max));
- if ($user->rights->adherent->lire) {
+ if ($user->hasRight('adherent', 'lire')) {
$num = 0;
$line = 0;
// List of subscription by year
diff --git a/htdocs/core/boxes/box_project_opportunities.php b/htdocs/core/boxes/box_project_opportunities.php
index 733e57db831..1acae79469f 100644
--- a/htdocs/core/boxes/box_project_opportunities.php
+++ b/htdocs/core/boxes/box_project_opportunities.php
@@ -74,14 +74,10 @@ class box_project_opportunities extends ModeleBoxes
*/
public function loadBox($max = 5)
{
- global $conf, $user, $langs;
+ global $user, $langs;
$this->max = $max;
- $totalMnt = 0;
- $totalnb = 0;
- $totalnbTask = 0;
-
$textHead = $langs->trans("OpenedProjectsOpportunities");
$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
@@ -158,9 +154,9 @@ class box_project_opportunities extends ModeleBoxes
'asis' => 1
);
- $this->info_box_contents[$i][] = array('td' => 'class="amount right"', 'text' => ($projectstatic->opp_amount ? price($projectstatic->opp_amount) : ''));
+ $this->info_box_contents[$i][] = array('td' => 'class="amount right nowraponall"', 'text' => ($projectstatic->opp_amount ? price($projectstatic->opp_amount) : ''));
- $this->info_box_contents[$i][] = array('td' => 'class=""', 'asis'=>1, 'text' => ($projectstatic->opp_status_code ? $langs->trans("OppStatus".$projectstatic->opp_status_code).' ' : '').'('.round($projectstatic->opp_percent).'%)');
+ $this->info_box_contents[$i][] = array('td' => 'class="nowraponall"', 'asis'=>1, 'text' => ($projectstatic->opp_status_code ? $langs->trans("OppStatus".$projectstatic->opp_status_code).' ' : '').'('.round($projectstatic->opp_percent).'%)');
$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => $projectstatic->getLibStatut(3));
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 65494e09e11..92acf87898a 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -1007,6 +1007,7 @@ class CMailFile
$this->dump_mail();
}
+ $smtperrorcode = 0;
if (! $result) {
$smtperrorcode = $this->smtps->lastretval; // SMTP error code
dol_syslog("CMailFile::sendfile: mail SMTP error code ".$smtperrorcode, LOG_WARNING);
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 11f2fca8226..4c0fda9cae0 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -106,6 +106,12 @@ abstract class CommonDocGenerator
public $emetteur;
+ /**
+ * @var array Minimum version of PHP required by module.
+ * e.g.: PHP ≥ 7.1 = array(7, 1)
+ */
+ public $phpmin = array(7, 1);
+
/**
* @var array Array of columns
*/
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index f7a993fd38f..8561b7e252f 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -793,7 +793,8 @@ abstract class CommonObject
$hookmanager->initHooks(array($this->element . 'dao'));
$parameters = array(
- 'tooltipcontentarray' => &$datas
+ 'tooltipcontentarray' => &$datas,
+ 'params' => $params,
);
// Note that $action and $object may have been modified by some hooks
$hookmanager->executeHooks('getTooltipContent', $parameters, $this, $action);
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 9f5ea960c9a..c66bd73b96e 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -366,13 +366,14 @@ class DiscountAbsolute
$sql .= " AND fk_invoice_supplier IS NULL)"; // Not used as credit note and not used as deposit
dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
+ require_once DOL_DOCUMENT_ROOT. '/core/class/commoninvoice.class.php';
$result = $this->db->query($sql);
if ($result) {
// If source of discount was a credit note or deposit, we change source statut.
if ($this->fk_facture_source) {
$sql = "UPDATE ".$this->db->prefix()."facture";
$sql .= " set paye=0, fk_statut=1";
- $sql .= " WHERE (type = 2 or type = 3) AND rowid = ".((int) $this->fk_facture_source);
+ $sql .= " WHERE (type IN (".$this->db->sanitize(CommonInvoice::TYPE_CREDIT_NOTE.", ".CommonInvoice::TYPE_DEPOSIT).") AND rowid = ".((int) $this->fk_facture_source);
dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
$result = $this->db->query($sql);
@@ -387,7 +388,7 @@ class DiscountAbsolute
} elseif ($this->fk_invoice_supplier_source) {
$sql = "UPDATE ".$this->db->prefix()."facture_fourn";
$sql .= " set paye=0, fk_statut=1";
- $sql .= " WHERE (type = 2 or type = 3) AND rowid = ".((int) $this->fk_invoice_supplier_source);
+ $sql .= " WHERE (type IN (".$this->db->sanitize(CommonInvoice::TYPE_CREDIT_NOTE.", ".CommonInvoice::TYPE_DEPOSIT).") AND rowid = ".((int) $this->fk_invoice_supplier_source);
dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
$result = $this->db->query($sql);
@@ -573,12 +574,12 @@ class DiscountAbsolute
$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";
$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc, ".$this->db->prefix()."facture as f";
$sql .= " WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = ".((int) $invoice->id);
- $sql .= " AND f.type = 3";
+ $sql .= " AND f.type = ". (int) $invoice::TYPE_DEPOSIT;
} elseif ($invoice->element == 'invoice_supplier') {
$sql = "SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount";
$sql .= " FROM ".$this->db->prefix()."societe_remise_except as rc, ".$this->db->prefix()."facture_fourn as f";
$sql .= " WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = ".((int) $invoice->id);
- $sql .= " AND f.type = 3";
+ $sql .= " AND f.type = ". (int) $invoice::TYPE_DEPOSIT;
} else {
$this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
dol_print_error($this->error);
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index e25f970fad2..2c0610084aa 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -158,6 +158,10 @@ class HookManager
if (!is_array($this->hooks) || empty($this->hooks)) {
return 0; // No hook available, do nothing.
}
+ if (!is_array($parameters)) {
+ dol_syslog('executeHooks was called with a non array $parameters. Surely a bug.', LOG_WARNING);
+ $parameters = array();
+ }
$parameters['context'] = join(':', $this->contextarray);
//dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index d18404921a8..09d01924dda 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1336,7 +1336,7 @@ class Form
// mode 1
$urloption = 'htmlname=' . urlencode(str_replace('.', '_', $htmlname)) . '&outjson=1&filter=' . urlencode($filter) . (empty($excludeids) ? '' : '&excludeids=' . join(',', $excludeids)) . ($showtype ? '&showtype=' . urlencode($showtype) : '') . ($showcode ? '&showcode=' . urlencode($showcode) : '');
- $out .= '';
+ $out .= '';
if (empty($hidelabel)) {
print $langs->trans("RefOrLabel") . ' : ';
} elseif ($hidelabel > 1) {
@@ -1706,22 +1706,22 @@ class Form
/**
* Return list of all contacts (for a third party or all)
*
- * @param int $socid Id ot third party or 0 for all
- * @param string $selected Id contact pre-selectionne
- * @param string $htmlname Name of HTML field ('none' for a not editable field)
- * @param int $showempty 0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list
- * @param string $exclude List of contacts id to exclude
- * @param string $limitto Disable answers that are not id in this array list
- * @param integer $showfunction Add function into label
- * @param string $morecss Add more class to class style
- * @param integer $showsoc Add company into label
- * @param int $forcecombo Force to use combo box
- * @param array $events Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
- * @param bool $options_only Return options only (for ajax treatment)
- * @param string $moreparam Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
- * @param string $htmlid Html id to use instead of htmlname
- * @return int <0 if KO, Nb of contact in list if OK
- * @deprecated You can use selectcontacts directly (warning order of param was changed)
+ * @param int $socid Id ot third party or 0 for all
+ * @param string $selected Id contact pre-selectionne
+ * @param string $htmlname Name of HTML field ('none' for a not editable field)
+ * @param int $showempty 0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list
+ * @param string $exclude List of contacts id to exclude
+ * @param string $limitto Disable answers that are not id in this array list
+ * @param integer $showfunction Add function into label
+ * @param string $morecss Add more class to class style
+ * @param integer $showsoc Add company into label
+ * @param int $forcecombo Force to use combo box
+ * @param array $events Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+ * @param bool $options_only Return options only (for ajax treatment)
+ * @param string $moreparam Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
+ * @param string $htmlid Html id to use instead of htmlname
+ * @return int <0 if KO, Nb of contact in list if OK
+ * @deprecated You can use selectcontacts directly (warning order of param was changed)
*/
public function select_contacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $morecss = '', $showsoc = 0, $forcecombo = 0, $events = array(), $options_only = false, $moreparam = '', $htmlid = '')
{
@@ -1731,28 +1731,28 @@ class Form
}
/**
- * Return HTML code of the SELECT of list of all contacts (for a third party or all).
- * This also set the number of contacts found into $this->num
+ * Return HTML code of the SELECT of list of all contacts (for a third party or all).
+ * This also set the number of contacts found into $this->num
*
* @since 9.0 Add afterSelectContactOptions hook
*
- * @param int $socid Id ot third party or 0 for all or -1 for empty list
- * @param array|int $selected Array of ID of pre-selected contact id
- * @param string $htmlname Name of HTML field ('none' for a not editable field)
- * @param int|string $showempty 0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list
- * @param string $exclude List of contacts id to exclude
- * @param string $limitto Disable answers that are not id in this array list
- * @param integer $showfunction Add function into label
- * @param string $morecss Add more class to class style
- * @param bool $options_only Return options only (for ajax treatment)
- * @param integer $showsoc Add company into label
- * @param int $forcecombo Force to use combo box (so no ajax beautify effect)
- * @param array $events Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
- * @param string $moreparam Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
- * @param string $htmlid Html id to use instead of htmlname
- * @param bool $multiple add [] in the name of element and add 'multiple' attribut
- * @param integer $disableifempty Set tag 'disabled' on select if there is no choice
- * @return int|string <0 if KO, HTML with select string if OK.
+ * @param int $socid Id ot third party or 0 for all or -1 for empty list
+ * @param array|int $selected Array of ID of pre-selected contact id
+ * @param string $htmlname Name of HTML field ('none' for a not editable field)
+ * @param int|string $showempty 0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list
+ * @param string $exclude List of contacts id to exclude
+ * @param string $limitto Disable answers that are not id in this array list
+ * @param integer $showfunction Add function into label
+ * @param string $morecss Add more class to class style
+ * @param bool $options_only Return options only (for ajax treatment)
+ * @param integer $showsoc Add company into label
+ * @param int $forcecombo Force to use combo box (so no ajax beautify effect)
+ * @param array $events Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
+ * @param string $moreparam Add more parameters onto the select tag. For example 'style="width: 95%"' to avoid select2 component to go over parent container
+ * @param string $htmlid Html id to use instead of htmlname
+ * @param bool $multiple add [] in the name of element and add 'multiple' attribut
+ * @param integer $disableifempty Set tag 'disabled' on select if there is no choice
+ * @return int|string <0 if KO, HTML with select string if OK.
*/
public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $morecss = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false, $disableifempty = 0)
{
@@ -2211,7 +2211,9 @@ class Form
$outarray2[$userstatic->id] = array(
'id'=>$userstatic->id,
'label'=>$labeltoshow,
- 'labelhtml'=>$labeltoshowhtml
+ 'labelhtml'=>$labeltoshowhtml,
+ 'color'=>'',
+ 'picto'=>''
);
$i++;
@@ -7944,7 +7946,7 @@ class Form
$urloption = 'htmlname=' . urlencode($htmlname) . '&outjson=1&objectdesc=' . urlencode($objectdesc) . '&filter=' . urlencode($filter) . ($sortfield ? '&sortfield=' . urlencode($sortfield) : '');
// Activate the auto complete using ajax call.
$out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());
- $out .= '';
+ $out .= '';
$out .= '';
} else {
// Immediate load of table record.
@@ -9350,22 +9352,22 @@ class Form
}
/**
- * Return a HTML area with the reference of object and a navigation bar for a business object
- * Note: To complete search with a particular filter on select, you can set $object->next_prev_filter set to define SQL criterias.
+ * Return a HTML area with the reference of object and a navigation bar for a business object
+ * Note: To complete search with a particular filter on select, you can set $object->next_prev_filter set to define SQL criterias.
*
- * @param object $object Object to show.
- * @param string $paramid Name of parameter to use to name the id into the URL next/previous link.
- * @param string $morehtml More html content to output just before the nav bar.
- * @param int $shownav Show Condition (navigation is shown if value is 1).
- * @param string $fieldid Name of field id into database to use for select next and previous (we make the select max and min on this field compared to $object->ref). Use 'none' to disable next/prev.
- * @param string $fieldref Name of field ref of object (object->ref) to show or 'none' to not show ref.
- * @param string $morehtmlref More html to show after ref.
- * @param string $moreparam More param to add in nav link url. Must start with '&...'.
- * @param int $nodbprefix Do not include DB prefix to forge table name.
- * @param string $morehtmlleft More html code to show before ref.
- * @param string $morehtmlstatus More html code to show under navigation arrows (status place).
- * @param string $morehtmlright More html code to show after ref.
- * @return string Portion HTML with ref + navigation buttons
+ * @param object $object Object to show.
+ * @param string $paramid Name of parameter to use to name the id into the URL next/previous link.
+ * @param string $morehtml More html content to output just before the nav bar.
+ * @param int $shownav Show Condition (navigation is shown if value is 1).
+ * @param string $fieldid Name of field id into database to use for select next and previous (we make the select max and min on this field compared to $object->ref). Use 'none' to disable next/prev.
+ * @param string $fieldref Name of field ref of object (object->ref) to show or 'none' to not show ref.
+ * @param string $morehtmlref More html to show after ref.
+ * @param string $moreparam More param to add in nav link url. Must start with '&...'.
+ * @param int $nodbprefix Do not include DB prefix to forge table name.
+ * @param string $morehtmlleft More html code to show before ref.
+ * @param string $morehtmlstatus More html code to show under navigation arrows (status place).
+ * @param string $morehtmlright More html code to show after ref.
+ * @return string Portion HTML with ref + navigation buttons
*/
public function showrefnav($object, $paramid, $morehtml = '', $shownav = 1, $fieldid = 'rowid', $fieldref = 'ref', $morehtmlref = '', $moreparam = '', $nodbprefix = 0, $morehtmlleft = '', $morehtmlstatus = '', $morehtmlright = '')
{
@@ -9536,8 +9538,10 @@ class Form
} else {
$ret .= dol_htmlentities($fullname) . $addgendertxt . ((!empty($object->societe) && $object->societe != $fullname) ? ' (' . dol_htmlentities($object->societe) . ')' : '');
}
- } elseif (in_array($object->element, array('contact', 'user', 'usergroup'))) {
+ } elseif (in_array($object->element, array('contact', 'user'))) {
$ret .= dol_htmlentities($object->getFullName($langs)) . $addgendertxt;
+ } elseif ($object->element == 'usergroup') {
+ $ret .= dol_htmlentities($object->name);
} elseif (in_array($object->element, array('action', 'agenda'))) {
$ret .= $object->ref . ' ' . $object->label; } elseif (in_array($object->element, array('adherent_type'))) { @@ -9547,7 +9551,6 @@ class Form } elseif ($fieldref != 'none') { $ret .= dol_htmlentities(!empty($object->$fieldref) ? $object->$fieldref : ""); } - if ($morehtmlref) { // don't add a additional space, when "$morehtmlref" starts with a HTML div tag if (substr($morehtmlref, 0, 4) != ' '; // You can use div-table-responsive-no-min if you dont need reserved height for your table
print "\n".'
|
';
$htmllink .= '';
- if (($cid || $socid) && isModEnabled('agenda') && $user->rights->agenda->myactions->create) {
+ if (($cid || $socid) && isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create')) {
$addlink = 'AC_SKYPE';
$link = '';
if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) {
@@ -3633,7 +3634,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
}
}
- //if (($cid || $socid) && isModEnabled('agenda') && $user->rights->agenda->myactions->create)
+ //if (($cid || $socid) && isModEnabled('agenda') && $user->hasRight('agenda', 'myactions', 'create'))
if (isModEnabled('agenda') && $user->hasRight("agenda", "myactions", "create")) {
$type = 'AC_TEL';
$link = '';
@@ -5253,7 +5254,7 @@ function dol_print_error_email($prefixcode, $errormessage = '', $errormessages =
$now = dol_now();
print '