From c1242f409b034a47b10a678ad4615e2dc4cfead1 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 27 May 2019 11:30:59 +0200 Subject: [PATCH 1/7] FIX add Windows and Mac executable --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index bce137d1e11..e50e0874faa 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -8275,7 +8275,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u */ function isAFileWithExecutableContent($filename) { - if (preg_match('/\.(htm|html|js|php|phtml|pl|py|cgi|ksh|sh|bash)$/i', $filename)) + if (preg_match('/\.(htm|html|js|php|phtml|pl|py|cgi|ksh|sh|bash|bat|cmd|wsk|exe|dmg)$/i', $filename)) { return true; } From 3df6f0f6c333b899fe4627dd70b92a861ce223f7 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 27 May 2019 11:43:06 +0200 Subject: [PATCH 2/7] FIX wrong extension --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index e50e0874faa..c189e309e4c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -8275,7 +8275,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u */ function isAFileWithExecutableContent($filename) { - if (preg_match('/\.(htm|html|js|php|phtml|pl|py|cgi|ksh|sh|bash|bat|cmd|wsk|exe|dmg)$/i', $filename)) + if (preg_match('/\.(htm|html|js|php|phtml|pl|py|cgi|ksh|sh|bash|bat|cmd|wpk|exe|dmg)$/i', $filename)) { return true; } From c5c7e8d4513e316471c6afff87d70005f68b5b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 29 May 2019 11:18:01 +0200 Subject: [PATCH 3/7] Update linkedobjectblock.tpl.php --- .../facture/tpl/linkedobjectblock.tpl.php | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index d184fb58966..f0916d79443 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -47,10 +47,31 @@ foreach($linkedObjectBlock as $key => $objectlink) if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total'; ?> - trans("CustomerInvoice"); ?> + type) { + case Facture::TYPE_REPLACEMENT: + echo $langs->trans("InvoiceReplacement"); + break; + case Facture::TYPE_CREDIT_NOTE: + echo $langs->trans("InvoiceAvoir"); + break; + case Facture::TYPE_DEPOSIT: + echo $langs->trans("InvoiceDeposit"); + break; + case Facture::TYPE_PROFORMA: + echo $langs->trans("InvoiceProForma"); + break; + case Facture::TYPE_SITUATION: + echo $langs->trans("InvoiceSituation"); + break; + default: + echo $langs->trans("CustomerInvoice"); + break; + } + ?> getNomUrl(1); ?> - ref_client; ?> - date, 'day'); ?> + ref_client; ?> + date, 'day'); ?> rights->facture->lire) { $sign = 1; @@ -76,8 +97,8 @@ if (count($linkedObjectBlock) > 1) trans("Total"); ?> - - + + From 6bb1a4a0e6f035132040a6c706e34f44e001a4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 29 May 2019 11:26:04 +0200 Subject: [PATCH 4/7] Update linkedobjectblock.tpl.php --- htdocs/compta/facture/tpl/linkedobjectblock.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index f0916d79443..97f0b876abc 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -55,7 +55,7 @@ foreach($linkedObjectBlock as $key => $objectlink) case Facture::TYPE_CREDIT_NOTE: echo $langs->trans("InvoiceAvoir"); break; - case Facture::TYPE_DEPOSIT: + case Facture::TYPE_DEPOSIT: echo $langs->trans("InvoiceDeposit"); break; case Facture::TYPE_PROFORMA: @@ -70,7 +70,7 @@ foreach($linkedObjectBlock as $key => $objectlink) } ?> getNomUrl(1); ?> - ref_client; ?> + ref_client; ?> date, 'day'); ?> rights->facture->lire) { From 48d15032af97b3c54714ae0d45d3b4ae83c9b9af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 29 May 2019 11:28:07 +0200 Subject: [PATCH 5/7] Update linkedobjectblock.tpl.php --- htdocs/comm/propal/tpl/linkedobjectblock.tpl.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index bbdfc57af50..1b78370048a 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -63,7 +63,7 @@ foreach($linkedObjectBlock as $key => $objectlink) getNomUrl(1); ?> ref_client; ?> - date, 'day'); ?> + date, 'day'); ?> rights->propale->lire) { $total = $total + $objectlink->total_ht; @@ -80,8 +80,8 @@ if (count($linkedObjectBlock) > 1) trans("Total"); ?> - - + + From 5b6821c191588a6f821ac2d8abcd11791fdecaea Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Wed, 29 May 2019 16:55:44 +0200 Subject: [PATCH 6/7] FIX display job/fucnction in contact list Display job/function is usefull for correct choice of additionnal contact in a object (PR from returns of severals professionnal dolibarr's user) --- htdocs/core/tpl/contacts.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 316e85a3ac6..3830e2bc31a 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -129,7 +129,7 @@ if ($permission) { selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); ?>
- select_contacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 0, 'minwidth100imp'); ?> + select_contacts(($selectedCompany > 0 ? $selectedCompany : -1), '', 'contactid', 3, '', '', 1, 'minwidth100imp'); ?>
Date: Thu, 30 May 2019 11:45:55 +0200 Subject: [PATCH 7/7] FIX missing encrypt llx_const fields --- htdocs/install/mysql/migration/9.0.0-10.0.0.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql index 075e95fb0bd..81a1e315751 100644 --- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql +++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql @@ -304,8 +304,8 @@ ALTER TABLE llx_actioncomm ADD COLUMN calling_duration integer; ALTER TABLE llx_emailcollector_emailcollector ADD COLUMN datelastok datetime; ALTER TABLE llx_emailcollector_emailcollector ADD COLUMN maxemailpercollect integer DEFAULT 100; -DELETE FROM llx_const WHERE name = 'THEME_ELDY_USE_HOVER' AND value = '0'; -DELETE FROM llx_const WHERE name = 'THEME_ELDY_USE_CHECKED' AND value = '0'; +DELETE FROM llx_const WHERE name = __ENCRYPT('THEME_ELDY_USE_HOVER')__ AND value = __ENCRYPT('0')__; +DELETE FROM llx_const WHERE name = __ENCRYPT('THEME_ELDY_USE_CHECKED')__ AND value = __ENCRYPT('0')__; ALTER TABLE llx_inventorydet DROP COLUMN pmp; ALTER TABLE llx_inventorydet DROP COLUMN pa;