Commit Graph

9579 Commits

Author SHA1 Message Date
Laurent Destailleur
cbb6ca071a Fix #yogosha15157 2023-02-25 19:51:05 +01:00
Philippe GRAND
05a32ab993 fix : Fatal error: Uncaught TypeError: Unsupported operand types: string / int in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/comm/propal/card.php on line 1420 2023-02-25 14:31:20 +01:00
Laurent Destailleur
1c9884e604 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 04:10:25 +01:00
Laurent Destailleur
7b7b8fda24 Fix sending emails with data:image inside 2023-02-25 04:05:18 +01:00
Laurent Destailleur
5981133a4e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 03:09:16 +01:00
Laurent Destailleur
6092932141 css 2023-02-25 02:55:28 +01:00
Laurent Destailleur
b04e7e38e6 Message 2023-02-25 02:53:34 +01:00
Laurent Destailleur
af71ad4993 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 02:45:43 +01:00
Laurent Destailleur
c90fa255fd css 2023-02-25 02:43:37 +01:00
Frédéric FRANCE
652a215a07 set errors from object 2023-02-24 16:57:39 +01:00
Frédéric FRANCE
2d454d6815 set errors from object 2023-02-24 16:50:41 +01:00
Laurent Destailleur
a64ed59e18 Merge 2023-02-23 22:25:56 +01:00
Laurent Destailleur
4068b1db87 Fix link for read or unsubscribe must use a unique hash 2023-02-23 21:19:01 +01:00
Laurent Destailleur
4d44e68533 Fix substitution for emailing test 2023-02-23 20:40:46 +01:00
Laurent Destailleur
56afa676c0 Fix tags 2023-02-23 18:47:37 +01:00
atm-florian
b29ebef05f Propale stats: reworking of the fix to comply with travis rule for SQL string building 2023-02-23 18:03:00 +01:00
Laurent Destailleur
6afb899f05 Fix tags 2023-02-23 15:50:57 +01:00
Laurent Destailleur
dbf3df5210 Fix emailing in test mode use correct user or sender signature 2023-02-23 13:50:25 +01:00
Laurent Destailleur
ead1f15838 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-23 12:17:55 +01:00
Laurent Destailleur
d86ab00950 Look and feel v18 2023-02-23 12:08:43 +01:00
Laurent Destailleur
5e4cf97a16 Merge pull request #23758 from marcusdeangabriel/PROPALE_MODIFY_MARGIN_RATES
NEW Can modify margin rates in offers like VAT rates.
2023-02-22 17:29:20 +01:00
Laurent Destailleur
5713ca8a43 Regression 2023-02-22 16:01:48 +01:00
Gauthier PC portable 024
a03a708b84 FIX : llxHeader() must be after header location of MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE 2023-02-22 15:15:58 +01:00
Laurent Destailleur
d4402aa7f5 code easier to understand 2023-02-22 01:09:23 +01:00
Laurent Destailleur
643c05116f Debug v17 2023-02-21 13:37:27 +01:00
Laurent Destailleur
50baadbe0a Fix warning 2023-02-21 13:27:21 +01:00
Laurent Destailleur
80df9434db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-02-21 02:37:22 +01:00
Laurent Destailleur
9627bc14fa Debug v18 2023-02-20 19:32:15 +01:00
Laurent Destailleur
a8cd8853f4 Modulebuildarisation of the emailing list 2023-02-20 19:25:29 +01:00
Laurent Destailleur
4af4f89fa6 Fix syntax error 2023-02-20 18:27:54 +01:00
Laurent Destailleur
870ac42082 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-20 16:20:49 +01:00
Laurent Destailleur
a2d35f216d Debug v17 2023-02-20 16:07:28 +01:00
Laurent Destailleur
d89ccaeaad Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-19 18:18:38 +01:00
Laurent Destailleur
56add74e71 Debug v17 2023-02-19 13:58:57 +01:00
Laurent Destailleur
b5ec68a1c3 Fix look and feel v17 2023-02-19 13:05:35 +01:00
Laurent Destailleur
eaa0e5eb3e CSS 2023-02-19 02:39:39 +01:00
Laurent Destailleur
2168578f2e Fix inline css 2023-02-18 14:00:25 +01:00
Laurent Destailleur
0b4cacd291 Use dolChmod 2023-02-17 20:01:53 +01:00
Laurent Destailleur
53c8329b50 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-17 17:11:23 +01:00
Laurent Destailleur
1ac4e6f458 Fix phpunit 2023-02-17 16:52:00 +01:00
Laurent Destailleur
cfd9e7ed62 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-02-17 16:17:06 +01:00
atm-florian
c3e42f1961 Propale stats: replace old-style joins with inner joins 2023-02-17 16:12:06 +01:00
atm-florian
e212019ddf FIX: SQL error "unknown column p.fk_soc" because ANSI-92 joins take precedence over ANSI-89 joins
cf. https://stackoverflow.com/questions/4065985/mysql-unknown-column-in-on-clause
2023-02-17 00:10:00 +01:00
Frédéric FRANCE
8765e00e00 Merge remote-tracking branch 'upstream/develop' into membertooltip 2023-02-16 21:27:56 +01:00
Laurent Destailleur
c498589bac Merge pull request #23937 from bloxera/wikilink_DE_1
New: add links to wiki pages in German language
2023-02-16 21:23:15 +01:00
priojk
247ba8d0c3 New: added links to wiki pages in German language 2023-02-16 17:52:41 +01:00
marcusdeangabriel
f39d32255c Merge branch 'Dolibarr:develop' into PROPALE_MODIFY_MARGIN_RATES 2023-02-16 10:28:44 +01:00
Juanjo Menent
670ae506e3 Fix: Bad assignation for external users access 2023-02-15 10:47:25 +01:00
Frédéric FRANCE
8e9db30707 add ajax tooltip on mailing 2023-02-15 08:52:15 +01:00
Frédéric FRANCE
03e8ee0e6d use user->hasRight 2023-02-14 23:00:15 +01:00