Commit Graph

102065 Commits

Author SHA1 Message Date
Laurent Destailleur
12f0a36095
Merge pull request #19284 from henrynopo/patch-1
Supplier Invoice Payment - Re-order the "Payment amount, original currency" to be together with the columns of original currency
2021-11-15 11:46:00 +01:00
Laurent Destailleur
fc489380a1
Merge pull request #19345 from hregis/fix_lost_superadmin_grade_after_edit_user
FIX lost superadmin grade after edit user card
2021-11-15 11:06:52 +01:00
Laurent Destailleur
0743c656ac
Merge pull request #19359 from daraelmin/daraelmin-patch-3
Fix date_select go away when sorting subscription
2021-11-15 11:00:48 +01:00
Laurent Destailleur
4d962f165d
Merge pull request #19375 from daraelmin/daraelmin-patch-5
Fix #19306 - Tracking url is clickable in reception card
2021-11-15 10:42:29 +01:00
Laurent Destailleur
641803ce7c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-15 10:41:20 +01:00
Laurent Destailleur
9c493127d5 Fix sync 2021-11-15 10:41:05 +01:00
Laurent Destailleur
1f58c60b6e
Merge pull request #19377 from aspangaro/14p23
FIX Ticket - Card - Wrong font awesome library
2021-11-15 10:39:30 +01:00
Alexandre SPANGARO
2be7da1031 Double line 2021-11-14 04:18:13 +01:00
Alexandre SPANGARO
d6cb95b0f7 FIX Ticket - Card - Wrong font awesome library 2021-11-14 04:18:03 +01:00
daraelmin
f2407a3f94
Fix 19306 - Tracking url is clickable in reception card 2021-11-13 20:04:03 +01:00
Laurent Destailleur
ec78f21c26 Sync transifex 2021-11-13 15:17:06 +01:00
daraelmin
53b565ec1d
Fix date_select go away when sorting subscription 2021-11-11 20:06:21 +01:00
Laurent Destailleur
21c2dba922 Fix phpcs 2021-11-11 19:06:55 +01:00
Laurent Destailleur
f5a7275077 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/takepos/index.php
2021-11-11 18:34:04 +01:00
Laurent Destailleur
a725ffefdd Fix sql error 2021-11-11 18:30:17 +01:00
Regis Houssin
5eff0e7a0c FIX only a superadmin can modify entity 2021-11-11 17:48:23 +01:00
Regis Houssin
564badc61b Merge remote-tracking branch 'origin/14.0' into fix_lost_superadmin_grade_after_edit_user 2021-11-11 17:23:55 +01:00
Laurent Destailleur
ddad00c8e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/takepos/index.php
2021-11-11 16:14:48 +01:00
Laurent Destailleur
f24c38db73 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/datapolicy/class/datapolicy.class.php
	htdocs/takepos/index.php
2021-11-11 16:06:21 +01:00
Laurent Destailleur
e188855dca Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/datapolicy/class/datapolicy.class.php
2021-11-11 16:01:37 +01:00
Laurent Destailleur
9aa5c94612 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-11-11 15:59:48 +01:00
Laurent Destailleur
ba724204a4 FIX Bad use of dol_concatdesc() 2021-11-11 15:50:32 +01:00
Laurent Destailleur
88d8f73614 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-11 15:36:00 +01:00
Laurent Destailleur
fa4b5d99c0 FIX Bad use of dol_concatdesc() 2021-11-11 15:35:34 +01:00
Laurent Destailleur
8518c772fb
Merge pull request #19343 from OPEN-DSI/fix-takepos-report-terminal
FIX close cash with some terminals in TakePOS
2021-11-11 14:42:12 +01:00
Laurent Destailleur
a4344a7ec5
Merge pull request #19337 from marc-dll/13.0_FIX_project_task_list_extrafields
FIX: project task list: extrafields could not be displayed
2021-11-11 14:41:56 +01:00
Laurent Destailleur
aae83d248c
Merge pull request #19346 from daraelmin/14.0
Fix wrong sign in test
2021-11-11 14:29:56 +01:00
Laurent Destailleur
28aa17e4fd FIX calculation of balance in conciliation page on desc sorting. 2021-11-11 14:27:17 +01:00
Laurent Destailleur
fd3fd9d945 Fix getpost 2021-11-11 13:46:58 +01:00
daraelmin
cea3d93b91 Fix wrong sign in test 2021-11-09 20:51:27 +01:00
Regis Houssin
5649e865c3 FIX wrong check 2021-11-09 18:38:29 +01:00
Regis Houssin
1e20e082fe FIX lost superadmin grade after edit user card ! 2021-11-09 18:36:04 +01:00
lvessiller
33e40c12c8 FIX close cash with some terminals in TakePOS 2021-11-09 14:12:28 +01:00
Laurent Destailleur
9f8e21bc2c Fix filter on dates 2021-11-08 20:39:52 +01:00
Laurent Destailleur
d28edae460 Fix idate must be jdate 2021-11-08 20:11:32 +01:00
Laurent Destailleur
6787998c56 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-11-08 20:08:35 +01:00
Laurent Destailleur
ebdcff3b49 FIX filter for export of accounting documents 2021-11-08 20:07:03 +01:00
Marc de Lima Lucio
c1a2e7b12e FIX: project task list: extrafields could not be displayed 2021-11-08 17:51:19 +01:00
Laurent Destailleur
a724cadd1f
Merge pull request #19290 from PyroShape/142
FIX : Change date format of the inventorycode to be equal as mass stock transfert
2021-11-08 03:33:53 +01:00
Laurent Destailleur
621f0812a1
Merge pull request #19304 from daraelmin/daraelmin-patch-3
Fix default enddate subscription must be in futur
2021-11-08 03:28:35 +01:00
Laurent Destailleur
a94b2b4f7e Clean code 2021-11-08 03:22:49 +01:00
Laurent Destailleur
cd4f59bb2a FIX bad sign of amount stored for multicurrency columns on credit notes 2021-11-08 03:01:18 +01:00
Laurent Destailleur
e8b3875e2e FIX bad sign of amount stored for multicurrency columns on credit notes 2021-11-08 02:57:21 +01:00
Laurent Destailleur
d591a83085 css 2021-11-08 00:57:00 +01:00
Laurent Destailleur
2fc05a4c1c Add test virus file 2021-11-08 00:37:42 +01:00
Laurent Destailleur
3b7c385c6c Fix syntax error 2021-11-07 13:53:30 +01:00
Laurent Destailleur
ccc1d4d1fa Fix warning 2021-11-07 12:24:25 +01:00
Laurent Destailleur
7e68f9e013 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
2021-11-06 21:04:17 +01:00
Laurent Destailleur
ddb68a3ae8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-06 20:40:34 +01:00
Laurent Destailleur
edbcf78495 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-11-06 20:39:05 +01:00