Commit Graph

61632 Commits

Author SHA1 Message Date
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
6a0ef4b561 Fix info ot total in direct debit page 2017-09-19 19:29:00 +02:00
Laurent Destailleur
f87614e2d3 Fix missing translation 2017-09-19 19:12:54 +02:00
Laurent Destailleur
ffe2ee8232 Standardize code 2017-09-19 19:00:28 +02:00
Laurent Destailleur
c38ed54990 Disable old datepicker 2017-09-19 17:31:37 +02:00
Laurent Destailleur
5f7631a95d NEW Days where user is on vacation use different colors in timesheet. 2017-09-19 17:07:39 +02:00
Laurent Destailleur
14e1306b20 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-19 17:06:03 +02:00
Laurent Destailleur
f4ddce7274 FIX View of timespent for another user 2017-09-19 17:05:50 +02:00
Laurent Destailleur
2a04d497da Use a different css into timespent entry page when user is on holiday 2017-09-19 16:40:55 +02:00
Laurent Destailleur
848bc0779a Merge pull request #7430 from atm-florian/6.0
fix : rest API URL
2017-09-19 12:19:31 +02:00
Laurent Destailleur
77d1a15016 Activate warning for french "Loi Finance 2016" 2017-09-19 12:03:48 +02:00
florian HENRY
7375afca3e fix : rest API URL 2017-09-19 09:03:25 +02:00
Laurent Destailleur
0b67ac36f1 Show image on tool page 2017-09-19 02:01:05 +02:00
Laurent Destailleur
978702d04b Fix false deprecated warning 2017-09-19 01:41:57 +02:00
Laurent Destailleur
b723d2c2d2 Fix scrutinizer bugs 2017-09-19 01:39:22 +02:00
Laurent Destailleur
89bfb81cc7 Fix repair 2017-09-19 01:05:13 +02:00
Laurent Destailleur
1e33495f42 Fix remove warnings 2017-09-19 00:31:51 +02:00
Laurent Destailleur
ed932db3a3 Merge pull request #7426 from hregis/develop_bug
Fix: avoid Warning: A non-numeric value encountered
2017-09-19 00:27:40 +02:00
Laurent Destailleur
777e1e1efa Merge pull request #7429 from Gitdyr/develop
Fix: Changed "Solde" to "Balance"
2017-09-19 00:25:40 +02:00
Laurent Destailleur
f936b17d68 FIX Protection to avoid to apply credit note discount > remain to pay 2017-09-19 00:24:52 +02:00
Laurent Destailleur
9838199de1 FIX Sign of amount in origin currency on credit note created from lines 2017-09-18 23:53:17 +02:00
Kjeld Borch Egevang
ee99483b0d Changed "Solde" to "Balance". 2017-09-18 22:30:08 +02:00
Regis Houssin
cdd1473cfa Fix: avoid Warning: A non-numeric value encountered 2017-09-18 16:30:01 +02:00
Laurent Destailleur
70b11f18b5 FIX #7367 2017-09-18 16:06:58 +02:00
Laurent Destailleur
c11ff4a18c FIX #7368 2017-09-18 15:55:25 +02:00
Laurent Destailleur
aba907d1a8 FIX #7420 2017-09-18 15:49:21 +02:00
Laurent Destailleur
0c01c7ceba Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-18 15:48:18 +02:00
Laurent Destailleur
6ac1b6e82e Fix template 2017-09-18 15:48:04 +02:00
Laurent Destailleur
0536d6cbed FIX #7330 2017-09-18 15:46:17 +02:00
Laurent Destailleur
8536d0f6e9 Merge pull request #7421 from atm-florian/6.0
fix : little fix
2017-09-18 15:08:02 +02:00
Laurent Destailleur
da6b1e92b2 NEW Add the total in the perday view of the time spent form. 2017-09-18 14:18:34 +02:00
Laurent Destailleur
85d59b32b3 Add timespent entry into HR top menu too
Faster update of total of timespent
2017-09-18 13:15:24 +02:00
Laurent Destailleur
1760972166 Merge pull request #7419 from hregis/develop_trad
Fix: wrong image url and file not present
2017-09-18 11:43:21 +02:00
Laurent Destailleur
230644070b Better detection of log to include merge labels 2017-09-18 11:42:05 +02:00
florian HENRY
31721165b5 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0 2017-09-18 11:36:45 +02:00
Laurent Destailleur
cc1b7c06ef Merge pull request #7417 from defrance/patch-27
NEW Can add link to other element on a donation
2017-09-18 11:17:40 +02:00
Laurent Destailleur
594e13180a Merge pull request #7415 from azawawi/develop
Fix example comment typo
2017-09-18 11:16:55 +02:00
Laurent Destailleur
0355b0d9ed Merge pull request #7414 from aspangaro/7.0-4
Accountancy - Finish moving admin to specific menu & some cleaning
2017-09-18 11:16:36 +02:00
Regis Houssin
bb0cb8adf4 Fix: remove unused file 2017-09-18 11:04:55 +02:00
Laurent Destailleur
dff4249e97 NEW Can include extrafields into member card templates 2017-09-18 10:48:49 +02:00
Regis Houssin
8389555882 Fix: wrong image url and file not present 2017-09-18 10:33:54 +02:00
Laurent Destailleur
291a0d46e6 Fix edit of categories 2017-09-18 01:39:39 +02:00
Laurent Destailleur
3f7b705674 Use correct term accounting for codes 2017-09-18 00:48:09 +02:00
Laurent Destailleur
aea7318fae Fix search on ref customer 2017-09-18 00:07:00 +02:00
Laurent Destailleur
d1fd1df345 Add column position on some dictionaries table 2017-09-17 22:52:29 +02:00
Laurent Destailleur
eaee8ee586 Fix box activity again 2017-09-17 21:30:27 +02:00
Laurent Destailleur
f76b675e09 Fix box activity again 2017-09-17 21:30:15 +02:00
Laurent Destailleur
99149b5cfe Fix box activity again 2017-09-17 21:30:11 +02:00
Laurent Destailleur
90ab6a1f30 Fix box activity again 2017-09-17 21:29:25 +02:00
Laurent Destailleur
f4b8489bd6 Fix box activity again 2017-09-17 21:24:30 +02:00