Laurent Destailleur
8d279a535c
Fix phan
2024-07-13 18:29:28 +02:00
Laurent Destailleur
150e162022
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-07-13 18:22:59 +02:00
Laurent Destailleur
30f9215846
Debug v20
2024-07-13 17:58:47 +02:00
Laurent Destailleur
5661a381ee
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/projet/tasks/time.php
2024-07-13 17:47:55 +02:00
Laurent Destailleur
305406d802
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2024-07-13 17:45:13 +02:00
Laurent Destailleur
88ee5ec89a
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-07-13 17:41:37 +02:00
Laurent Destailleur
413b430cc7
Fix Phan
2024-07-13 17:25:48 +02:00
Frédéric FRANCE
f91c96842f
fix typo ( #30368 )
2024-07-13 17:11:20 +02:00
Laurent Destailleur
147a8bfaee
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/categories/viewcat.php
htdocs/contrat/card.php
htdocs/contrat/list.php
htdocs/eventorganization/conferenceorbooth_list.php
htdocs/expedition/list.php
htdocs/societe/card.php
2024-07-11 10:44:39 +02:00
Alexandre SPANGARO
128769811c
Add css bodylist on list ( #30334 )
...
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-07-11 00:45:05 +02:00
HENRY Florian
32aaab75b5
fix: hidden option MAIN_KEEP_REF_CUSTOMER_ON_CLONING always win on pr… ( #30340 )
...
* fix: hidden option MAIN_KEEP_REF_CUSTOMER_ON_CLONING always win on propal clone even if it's for enother customer
* Update propal.class.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-07-10 18:53:57 +02:00
Frédéric FRANCE
94feb2cfa7
fix phpstan expects values ( #30324 )
...
* fix phpstan expects values
* fix phpstan expects values
2024-07-09 19:28:59 +02:00
Laurent Destailleur
8a4f550d64
Debug v20
2024-07-09 17:33:27 +02:00
Alexandre SPANGARO
4abe433c22
NEW Propale - Can upload a file with drag and drop ( #30315 )
2024-07-08 21:46:36 +02:00
Rémi Champlon
d2907b68c0
NEW : Add pagination data to some api routes ( #29895 )
...
* Add pagination date
* Spaces to tabs
* fix
2024-07-06 15:04:11 +02:00
Laurent Destailleur
6fb7aee808
Clean code to avoid strange code manipulation as reported into #30259
...
FIX SQL Error group by
2024-07-06 03:26:43 +02:00
atm-jonathan
3ddd6cceba
New box comm card ( #30220 )
...
* hook retour completeListOfReferent
* box comm card.php
* commit
2024-07-03 03:22:42 +02:00
Laurent Destailleur
6ebcf20b6d
Fix phan
2024-07-02 11:33:44 +02:00
Zephyriony
4170bd410c
NEW Opacity for finished lines ( #30219 )
...
* Update list.php
* Update list.php
* Update list.php
* Update list.php
* Update list.php
* Update list.php
* Update list.php
* Update list.php
* Update list.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-07-01 14:17:44 +02:00
Frédéric FRANCE
c6d44671f5
clean date phpdoc ( #30221 )
2024-07-01 12:55:16 +02:00
Alexandre SPANGARO
96afcaa476
Better comments ( #30200 )
...
* Fix language
* Fix language
* Fix language
* Fix language
* Fix language
* Fix language
* Fix language
* CI Missing language key
* Update eventorganization.lang
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr >
2024-06-30 21:02:50 +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
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
db61320098
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
...
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/product/price.php
htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
htdocs/user/list.php
2024-06-30 04:05:46 +02:00
Laurent Destailleur
b2e288f8ec
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/menus/standard/eldy.lib.php
2024-06-30 03:53:16 +02:00
Laurent Destailleur
f64e4b4981
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-06-29 20:53:10 +02:00
Laurent Destailleur
d4b49fac4a
Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
2024-06-29 20:49:03 +02:00
Laurent Destailleur
00b58c94c3
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
2024-06-29 20:48:39 +02:00
Frédéric FRANCE
f1302291de
fix phan emailcollector ( #30196 )
...
* fix phan emailcollector
* fix phpstan
* add phpdoc
* add phpdoc
* add phpdoc
* add phpdoc
* add phpdoc
* add phpdoc
* add phpdoc
2024-06-29 18:57:43 +02:00
Laurent Destailleur
d03655b1fa
Look and feel
2024-06-29 10:46:16 +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
0a15655720
Debug v20
2024-06-27 10:41:55 +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
Laurent Destailleur
a8a48c3315
Debug v20 - fix css
2024-06-24 16:20:01 +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
Laurent Destailleur
1e1058b29a
Debug v20
2024-06-24 12:35:27 +02:00
Zephyriony
a7515327e0
FIX #30120 ( #30133 )
...
* FIX #30120
* Update card.php
* Update card.php
2024-06-24 02:22:12 +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
Vincent Maury
ede95c97fb
Cant link event to an object : here recruitment ( #30100 )
...
The perm has changed in event card
2024-06-22 19:18:53 +02:00
Zephyriony
7ad21964e2
QUAL #30122 ( #30131 )
2024-06-22 15:50:27 +02:00
Laurent Destailleur
18fc25e799
Fix label on discounts
2024-06-22 13:53:59 +02:00
Laurent Destailleur
c78a74edde
Fix label on discounts
2024-06-22 13:53:11 +02:00
Laurent Destailleur
9e7daee7b3
Fix look and feel v20
2024-06-22 13:00:29 +02:00
Laurent Destailleur
a5ecf1ac1b
Debug v20
2024-06-22 02:30:31 +02:00
Laurent Destailleur
2d87289be7
Debug v20
2024-06-22 01:18:10 +02:00
Laurent Destailleur
b45a322d25
Debug v20
2024-06-21 19:58:38 +02:00
Laurent Destailleur
97eaa77a74
Fix desc in ICS file of events
2024-06-20 17:46:13 +02:00
Laurent Destailleur
eb537088ba
Exclude phan error type that is for the moment too annoying to manage
2024-06-18 19:15:29 +02:00
Laurent Destailleur
27985a4707
Debug
2024-06-18 14:04:59 +02:00
Laurent Destailleur
340aa2e568
Debug v20
2024-06-18 12:47:02 +02:00
