Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur (aka Eldy) 2025-01-05 18:38:48 +01:00
commit 2c2ac2a48f
47 changed files with 112 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dev/build/makepack-howto.txt
View File

@ -45,8 +45,7 @@ Prerequisites to build autoexe DoliWamp package from Windows:
***** Actions to do a BETA *****
This files describe steps made by Dolibarr packaging team to make a
beta version of Dolibarr, step by step.
This files describe steps made by Dolibarr packaging team to make a beta version of Dolibarr, step by step.
- Check all files are committed.
- Update version/info in ChangeLog, for this you can:
@ -58,20 +57,17 @@ Recopy the content of the output file into the file ChangeLog.
- Update version number with x.y.z-w in file htdocs/filefunc.inc.php
- Commit all changes.
- Run makepack-dolibarr.pl to generate all packages.
- Run makepack-dolibarr.pl to check the generation of all packages. No need to publish them.
- Create a branch (x.y), if version seems stable enough.
- Post a news on dolibarr.org/dolibarr.fr + social networks about the freeze
- Move build files into www.dolibarr.org web site
(/home/dolibarr/wwwroot/files/lastbuild).
- Post a news on dolibarr.org/dolibarr.fr + social networks
- Create a branch x.y (but only when version seems stable enough).
***** Actions to do a RELEASE *****
This files describe steps made by Dolibarr packaging team to make a
complete release of Dolibarr, step by step.
This files describe steps made by Dolibarr packaging team to make a complete release of Dolibarr, step by step.
We suppose the branch x.y has already been created during the beta (see previous step).
- Check all files are committed.
- Update version/info in ChangeLog, for this you can:
@ -87,11 +83,7 @@ Recopy the content of the output file into the file ChangeLog.
- Check content of built packages.
- Run makepack-dolibarr.pl again with option to publish files on
dolibarr foundation server (Dir /home/dolibarr/wwwroot/files/stable on www.dolibarr.org).
- Run makepack-dolibarr.pl again with option to publish files on
sourceforge. This will also add official tag.
- Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx"
on server to point to new files (used by some web sites).
- Run makepack-dolibarr.pl again with option to publish files on dolibarr foundation server (Dir /home/dolibarr/wwwroot/files/stable on www.dolibarr.org).
- Run makepack-dolibarr.pl again with option to publish files on sourceforge. This will also add official tag.
- Post a news on dolibarr.org/dolibarr.fr + social networks

2
htdocs/admin/delais.php
View File

