Commit Graph

7675 Commits

Author SHA1 Message Date
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
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
Regis Houssin
c21156dd13 Fix: strict mode hunter 2015-06-10 18:58:42 +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
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
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
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
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
c4ccf6f744 Fix: Missing the delete command 2015-06-07 00:06:11 +02:00
Laurent Destailleur
b89473383c Fix phpcs 2015-06-06 16:41:11 +02:00
Laurent Destailleur
02dbe16366 Mutualize code to show block to link an element to another one. 2015-06-06 15:57:59 +02:00
Laurent Destailleur
1652f80300 Memory optimizing. Save 2.3 Mb of memory for all forms that can show
margin informations. Save 300 Kb of memory for all other pages.
2015-06-06 15:19:25 +02:00
Laurent Destailleur
8d84dd1155 Uniformize code 2015-06-06 14:34:57 +02:00
Laurent Destailleur
89f77f5e2b Uniformize code 2015-06-06 14:21:18 +02:00
Laurent Destailleur
1880ed701f Uniformize code 2015-06-06 13:22:15 +02:00
Regis Houssin
9a812a6c28 Fix: add filter for "dol_most_recent_files" for avoid conflict with
option "Save file on server with name "FA0700034-Original filename""
2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a Start to clean html.form class. 2015-06-06 12:26:47 +02:00
Laurent Destailleur
43ed48896a Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	build/debian/changelog
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-06-05 18:31:53 +02:00
Laurent Destailleur
1252a500ce Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
2015-06-05 16:50:46 +02:00
Laurent Destailleur
30f6cd08cf Merge pull request #2943 from aspangaro/develop-donation2
New: Add object ot the company & Add picture cerfa logo
2015-06-05 15:58:47 +02:00
Laurent Destailleur
7e3a457f85 Merge pull request #2942 from aspangaro/develop-donation
Fix: Donation error on admin tab & Fix: Input disabled by default
2015-06-05 15:57:35 +02:00
Laurent Destailleur
df60754e52 Merge pull request #2708 from GPCsolutions/deprecated
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
a33241f487 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:46:30 +02:00
Laurent Destailleur
5e2d9efa07 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:02:50 +02:00
Laurent Destailleur
4c7ccf6145 NEW Can filter on contact status in prospect list. Removed deprecated
menu entry.
2015-06-05 10:49:02 +02:00
Laurent Destailleur
14b1fb845f Remove useless tab of categories 2015-06-05 09:57:41 +02:00
Laurent Destailleur
bbd8a712cf Merge pull request #2932 from GPCsolutions/dolibarr-2571
Added tags/categories management to customers
2015-06-05 09:44:06 +02:00
Laurent Destailleur
a1391ba8b7 Merge pull request #2959 from aspangaro/develop-patch22
Fix: wrong file & problem to install model
2015-06-05 09:07:29 +02:00
Laurent Destailleur
5edef2f02f NEW A module can add its entries into cron module. 2015-06-05 03:32:09 +02:00
aspangaro
fc5ea9f20f Fix: wrong file & problem to install model 2015-06-04 21:14:30 +02:00
Laurent Destailleur
1f92f542a6 NEW Hidden option THEME_ELDY_USE_HOVER is stable enough to become
officialy visible into setup.
2015-06-04 13:32:21 +02:00
Laurent Destailleur
fa01dc200d NEW Add hidden option MAIN_MAILFORM_DISABLE_ENTERKEY to disable the key
enter into the form to send email.
2015-06-04 12:57:49 +02:00
Laurent Destailleur
331ebbdd73 Fix behaviour on grey/visible menu must be same everywhere on
application.
2015-06-04 11:42:24 +02:00
Laurent Destailleur
8010cb7f33 Fix the extracss parameter was overwritten other css into
textwithtooltip function.
Add tooltip on THM and TJM parameter of user.
2015-06-04 10:42:12 +02:00
Laurent Destailleur
dd8a0b849a NEW If module salaries is on, you can set a hourly value for tome
consumed by users. Each time a user enter its time consumed on a
project, a calculation is done to provide the cost for human services.
This value appears into the "Transversal view" of project.
2015-06-03 21:01:50 +02:00
Laurent Destailleur
995645800e Fix loading of project 2015-06-03 18:24:09 +02:00
Laurent Destailleur
1411772c81 Fix sql error 2015-06-03 17:07:46 +02:00
Laurent Destailleur
d109c78c6b Fix label of project was not visible 2015-06-03 16:59:48 +02:00