Commit Graph

76557 Commits

Author SHA1 Message Date
Laurent Destailleur
078324811b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
2019-06-20 03:43:16 +02:00
Laurent Destailleur
26c12c61a7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-20 03:39:56 +02:00
Laurent Destailleur
4574ad2eeb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
2019-06-20 03:39:48 +02:00
Laurent Destailleur
53688e2d0f
Merge pull request #11353 from fmarcet/8.0
FIX: Wrong stock movement on supplier credit notes
2019-06-20 03:11:28 +02:00
Laurent Destailleur
d840c8f831
Merge pull request #11348 from frederic34/patch-5
Update companies.lang
2019-06-20 03:05:43 +02:00
Laurent Destailleur
4c7a689fb5
Merge pull request #11373 from atm-john/8.0_fix_var_name
FIX var name
2019-06-20 02:57:39 +02:00
Laurent Destailleur
a70dfa17a4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-20 02:56:53 +02:00
Laurent Destailleur
6d38f5ec9c FIX #11369 2019-06-20 02:56:44 +02:00
Laurent Destailleur
925314c710
Merge pull request #11367 from aspangaro/10.0_other3
Nowrap on amount
2019-06-20 02:51:14 +02:00
Laurent Destailleur
e060af5c97
Update treso.php 2019-06-20 02:50:23 +02:00
Laurent Destailleur
33f39bdfcb
Merge pull request #11368 from atm-gauthier/8.0_fix_facfourn_fetch_in_right_entity
FIX : we need to fetch fourn invoice with ref in current entity
2019-06-20 02:48:42 +02:00
Laurent Destailleur
bf71731fc9 Fix phpcs 2019-06-19 22:28:33 +02:00
Laurent Destailleur
d6b6f77e74 Fix support domains with 3 levels 2019-06-19 22:06:12 +02:00
John Botella
31a53b72ae FIX var name 2019-06-19 16:55:45 +02:00
Laurent Destailleur
7c4cddf28d Fix missing trad 2019-06-19 16:34:01 +02:00
Laurent Destailleur
5b5028254f Fix label 2019-06-19 16:30:03 +02:00
Laurent Destailleur
c3b8582076 Fix use of deprecated function 2019-06-19 15:55:18 +02:00
Laurent Destailleur
daa8b43732 css 2019-06-19 15:51:48 +02:00
Laurent Destailleur
04f2fb604f Fix duplicate 'option_' in prefix 2019-06-19 15:48:37 +02:00
Laurent Destailleur
a11c816a17 Fix tooltip 2019-06-19 14:24:48 +02:00
Laurent Destailleur
f9cc120d75 Debug module ticket 2019-06-19 12:53:28 +02:00
Laurent Destailleur
7afcdb46eb Debug module ticket 2019-06-19 12:10:05 +02:00
gauthier
3ad13adf31 FIX : better syntax 2019-06-19 10:43:42 +02:00
gauthier
7331e43db8 FIX : we need to fetch fourn invoice with ref in current entity 2019-06-19 10:19:33 +02:00
Alexandre SPANGARO
9bde7c5229 Nowrap on amount 2019-06-19 09:21:18 +02:00
Alexandre SPANGARO
e44b9113b7 Nowrap on amount 2019-06-19 09:01:57 +02:00
Alexandre SPANGARO
ec7523d3d2 Nowrap on amount 2019-06-19 09:01:37 +02:00
Alexandre SPANGARO
b8311da262 Nowrap on amount 2019-06-19 08:56:45 +02:00
Alexandre SPANGARO
9a32117b1d Nowrap on amount 2019-06-19 08:43:57 +02:00
Alexandre SPANGARO
a849fbe42e Nowrap on amount 2019-06-19 07:15:52 +02:00
Laurent Destailleur
53923a8581 Fix scrutinizer warnings 2019-06-18 20:21:22 +02:00
Laurent Destailleur
663998bab1 Fix scrutinizer errors 2019-06-18 20:15:04 +02:00
Laurent Destailleur
525598f6aa Fix scrutinizer warnings 2019-06-18 20:01:28 +02:00
Laurent Destailleur
20e00ca290 FIX if last char of customercode is accent making the truncate of first
chars wrong.
2019-06-18 19:41:16 +02:00
Laurent Destailleur
f3703c8805 Fix phpcs 2019-06-18 18:07:47 +02:00
Laurent Destailleur
2e1eb29ca0 Fix rendering of amount 2019-06-18 17:43:08 +02:00
Laurent Destailleur
13abfc3140 Code comment 2019-06-18 16:46:12 +02:00
Laurent Destailleur
1dc247705d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/expensereport/list.php
	htdocs/holiday/list.php
2019-06-18 16:11:16 +02:00
Laurent Destailleur
ae00743590 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-18 16:04:48 +02:00
Laurent Destailleur
81bca34a08 FIX A user may read holiday and expense report without permissions 2019-06-18 16:04:25 +02:00
Laurent Destailleur
6e9874b95a FIX A user may read holiday and expense report without permissions 2019-06-18 16:01:24 +02:00
Laurent Destailleur
6afda6a47a FIX invalid link on user.fk_user 2019-06-18 15:57:22 +02:00
Laurent Destailleur
6bda130835 Protect from dir scan 2019-06-18 14:51:57 +02:00
Laurent Destailleur
2a7ed44c72 Merge 2019-06-18 14:35:02 +02:00
Laurent Destailleur
27f52dd0bd Fix columns in csv 2019-06-18 14:32:35 +02:00
Laurent Destailleur
ad20a5158c Fix columns in csv 2019-06-18 14:32:28 +02:00
Laurent Destailleur
8835b49f3f Debug the accounting-file tool 2019-06-18 14:30:13 +02:00
Laurent Destailleur
0123a18ff8 Look and feel v10 2019-06-17 18:44:08 +02:00
Laurent Destailleur
42e58d9ea5 Fix preview of interventions 2019-06-17 18:38:14 +02:00
Laurent Destailleur
a6d4475aff Fix scrutinizer 2019-06-17 18:24:45 +02:00