Commit Graph

107554 Commits

Author SHA1 Message Date
Laurent Destailleur
912428f5a1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-27 11:14:40 +01:00
Laurent Destailleur
a17c417205
Merge pull request #23018 from Easya-Solutions/14.0_fix-22837
FIX #22837
2022-12-27 00:26:52 +01:00
Laurent Destailleur
1d7c550adb Fix add BARCODE_INIT_MAX to solve timeout in barcode generation 2022-12-26 16:09:05 +01:00
Laurent Destailleur
04b38997c6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-26 15:21:22 +01:00
Laurent Destailleur
76b7f80443 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-26 15:20:28 +01:00
Laurent Destailleur
11c86416a9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-12-26 15:15:13 +01:00
Laurent Destailleur
f6149903dc FIX bad selection of barcode numbering module 2022-12-26 15:08:51 +01:00
Laurent Destailleur
e12ef6735f
Merge pull request #23250 from daraelmin/patch-7
Fix #23077 - Cannot update subscription note
2022-12-22 14:40:57 +01:00
Laurent Destailleur
e75617268b Log 2022-12-22 01:04:06 +01:00
Laurent Destailleur
bd90d783c7 Reduce code 2022-12-22 00:48:56 +01:00
Laurent Destailleur
599aa6009a Try to solve phpunit regression 2022-12-22 00:37:33 +01:00
Laurent Destailleur
49e8b53fab Try fix for phpunit regression 2022-12-22 00:33:03 +01:00
Laurent Destailleur
d29fde6603 Add log to test phpunit pb 2022-12-22 00:02:22 +01:00
Laurent Destailleur
a0f282d100 Try a fix of phpunit regression 2022-12-21 23:34:32 +01:00
Laurent Destailleur
8e914b2423 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-21 20:47:09 +01:00
Laurent Destailleur
c3ada976e1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-21 20:46:56 +01:00
daraelmin
6a658499e7
Fix #23077 - Cannot update subscription note 2022-12-17 21:16:03 +01:00
Laurent Destailleur
6950e2be20
Merge pull request #23243 from Hystepik/develop_v14#1
Fix #19485 : add of missing tickets trad key for menu
2022-12-17 00:39:21 +01:00
hystepik
c0a0b977bf Fix #19485 : add of missing tickets trad key for menu 2022-12-16 16:20:43 +01:00
Laurent Destailleur
617a8e1983
Merge pull request #23223 from atm-gauthier/15.0_fix_cant_search_time_spent_by_all_users
FIX : Can't see all time spent by all user
2022-12-14 18:24:31 +01:00
stickler-ci
70b6b3d82d Fixing style errors. 2022-12-14 15:21:42 +00:00
Gauthier PC portable 024
1a16e41ce3 FIX : Can't see all time spent by all user 2022-12-14 16:04:35 +01:00
Laurent Destailleur
348c54680e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:21:43 +01:00
Laurent Destailleur
64de591770 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:20:47 +01:00
Laurent Destailleur
af6854c5fb
Merge pull request #23213 from henrynopo/patch-1
Create invoice from Shipment - fix error of multicurrency code
2022-12-14 10:10:30 +01:00
stickler-ci
24585cf61b Fixing style errors. 2022-12-14 02:45:20 +00:00
Henry
c4dbc5e6d6
Create invoice from Shipment - fix error of multicurrency code 2022-12-14 10:39:15 +08:00
Laurent Destailleur
9087fb937d
Merge pull request #23196 from vold-lu/order_inventory_det
FIX: Give predictable order to inventory lines
2022-12-14 00:19:41 +01:00
Aloïs Micard
8a1df1df92 Give order to inventory lines 2022-12-12 17:36:00 +01:00
Laurent Destailleur
570fc5c0ed
Merge pull request #23164 from vold-lu/fix_confirm_valid
FIX: CommonObject - showOptionals - Display blank td when MAIN_VIEW_LINE_NUMBER is enabled and action is confirm_valid
2022-12-10 16:31:34 +01:00
Laurent Destailleur
0d8dc5c2e5
Merge pull request #23174 from simnandez/15.0
Fix #23142
2022-12-10 16:14:54 +01:00
Juanjo Menent
9b3f6cfa5a Fix #23142 2022-12-09 20:38:44 +01:00
Aloïs Micard
285731200a Add confirm_cancel action 2022-12-09 13:45:15 +01:00
Aloïs Micard
381b998413 Display blank td when action is confirm_valid 2022-12-09 11:45:09 +01:00
Laurent Destailleur
4d06e88f19 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-07 12:36:51 +01:00
Laurent Destailleur
f6289297da FIX #21280 FIX #23008 2022-12-07 12:35:54 +01:00
Laurent Destailleur
7dd0c6646d
Merge pull request #23114 from aspangaro/14p42
Fix CSS
2022-12-06 21:06:53 +01:00
Laurent Destailleur
37e91fa6bf
Merge pull request #23066 from FHenry/14_fix_stats_propal_order
FIX: propal and order stats broken on Tag+User(retricted customer list)
2022-12-06 21:04:55 +01:00
Laurent Destailleur
850f06a3ea
Merge pull request #23079 from frederic34/patch-8
fetch entity contact to take the right directory
2022-12-06 20:48:40 +01:00
Alexandre SPANGARO
a107c81bf1 Merge branch '14.0' into 14p42 2022-12-06 04:53:10 +01:00
Alexandre SPANGARO
89b10b0dfb Fix css 2022-12-06 04:48:04 +01:00
Florian HENRY
f405f859ca ineer join is better than coma and where 2022-12-02 22:49:52 +01:00
Frédéric FRANCE
9f4182c924
fetch entity contact to take the right directory 2022-12-02 11:00:52 +01:00
Laurent Destailleur
8236ad34fa Fix revert a new feature that must be in develop 2022-12-01 18:34:20 +01:00
Laurent Destailleur
e8e9086c15
Merge pull request #22999 from inovea-conseil/FIX#20415
FIX#20415
2022-12-01 17:52:55 +01:00
Laurent Destailleur
8a8f6e0c16 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-01 17:42:13 +01:00
Laurent Destailleur
cc982adc2f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-01 17:42:02 +01:00
Laurent Destailleur
931fe92148
Merge pull request #23068 from noec764/14_0_FIX_PGSQL_UpdatField
FIX: PGSQL Integer type does not have a free lenght
2022-12-01 17:13:26 +01:00
Noé Courtier
a4ac90a316 FIX: PGSQL Int type does not have a free lenght 2022-12-01 15:15:31 +01:00
Florian HENRY
8ddc4c8db6 FIX: propal and order stats broken on Tag+User(retricted customer list) 2022-12-01 14:28:00 +01:00