Commit Graph

76611 Commits

Author SHA1 Message Date
Laurent Destailleur
001da8b2fc Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:44:54 +02:00
Laurent Destailleur
ee8e7d66f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-20 03:43:27 +02:00
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
554724a46f
Merge pull request #11363 from aspangaro/10.0_other
Translate rights
2019-06-20 03:36:16 +02:00
Laurent Destailleur
980239e617
Merge pull request #11362 from aspangaro/10.0_index
Responsive on project index
2019-06-20 03:35:13 +02:00
Laurent Destailleur
3faa0012a1
Merge pull request #11358 from hregis/10.0
FIX add v10 in virtualmin script
2019-06-20 03:24:48 +02:00
Laurent Destailleur
03178bc481
Merge pull request #11293 from hregis/develop_pdf
FIX better method to check if pdf is protected/encrypted
2019-06-20 03:22:51 +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
ca4b8f9540
Merge pull request #11355 from ptibogxiv/patch-190
Fix access category API
2019-06-20 03:10:11 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber
Allow zero as account number
2019-06-20 03:09:37 +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
23b0263ad9
Merge pull request #11357 from frederic34/patch-8
avoid countable error
2019-06-20 03:05:23 +02:00
Laurent Destailleur
daab58974e
Merge pull request #11366 from aspangaro/10.0_other2
Missing language key
2019-06-20 03:02:13 +02:00
Laurent Destailleur
b4cb440b0f
Merge pull request #11359 from inoveaconseil/FIX_BOM_sql
Fix bom sql
2019-06-20 02:58:24 +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
b4e47d289b Code comment 2019-06-20 02:43:56 +02:00
Laurent Destailleur
14cce1f8b0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-19 22:28:53 +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
Laurent Destailleur
68e9712f0c Fix support domains with 3 levels 2019-06-19 22:05:38 +02:00
John Botella
31a53b72ae FIX var name 2019-06-19 16:55:45 +02:00
Laurent Destailleur
97274167bd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-19 16:37:28 +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
45f11f1033 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-19 15:56:23 +02:00
Laurent Destailleur
c3b8582076 Fix use of deprecated function 2019-06-19 15:55:18 +02:00
Laurent Destailleur
c5edf85bb6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-19 15:52:09 +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
2034faf280 Fix duplicate 'option_' in prefix 2019-06-19 15:48:04 +02:00
Laurent Destailleur
a11c816a17 Fix tooltip 2019-06-19 14:24:48 +02:00
Laurent Destailleur
f32b2e9f1f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/includes/odtphp/odf.php
2019-06-19 13:18:01 +02:00
Laurent Destailleur
8e8199cc0f Fix scrutinizer 2019-06-19 13:17:02 +02:00
Laurent Destailleur
df8fff843c Standardize code 2019-06-19 13:16:46 +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