lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,975 Commits 43 Branches 150 Tags 886 MiB
f58bd37067
Commit Graph

47975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f58bd37067 Css 2015-06-12 16:22:32 +02:00
Laurent Destailleur
4e5ed08ff8 Clean code 2015-06-12 13:21:21 +02:00
Laurent Destailleur
ed0e6753e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-12 13:09:32 +02:00
Laurent Destailleur
d2843ceabb Add field frstrecur to be managed by withdrawal module. 2015-06-11 19:16:29 +02:00
Laurent Destailleur
3678a12767 NEW Can assign a task to yourself to have it appear on timesheet 2015-06-11 18:27:59 +02:00
Juanjo Menent
0de3f8ac98 Merge pull request #3000 from hregis/develop_origin 
Fix: Strict standards: Only variables should be passed by reference
 2015-06-10 21:14:01 +02:00
Juanjo Menent
49b369035a Merge pull request #3002 from hregis/develop_productprice 
NEW: add "productpricecard" hook and uniformize code
 2015-06-10 21:13:01 +02:00
Juanjo Menent
4d0734950d Merge pull request #3003 from GPCsolutions/dolibarr-3001 
Fix #3001: the current code needs an array, not an object
 2015-06-10 21:12:02 +02:00
Juanjo Menent
680269da26 Merge pull request #3004 from hregis/develop_strict 
Fix: strict mode hunter
 2015-06-10 21:11:07 +02:00
Juanjo Menent
bf7c3a0a6c Merge pull request #3005 from GPCsolutions/nophotopathfix 
Fix nophoto image path on company admin
 2015-06-10 21:08:59 +02:00
Raphaël Doursenaud
95debcc376 Fix nophoto image path on company admin 2015-06-10 19:49:09 +02:00
Regis Houssin
c21156dd13 Fix: strict mode hunter 2015-06-10 18:58:42 +02:00
Raphaël Doursenaud
2629e47f77 Fix #3001: the current code needs an array, not an object 2015-06-10 18:45:10 +02:00
Regis Houssin
e43d4a6239 NEW: add "productpricecard" hook and uniformize code 2015-06-10 18:42:16 +02:00
Regis Houssin
edd5c33c5b Fix: Strict standards: Only variables should be passed by reference 
http://geoffray.be/blog/php/only-variables-should-be-passed-by-reference
 2015-06-10 18:22:47 +02:00
Juanjo Menent
7f06727c56 Merge pull request #2996 from aspangaro/develop-patch28 
NEW: Add a tab document in donation card
 2015-06-10 17:37:17 +02:00
Laurent Destailleur
488257d180 Fix bad coding 2015-06-08 22:16:00 +02:00
aspangaro
592d124f26 Merge remote-tracking branch 'Upstream/develop' into develop-28 2015-06-08 21:33:45 +02:00
aspangaro
1d1f19b976 NEW: Add a tab document in donation card 2015-06-08 21:28:32 +02:00
Laurent Destailleur
9b7982bf0c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/fourn/facture/card.php
	htdocs/theme/eldy/style.css.php
 2015-06-08 18:28:50 +02:00
Laurent Destailleur
05a653ee5f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/html.form.class.php
 2015-06-08 18:21:16 +02:00
Laurent Destailleur
f9d85973aa Merge remote-tracking branch 'origin/3.5' into 3.6 2015-06-08 18:18:37 +02:00
Laurent Destailleur
35dd069ec9 Fix #2994 2015-06-08 18:17:13 +02:00
Laurent Destailleur
b61f7dda0b Merge pull request #2990 from GPCsolutions/dolibarr-2985 
Make default avatar images public to allow Gravatar proxying
 2015-06-08 17:53:37 +02:00
Laurent Destailleur
fd42b17027 Merge pull request #2984 from GPCsolutions/dolibarr-2983 
FIX #2983 Load gravatar avatar images securely over HTTPS
 2015-06-08 17:53:30 +02:00
