Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
47,992 Commits 35 Branches 179 Tags 1.7 GiB
deff75d2ac
Commit Graph

41346 Commits

Author SHA1 Message Date
Juanjo Menent
deff75d2ac Merge pull request #3007 from hregis/develop_origin 
Fix: possibility to show icon pdf, dot, doc, etc...
 2015-06-12 21:37:07 +02:00
Juanjo Menent
0596be1656 Merge pull request #3008 from hregis/develop_strict 
Fix: ereg more simple
 2015-06-12 21:24:13 +02:00
Juanjo Menent
648719efdd Merge pull request #3015 from fmarcet/develop 
New: Add due date filter on invoices lists
 2015-06-12 21:18:31 +02:00
Juanjo Menent
9dad0add61 Merge pull request #3014 from GPCsolutions/dolibarr-2987 
FIX #2987: removed dead function moneyMeter()
 2015-06-12 21:07:15 +02:00
Juanjo Menent
609b1291c7 Merge pull request #3016 from GPCsolutions/dolibarr-2571 
Added tag/categories management to contact card
 2015-06-12 21:04:29 +02:00
Juanjo Menent
56ba4ea3d4 Merge pull request #3018 from open-minds/develop 
Rename "duree" property of interventions to "duration"
 2015-06-12 21:03:36 +02:00
Juanjo Menent
2522cf7a0f Merge pull request #3024 from GPCsolutions/categoriesfix 
Fix: missing categories class in customer/prospect card
 2015-06-12 21:02:14 +02:00
Laurent Destailleur
1c280a9219 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/theme/eldy/style.css.php
 2015-06-12 16:29:50 +02:00
Laurent Destailleur
f58bd37067 Css 2015-06-12 16:22:32 +02:00
Raphaël Doursenaud
4e143755e8 Fix: missing categories class in customer/prospect card 
Also check that the categories module is enabled and user has permissions to see categories
 2015-06-12 15:56:39 +02:00
Laurent Destailleur
1a2bde14fb FIX Better management error into the color conversion functions 2015-06-12 14:37:27 +02:00
Laurent Destailleur
4a726f6315 Fix css 2015-06-12 13:44:03 +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 Léonard
a337b6f874 Rename "duree" property of interventions to "duration" 
This also fixes the display problem of total duration on the "soleil" document model
 2015-06-11 23:18:29 +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
Raphaël Doursenaud
6465e58032 Added tag/categories management to contact card 
Contact part of #2571
 2015-06-11 14:50:13 +02:00
fmarcet
42b04102ba New: Add due date filter on invoices lists 2015-06-11 12:40:16 +02:00
Raphaël Doursenaud
36486d6329 FIX #2987: removed dead function moneyMeter() 2015-06-11 10:57:08 +02:00
Regis Houssin
e3d1614004 Fix: ereg more simple 2015-06-11 09:21:44 +02:00
Regis Houssin
a51a8aff59 Fix: possibility to show pdf, dot, doc, etc... 2015-06-11 09:12:24 +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
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
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