Commit Graph

49511 Commits

Author SHA1 Message Date
Laurent Destailleur
60c6510fc1 NEW Can set default value of event type when creating an event (if type
of event option is used).
2015-09-29 14:17:03 +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
3381d8efdd Work on css 2015-09-27 01:59:48 +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
Laurent Destailleur
6aa13d4189 Fix the $colorbackvmenu2 was removed with 3.8 2015-09-26 16:34:43 +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
dd88a799fb FIX Event from ical stream should not be movable into calendar view 2015-09-26 13:54:50 +02:00
Laurent Destailleur
c707c899c1 Fix remove warning 2015-09-26 13:22:05 +02:00
Laurent Destailleur
fef8203e65 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 12:01:58 +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
5a2dc88d42 Merge pull request #3610 from defrance/patch-80
3.8 bad filtering caused by statut filter #3580
2015-09-26 11:20:54 +02:00
Laurent Destailleur
b99ef6b27c Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 11:05:12 +02:00
Laurent Destailleur
4e77a651d4 Merge pull request #3600 from fmarcet/3.8
FIX #3599 Not saving legal form
2015-09-26 11:05:02 +02:00
Laurent Destailleur
9644e242ae Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-26 11:04:32 +02:00
Laurent Destailleur
5f765419ea Fix because project module introduced opportunity, user may create
project (opportunity) even when thirdparty does not exists yet, so we
must provide a solution for this.
2015-09-26 11:04:17 +02:00
Laurent Destailleur
f3ba115ef0 Fix missing default value 2015-09-26 10:53:59 +02:00
Laurent Destailleur
7424b521ed Merge pull request #3609 from aspangaro/3.8-20
Fix centering on login page
2015-09-26 10:30:24 +02:00
BENKE Charlie
8dcd6158e3 3.8 bad filtering caused by statut filter #3580
correction ported on 3.8 too, sorry for the bad step process
2015-09-26 10:15:42 +02:00
Juanjo Menent
b8bf21b905 Merge pull request #3582 from grandoc/3.8
FIX: order ref must not be translated
2015-09-26 08:54:25 +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
d503dd928b Merge pull request #3597 from GPCsolutions/displaymargin
[Qual] Replaced deprecated displayMarginInfos()
2015-09-26 08:47:55 +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
86a201edcf Merge pull request #3595 from GPCsolutions/note
[Qual] Do not test deprecated update_note_public()
2015-09-26 08:46:51 +02:00
Juanjo Menent
2fc0852492 Merge pull request #3594 from GPCsolutions/select_color
[Qual] Replaced deprecated select_color()
2015-09-26 08:45:24 +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
7bdb5ec86e Merge pull request #3580 from defrance/patch-80
fix issue #3579 : bad filtering caused by statut filter
2015-09-26 08:31:24 +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
aspangaro
df0e64eb7c Fix centering on login page 2015-09-26 07:59:06 +02:00
Laurent Destailleur
9d0cd148a8 Fix duplicate log 2015-09-25 11:47:24 +02:00
Laurent Destailleur
dcf3c00023 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-09-25 11:28:59 +02:00
Laurent Destailleur
c0433928c6 FIX sortder field was missing so manually added values were moved to
begin.
2015-09-25 11:28:49 +02:00
fmarcet
b5b90d1639 FIX #3599 Not saving legal form 2015-09-25 08:50:00 +02:00
Raphaël Doursenaud
485c369d55 [Qual] Replaced deprecated form_confirm() 2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
50edf63448 [Qual] Replaced deprecated displayMarginInfos() 2015-09-24 21:05:58 +02:00
Raphaël Doursenaud
57f05e850a [Qual] Fixed typo and added hinting 2015-09-24 20:56:50 +02:00
Raphaël Doursenaud
bd7d487c79 [Qual] Do not test deprecated update_note_public() 2015-09-24 20:52:43 +02:00
Raphaël Doursenaud
c0570a7f84 [Qual] Replaced deprecated select_color() 2015-09-24 20:40:40 +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