Laurent Destailleur
9ffa8641ef
Fix phan
2024-07-02 11:41:08 +02:00
Laurent Destailleur
6ebcf20b6d
Fix phan
2024-07-02 11:33:44 +02:00
Laurent Destailleur
e985d24b52
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-07-02 02:11:39 +02:00
Laurent Destailleur
d6480594af
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
2024-07-02 02:09:25 +02:00
Laurent Destailleur
6259d02042
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-07-02 02:08:10 +02:00
noec764
96a5479e9e
FIX: Error mesg show untranslated extrafield name ( #30227 )
...
Co-authored-by: Noé <noe@scopen.fr >
2024-07-02 01:56:45 +02:00
Laurent Destailleur
8b9b3f9429
QUAL Use archiveOrBackupFile for MAIN_MAIL_DEBUG_LOG_WITH_DATE
2024-07-01 12:30:36 +02:00
Laurent Destailleur
5ef4d40d4b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2024-07-01 01:22:54 +02:00
Noé Cendrier
4e15085d79
NEW: add trigger for linking and unlinking invoices ( #30182 )
...
* NEW: add trigger for linking and unlinking invoices
* Update discount.class.php
* Update discount.class.php
* Update discount.class.php
* trailing spaces
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-07-01 00:21:14 +02:00
Frédéric FRANCE
4b275dc148
add phpdoc ( #30208 )
...
* add phpdoc
* add phpdoc
* add phpdoc
* add phpdoc
* clean phpdoc
2024-06-30 19:39:01 +02:00
Laurent Destailleur
0d4452bad2
Clean code
2024-06-30 15:40:19 +02:00
Laurent Destailleur
4ba6b0d2f0
Clean language
2024-06-30 15:26:31 +02:00
Laurent Destailleur
4dfef24f2f
Doc
2024-06-30 15:03:52 +02:00
Laurent Destailleur
29434544e0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2024-06-30 15:01:42 +02:00
Laurent Destailleur
9f54e7f389
doc
2024-06-30 15:01:29 +02:00
lvessiller-opendsi
a967f94850
FIX force rounding mode 0 for expense report ( #30191 )
2024-06-30 15:01:19 +02:00
Laurent Destailleur
7ebf1effa0
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-06-30 14:57:55 +02:00
Laurent Destailleur
896bfeb050
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
2024-06-30 14:57:01 +02:00
Laurent Destailleur
a51e71941b
Fix syntax error
2024-06-30 14:52:27 +02:00
Laurent Destailleur
bde5687890
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-06-30 11:59:25 +02:00
Laurent Destailleur
675e761297
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
2024-06-30 04:11:04 +02:00
Laurent Destailleur
d7c2e78239
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/tpl/card_presend.tpl.php
2024-06-30 03:50:02 +02:00
Regis Houssin
fdf5fe0f26
FIX broken pdf preview when multicompany sharing ( #30188 )
...
* FIX broken pdf preview when multicompany sharing
* Update html.formmail.class.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-06-29 19:28:30 +02:00
Laurent Destailleur
bbbcf57756
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-06-29 19:25:59 +02:00
Laurent Destailleur
2f4c84f4b5
Debug v20
2024-06-29 13:23:05 +02:00
Laurent Destailleur
b574fe4c81
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-06-28 18:50:34 +02:00
Frédéric FRANCE
409bccb4f0
fix phan api_workstations.class.php ( #30169 )
...
* fix api_workstations.class.php
* Update api_workstations.class.php
* Update api_workstations.class.php
* Update api_workstations.class.php
* Update html.formwebsite.class.php
2024-06-27 16:39:15 +02:00
Laurent Destailleur
1104b95137
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-06-27 13:47:27 +02:00
Laurent Destailleur
902065406b
Debug v20
2024-06-27 09:20:04 +02:00
Laurent Destailleur
cfaadbaa7c
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-06-26 21:50:14 +02:00
Alexandre SPANGARO
0cb82b4035
Situation invoice #29897 - Add specific model Octopus ( #30116 )
...
* Situation invoice #29897 - Add specific model Octopus
* Fix phan
* Comment translation
* Fix phan
* add fix to octopus
* add fix to octopus
* Add fix octopus
* fix phan
fix phan
fix phan
fix phan
* fix phan
fix phan
fix phan
fix phan
* fix phan
* fix phan
* fix phan
* fix phan
* fix phan
* fix phan
* fix phan
* fix phan
* fix phan
* fix phan
* fix phan
* fix phan
* fix phan
* fix phan
* Cancel fix (compatibility php 8.x only)
* Add fix octopus
* Fix phan
* Fix phan
---------
Co-authored-by: Frédéric France <frederic.france@free.fr >
2024-06-26 17:25:15 +02:00
lamrani abdelwadoud
6f40e309f1
Fix display all news of all website ( #30146 )
...
* Fix display all news of all website
* fix type of variable
* Update page-sample-news.html
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-06-26 17:12:31 +02:00
Lucas Marcouiller
2cf322184e
Fix php 8.3 warnings ( #30160 )
...
* Fix php 8.3 warnings
* fix deprecation
---------
Co-authored-by: Hystepik <lmarcouiller@nltechno.com >
2024-06-26 17:04:05 +02:00
Laurent Destailleur
22b50b2172
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-06-26 13:26:37 +02:00
Laurent Destailleur
bd2a0b9e55
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
2024-06-25 15:13:51 +02:00
Laurent Destailleur
db5ade973c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2024-06-25 11:18:31 +02:00
John BOTELLA
322bbd934b
fix : 19.0 fix inconsistent link validation ( #30141 )
...
* Dirty fix for inconcistant link psedo langage
* add todo
* Update commonobject.class.php
* Update commonobject.class.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-06-24 22:53:43 +02:00
Frédéric FRANCE
702cca1502
fix $action is unknown ( #30148 )
...
dafbefdc74
2024-06-24 22:15:56 +02:00
Laurent Destailleur
57414242bd
Debug v20
2024-06-24 15:55:45 +02:00
Laurent Destailleur
10e0f6f2ab
Debug v20 - popup of combo go out of screen
2024-06-24 15:08:16 +02:00
Laurent Destailleur
2e938fe9ef
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-06-24 12:44:28 +02:00
lvessiller-opendsi
34a98e369b
FIX rounding update price for expense report lines ( #30051 )
...
* FIX rounding update price for expense report lines
* fix phan ci error
* fix vat amount diff on rouding mode 1
2024-06-24 02:26:37 +02:00
Laurent Destailleur
c54a97e923
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
2024-06-24 01:47:18 +02:00
Laurent Destailleur
e8c5115068
Debug v20
2024-06-23 23:35:00 +02:00
Laurent Destailleur
86341f110c
Debug v20
2024-06-23 21:31:44 +02:00
Christian Humpel
dafbefdc74
NEW: Hook do actions or check input after changing a extrafield in commonobject.class.php ( #30128 )
...
* Integration Textbausteine weiter...
* fix typo.
2024-06-23 18:00:44 +02:00
Zephyriony
ce2631db14
FIX #30132 ( #30134 )
...
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-06-23 17:59:19 +02:00
Laurent Destailleur
adb354f97a
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-06-23 14:00:12 +02:00
boudet jean pascal
da4f526f77
test status contact ( #30098 )
...
* test status contact
* Update notify.class.php
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr >
---------
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr >
Co-authored-by: jpb <jean-pascal.boudet@atm-consulting>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-06-22 16:07:46 +02:00
Alexandre SPANGARO
82d144c057
Situation invoice #29897 - CommonObject ( #30118 )
2024-06-22 15:57:38 +02:00
