Laurent Destailleur
ff2d609814
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/mrp/mo_production.php
2024-02-12 03:35:39 +01:00
Laurent Destailleur
2e620c9a43
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-12 03:33:09 +01:00
Laurent Destailleur
65533360a2
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
...
Conflicts:
htdocs/main.inc.php
2024-02-12 03:32:58 +01:00
William Mead
92afb654db
Fixed default value for radio extrafield ( #27066 )
2024-02-10 01:58:36 +01:00
Laurent Destailleur
31816168da
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-09 19:05:49 +01:00
Laurent Destailleur
d07b7dc72e
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-09 19:05:41 +01:00
Laurent Destailleur
2f1eecd709
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-02-09 19:04:06 +01:00
lvessiller-opendsi
62632893ad
FIX avoid from re-initializing result on nested hook getEntity ( #27799 )
...
* FIX avoid from re-initializing result on nested hook getEntity
* FIX uses local resPrint instead of cloning hookmanager for nested hooks
2024-02-09 18:15:35 +01:00
Frédéric FRANCE
b92b8c443d
fix cunits.class.php (backport) ( #28068 )
2024-02-08 13:09:39 +01:00
thibdrev
ad141c1e1f
qual: phpstan for htdocs/core/class/cunits.class.php ( #28064 )
...
htdocs/core/class/cunits.class.php 88 Property CommonDict::$active (int) does not accept string.
htdocs/core/class/cunits.class.php 415 Method CUnits::getUnitFromCode() should return int but returns string.
2024-02-08 00:15:44 +01:00
Laurent Destailleur
097290fc38
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
...
Conflicts:
htdocs/comm/action/peruser.php
htdocs/core/class/commonobject.class.php
2024-02-07 18:16:57 +01:00
Laurent Destailleur
4b60b3d991
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2024-02-07 18:11:36 +01:00
Laurent Destailleur
e6b165003f
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2024-02-07 18:01:11 +01:00
Laurent Destailleur
5a756ffc4c
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/takepos/invoice.php
2024-02-07 17:44:39 +01:00
Quentin-Seekness
0ad3581e00
Update cunits.class.php ( #28056 )
...
FIX: error SQL when creating a Cunit
2024-02-07 17:29:45 +01:00
boudet jean pascal
fe63333c28
FIX : move input type hidden ( #28054 )
...
* move input type hidden
* pre-commit from another dev
* Delete htdocs/includes/mike42/escpos-php/doc/escpos.conf
---------
Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-02-07 16:24:11 +01:00
Laurent Destailleur
f828cc5119
Debug v19
2024-02-07 12:28:35 +01:00
Laurent Destailleur
c66b434c80
Fix for export
2024-02-06 18:41:45 +01:00
Laurent Destailleur
8b8aa3a27f
Fix comment
2024-02-06 17:46:12 +01:00
Frédéric FRANCE
10eaa1d269
fix saved model_pdf after generating odt ( #28005 )
2024-02-05 01:10:35 +01:00
Laurent Destailleur
0f931ef471
Disable ajax tooltip by default. Still trouble of persistent popup.
2024-02-02 13:29:02 +01:00
Laurent Destailleur
b0fd166142
Add MAIN_MAIL_FORCE_FROM to fix sending email with mono user SMTP
2024-02-01 13:12:21 +01:00
Laurent Destailleur
4cba87129c
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-02-01 12:22:54 +01:00
Laurent Destailleur
9dd1646818
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-02-01 12:20:12 +01:00
Laurent Destailleur
7b178844e8
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-02-01 12:16:50 +01:00
Laurent Destailleur
07d0093fbc
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2024-02-01 12:14:30 +01:00
Laurent Destailleur
ab585b6efc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2024-02-01 12:11:25 +01:00
Eric Seigne
8d9ddf4a51
fix comment about datehour -> datetime
2024-01-30 21:35:19 +01:00
atm-florian
101c5a2dca
FIX 17.0 - php8 warnings: test for $field existence before checking if it is null or empty
2024-01-30 16:21:51 +01:00
Laurent Destailleur
40794458d2
Comment
2024-01-29 13:00:33 +01:00
vmaury
f033cc455f
Fix : random bug when attaching file to email : no file attached
2024-01-29 01:58:07 +01:00
Frédéric FRANCE
673b1727e2
fix getMultidirOutput can't find multidir_output for mycompany
2024-01-27 10:38:23 +01:00
Laurent Destailleur
b8686f159f
Debug module receipt printer
2024-01-25 15:18:06 +01:00
Laurent Destailleur
3eb461db7c
FIX #27771 Sec: birth date and personal address not visible by default
...
on vcard
2024-01-24 11:56:56 +01:00
Laurent Destailleur
0602b40e3a
FIX Debug setup of module TakePOS
2024-01-24 03:34:42 +01:00
Laurent Destailleur
cca01cbda4
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-01-23 22:15:36 +01:00
Laurent Destailleur
4c4ee11abf
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-01-19 20:08:04 +01:00
Laurent Destailleur
916c017aa6
Debug v19
2024-01-19 20:04:11 +01:00
Laurent Destailleur
f711d0d144
Typo doc
2024-01-19 12:36:07 +01:00
VESSILLER
26a05d3046
FIX update price extrafield on propal card
2024-01-19 10:15:42 +01:00
Laurent Destailleur
31d8600811
Merge pull request #27568 from comaiteseb/19.0
...
FIX #27536 VAT of the buyer's country not applied while SERVICE_ARE_ECOMMERCE_200238EC option is activated
2024-01-18 11:05:14 +01:00
Laurent Destailleur
1773d432a4
Fix logs
2024-01-18 00:44:42 +01:00
Laurent Destailleur
8ca7f0c989
Fix var_dump
2024-01-17 20:38:22 +01:00
Laurent Destailleur
fc67947834
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-01-17 20:23:46 +01:00
Laurent Destailleur
af3bb1d144
Merge
2024-01-17 20:23:38 +01:00
Laurent Destailleur
f7485182f7
Fix warning and MAIN_MAIL_AUTOCOPY_...
2024-01-17 19:52:17 +01:00
Sébastien NASSIET
ec23bc3c90
Syntax error crrected
2024-01-17 16:03:14 +01:00
Sébastien NASSIET
b70faf9132
oubli correction de la logique pour la TVA Intraco vers un particulier
2024-01-17 11:04:26 +01:00
Sébastien NASSIET
efdaa0c9ec
phpcs correction
2024-01-16 13:49:15 +01:00
Sébastien NASSIET
f53aa7c505
phpcs correction
2024-01-16 13:45:38 +01:00