brad
1fa7013313
FIX Add state/province filter to email adv select
2024-03-22 15:11:52 +11:00
Laurent Destailleur
7997db3eb9
Fix bad table
2024-03-22 02:50:12 +01:00
Laurent Destailleur
51322707e9
Try to fix phpunit with pgsql
2024-03-22 02:44:55 +01:00
Laurent Destailleur
51a3641105
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/bom/tpl/objectline_create.tpl.php
htdocs/compta/bank/releve.php
htdocs/core/class/html.formsetup.class.php
htdocs/takepos/freezone.php
2024-03-22 02:35:37 +01:00
Laurent Destailleur
b658bde88a
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
...
Conflicts:
htdocs/core/class/html.formsetup.class.php
htdocs/takepos/index.php
2024-03-22 02:11:58 +01:00
Laurent Destailleur
7b0177a84d
Move to getDolGlobalString
2024-03-22 00:37:56 +01:00
Laurent Destailleur
a44f1799c8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2024-03-21 23:28:50 +01:00
Frédéric France
c76ab41c91
fix warnings with syslog checkconfiguration
2024-03-21 22:01:11 +01:00
Frédéric France
ce38158c35
fix warnings with syslog checkconfiguration
2024-03-21 21:50:42 +01:00
Florian HENRY
b4f04dbaee
new: upgrade minimum version of dolibarr for module builder
2024-03-21 20:58:59 +01:00
Frédéric France
a2974f7778
fix phpstan
2024-03-21 19:13:33 +01:00
Frédéric France
2c1e8ff7c3
fix phpstan
2024-03-21 19:10:42 +01:00
Frédéric France
34028bac6e
fix phpstan
2024-03-21 18:39:30 +01:00
Frédéric France
55b86350ae
fix phpstan
2024-03-21 18:35:12 +01:00
Lamrani Abdel
880b5f2623
remove var_dump
2024-03-21 17:46:12 +01:00
Lamrani Abdel
b8bb0a075c
Merge branch 'addLayoutForWebsite' of github.com:lamrani002/dolibarr into addLayoutForWebsite
2024-03-21 17:39:38 +01:00
Lamrani Abdel
f96f4fd3e9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into addLayoutForWebsite
2024-03-21 17:36:17 +01:00
Lamrani Abdel
469735c74c
remove var_dump
2024-03-21 17:35:31 +01:00
le-reparateur
68cd3d657f
Update filefunc.inc.php
...
Fix #28993
2024-03-21 17:08:14 +01:00
Laurent Destailleur
9232c2bda9
Merge branch 'develop' into addLayoutForWebsite
2024-03-21 16:34:55 +01:00
Laurent Destailleur
ea828be941
Merge branch 'develop' into fixApi_Shipment
2024-03-21 16:34:39 +01:00
Laurent Destailleur
1285154bf1
Merge branch 'develop' into fixInDictMB
2024-03-21 16:34:18 +01:00
Laurent Destailleur
fd1322c095
Fix warning
2024-03-21 16:33:57 +01:00
Lamrani Abdel
e5d79df30d
Fix errors in
2024-03-21 16:25:43 +01:00
Lamrani Abdel
f54916ee4d
Fix return type
2024-03-21 15:57:57 +01:00
Laurent Destailleur
7290ffd1ab
Better support for postgesql
2024-03-21 15:57:45 +01:00
Lamrani Abdel
820247dbd6
Fix condition in createDictionary for modulebuilder
2024-03-21 15:54:29 +01:00
Laurent Destailleur
48050beb86
Merge branch 'altairisfr-rdb4' into develop
2024-03-21 15:38:30 +01:00
Laurent Destailleur
922f30eceb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2024-03-21 15:38:11 +01:00
Laurent Destailleur
7073fd1028
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2024-03-21 15:04:03 +01:00
Laurent Destailleur
5121185541
Code readability
2024-03-21 15:00:54 +01:00
Laurent Destailleur
351af65b7d
Merge pull request #29005 from mdeweerd/fix/PhanTypeInvalidLeftOperandOfBitwiseOp
...
Fix $var |= ... ; into $var = || $var ; PhanTypeInvalidLeftOperandOfAdd
2024-03-21 14:51:53 +01:00
Laurent Destailleur
d3bb171547
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2024-03-21 14:48:14 +01:00
Laurent Destailleur
7cbff76f9d
Fix phpunit
2024-03-21 14:48:03 +01:00
Laurent Destailleur
fa45588c49
Merge pull request #29007 from vold-lu/fix_takepos_update_invoice
...
FIX : TakePOS | Add product / Delete line of existing invoice
2024-03-21 14:46:36 +01:00
Laurent Destailleur
10444e588a
Merge pull request #29008 from hregis/fix_missing_entity_parameter
...
FIX missing entity parameter for ajax_constantonoff
2024-03-21 14:40:27 +01:00
Laurent Destailleur
e1c6b02840
Merge pull request #28996 from mdeweerd/qual/db/typing
...
Update typing for database functions
2024-03-21 14:38:42 +01:00
Laurent Destailleur
d7a130ab29
Merge branch 'develop' into fix/PhanTypeInvalidLeftOperandOfBitwiseOp
2024-03-21 14:38:16 +01:00
Laurent Destailleur
956f4d35a9
Merge pull request #29000 from PsyCrow-code/patch-8
...
PHP Warning: Undefined array key 1 on line 532
2024-03-21 14:37:34 +01:00
Laurent Destailleur
ea1762f0fd
Update releve.php
2024-03-21 14:36:31 +01:00
Rémi Champlon
d8b87ff6eb
fix
2024-03-21 14:22:12 +01:00
Laurent Destailleur
a6d5b32c2e
Merge branch 'develop' into qual/db/typing
2024-03-21 14:13:58 +01:00
Laurent Destailleur
2d0e57ce7c
Fix test for pgsql
2024-03-21 14:13:17 +01:00
Laurent Destailleur
8ab80490e6
Merge branch 'develop' into qual/db/typing
2024-03-21 13:57:13 +01:00
Laurent Destailleur
a403b951e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2024-03-21 13:55:42 +01:00
MDW
7032578914
Fix PHPdoc typing
2024-03-21 13:55:29 +01:00
Laurent Destailleur
477fb7a035
Fix warning
2024-03-21 13:55:23 +01:00
Laurent Destailleur
16c9393ba6
Merge pull request #29003 from bradley-jarvis/fix-email-sendscript
...
FIX broken send mail script
2024-03-21 13:49:01 +01:00
Laurent Destailleur
9d31390e74
Update mailing-send.php
2024-03-21 13:48:50 +01:00
MDW
c9d897ee35
Fix $mybool |=... which is binary op, not boolean op
...
# Fix $mybool |=... which is binary op, not boolean op
This fixes PhanTypeInvalidLeftOperandOfBitwiseOp.
Replace $var |= ... with $var = ... || $var .
Add cast before ... when needed (@include does not always return bool).
|= always evaluates expression, there for || $var, not $var ||
2024-03-21 13:45:52 +01:00