Commit Graph

66384 Commits

Author SHA1 Message Date
Laurent Destailleur
ecb50a8a6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 22:02:05 +02:00
Laurent Destailleur
69c26e19a8 NEW Can edit the text color for title line of tables 2018-04-15 22:01:52 +02:00
Laurent Destailleur
56a634bec3 Look and feel v7 2018-04-15 20:17:04 +02:00
Laurent Destailleur
72de21537c Clean code 2018-04-15 20:09:09 +02:00
Laurent Destailleur
6450f95c90 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 19:13:38 +02:00
Laurent Destailleur
2959dc4a3a Fix regression 2018-04-15 18:20:04 +02:00
Laurent Destailleur
e2838aa074 NEW Show also size in bytes in tooltip if visible unit is not bytes 2018-04-15 17:58:13 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
Laurent Destailleur
9e50bbb9b1 standardize code 2018-04-15 16:35:18 +02:00
Laurent Destailleur
57c03553dd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/lib/functions.lib.php
2018-04-15 12:09:07 +02:00
Laurent Destailleur
9ae789b358 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 11:42:12 +02:00
Laurent Destailleur
13ba69e085
Merge pull request #8595 from hregis/develop_ldap
Fix: broken $pdf object !
2018-04-15 11:38:51 +02:00
Laurent Destailleur
da66e5c5a7
Update pdf.lib.php 2018-04-15 11:38:29 +02:00
Laurent Destailleur
64dafbc37f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:40 +02:00
Laurent Destailleur
37e4da30d0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:27 +02:00
Laurent Destailleur
e29476428c
Merge pull request #8594 from hregis/6.0_multicompany
FIX project category is type 6 not 5 !!
2018-04-15 11:32:49 +02:00
Laurent Destailleur
daf63ca116 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 11:32:06 +02:00
Laurent Destailleur
5968ca8cf2
Merge pull request #8593 from frederic34/patch-2
Translation
2018-04-15 11:31:21 +02:00
Laurent Destailleur
e49e455c0c
Merge pull request #8598 from aspangaro/8.0-a19
Accountancy - list by account - Add some fix & functions
2018-04-15 11:31:01 +02:00
Laurent Destailleur
90b5adaef1
Merge pull request #8600 from aspangaro/8.0-a20
Fix export balance
2018-04-15 11:28:22 +02:00
Laurent Destailleur
514b1116b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-15 11:28:05 +02:00
Laurent Destailleur
f9382ce395 Upgrade octicons 2018-04-15 11:27:39 +02:00
Laurent Destailleur
dbfee8117d
Merge pull request #8597 from atm-florian/dev_uniformcode
fix syntax and uniformize code
2018-04-15 11:26:18 +02:00
Laurent Destailleur
6b3c17680f
Merge pull request #8596 from simnandez/5.0
FIX: some localtaxes errors
2018-04-15 11:25:27 +02:00
Laurent Destailleur
9a018cba1c
Merge pull request #8599 from grandoc/new_branch_15_04_2018
fix typo
2018-04-15 11:22:56 +02:00
Alexandre SPANGARO
910d83d6e3 Fix export balance 2018-04-15 07:49:54 +02:00
Philippe GRAND
0a6bcb2a39 fix typo and translation 2018-04-15 07:37:23 +02:00
Philippe GRAND
7943a19402 fix typo 2018-04-15 07:07:04 +02:00
Alexandre SPANGARO
899ef6d2a6 Accountancy - list by account - Add some fix & functions 2018-04-15 06:55:18 +02:00
Laurent Destailleur
db385d64b6 Fix br 2018-04-14 23:24:01 +02:00
Laurent Destailleur
ffffd848a9 Look and feel v8 2018-04-14 22:34:46 +02:00
Laurent Destailleur
92d8867b6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2018-04-14 22:24:47 +02:00
Laurent Destailleur
187cc35786 Look and feel v8 2018-04-14 22:23:56 +02:00
Laurent Destailleur
fdbeb4265a Look and feel v8 2018-04-14 22:22:29 +02:00
Laurent Destailleur
77b686500c css 2018-04-14 21:07:20 +02:00
florian HENRY
ad403c7045 fix syntax and uniformize code 2018-04-14 17:04:38 +02:00
Laurent Destailleur
2f0780a51f csss 2018-04-14 15:53:58 +02:00
Laurent Destailleur
96ef9802df css 2018-04-14 15:44:57 +02:00
Regis Houssin
fb4765c472 Fix clean code 2018-04-14 15:24:52 +02:00
Regis Houssin
732f019fb2 Fix: json format in llx_const 2018-04-14 15:17:51 +02:00
Regis Houssin
25a87507b9 NEW add new parameters for tcpf encryption 2018-04-14 15:12:51 +02:00
Juanjo Menent
bfed1b9db1 FIX: some localtaxes errors 2018-04-14 12:45:40 +02:00
Regis Houssin
d97c052d08 Fix: broken $pdf object ! 2018-04-14 10:41:38 +02:00
Regis Houssin
79c34f4d69 Fix: project category is type 6 not 5 !! 2018-04-14 10:03:21 +02:00
Frédéric FRANCE
9a001ed203
Translation 2018-04-14 09:51:11 +02:00
Laurent Destailleur
fea3182e93 NEW Can filter on account range in general ledger grouped by account 2018-04-14 00:01:54 +02:00
Laurent Destailleur
b4ef3945d2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/facture/card.php
2018-04-13 23:52:08 +02:00
Laurent Destailleur
6cdb801ed8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 23:50:12 +02:00
Laurent Destailleur
d833620285 Fix title of break in balance account report 2018-04-13 23:49:08 +02:00
Laurent Destailleur
f84b74f4cc
Merge pull request #8583 from hregis/develop_ldap
NEW add "printUserPasswordField" hooks
2018-04-13 23:36:20 +02:00