Commit Graph

2662 Commits

Author SHA1 Message Date
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
Frédéric FRANCE
7da49a3592 Add badge for number of files in bank's tab 2015-10-03 12:09:42 +02:00
Laurent Destailleur
10b481f47f Fix colspan 2015-10-03 11:15:12 +02:00
Frédéric FRANCE
d451051d97 can't access documents for bank 2015-10-02 16:29:54 +02:00
Laurent Destailleur
43f09dfccf Work on theme 2015-10-02 16:26:08 +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
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
Laurent Destailleur
1108656d19 NEW Can set color of the highlight hover line 2015-09-29 15:58:24 +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
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
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
Juanjo Menent
4fa1be0e35 Issue #3509: Init works 2015-09-26 10:37:36 +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
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
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
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
aspangaro
9b97e31a09 Merge remote-tracking branch 'Upstream/develop' into develop-67 2015-09-23 21:09:28 +02:00
Laurent Destailleur
95daf14725 Merge branch 'patch-73' of https://github.com/defrance/dolibarr into
defrance-patch-73

Conflicts:
	htdocs/core/lib/functions.lib.php
2015-09-23 19:21:59 +02:00
tysauron
f3a28682ea For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE 2015-09-23 18:26:50 +02:00
Alexis Algoud
2d35124c71 FIX no need to remove file into mail form, the temp dir will be deleted after any sending 2015-09-23 11:11:19 +02:00
aspangaro
918c323f8f Salaries : Add info card / add field datec / rename field user_creat to user_author 2015-09-23 06:37:14 +02:00
tysauron
f8f50b3071 For not error Undefined property: stdClass::$MAIN_AGENDA_EXPORT_CACHE 2015-09-23 01:24:30 +02:00
tysauron
f1ab0d36c5 Chmod new file not old file 2015-09-23 00:32:30 +02:00
Laurent Destailleur
33f1dfd6f0 Merge pull request #3568 from tysauron/patch-4
Chmod new file not old file
2015-09-23 00:31:52 +02:00
tysauron
2d237cadc9 Chmod new file not old file 2015-09-22 22:37:31 +02:00
Laurent Destailleur
72d7671a1e Enhance CSS 2015-09-22 16:21:46 +02:00
Laurent Destailleur
58a734cb17 Firstname only on login 2015-09-21 17:28:11 +02:00
Laurent Destailleur
0821f18712 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-18 21:50:10 +02:00
Laurent Destailleur
5f507cbbd8 Fix missing closing div making jmobile crazy 2015-09-18 20:23:06 +02:00
Laurent Destailleur
f72f652d98 FIX Pb into pagination scroll widget
FIX Style of previous-next card when using dolidroid
2015-09-18 15:51:27 +02:00
Laurent Destailleur
872b59f568 NEW: Add experimental option PDF_ALLOW_HTML_FOR_FREE_TEXT to be able to
enter pdf footer text with wysiwyg editor.
2015-09-18 12:34:36 +02:00
Laurent Destailleur
a4ab5f5552 Restore manual install of ckeditor. It seems upgrade with phpcomposer
make some plugins not working.
2015-09-18 12:10:47 +02:00
Laurent Destailleur
9cbd236c8c Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
Marcos García de La Fuente
3818bff86a Fix: [ bug 1776 ] Undefined $deliverycompany variable in pdf_build_address 2015-09-16 12:49:05 +02:00
Laurent Destailleur
813667e564 Debug swith of ckeditor theme 2015-09-15 17:45:40 +02:00