Commit Graph

8941 Commits

Author SHA1 Message Date
Laurent Destailleur
e76124add5 FIX #3606 2015-10-01 16:09:51 +02:00
Laurent Destailleur
b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
2015-10-01 11:16:35 +02:00
Laurent Destailleur
34adc60d26 Merge pull request #3618 from atm-alexis/fix_event_for_user_restricted_if_no_company
FIX error in SQL due to a previous fix
2015-10-01 10:35:07 +02:00
Laurent Destailleur
9c28894ec3 Merge pull request #3615 from FHenry/3.7
FIX : When delete actioncomm also delete actioncomm_resources
2015-10-01 10:34:54 +02:00
Laurent Destailleur
d4b5256f18 Merge pull request #3611 from atm-alexis/develop
FIX there is no way to hide or change qty by hook
2015-10-01 10:27:26 +02:00
Laurent Destailleur
747c49862c Try to solve a flush pb 2015-09-30 19:15:45 +02:00
Florian HENRY
a96b92a618 FIX : Email selector contact must not include inactive contact 2015-09-30 14:06:45 +02:00
Laurent Destailleur
1108656d19 NEW Can set color of the highlight hover line 2015-09-29 15:58:24 +02:00
fmarcet
a585698b69 FIX: Only are showing one object linked 2015-09-29 08:49:11 +02:00
Alexis ALGOUD
453ed8a05e FIX error in SQL due to a previous fix 2015-09-28 15:36:27 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
2015-09-27 21:29:16 +02:00
Laurent Destailleur
1e2d06bcd1 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-27 16:02:44 +02:00
Laurent Destailleur
ff5f823bef FIX not responsive part for project page 2015-09-27 16:01:57 +02:00
philippe
1454d942ef missing translation 2015-09-27 11:06:45 +02:00
Laurent Destailleur
e1b969cb90 FIX Init into bad var 2015-09-26 16:52:58 +02:00
Laurent Destailleur
a097938ce5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-26 16:52:09 +02:00
Laurent Destailleur
f0d39a6a92 FIX Init into bad var 2015-09-26 16:51:51 +02:00
Alexis Algoud
688d6e37e2 FIX there is no way to hide or change qty to useful information by module 2015-09-26 14:42:26 +02:00
Laurent Destailleur
d119e04963 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 14:17:02 +02:00
Laurent Destailleur
9ecc8e5e6b FIX Regression on bad use of fk_account showing the bad bank account on
PDF.
2015-09-26 14:11:39 +02:00
Laurent Destailleur
c707c899c1 Fix remove warning 2015-09-26 13:22:05 +02:00
Laurent Destailleur
a3647bea4e Fix bad information in report 2015-09-26 11:53:36 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Laurent Destailleur
f3ba115ef0 Fix missing default value 2015-09-26 10:53:59 +02:00
Juanjo Menent
4fa1be0e35 Issue #3509: Init works 2015-09-26 10:37:36 +02:00
Juanjo Menent
f14c806439 Merge branch 'develop' into dolibarr-3509
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-09-26 09:03:50 +02:00
Juanjo Menent
ad1a4c7e15 Merge pull request #3598 from GPCsolutions/formconfirm
[Qual] Replaced deprecated form_confirm()
2015-09-26 08:48:16 +02:00
Juanjo Menent
a046bcfc9b Merge pull request #3596 from GPCsolutions/linkedobject
[Qual] Fixed typo and added hinting
2015-09-26 08:47:19 +02:00
Juanjo Menent
40425d427d Merge pull request #3593 from GPCsolutions/deprecatedclasses
[Qual] Constructors of deprecated classes are deprecated
2015-09-26 08:45:03 +02:00
Juanjo Menent
c726afe3bc Merge pull request #3592 from GPCsolutions/select_users
[Qual] Replaced deprecated select_users()
2015-09-26 08:44:34 +02:00
Juanjo Menent
ef161e356e Merge pull request #3590 from GPCsolutions/json
[Qual] Replaced deprecated dol_json_*()
2015-09-26 08:42:13 +02:00
Juanjo Menent
dd19029279 Merge pull request #3589 from GPCsolutions/moduletabs
[Qual] Warning on deprecated number of values
2015-09-26 08:41:33 +02:00
Juanjo Menent
4f187d3413 Merge pull request #3588 from GPCsolutions/microtime
[Qual] Replaced deprecated dol_microtime_float()
2015-09-26 08:40:52 +02:00
Juanjo Menent
6999ad0a4f Merge pull request #3587 from GPCsolutions/fiche_titre
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +02:00
Juanjo Menent
005ead8db4 Merge pull request #3586 from GPCsolutions/deprecatedcss
[Qual] Removed unused deprecated fields
2015-09-26 08:34:10 +02:00
Juanjo Menent
93c0adf725 Merge pull request #3583 from GPCsolutions/clone
[Qual] Replaced deprecated dol_clone by native clone
2015-09-26 08:33:48 +02:00
Juanjo Menent
99a945882d Merge pull request #3576 from aspangaro/develop-67
New : Salaries  - Add info card / add field datec / rename field user_creat to user_author
2015-09-26 08:29:13 +02:00
Raphaël Doursenaud
485c369d55 [Qual] Replaced deprecated form_confirm() 2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
57f05e850a [Qual] Fixed typo and added hinting 2015-09-24 20:56:50 +02:00
Raphaël Doursenaud
5f5ef43e04 [Qual] Constructors of deprecated classes are deprecated
This gives better deprecation hinting.
2015-09-24 20:35:59 +02:00
Raphaël Doursenaud
b0b552c378 [Qual] Replaced deprecated select_users() 2015-09-24 20:32:35 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
85c34af019 [Qual] Replaced deprecated dol_json_*() 2015-09-24 18:57:05 +02:00
Raphaël Doursenaud
bbaa76fab1 [Qual] Warning on deprecated number of values
Module tabs declarations now uses 6 values including permissions.
2015-09-24 18:47:43 +02:00
Raphaël Doursenaud
65340667b6 [Qual] Replaced deprecated dol_microtime_float() 2015-09-24 18:42:35 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
3feffdb84f [Qual] Removed unused deprecated fields 2015-09-24 17:50:39 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
philippe
9e185eec75 FIX: order ref must not be translated 2015-09-24 15:29:17 +02:00