Commit Graph

106113 Commits

Author SHA1 Message Date
Laurent Destailleur
b9649632fa Fix update 2022-02-28 11:53:29 +01:00
Laurent Destailleur
2ce50b6c00 CSS 2022-02-26 19:30:46 +01:00
Laurent Destailleur
5d0408f7af Fix filter on member list 2022-02-26 19:15:40 +01:00
Laurent Destailleur
fb0e2f9c6c FIX #yogosha9095 2022-02-26 01:00:22 +01:00
Laurent Destailleur
eba20957f3 Fix CSS
Conflicts:
	htdocs/projet/list.php
2022-02-25 21:47:25 +01:00
Laurent Destailleur
488049c6a6 FIX bad position of extrafields for interventions 2022-02-25 20:36:40 +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
Thomas Negre
4d2dde0fe4 fix bookmarks info bubble 2022-02-24 14:38:28 +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
Maxime Kohlhaas
a9ce98dfb0
Update document.php 2022-02-24 03:11:43 +01:00
Laurent Destailleur
c5cd6a5f3c Fix css 2022-02-24 00:17:49 +01:00
atm-lena
ed6f4b4ee1 Display Salary Paiement on compta report 2022-02-23 15:33:51 +01:00
Laurent Destailleur
73b04deb19 Fix error management. 2022-02-23 00:17:49 +01:00
Laurent Destailleur
d6786459b4 FIX #yogosha9054 2022-02-22 22:03:34 +01:00
Laurent Destailleur
fb58b7e930 FIX #yogosha9048 2022-02-22 18:49:16 +01:00
Laurent Destailleur
2d841d5b99 Fix param 2022-02-22 18:48:25 +01:00
Marc de Lima Lucio
0e0dd1ec6c FIX: invoice pdf: lines originating from deposits were not detailed anymore 2022-02-22 17:42:11 +01:00
stickler-ci
19dbed1804 Fixing style errors. 2022-02-22 16:10:56 +00:00
lmarcouiller
65ecd2f3ef Fix : fix error of permission in holiday 2022-02-22 17:06:10 +01:00
Laurent Destailleur
21069dd9a5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-22 16:44:31 +01:00
Laurent Destailleur
f544219d92 FIX permission to download files of expense report with readall. 2022-02-22 16:44:17 +01:00
Laurent Destailleur
1c5541db1f
Merge pull request #20121 from ptibogxiv/patch-6
FIX error with php8
2022-02-22 00:59:26 +01:00
Laurent Destailleur
678c3bdb76 Fix switch to login page 2022-02-20 18:07:10 +01:00
ptibogxiv
b8d82671b3
Update filecheck.php 2022-02-20 10:39:59 +01:00
ptibogxiv
996dcdde82
FIX error with php8 2022-02-19 18:34:53 +01:00
Laurent Destailleur
6b8793e171 Fix sql error on web service 2022-02-19 00:41:45 +01:00
Laurent Destailleur
05f0f1733d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-18 21:52:33 +01:00
Laurent Destailleur
bd58cf1b37 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-18 21:52:18 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
2022-02-18 21:50:08 +01:00
Laurent Destailleur
e948db69f2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-18 21:46:01 +01:00