Commit Graph

87108 Commits

Author SHA1 Message Date
Laurent Destailleur
c7b1a43529
Merge pull request #13893 from ptibogxiv/patch-340
Fix datapolicycron
2020-05-15 14:04:16 +02:00
Laurent Destailleur
e327d609d7
Merge pull request #13891 from aspangaro/9.0p1
FIX Site ec.europa.eu has moved to https://
2020-05-15 14:01:28 +02:00
Langlais115
dc6ae70aa6 Fix #13805
Add proper type check to "seuil_stock_alerte" parameter.
2020-05-15 14:00:26 +02:00
Laurent Destailleur
00fb386522
Merge pull request #13894 from Langlais115/patch-1
Fix  #13805 Add type check to "seuil_stock_alerte"
2020-05-15 13:59:57 +02:00
Laurent Destailleur
672ea60ffd FIX #13896 2020-05-15 13:58:34 +02:00
Laurent Destailleur
9d87eae12e
Merge pull request #13897 from Dolibarr/scrutinizer-patch-11
Scrutinizer Auto-Fixes
2020-05-15 13:56:09 +02:00
Scrutinizer Auto-Fixer
9699ee7263 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-05-15 11:55:31 +00:00
Laurent Destailleur
02b40ae8f6 Fix scrutinizer 2020-05-15 13:54:05 +02:00
Laurent Destailleur
91f87d6834 Fix bad param of getNomUrl 2020-05-15 13:52:35 +02:00
Laurent Destailleur
949ef8d7d8 Fix css 2020-05-15 12:49:22 +02:00
Laurent Destailleur
8a2741650a Fix css 2020-05-15 12:46:55 +02:00
Laurent Destailleur
ad906fc508 Fix use SVG logo instead of PNG 2020-05-15 12:43:48 +02:00
Laurent Destailleur
bfca151d85 Responsive 2020-05-15 11:58:50 +02:00
Langlais115
100bfb921f
Fix #13805
Add proper type check to "seuil_stock_alerte" parameter.
2020-05-15 10:25:56 +02:00
stickler-ci
e691045c3d Fixing style errors. 2020-05-14 23:20:39 +00:00
ptibogxiv
cb98ec4d23
Fix datapolicycron 2020-05-15 01:18:53 +02:00
Frédéric FRANCE
fbc6f2d954
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-14 21:25:41 +02:00
Alexandre SPANGARO
3811586cd0 FIX Site ec.europa.eu has moved to https:// 2020-05-14 20:34:48 +02:00
Laurent Destailleur
0842259012 Fix lang must be set to null and not 0 when not defined 2020-05-14 18:56:07 +02:00
Laurent Destailleur
a660fd61c9 Fix lang must be set to null and not 0 when not defined 2020-05-14 18:55:20 +02:00
Frédéric FRANCE
9afe335e4e
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-14 18:45:52 +02:00
Laurent Destailleur
40fa0933eb Fix on sarch pages 2020-05-14 18:44:21 +02:00
Laurent Destailleur
4cf7f68b6c Fix search on pages 2020-05-14 18:44:05 +02:00
Laurent Destailleur
d8ee049b4c Can select not defined language 2020-05-14 18:41:31 +02:00
Laurent Destailleur
40d30f9a60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 18:37:47 +02:00
Laurent Destailleur
7daef0d146 Fix bad parameters of function 2020-05-14 18:17:08 +02:00
Laurent Destailleur
f7d69e443e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 18:15:08 +02:00
Laurent Destailleur
1bf677f537 Can set status of a websitepage 2020-05-14 18:14:55 +02:00
jove@bisquerra.com
991996697d Public photos for customers with TakePOS 2020-05-14 18:03:22 +02:00
Laurent Destailleur
949e0f2326 Fix filter on language 2020-05-14 17:27:12 +02:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod
NEW possibilty to group payments by mode and show their subtotal
2020-05-14 16:55:37 +02:00
Laurent Destailleur
499c2ea30a FIX #13855 2020-05-14 16:52:21 +02:00
Laurent Destailleur
215cf9e6f8 Prepare v13 2020-05-14 16:45:32 +02:00
Laurent Destailleur
b68722a66c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 16:40:51 +02:00
Laurent Destailleur
9becb24073 Prepare v13 2020-05-14 16:40:40 +02:00
Laurent Destailleur
aed917bda9
Merge pull request #13862 from aspangaro/12.0_a27
NEW Accountancy balance - Add a input to show subtotal by group
2020-05-14 16:40:02 +02:00
Laurent Destailleur
adcc9e14f6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 16:35:39 +02:00
Laurent Destailleur
c1fb712c86 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:53 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
Laurent Destailleur
92b245ae93 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/card.php
2020-05-14 16:34:24 +02:00
Laurent Destailleur
2b8da85eea Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-14 16:20:15 +02:00
Laurent Destailleur
49cfc1afd8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/install/upgrade2.php
2020-05-14 16:20:04 +02:00
Laurent Destailleur
61f1a57e2f
Merge pull request #13850 from andreubisquerra/master
TakePOS Auto Order improvements
2020-05-14 16:18:28 +02:00
Laurent Destailleur
bc581ead3b
Merge branch 'develop' into master 2020-05-14 16:17:37 +02:00
Laurent Destailleur
f5b9151f17
Merge pull request #13871 from FHenry/11.0
fix template email on propal list
2020-05-14 16:10:33 +02:00
Laurent Destailleur
136d002639
Merge pull request #13872 from simnandez/11.0
FIX: Do not show stats panel if the user does not have permissions
2020-05-14 16:09:37 +02:00
Laurent Destailleur
1032e5dfda Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-14 16:07:35 +02:00
Laurent Destailleur
b26c1757e6 Prepare v13 2020-05-14 16:07:23 +02:00
Laurent Destailleur
14fce7fe55 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:03:42 +02:00
Laurent Destailleur
3d26351c6b Fix function if hours. 2020-05-14 16:03:31 +02:00