Commit Graph

96756 Commits

Author SHA1 Message Date
Laurent Destailleur
f462e353e9 FIX #16079 2021-01-28 09:59:13 +01:00
Laurent Destailleur
0b393676e6 Fix group by 2021-01-28 09:30:01 +01:00
Laurent Destailleur
ba3e902292 FIX #16080 2021-01-28 09:25:58 +01:00
Laurent Destailleur
f024f06df7 Fix url 2021-01-28 09:23:28 +01:00
Laurent Destailleur
3fe8be5dab Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-28 09:09:08 +01:00
Laurent Destailleur
b488bca020 FIX 16084 2021-01-28 08:53:13 +01:00
Laurent Destailleur
6fae2cfebe Merge branch '13.0' of https://github.com/dolibarr/dolibarr into develop 2021-01-28 00:29:16 +01:00
Laurent Destailleur
79c68c6132 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0
Conflicts:
	htdocs/commande/stats/index.php
2021-01-28 00:23:44 +01:00
Laurent Destailleur
19a5caf212 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 12.0 2021-01-28 00:18:35 +01:00
Laurent Destailleur
2be157c91f Trans 2021-01-28 00:18:11 +01:00
Florian Mortgat
8dfe39258b FIX 11.0 - when a mandatory extrafield of type sellist contains '0' it should be considered empty and trigger an error message upon insertion 2021-01-27 23:46:09 +01:00
Laurent Destailleur
8c97b55548 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-27 21:09:13 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/user/list.php
2021-01-27 21:09:01 +01:00
Laurent Destailleur
6097e3a14f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-27 21:05:53 +01:00
Laurent Destailleur
77c2753051 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-27 21:05:45 +01:00
Laurent Destailleur
76fb64e8fe Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-27 21:05:17 +01:00
Laurent Destailleur
dd70bee773 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-27 21:05:09 +01:00
Laurent Destailleur
b50728d4fb FIX #16076 2021-01-27 21:04:48 +01:00
Laurent Destailleur
34ce398033
Merge pull request #16071 from atm-adrien/FIX/Linked_extrafields_alphaValue
FIX : Linked extrafields don't work with string value
2021-01-27 19:36:13 +01:00
Laurent Destailleur
e431b5aacb
Merge pull request #16074 from ATM-Consulting/11.0_FIX_wrong_extrafield_insertion_when_creating_intervention
FIX 11.0: when a new intervention is created from an object, a new $e…
2021-01-27 19:35:05 +01:00
Laurent Destailleur
b92d794f77 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-27 19:32:23 +01:00
Laurent Destailleur
8a13ad2f26 Close #16075 2021-01-27 19:31:30 +01:00
Laurent Destailleur
3e4a9b1bfc
Merge pull request #16070 from aspangaro/13p3
Fix: Fa-icon on stock movement
2021-01-27 19:24:31 +01:00
Laurent Destailleur
7b41e0d60c
Merge pull request #16069 from aspangaro/13p2
Fix language & translation
2021-01-27 19:23:40 +01:00
Laurent Destailleur
f086d7e926
Merge pull request #16064 from frederic34/workstation
fix phpcs in Workstation
2021-01-27 19:21:29 +01:00
Laurent Destailleur
8f8349c671
Merge pull request #16066 from frederic34/patch-1
fix include
2021-01-27 19:21:12 +01:00
Frédéric FRANCE
7ff542552b
Merge remote-tracking branch 'upstream/develop' into workstation 2021-01-26 20:47:07 +01:00
Frédéric FRANCE
7cd698aff9
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-26 20:19:49 +01:00
Laurent Destailleur
0de06b7ef4 Fix odttopdf generation 2021-01-26 16:49:54 +01:00
Laurent Destailleur
23c0a30263 Use a better temp directory 2021-01-26 16:40:57 +01:00
Laurent Destailleur
69344a7170 Fix create temp dir 2021-01-26 16:33:47 +01:00
Laurent Destailleur
8bc639fe02 Fix too many logs 2021-01-26 16:10:27 +01:00
Laurent Destailleur
1637b6af7d Look and feel v14 2021-01-26 15:16:06 +01:00
LAURIER Alexis
d1253d0f36
Merge pull request #4 from Dolibarr/13.0
13.0
2021-01-26 15:11:04 +01:00
Laurent Destailleur
f331ce8028 Look and feel v14 2021-01-26 14:24:32 +01:00
Laurent Destailleur
b3d2d50a0c Fix delete aliases 2021-01-26 13:57:56 +01:00
Laurent Destailleur
c0426b866f Fix loop 2021-01-26 13:40:38 +01:00
Laurent Destailleur
aa2d581b41 Fix rename of alias 2021-01-26 13:38:41 +01:00
Laurent Destailleur
26c22e1b28 Fix warning 2021-01-26 13:22:20 +01:00
Laurent Destailleur
a1147319d2 Fix countAll 2021-01-26 13:11:10 +01:00
Laurent Destailleur
02098bf37b Fix default 2021-01-26 12:43:23 +01:00
Florian Mortgat
35448e3307 FIX 11.0: when a new intervention is created from an object, a new $extrafields object is instantiated but not initialized
Because of this, missing mandatory extrafields are not checked and no extrafields are inserted
2021-01-26 12:42:04 +01:00
Laurent Destailleur
d7bf173f0d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/lib/functions.lib.php
	test/phpunit/SecurityTest.php
2021-01-26 12:12:35 +01:00
Laurent Destailleur
977e4dde86 Fix regression 2021-01-26 12:08:54 +01:00
Laurent Destailleur
19dd36aa59 Trans 2021-01-26 11:45:29 +01:00
Laurent Destailleur
6313fb8be0 Fix lang 2021-01-26 11:38:07 +01:00
Laurent Destailleur
c417f730b9 Clean language file 2021-01-26 11:31:48 +01:00
Laurent Destailleur
8db80ff44d Fix reponsive 2021-01-26 11:19:13 +01:00
Adrien Raze
6ab63a10d6 FIX : Linked extrafields don't work with string value 2021-01-26 09:37:28 +01:00
Alexandre SPANGARO
0ef02880eb Fix: Fa-icon on movement 2021-01-26 08:54:21 +01:00