Laurent Destailleur
f6dd2f808e
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-02-12 03:35:51 +01:00
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
c261b84667
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-02-09 19:06:52 +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
noec764
2c07bd764d
FIX: Bar code verification should be done by entity because generation does ( #28087 )
...
* FIX: Bar code verification should be done by entity because generation does
* FIX: handle Entities shared tables
* FIX: Remove unused global
---------
Co-authored-by: Noé <noe@scopen.fr>
2024-02-09 14:07:04 +01:00
Laurent Destailleur
0f53fe10d1
FIX oauth authent must be done only on click on link
...
Better message for notification denied.
2024-02-09 13:32:44 +01:00
Laurent Destailleur
290cb8447a
comment
2024-02-09 12:12:54 +01:00
Laurent Destailleur
7783575bf7
Fix bad parameter
2024-02-08 15:02:54 +01:00
Frédéric FRANCE
b92b8c443d
fix cunits.class.php (backport) ( #28068 )
2024-02-08 13:09:39 +01:00
Laurent Destailleur
550e4e8c9a
Fix compatibility
...
Conflicts:
htdocs/resource/class/dolresource.class.php
2024-02-08 00:26:55 +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
William Mead
27002a95e4
Fixed undefined thirdparty_id property ( #28044 )
2024-02-07 16:29:57 +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
Laurent Destailleur
b40ebfa9e8
Better log for debug
2024-02-06 11:57:27 +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
4aeda8d28d
Fix escapeforlike/escape
2024-02-03 15:29:40 +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
fedbc0f08e
Fix use of not existing object
2024-02-02 12:51:11 +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
75df3bc24d
FIX #27375
2024-02-01 12:43:46 +01:00
Laurent Destailleur
3bb3a8d6ed
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-02-01 12:23: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
5f24f79b4d
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2024-02-01 12:14: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
Laurent Destailleur
badf3e1971
Fix payment mode/term and label and sort order in export
2024-02-01 11:53:55 +01:00
Laurent Destailleur
662ab45037
Merge pull request #27904 from rycks/14.0_fix_zero_could_be_a_value_into_conf_global_key
...
fix #27883 : zero could be a value stored
2024-02-01 10:59:11 +01:00
Laurent Destailleur
bd88f1df67
Merge pull request #27926 from noec764/18_FIX_Global_filter_deleted_on_massactions
...
FIX: Save global filter when clicking on massaction buttons
2024-01-31 19:28:00 +01:00
Laurent Destailleur
f152d5e0fd
Update massactions_pre.tpl.php
2024-01-31 19:24:58 +01:00
Laurent Destailleur
9843f31814
Fix warning
2024-01-31 18:26:09 +01:00
Noé
9beb210ead
FIX: Save global filter when clicking on massaction buttons
2024-01-31 15:11:37 +01:00
Laurent Destailleur
16accb3460
Fix missing due date
2024-01-31 11:19:52 +01:00
Eric Seigne
1f21e1a945
fix #27883 : zero could be a value stored
2024-01-30 21:42:57 +01:00
Eric Seigne
8d9ddf4a51
fix comment about datehour -> datetime
2024-01-30 21:35:19 +01:00