@ -326,8 +326,6 @@ if (!getDolGlobalString('MAIN_DISABLE_METEO') || getDolGlobalInt('MAIN_DISABLE_M
$offset = 0;
$cursor = 10; // By default
//if (!empty($conf->global->MAIN_METEO_OFFSET)) $offset=$conf->global->MAIN_METEO_OFFSET;
//if (!empty($conf->global->MAIN_METEO_GAP)) $cursor=$conf->global->MAIN_METEO_GAP;
$level0 = $offset;
if (getDolGlobalString('MAIN_METEO_LEVEL0')) {
$level0 = getDolGlobalString('MAIN_METEO_LEVEL0');

1
htdocs/comm/action/list.php
View File

@ -886,7 +886,6 @@ if (!empty($arrayfields['a.note']['checked'])) {
print_liste_field_titre($arrayfields['a.note']['label'], $_SERVER["PHP_SELF"], "a.note", $param, "", "", $sortfield, $sortorder);
$totalarray['nbfield']++;
}
//if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
if (!empty($arrayfields['a.datep']['checked'])) {
print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep,a.id", $param, '', '', $sortfield, $sortorder, 'center ');
$totalarray['nbfield']++;

3
htdocs/commande/card.php
View File

@ -501,8 +501,7 @@ if (empty($reshook)) {
// Now we create same links to contact than the ones found on origin object
/* Useless, already into the create
if (!empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))
{
if (getDolGlobalString('MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN')) {
$originforcontact = $object->origin;
$originidforcontact = $object->origin_id;
if ($originforcontact == 'shipping') // shipment and order share the same contacts. If creating from shipment we take data of order

3
htdocs/commande/class/commande.class.php
View File

@ -1847,8 +1847,7 @@ class Commande extends CommonOrder
$this->lines[] = $line;
/** POUR AJOUTER AUTOMATIQUEMENT LES SOUSPRODUITS a LA COMMANDE
if (!empty($conf->global->PRODUIT_SOUSPRODUITS))
{
if (getDolGlobalString('PRODUIT_SOUSPRODUITS')) {
$prod = new Product($this->db);
$prod->fetch($idproduct);
$prod -> get_sousproduits_arbo();

4
htdocs/compta/localtax/quadri_detail.php
View File

@ -201,10 +201,10 @@ $builddate = dol_now();
if (getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'payment') $description.=$langs->trans("RulesVATInProducts");
if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice') $description.='<br>'.$langs->trans("RulesVATDueServices");
if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'payment') $description.='<br>'.$langs->trans("RulesVATInServices");
if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
$description.='<br>'.$langs->trans("DepositsAreNotIncluded");
}
if (! empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
$description.='<br>'.$langs->trans("SupplierDepositsAreNotIncluded");
}
*/

4
htdocs/compta/paiement.php
View File

@ -904,7 +904,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '<input type="checkbox" checked name="closepaidinvoices" id="closepaidinvoices"><label for="closepaidinvoices"> '.$checkboxlabel.'</label>';
/*if (isModEnabled('prelevement')) {
$langs->load("withdrawals");
if (!empty($conf->global->WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS)) print '<br>'.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed");
if (getDolGlobalString('WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS')) {
print '<br>'.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed");
}
}*/
print '<br><input type="submit" class="button reposition" value="'.dol_escape_htmltag($buttontitle).'"><br><br>';
print '</div>';

3
htdocs/compta/payment_sc/card.php
View File

@ -253,8 +253,7 @@ if ($resql) {
print '<div class="tabsAction">';
/*
if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
{
if (getDolGlobalString('BILL_ADD_PAYMENT_VALIDATION')) {
if ($user->socid == 0 && $object->statut == 0 && $action == '')
{
if ($user->hasRight('facture', 'paiement')){

4
htdocs/core/class/CMailFile.class.php
View File

@ -1212,7 +1212,7 @@ class CMailFile
$result = $this->smtps->sendMsg();
if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
if (getDolGlobalString('MAIN_MAIL_DEBUG')) {
$this->dump_mail();
}
*/
@ -1937,7 +1937,7 @@ class CMailFile
$host = 'ssl://'.$host;
}
// tls smtp start with no encryption
//if (!empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
//if (getDolGlobalString('MAIN_MAIL_EMAIL_STARTTLS') && function_exists('openssl_open')) $host='tls://'.$host;
dol_syslog("Try socket connection to host=".$host." port=".$port." timeout=".$timeout);
//See if we can connect to the SMTP server

1
htdocs/core/lib/agenda.lib.php
View File

@ -541,7 +541,6 @@ function calendars_prepare_head($param)
$head[$h][2] = 'cardday';
$h++;
//if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
if (getDolGlobalString('AGENDA_SHOW_PERTYPE')) {
$head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param ? '?'.$param : '');
$head[$h][1] = $langs->trans("ViewPerType");

6
htdocs/core/lib/functions.lib.php
View File

@ -5094,9 +5094,6 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
$enabledisablehtml = '<span class="'.$faprefix.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');
$enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';
/*if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$enabledisablehtml .= $titlealt;
}*/
$enabledisablehtml .= '</span>';
return $enabledisablehtml;
@ -5322,9 +5319,6 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
$enabledisablehtml = '<span class="'.$fa.' '.$fakey.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? ' marginleftonlyshort' : ' marginleftonly') : '');
$enabledisablehtml .= ($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').($morestyle ? ' '.$morestyle : '').'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : '').'>';
/*if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$enabledisablehtml .= $titlealt;
}*/
$enabledisablehtml .= '</span>';
return $enabledisablehtml;

3
htdocs/core/lib/stock.lib.php
View File

@ -55,8 +55,7 @@ function stock_prepare_head($object)
*/
/* Disabled because will never be implemented. Table always empty.
if (!empty($conf->global->STOCK_USE_WAREHOUSE_BY_USER))
{
if (getDolGlobalString('STOCK_USE_WAREHOUSE_BY_USER')) {
// Should not be enabled by default because does not work yet correctly because
// personal stocks are not tagged into table llx_entrepot
$head[$h][0] = DOL_URL_ROOT.'/product/stock/user.php?id='.$object->id;

4
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -1089,7 +1089,7 @@ class pdf_einstein extends ModelePDFCommandes
}
//Local tax 1 after VAT
//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION() == 'localtax1on')
//{
foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
if (in_array((string) $localtax_type, array('2', '4', '6'))) {
@ -1128,7 +1128,7 @@ class pdf_einstein extends ModelePDFCommandes
}
//}
//Local tax 2 after VAT
//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') && getDolGlobalString('FATURE_LOCAL_TAX2_OPTION') == 'localtax2on')
//{
foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
if (in_array((string) $localtax_type, array('2', '4', '6'))) {

5
htdocs/core/modules/modBlockedLog.class.php
View File

@ -79,9 +79,8 @@ class modBlockedLog extends DolibarrModules
// Currently, activation is not automatic because only companies (in France) making invoices to non business customers must
// enable this module.
/*if (!empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
{
$tmp=explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY);
/*if (getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY')) {
$tmp=explode(',', getDolGlobalString('BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY'));
$this->automatic_activation = array();
foreach($tmp as $key)
{

5
htdocs/core/modules/movement/doc/pdf_standard_movementstock.modules.php
View File

@ -1065,8 +1065,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
// Get contact
/*
if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
{
if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
$arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
if (count($arrayidcontact) > 0)
{
@ -1097,7 +1096,7 @@ class pdf_standard_movementstock extends ModelePDFMovement
// Show sender
$posy=42;
$posx=$this->marge_gauche;
if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) $posx=$this->page_largeur-$this->marge_droite-80;
$hautcadre=40;
// Show sender frame

6
htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
View File

@ -795,7 +795,7 @@ class pdf_vinci extends ModelePDFMo
$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
}
} else {
//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
//{
//Local tax 1
foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
@ -825,7 +825,7 @@ class pdf_vinci extends ModelePDFMo
}
}
//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on')
//{
//Local tax 2
foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
@ -1248,7 +1248,7 @@ class pdf_vinci extends ModelePDFMo
//}
//$posy = 42 + $top_shift;
//$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
//if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
//if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) {
// $posx = $this->marge_gauche;
//}
//

10
htdocs/core/modules/product/doc/pdf_standard.modules.php
View File

@ -508,7 +508,7 @@ class pdf_standard extends ModelePDFProduct
$this->tva[$vatrate] += $tvaligne;
// Add line
if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
if (getDolGlobalString('MAIN_PDF_DASH_BETWEEN_LINES') && $i < ($nblines - 1))
{
$pdf->setPage($pageposafter);
$pdf->SetLineStyle(array('dash'=>'1,1','color'=>array(80,80,80)));
@ -815,11 +815,9 @@ class pdf_standard extends ModelePDFProduct
// Get contact
/*
if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
{
if (getDolGlobalString('DOC_SHOW_FIRST_SALES_REP')) {
$arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
if (count($arrayidcontact) > 0)
{
if (count($arrayidcontact) > 0) {
$usertmp=new User($this->db);
$usertmp->fetch($arrayidcontact[0]);
$posy+=4;
@ -842,7 +840,7 @@ class pdf_standard extends ModelePDFProduct
// Show sender
$posy=42;
$posx=$this->marge_gauche;
if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) $posx=$this->page_largeur-$this->marge_droite-80;
$hautcadre=40;
// Show sender frame

8
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
View File

@ -1278,7 +1278,7 @@ class pdf_cyan extends ModelePDFPropales
// Nothing to do
} else {
//Local tax 1 before VAT
//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
//{
foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@ -1311,7 +1311,7 @@ class pdf_cyan extends ModelePDFPropales
}
//}
//Local tax 2 before VAT
//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on')
//{
foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@ -1368,7 +1368,7 @@ class pdf_cyan extends ModelePDFPropales
}
//Local tax 1 after VAT
//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
//{
foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
if (in_array((string) $localtax_type, array('2', '4', '6'))) {
@ -1402,7 +1402,7 @@ class pdf_cyan extends ModelePDFPropales
}
//}
//Local tax 2 after VAT
//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on')
//{
foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
if (in_array((string) $localtax_type, array('2', '4', '6'))) {

1
htdocs/core/modules/societe/mod_codecompta_aquarium.php
View File

@ -110,7 +110,6 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
if (getDolGlobalInt('COMPANY_AQUARIUM_REMOVE_SPECIAL')) {
$texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
}
//if (!empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
if (getDolGlobalString('COMPANY_AQUARIUM_CLEAN_REGEX')) {
$texte .= $langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = ' . getDolGlobalString('COMPANY_AQUARIUM_CLEAN_REGEX')."<br>\n";
}

6
htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
View File

@ -128,7 +128,7 @@ class pdf_eagle extends ModelePDFStockTransfer
$this->posxwarehousedestination = $this->page_largeur - $this->marge_droite - 35;
$this->posxpuht = $this->page_largeur - $this->marge_droite;
/*if (!empty($conf->global->STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT)) { // Show also the prices
/*if (getDolGlobalString('STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT')) { // Show also the prices
$this->posxqty = $this->page_largeur - $this->marge_droite - 118;
$this->posxwarehousesource = $this->page_largeur - $this->marge_droite - 96;
$this->posxwarehousedestination = $this->page_largeur - $this->marge_droite - 68;
@ -151,7 +151,7 @@ class pdf_eagle extends ModelePDFStockTransfer
$this->posxwarehousedestination -= 20;
}
/*if (!empty($conf->global->STOCKTRANSFER_PDF_HIDE_ORDERED)) {
/*if (getDolGlobalString('STOCKTRANSFER_PDF_HIDE_ORDERED')) {
$this->posxqty += ($this->posxwarehousedestination - $this->posxwarehousesource);
$this->posxpicture += ($this->posxwarehousedestination - $this->posxwarehousesource);
$this->posxwarehousesource = $this->posxwarehousedestination;
@ -960,7 +960,7 @@ class pdf_eagle extends ModelePDFStockTransfer
$pdf->MultiCell(($this->posxpuht - $this->posxwarehousedestination + 4), 2, $outputlangs->transnoentities("WarehouseTarget"), '', 'C');
}
/*if (!empty($conf->global->STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT)) {
/*if (getDolGlobalString('STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT')) {
$pdf->line($this->posxpuht - 1, $tab_top, $this->posxpuht - 1, $tab_top + $tab_height);
if (empty($hidetop))
{

6
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
View File

@ -123,7 +123,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$this->posxdiscount = 162;
$this->postotalht = 174;
/* if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
/* if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT') || getDolGlobalString('MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN')) {
$this->posxtva = $this->posxup;
} */
$this->posxpicture = $this->posxtva - (getDolGlobalInt('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH', 20)); // width of images
@ -705,7 +705,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2, 0, $outputlangs), 0, 'R', 1);
}
} else {
//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
//{
//Local tax 1
foreach ($this->localtax1 as $tvakey => $tvaval) {
@ -730,7 +730,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
}
//}
//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on')
//{
//Local tax 2
foreach ($this->localtax2 as $tvakey => $tvaval) {

4
htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
View File

@ -1020,7 +1020,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
}
} else {
//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
//{
//Local tax 1
foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
@ -1050,7 +1050,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
}
}
//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on')
//{
//Local tax 2
foreach ($this->localtax2 as $localtax_type => $localtax_rate) {

4
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
View File

@ -882,7 +882,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
}
} else {
//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
//{
//Local tax 1
foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
@ -912,7 +912,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
}
}
//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on')
//{
//Local tax 2
foreach ($this->localtax2 as $localtax_type => $localtax_rate) {

7
htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php
View File

@ -212,7 +212,7 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
//$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
$dir = $conf->fournisseur->payment->dir_output.'/'.$objectref;
$file = $dir."/".$objectref.".pdf";
//if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) {
//if (getDolGlobalString('SUPPLIER_REF_IN_NAME')) {
// $file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
//}
}
@ -663,7 +663,7 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
$pdf->SetFont('','', $default_font_size - 1);
if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
if (getDolGlobalString('PDF_SHOW_PROJECT_TITLE')) {
$object->fetchProject();
if (!empty($object->project->ref)) {
$posy += 3;
@ -673,8 +673,7 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
}
}
if (!empty($conf->global->PDF_SHOW_PROJECT))
{
if (getDolGlobalString('PDF_SHOW_PROJECT')) {
$object->fetchProject();
if (!empty($object->project->ref))
{

8
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
View File

@ -920,7 +920,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
// Nothing to do
} else {
//Local tax 1 before VAT
//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
//{
foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@ -950,7 +950,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
}
//}
//Local tax 2 before VAT
//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on')
//{
foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
if (in_array((string) $localtax_type, array('1', '3', '5'))) {
@ -1004,7 +1004,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
}
//Local tax 1 after VAT
//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
//{
foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
if (in_array((string) $localtax_type, array('2', '4', '6'))) {
@ -1034,7 +1034,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
}
//}
//Local tax 2 after VAT
//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on')
//{
foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
if (in_array((string) $localtax_type, array('2', '4', '6'))) {

4
htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php
View File

@ -1003,7 +1003,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_localtax2), $useborder, 'R', 1);
}
} else {
//if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX1_OPTION') == 'localtax1on')
//{
//Local tax 1
foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
@ -1033,7 +1033,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
}
}
//if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
//if (getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') && getDolGlobalString('FACTURE_LOCAL_TAX2_OPTION') == 'localtax2on')
//{
//Local tax 2
foreach ($this->localtax2 as $localtax_type => $localtax_rate) {

1
htdocs/core/tpl/login.tpl.php
View File

@ -434,7 +434,6 @@ if (getDolGlobalInt('MAIN_MODULE_OPENIDCONNECT', 0) > 0 && isset($conf->file->ma
dol_include_once('/core/lib/openid_connect.lib.php');
$langs->load("users");
//if (!empty($conf->global->MAIN_OPENIDURL_PERUSER)) $url=
print '<div class="center" style="margin-top: 20px; margin-bottom: 10px">';
print '<div class="loginbuttonexternal">';

2
htdocs/expedition/dispatch.php
View File

@ -332,7 +332,7 @@ if ($action == 'updatelines' && $usercancreate) {
$mouv->setOrigin($objectorder->element, $objectorder->id);
// Method change if qty < 0
if (!empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN) && $qtymouv < 0) {
if (getDolGlobalString('SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN') && $qtymouv < 0) {
$result = $mouv->reception($user, $product, $entrepot, $qtymouv*(-1), $price, $comment, $eatby, $sellby, $batch, '', 0, $inventorycode);
} else {
$result = $mouv->livraison($user, $product, $entrepot, $qtymouv, $price, $comment, $now, $eatby, $sellby, $batch, 0, $inventorycode);

4
htdocs/fourn/commande/dispatch.php
View File

@ -639,10 +639,6 @@ if ($id > 0 || !empty($ref)) {
// if ($mesg) print $mesg;
print '<br>';
/*$disabled = 1;
if (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
$disabled = 0;
}*/
$disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0.
// Line of orders

1
htdocs/fourn/facture/card.php
View File

@ -3991,7 +3991,6 @@ if ($action == 'create') {
$dateSelector = 0;
$inputalsopricewithtax = 1;
$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum.
//if (!empty($conf->global->SUPPLIER_INVOICE_WITH_NOPRICEDEFINED)) $senderissupplier=2;
if (getDolGlobalInt('SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY')) {
$senderissupplier = getDolGlobalInt('SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY');
}

4
htdocs/hrm/class/evaluation.class.php
View File

@ -210,7 +210,7 @@ class Evaluation extends CommonObject
*/
public function __construct(DoliDB $db)
{
global $conf, $langs, $user;
global $langs, $user;
$this->db = $db;
@ -225,7 +225,7 @@ class Evaluation extends CommonObject
}
if (!$user->hasRight('hrm', 'evaluation', 'readall')) {
$this->fields['fk_user']['type'] .= ':rowid IN('.$this->db->sanitize(implode(", ", $user->getAllChildIds(1))).')';
$this->fields['fk_user']['type'] .= ':t.rowid:IN:'.$this->db->sanitize(implode(",", $user->getAllChildIds(1)));
}
$this->date_eval = dol_now();

4
htdocs/includes/odtphp/odf.php
View File

@ -926,7 +926,7 @@ IMG;
throw new OdfException("headers already sent ($filename at $linenum)");
}
if (!empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
if (getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
$name=preg_replace('/\.od(x|t)/i', '', $name);
header('Content-type: application/pdf');
header('Content-Disposition: attachment; filename="'.basename($name).'.pdf"');
@ -934,7 +934,7 @@ IMG;
}
}
if (!empty($conf->global->MAIN_ODT_AS_PDF_DEL_SOURCE)) {
if (getDolGlobalString('MAIN_ODT_AS_PDF_DEL_SOURCE')) {
unlink($name);
}
} else {

8
htdocs/langs/en_US/hrm.lang
View File

@ -46,11 +46,11 @@ NewEval=New competency assessment
ValidateEvaluation=Validate competency assessment
ConfirmValidateEvaluation=Are you sure you want to validate this competency assessment with the reference <b>%s</b>?
EvaluationCard=Competency assessment
RequiredRank=Required rank for the job profile
RequiredRankShort=Required rank
RequiredRank=Required level for the job profile
RequiredRankShort=Required level
PositionsWithThisProfile=Positions with this job profiles
EmployeeRank=Employee rank for this skill
EmployeeRankShort=Employee rank
EmployeeRank=Employee level for this skill
EmployeeRankShort=Employee level
EmployeePosition=Employee position
EmployeePositions=Employee positions
EmployeesInThisPosition=Employees in this position

2
htdocs/partnership/admin/website.php
View File

@ -168,7 +168,7 @@ print '<br>';
/*
if (!empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
if (getDolGlobalString('PARTNERSHIP_ENABLE_PUBLIC')) {
print '<br>';
print '<div class="div-table-responsive-no-min">';

6
htdocs/product/stock/class/productlot.class.php
View File

@ -881,7 +881,7 @@ class Productlot extends CommonObject
// Virtual products can't be used with kits (see langs with key ErrorNoteAlsoThatSubProductCantBeFollowedByLot)
// if it's a virtual product, maybe it is in invoice by extension
// if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
// if (getDolGlobalString('PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC')) {
// $TFather = $this->getFather();
// if (is_array($TFather) && !empty($TFather)) {
// foreach ($TFather as &$fatherData) {
@ -955,7 +955,7 @@ class Productlot extends CommonObject
// Virtual products can't be used with kits (see langs with key ErrorNoteAlsoThatSubProductCantBeFollowedByLot)
// if it's a virtual product, maybe it is in invoice by extension
// if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
// if (getDolGlobalString('PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC')) {
// $TFather = $this->getFather();
// if (is_array($TFather) && !empty($TFather)) {
// foreach ($TFather as &$fatherData) {
@ -1028,7 +1028,7 @@ class Productlot extends CommonObject
// Virtual products can't be used with kits (see langs with key ErrorNoteAlsoThatSubProductCantBeFollowedByLot)
// if it's a virtual product, maybe it is in invoice by extension
// if (!empty($conf->global->PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC)) {
// if (getDolGlobalString('PRODUCT_STATS_WITH_PARENT_PROD_IF_INCDEC')) {
// $TFather = $this->getFather();
// if (is_array($TFather) && !empty($TFather)) {
// foreach ($TFather as &$fatherData) {

4
htdocs/product/stock/stats/commande_fournisseur.php
View File

@ -185,7 +185,7 @@ if ($id > 0 || !empty($ref)) {
// print '</tr>';
// }
//
// if (!empty($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY)) {
// if (getDolGlobalString('PRODUCT_LOT_ENABLE_TRACEABILITY')) {
// print '<tr><td>'.$form->editfieldkey($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer).'</td>';
// print '<td>'.$form->editfieldval($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
// print '</tr>';
@ -198,7 +198,7 @@ if ($id > 0 || !empty($ref)) {
// }
//
// // Quality control
// if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
// if (getDolGlobalString('PRODUCT_LOT_ENABLE_QUALITY_CONTROL')) {
// print '<tr><td>'.$form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer).'</td>';
// print '<td>'.$form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
// print '</tr>';

4
htdocs/product/stock/stats/expedition.php
View File

@ -185,7 +185,7 @@ if ($id > 0 || !empty($ref)) {
// print '</tr>';
// }
//
// if (!empty($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY)) {
// if (getDolGlobalString('PRODUCT_LOT_ENABLE_TRACEABILITY()) {
// print '<tr><td>'.$form->editfieldkey($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer).'</td>';
// print '<td>'.$form->editfieldval($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
// print '</tr>';
@ -198,7 +198,7 @@ if ($id > 0 || !empty($ref)) {
// }
//
// // Quality control
// if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
// if (getDolGlobalString('PRODUCT_LOT_ENABLE_QUALITY_CONTROL')) {
// print '<tr><td>'.$form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer).'</td>';
// print '<td>'.$form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
// print '</tr>';

4
htdocs/product/stock/stats/reception.php
View File

@ -185,7 +185,7 @@ if ($id > 0 || !empty($ref)) {
// print '</tr>';
// }
//
// if (!empty($conf->global->PRODUCT_LOT_ENABLE_TRACEABILITY)) {
// if (getDolGlobalString('PRODUCT_LOT_ENABLE_TRACEABILITY')) {
// print '<tr><td>'.$form->editfieldkey($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer).'</td>';
// print '<td>'.$form->editfieldval($langs->trans('ManufacturingDate'), 'manufacturing_date', $object->manufacturing_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
// print '</tr>';
@ -198,7 +198,7 @@ if ($id > 0 || !empty($ref)) {
// }
//
// // Quality control
// if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
// if (getDolGlobalString('PRODUCT_LOT_ENABLE_QUALITY_CONTROL')) {
// print '<tr><td>'.$form->editfieldkey($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer).'</td>';
// print '<td>'.$form->editfieldval($langs->trans('EndOfLife'), 'eol_date', $object->eol_date, $object, $user->rights->stock->creer, 'datepicker').'</td>';
// print '</tr>';

12
htdocs/projet/tasks.php
View File

@ -1060,12 +1060,6 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
print '</td>';
}
}
// Contacts of task, disabled because available by default just after
/*
if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
print '<td class="liste_titre"></td>';
}
*/
if (!empty($arrayfields['t.budget_amount']['checked'])) {
print '<td class="liste_titre center">';
@ -1148,12 +1142,6 @@ if ($action == 'create' && $user->hasRight('projet', 'creer') && (empty($object-
print_liste_field_titre($arrayfields['t.billed']['label'], $_SERVER["PHP_SELF"], "t.billed", '', $param, '', $sortfield, $sortorder, 'right ');
}
}
// Contacts of task, disabled because available by default just after
/*
if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
print_liste_field_titre("TaskRessourceLinks", $_SERVER["PHP_SELF"], '', '', $param, $sortfield, $sortorder);
}
*/
if (!empty($arrayfields['t.budget_amount']['checked'])) {
print_liste_field_titre($arrayfields['t.budget_amount']['label'], $_SERVER["PHP_SELF"], "t.budget_amount", "", $param, '', $sortfield, $sortorder, 'center ');

50
htdocs/public/partnership/new.php
View File

@ -393,12 +393,12 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he
// Send email to the foundation to say a new member subscribed with autosubscribe form
/*
if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') && !empty($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT) &&
!empty($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL)) {
if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') && getDolGlobalString('PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT') &&
getDolGlobalString('PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL')) {
// Define link to login card
$appli = constant('DOL_APPLICATION_TITLE');
if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
$appli = $conf->global->MAIN_APPLICATION_TITLE;
if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
$appli = getDolGlobalString('MAIN_APPLICATION_TITLE');
if (preg_match('/\d\.\d/', $appli)) {
if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
$appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
@ -441,8 +441,8 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he
}
/*
if (!empty($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE) && $conf->global->PARTNERSHIP_NEWFORM_PAYONLINE != '-1') {
if ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'all') {
if (getDolGlobalString('PARTNERSHIP_NEWFORM_PAYONLINE') && getDolGlobalString('PARTNERSHIP_NEWFORM_PAYONLINE' != '-1') {
if (getDolGlobalString('PARTNERSHIP_NEWFORM_PAYONLINE') == 'all') {
$urlback = DOL_MAIN_URL_ROOT.'/public/payment/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.urlencode($partnership->ref);
if (price2num(GETPOST('amount', 'alpha'))) {
$urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@ -450,14 +450,14 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he
if (GETPOST('email')) {
$urlback .= '&email='.urlencode(GETPOST('email'));
}
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, '2'));
if (getDolGlobalString('PAYMENT_SECURITY_TOKEN()) {
if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE()) {
$urlback .= '&securekey='.urlencode(dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'membersubscription'.$partnership->ref, '2'));
} else {
$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
$urlback .= '&securekey='.urlencode(getDolGlobalString('PAYMENT_SECURITY_TOKEN'));
}
}
} elseif ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'paybox') {
} elseif (getDolGlobalString('PARTNERSHIP_NEWFORM_PAYONLINE') == 'paybox') {
$urlback = DOL_MAIN_URL_ROOT.'/public/paybox/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.urlencode($partnership->ref);
if (price2num(GETPOST('amount', 'alpha'))) {
$urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@ -465,14 +465,14 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he
if (GETPOST('email')) {
$urlback .= '&email='.urlencode(GETPOST('email'));
}
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, '2'));
if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
$urlback .= '&securekey='.urlencode(dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'membersubscription'.$partnership->ref, '2'));
} else {
$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
$urlback .= '&securekey='.urlencode(getDolGlobalString('PAYMENT_SECURITY_TOKEN'));
}
}
} elseif ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'paypal') {
} elseif (getDolGlobalString('PARTNERSHIP_NEWFORM_PAYONLINE') == 'paypal') {
$urlback = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.urlencode($partnership->ref);
if (price2num(GETPOST('amount', 'alpha'))) {
$urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@ -480,14 +480,14 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he
if (GETPOST('email')) {
$urlback .= '&email='.urlencode(GETPOST('email'));
}
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, '2'));
if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
$urlback .= '&securekey='.urlencode(dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'membersubscription'.$partnership->ref, '2'));
} else {
$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
$urlback .= '&securekey='.urlencode(getDolGlobalString('PAYMENT_SECURITY_TOKEN'));
}
}
} elseif ($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE == 'stripe') {
} elseif (getDolGlobalString('PARTNERSHIP_NEWFORM_PAYONLINE') == 'stripe') {
$urlback = DOL_MAIN_URL_ROOT.'/public/stripe/newpayment.php?from=partnershipnewform&source=membersubscription&ref='.$partnership->ref;
if (price2num(GETPOST('amount', 'alpha'))) {
$urlback .= '&amount='.price2num(GETPOST('amount', 'alpha'));
@ -495,11 +495,11 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he
if (GETPOST('email')) {
$urlback .= '&email='.urlencode(GETPOST('email'));
}
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
$urlback .= '&securekey='.urlencode(dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$partnership->ref, '2'));
if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
$urlback .= '&securekey='.urlencode(dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'membersubscription'.$partnership->ref, '2'));
} else {
$urlback .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
$urlback .= '&securekey='.urlencode(getDolGlobalString('PAYMENT_SECURITY_TOKEN'));
}
}
} else {

3
htdocs/public/payment/newpayment.php
View File

@ -662,8 +662,7 @@ if ($action == 'charge' && isModEnabled('stripe')) { // Test on permission not r
// Create the VAT record in Stripe
/* We don't know country of customer, so we can't create tax
if (!empty($conf->global->STRIPE_SAVE_TAX_IDS)) // We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
{
if (getDolGlobalString('STRIPE_SAVE_TAX_IDS')) { // We setup to save Tax info on Stripe side. Warning: This may result in error when saving customer
if (!empty($vatcleaned))
{
$isineec=isInEEC($object);

8
htdocs/public/project/suggestbooth.php
View File

@ -480,11 +480,11 @@ if (empty($reshook) && $action == 'add') { // Test on permission not required he
$sourcetouse = 'boothlocation';
$reftouse = $facture->id;
$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse.'&booth='.$conforbooth->id;
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, '2'); // Use the source in the hash to avoid duplicates if the references are identical
if (getDolGlobalString('PAYMENT_SECURITY_TOKEN')) {
if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
$redirection .= '&securekey='.dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $sourcetouse . $reftouse, '2'); // Use the source in the hash to avoid duplicates if the references are identical
} else {
$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
$redirection .= '&securekey='.getDolGlobalString('PAYMENT_SECURITY_TOKEN');
}
}
header("Location: ".$redirection);

2
htdocs/reception/dispatch.php
View File

@ -239,7 +239,7 @@ if ($action == 'updatelines' && $permissiontoreceive) {
$mouv->setOrigin($objectsrc->element, $objectsrc->id);
// Method change if qty < 0
if (!empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN) && $qtymouv < 0) {
if (getDolGlobalString('SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN') && $qtymouv < 0) {
$result = $mouv->livraison($user, $product, $entrepot, $qtymouv*(-1), $price, $comment, $now, $eatby, $sellby, $batch, 0, $inventorycode);
} else {
$result = $mouv->reception($user, $product, $entrepot, $qtymouv, $price, $comment, $eatby, $sellby, $batch, '', 0, $inventorycode);

2
htdocs/recruitment/admin/public_interface.php
View File

@ -127,7 +127,7 @@ print '<input type="hidden" id="RECRUITMENT_ENABLE_PUBLIC_INTERFACE" name="RECRU
print '<br>';
/*
if (!empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
if (getDolGlobalString('RECRUITMENT_ENABLE_PUBLIC_INTERFACE')) {
print '<br>';
print '<table class="noborder centpercent">';

4
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
View File

@ -927,7 +927,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
$posy += $top_shift;
$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
if (getDolGlobalString('MAIN_INVERT_SENDER_RECIPIENT')) $posx = $this->marge_gauche;
// Show recipient frame
$pdf->SetTextColor(0, 0, 0);
@ -1099,7 +1099,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
),
'border-left' => true, // add left line separator
);
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
if (getDolGlobalString('PRODUCT_USE_UNITS')) {
$this->cols['unit']['status'] = true;
}

7
htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
View File

@ -138,10 +138,9 @@ function getPublicJobPositionUrl($mode, $ref = '', $localorexternal = 0)
}
$out = $urltouse . '/public/recruitment/view.php?ref=' . ($mode ? '<span style="color: #666666">' : '') . $ref . ($mode ? '</span>' : '');
/*if (!empty($conf->global->RECRUITMENT_SECURITY_TOKEN))
{
if (empty($conf->global->RECRUITMENT_SECURITY_TOKEN)) $out .= '&securekey='.urlencode($conf->global->RECRUITMENT_SECURITY_TOKEN);
else $out .= '&securekey='.urlencode(dol_hash($conf->global->RECRUITMENT_SECURITY_TOKEN, '2'));
/*if (getDolGlobalString('RECRUITMENT_SECURITY_TOKEN')) {
if (!getDolGlobalString('RECRUITMENT_SECURITY_TOKEN')) $out .= '&securekey='.urlencode(getDolGlobalString('RECRUITMENT_SECURITY_TOKEN'));
else $out .= '&securekey='.urlencode(dol_hash(getDolGlobalString('RECRUITMENT_SECURITY_TOKEN'), '2'));
}*/
// For multicompany

2
htdocs/takepos/index.php
View File

@ -604,7 +604,7 @@ function Reduction() {
function CloseBill() {
<?php
if (!empty($conf->global->TAKEPOS_FORBID_SALES_TO_DEFAULT_CUSTOMER)) {
if (getDolGlobalString('TAKEPOS_FORBID_SALES_TO_DEFAULT_CUSTOMER')) {
echo "customerAnchorTag = document.querySelector('a[id=\"customer\"]'); ";
echo "if (customerAnchorTag && customerAnchorTag.innerText.trim() === '".$langs->trans("Customer")."') { ";
echo "alert('".dol_escape_js($langs->trans("NoClientErrorMessage"))."'); ";