Commit Graph

68347 Commits

Author SHA1 Message Date
Laurent Destailleur
72c3a60d24 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-17 09:46:11 +02:00
Laurent Destailleur
80ece31631 Merge pull request #8607 from ATM-Marc/FIX_leftmenu_search
FIX: left search form: directly display all qualified objects
2018-04-17 09:45:55 +02:00
Laurent Destailleur
c3970f1a52 Code comment 2018-04-17 09:44:57 +02:00
Laurent Destailleur
bcecc25401 Merge pull request #8606 from atm-greg/Add_hooks_on_supplier_docs
add hooks on supplier documents
2018-04-17 09:43:51 +02:00
Laurent Destailleur
7b3a9de9db Merge pull request #8603 from frederic34/logintransp
login transparent when using background
2018-04-17 09:35:47 +02:00
Laurent Destailleur
f06412ebc1 Update style.css.php 2018-04-17 09:35:25 +02:00
Laurent Destailleur
1e0a660d24 More font awesome picto instead of img 2018-04-16 19:57:46 +02:00
Laurent Destailleur
106fb87d0a NEW Can sort order of files in attach tab for leave and expensereport 2018-04-16 19:25:27 +02:00
Laurent Destailleur
faea6861c3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
	htdocs/langs/en_US/bills.lang
2018-04-16 18:19:21 +02:00
Laurent Destailleur
f19abe38d7 FIX pdf thumb for expense report 2018-04-16 18:17:35 +02:00
Laurent Destailleur
27a8476117 FIX remove var_dump 2018-04-16 17:02:54 +02:00
Marc de Lima Lucio
ba50fcd130 FIX: left search form: directly display all qualified objects 2018-04-16 15:15:35 +02:00
Laurent Destailleur
622042e9b2 FIX Max nb of generation of recurring invoice should not show warning 2018-04-16 15:05:35 +02:00
Laurent Destailleur
50d86a7cfd Fix accounting area when advanced accounting module not enabled 2018-04-16 14:25:39 +02:00
Laurent Destailleur
f1ad3912e7 Fix multicompany compatibility for recurring invoice generation 2018-04-16 14:18:38 +02:00
Laurent Destailleur
14ed19265c FIX environment shown on cron card 2018-04-16 13:53:59 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
c702c88fde CSS 2018-04-16 13:11:48 +02:00
Laurent Destailleur
e7f6785a53 Add log 2018-04-16 12:23:24 +02:00
Laurent Destailleur
f05cc8b310 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-16 11:20:44 +02:00
Laurent Destailleur
0d26bdcdc5 FIX Button receive products not visible 2018-04-16 11:20:29 +02:00
Laurent Destailleur
d549090290 Fix translation of button action must be a verb 2018-04-16 11:12:56 +02:00
Laurent Destailleur
99633eb815 FIX button "Classify bill" on supplier order was not visible 2018-04-16 11:12:27 +02:00
atm-greg
90f1ab8af4 add hooks on supplier documents 2018-04-16 06:46:22 +02:00
Laurent Destailleur
8c307987d8 css 2018-04-16 00:26:13 +02:00
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
Frédéric FRANCE
46cfe1e2e7 Merge remote-tracking branch 'upstream/develop' into esign 2018-04-15 14:33:03 +02:00
Frédéric FRANCE
dec774ccf5 login transparent when using background 2018-04-15 14:03:05 +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
Frédéric FRANCE
d4c03230a0 add optional esign field in pdf propal 2018-04-15 11:34:21 +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