Laurent Destailleur
7da33519a9 Merge pull request #2989 from GPCsolutions/dolibarr-2988 
Use rfc6761 example.com domain instead of domain.com in examples
 2015-06-08 17:51:08 +02:00
Laurent Destailleur
3ed200766c Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-06-08 17:38:59 +02:00
Laurent Destailleur
9e1dd42b56 Fix #2986 2015-06-08 17:38:33 +02:00
Laurent Destailleur
5d4bbc457a Fix #2987 Removed deprecated page 2015-06-08 17:30:15 +02:00
Raphaël Doursenaud
4aee11e54b Make default avatar images public to allow Gravatar proxying 
Fix #2985
 2015-06-08 17:23:02 +02:00
Raphaël Doursenaud
143a7d7328 Use rfc6761 example.com domain instead of domain.com in examples 
Fix #2988
 2015-06-08 17:13:23 +02:00
Raphaël Doursenaud
08c9dd358d FIX #2983 Load gravatar avatar images securely over HTTPS 2015-06-08 15:51:41 +02:00
Laurent Destailleur
df1dfcbd8a NEW Can filter proposal on a tag of a product 
Enhance also the prototype test_arrays to include select form before
table.
 2015-06-08 15:07:37 +02:00
Laurent Destailleur
e9526066b7 Prepare edition of field "bydefaultinlist" for extrafields. 2015-06-08 14:12:57 +02:00
Laurent Destailleur
4a18b730b5 Fix: Avoid warning in expense report validation 
Fix: navigation in expense report
 2015-06-08 13:49:09 +02:00
Laurent Destailleur
1e0218bb9b Merge pull request #2784 from aaujon/3.7-webservices-fix 
various fixes on webservices
 2015-06-08 10:37:29 +02:00
Laurent Destailleur
a85f664b7a Merge pull request #2950 from defrance69/patch-64 
if duration is present on service, we use it
 2015-06-08 10:35:23 +02:00
Laurent Destailleur
7f16eea13b Merge pull request #2978 from hregis/3.7-bug 
Fix: use dash instead underscore and add filter for "dol_most_recent_files" for avoid conflict
 2015-06-08 10:35:00 +02:00
Juanjo Menent
54ad709d1a Merge pull request #2979 from aspangaro/develop-patch27 
FIX: Correct migration script
 2015-06-08 09:52:51 +02:00
Juanjo Menent
dc3ae22379 Merge pull request #2980 from hregis/3.7_crash 
Close #2951
 2015-06-08 09:46:39 +02:00
Regis Houssin
de0dd5da60 Fix: Drop foreign key for avoid Mysql crash 2015-06-08 09:14:46 +02:00
aspangaro
67c9a95ffb FIX: Correct migration script 2015-06-08 05:28:12 +02:00
BENKE Charlie
bcf9bdc92e Update card.php 
new setting vars FICHINTER_USE_SERVICE_DURATION
 2015-06-07 23:18:51 +02:00
Laurent Destailleur
101a9a4cf3 Fix: object user must not be overwritten 2015-06-07 19:35:47 +02:00
Laurent Destailleur
37cadaf4bf Fix the trigger on delete thirdparty was not called 2015-06-07 03:41:12 +02:00
Laurent Destailleur
7e169c0801 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-07 03:39:55 +02:00
Laurent Destailleur
dd08d5d660 Fix bad parameter for PUT method 2015-06-07 03:39:43 +02:00
Laurent Destailleur
536f565d4e Fix Return value is always utf8 encoded and without entities. 2015-06-07 02:47:28 +02:00
Laurent Destailleur
7e4abf94b4 Fix Return value is always utf8 encoded and without entities. 2015-06-07 02:43:51 +02:00
Laurent Destailleur
c4ccf6f744 Fix: Missing the delete command 2015-06-07 00:06:11 +02:00