Commit Graph

106751 Commits

Author SHA1 Message Date
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
f8a5749fc4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-25 19:00:10 +01:00
Laurent Destailleur
b989c257ad Fix report on salaries 2022-02-25 18:53:21 +01:00
Laurent Destailleur
a6a6c588db Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-25 14:37:28 +01:00
Laurent Destailleur
ac67a5a2bb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-25 14:34:25 +01:00
Laurent Destailleur
def0c76ec6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-25 14:31:37 +01:00
Laurent Destailleur
971c0fc764
Merge pull request #20147 from Hystepik/develop_safe_v14
Fix : fix error of permission in holiday
2022-02-25 14:30:05 +01:00
Laurent Destailleur
6dadfc9d0d
Merge pull request #20149 from marc-dll/13.0_FIX_pdf_deposit_detail
FIX: invoice pdf: lines originating from deposits were not detailed anymore
2022-02-25 14:29:33 +01:00
Laurent Destailleur
84db3437bd Add missing ' in command 2022-02-25 14:13:42 +01:00
Laurent Destailleur
eb6383ff1d
Merge pull request #20165 from atm-lena/FIX_SalaryPaiement_RapportCompta
Display Salary Paiement on compta report
2022-02-25 14:02:32 +01:00
Laurent Destailleur
a2dea71b4d
Merge pull request #20172 from Dolibarr/atm-maxime-patch-1
Fix #20171 permissiontoadd
2022-02-25 14:00:13 +01:00
Laurent Destailleur
f4f75e1d0e
Merge pull request #20175 from bloxera/15.0
Fix #20141 generation of intervention
2022-02-25 13:44:03 +01:00
Laurent Destailleur
3eca04e85b
Merge pull request #20178 from thomas-Ngr/14.0_fix_bookmark_info_bubble
fix bookmarks info bubble
2022-02-25 13:34:01 +01:00
Laurent Destailleur
8c6f005ea1
Merge pull request #20195 from Dolibarr/revert-20193-14.0
Revert "NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list"
2022-02-25 13:22:10 +01:00
Laurent Destailleur
be95662ece
Revert "NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list" 2022-02-25 13:19:01 +01:00
Laurent Destailleur
1b72b27f75
Merge pull request #20193 from gdsoftdev/14.0
NEW : accoutancy : subleger label input automatic filling when selecting subleger account in select2 list
2022-02-25 13:18:56 +01:00
Sylvain Legrand
cb86224613 new : allow to show all logos on a table 2022-02-25 13:17:05 +01:00
Laurent Destailleur
898087de7e
Merge pull request #20194 from bb2a/patch-1
FIX- Preview icon in documents list PDF in the admin page third-party
2022-02-25 13:11:28 +01:00
Anthony Berton
a9450f5673
Update societe.php 2022-02-25 11:50:41 +01:00
stickler-ci
c0dd96a456 Fixing style errors. 2022-02-25 10:36:02 +00:00
gdsoftdev
c4ed8cf25f
Merge branch 'Dolibarr:14.0' into 14.0 2022-02-25 11:28:46 +01:00
Jé GDSOFT
1040555baf accoutancy : subleger label input automatic filling when selecting subleger account in select2 list 2022-02-25 11:26:56 +01:00
Laurent Destailleur
c097ee5331 FIX #yogosha9089 2022-02-25 01:49:38 +01:00
Laurent Destailleur
8c61a29051 Show value of short_open_tags 2022-02-25 01:30:34 +01:00
Laurent Destailleur
117e1057e1 FIX #yogosha9083 2022-02-24 18:29:24 +01:00
Laurent Destailleur
98da84f9b2 FIX #yogosha9086 2022-02-24 18:15:04 +01:00
Laurent Destailleur
f0c5fe31f8 FIX #yogosha9083 2022-02-24 17:49:52 +01:00
Thomas Negre
4d2dde0fe4 fix bookmarks info bubble 2022-02-24 14:38:28 +01:00
Laurent Destailleur
ba3856f9e9 Fix regression 2022-02-24 14:21:28 +01:00
Laurent Destailleur
a6e7a41e98 FIX Reduce flash effect on collapse extrafield
FIX Reduce flash effect on edit inline feature.
2022-02-24 12:54:33 +01:00
Laurent Destailleur
118b211807 Fix error on null 2022-02-24 12:37:20 +01:00
priojk
c201ff211f Fix #20141 generation of intervention
When an intervention card was created from the times spent on tasks in a project, the task label was wrong in
the descriptions on the intervention card
2022-02-24 11:10:46 +01:00
Laurent Destailleur
4973019630 Fix #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-24 09:59:16 +01:00
Maxime Kohlhaas
a9ce98dfb0
Update document.php 2022-02-24 03:11:43 +01:00
Laurent Destailleur
43c3869f08 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-24 01:01:43 +01:00
Laurent Destailleur
c5cd6a5f3c Fix css 2022-02-24 00:17:49 +01:00
Laurent Destailleur
2f0040e9c1 Fix phpunit 2022-02-23 19:24:17 +01:00
atm-lena
ed6f4b4ee1 Display Salary Paiement on compta report 2022-02-23 15:33:51 +01:00
Laurent Destailleur
64ce13e273 Clean setup page 2022-02-23 13:20:14 +01:00
Laurent Destailleur
88f1ae9c13 NEW A module can embed a sql script run at each Dolibarr upgrade 2022-02-23 12:55:15 +01:00
Laurent Destailleur
e119ea0524 css 2022-02-23 12:31:32 +01:00
Laurent Destailleur
73b04deb19 Fix error management. 2022-02-23 00:17:49 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
77e2969411 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-22 22:27:32 +01:00
Laurent Destailleur
c7c0c75429 Clean code 2022-02-22 22:27:09 +01:00
Laurent Destailleur
e0c24e5d29 Enhance WAF 2022-02-22 22:19:32 +01:00
Laurent Destailleur
27cc6078ed Clean code 2022-02-22 22:15:29 +01:00
Laurent Destailleur
d6786459b4 FIX #yogosha9054 2022-02-22 22:03:34 +01:00
Laurent Destailleur
209ab708d4 FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-22 21:24:34 +01:00
Laurent Destailleur
c63e2c2981 Website tables are created only if module enabled. 2022-02-22 19:15:37 +01:00