lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
76,209 Commits 43 Branches 150 Tags 886 MiB
9a974814fa
Commit Graph

76209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
35ab3c9aad
Update holiday.php 2018-10-26 18:24:04 +02:00
Regis Houssin
866a7df510 FIX $forceentity is not used, replace by $currentobject if needed 2018-10-26 18:23:48 +02:00
Laurent Destailleur
087b68948d Fix: do not use point for graph with too many points. 2018-10-26 17:32:32 +02:00
Laurent Destailleur
d800fe9256 FIX extrafields of taks not visible in creation 2018-10-26 16:21:01 +02:00
De Coninck Laurent
d347cf3a85 set a message 2018-10-26 16:18:27 +02:00
Laurent Destailleur
852b069785 Fix reponsive in stats pages 2018-10-26 15:46:17 +02:00
Philippe GRAND
f450e04856 Merge remote-tracking branch 'upstream/8.0' into 8.0 2018-10-26 15:38:15 +02:00
Laurent Destailleur
4955ae03e8
Merge pull request #9867 from atm-john/develop_jflot 
FIX hover stability and modernize style
 2018-10-26 15:33:47 +02:00
Laurent Destailleur
0e464ea4f5
Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
d28c9ddea5
Merge pull request #9872 from laudeco/feature/improvement_module_picto 
improve img_picto by returning ASAP
 2018-10-26 15:20:40 +02:00
Laurent Destailleur
2f30381cde
Merge pull request #9876 from frederic34/patch-9 
add string cast
 2018-10-26 15:19:42 +02:00
Laurent Destailleur
e875aee2c5
Merge pull request #9868 from atm-ph/fix_develop_php_warnings_in_js 
Fix PHP warnings printed in javascript
 2018-10-26 15:19:21 +02:00
Laurent Destailleur
daa9ff9ea5
Merge pull request #9879 from frederic34/patch-15 
use strict compare with boolean
 2018-10-26 15:18:36 +02:00
Laurent Destailleur
7c81124e66
Merge pull request #9869 from ATM-Marc/FIX_6.0_typhon_order_ref 
FIX: pdf typhon: order reference duplicate
 2018-10-26 15:18:19 +02:00
Laurent Destailleur
84bff545b8
Merge pull request #9873 from frederic34/expeditioncomment 
code comment expedition class
 2018-10-26 15:15:08 +02:00
Laurent Destailleur
ed0393dfa8
Merge pull request #9875 from atm-john/Fix_title 
FIX title
 2018-10-26 15:14:44 +02:00
Laurent Destailleur
35421d135a FIX Total of timespent 
Conflicts:
	htdocs/core/js/timesheet.js
 2018-10-26 15:04:02 +02:00
Laurent Destailleur
20d7c8bb8c FIX Total of timespent 2018-10-26 15:01:50 +02:00
Laurent Destailleur
5d249d71ca Fix menu at wrong place 2018-10-26 14:38:26 +02:00
Laurent Destailleur
0ba86d4e5b Trans 2018-10-26 12:22:31 +02:00
Laurent Destailleur
2ce7429735 Remove Google advert 2018-10-26 12:09:52 +02:00
Laurent Destailleur
cae83cd8e7 Add solution to translate 2018-10-26 11:10:04 +02:00
Frédéric FRANCE
52b7d60a0f
use strict compare with boolean 2018-10-26 08:11:27 +02:00
De Coninck Laurent
84c30280d3 change the unlink icon to fontawesome icon 
On the project summary page, the unlink icon was still an image I change to that icon https://fontawesome.com/icons/unlink?style=solid.
 2018-10-25 22:00:19 +02:00
Frédéric FRANCE
21c441540c
add string cast 2018-10-25 21:57:19 +02:00
atm-john
8a9b9f1736 Fix title 2018-10-25 21:53:48 +02:00
atm-john
759b2b6ccf Extend import option to Order's card and Propal's card 2018-10-25 21:39:22 +02:00
Frédéric FRANCE
eb0b0baf40
code comment expedition class 2018-10-25 21:36:01 +02:00
Laurent Destailleur
af18e1b043 FIX XSS 2018-10-25 19:38:45 +02:00
Laurent Destailleur
61ab507ba4 Fix navigation 2018-10-25 18:53:00 +02:00
Laurent Destailleur
8b601bd7fd Fix numbering of holidays 2018-10-25 18:50:53 +02:00
De Coninck Laurent
70cd68ebef improve img_picto by returning ASAP 
We do not need an else each time some times, return is good enough. I also remove some line of comments since it's only code in it. We have GIT to find the code back we do not need to put it in comment ;-).
 2018-10-25 18:21:00 +02:00
De Coninck Laurent
35bf07bab6 migrate fontawesome to 5.4.1 
migrate the fontawesome to the latest library in the idea to use the last one (more complete) to use fontawesome icons instead of images.

Font awesome 5.4.1 is leighter than the previous loaded version.
 2018-10-25 17:54:29 +02:00
Laurent Destailleur
094bcc519f Fix show customer code only if customer in company tooltip 2018-10-25 17:25:36 +02:00
Inovea Conseil
c782a98f9f Merge remote-tracking branch 'Dolibarr/develop' into develop 2018-10-25 16:59:31 +02:00
Laurent Destailleur
1ba716b82c Fix do not allow use of second or third tax without using 1st one. 2018-10-25 14:39:54 +02:00
Laurent Destailleur
5daf095fc6 FIX Title and content of automatic email of expense report 2018-10-25 14:05:22 +02:00
Laurent Destailleur
9ccdd10a81 FIXx format (html/text) of emails sent on leave request module 2018-10-25 13:19:56 +02:00
Laurent Destailleur
25a374bd9a NEW Notification module support expense report+holiday validation and 
approval event.
 2018-10-25 12:45:13 +02:00
Marc de Lima Lucio
16c35035c1 FIX: pdf typhon: order reference duplicate 2018-10-25 12:07:40 +02:00
atm-ph
f41e7e05e1 Fix PHP warnings printed in javascript 2018-10-25 12:01:17 +02:00
atm-john
d0dc8b2a9c Add points to lines charts and remove shadow to improve performances 2018-10-25 00:24:25 +02:00
atm-john
b5c47f16e6 Fix hover stability and modernize style 2018-10-24 23:25:40 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
277655b911 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 13:31:31 +02:00
Laurent Destailleur
f44162715e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-24 13:31:04 +02:00
Laurent Destailleur
30a2004d53 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-24 13:30:54 +02:00
Laurent Destailleur
4785884457 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 13:30:16 +02:00
Laurent Destailleur
8eb1af2b40 Start beta 2018-10-24 13:29:59 +02:00
Laurent Destailleur
c9dca22df2
Merge pull request #9854 from atm-john/NEW_missing_payment_date_col 
NEW Add due date column in payment lists
 2018-10-24 12:27:59 +02:00