Laurent Destailleur
|
e3c6e4ebe5
|
NEW Add planned workload and declared progress on project summary list
on project home page (data aggregated from tasks of project)
|
2015-11-21 20:00:38 +01:00 |
|
Laurent Destailleur
|
7b0a9fabab
|
FIX Order last name / firstname in user list must be done according to
option
|
2015-11-21 18:26:25 +01:00 |
|
Laurent Destailleur
|
c15c0f6fbb
|
Minor css fix
|
2015-11-21 15:31:27 +01:00 |
|
Laurent Destailleur
|
548ff26628
|
Focus on textarea works also when ckeditor is on
|
2015-11-21 13:42:01 +01:00 |
|
Laurent Destailleur
|
2a345b6fc0
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/admin/company.php
htdocs/admin/menus/edit.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
|
2015-11-21 12:48:41 +01:00 |
|
Laurent Destailleur
|
758b8e1f7e
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/core/boxes/box_project.php
|
2015-11-21 12:32:03 +01:00 |
|
Laurent Destailleur
|
c04743aa84
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2015-11-21 12:23:51 +01:00 |
|
Laurent Destailleur
|
69757210ce
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-21 02:40:21 +01:00 |
|
Laurent Destailleur
|
2eba3c9e81
|
Comment
|
2015-11-21 02:39:49 +01:00 |
|
Laurent Destailleur
|
30f0b6e2e8
|
Merge pull request #4046 from marcosgdf/bug-4016
FIX #4016 User link is not correctly formed in emailing receivers
|
2015-11-21 02:14:08 +01:00 |
|
Laurent Destailleur
|
c77eaeaa77
|
Merge pull request #4040 from atm-arnaud/3.6_fix_export_category_contact
FIX export with category contact extrafields
|
2015-11-21 02:09:32 +01:00 |
|
Laurent Destailleur
|
94fdff9a46
|
Merge pull request #4045 from marcosgdf/bug-4043
FIX #4043 Incorrect translation in error mesage in menu creation admin page
|
2015-11-21 02:08:55 +01:00 |
|
Laurent Destailleur
|
07d24a9a05
|
Merge pull request #4044 from atm-arnaud/3.7_fix_project_box_nb_task
FIX Nb of tasks and percent progress in box project
|
2015-11-21 02:08:00 +01:00 |
|
Laurent Destailleur
|
bfaa8d539f
|
Merge pull request #4039 from frederic34/patch-9
typo
|
2015-11-21 01:51:56 +01:00 |
|
Laurent Destailleur
|
60724df496
|
Merge pull request #4038 from atm-maxime/develop
NEW add info page on product card
|
2015-11-21 01:51:32 +01:00 |
|
Laurent Destailleur
|
9db71098ac
|
Merge pull request #4031 from FHenry/develop
PG SQL
|
2015-11-21 01:50:47 +01:00 |
|
Laurent Destailleur
|
1bea9917c4
|
Introduce version on resource link, so no cache effect after upgrading
|
2015-11-21 00:52:20 +01:00 |
|
Laurent Destailleur
|
a79e8d33f1
|
FIX Bad meteo icon
|
2015-11-21 00:43:35 +01:00 |
|
Laurent Destailleur
|
97dc4c346b
|
Merge pull request #4026 from aspangaro/develop-hrm
New: FR #3699 HRM Add address informations in user card
|
2015-11-21 00:27:29 +01:00 |
|
Laurent Destailleur
|
45d6635bf6
|
Merge pull request #4025 from ndrosis/3.8
FIX utf-8 characters in the mask mercure does not break counter
|
2015-11-21 00:26:38 +01:00 |
|
Laurent Destailleur
|
611d8f3e86
|
Merge pull request #4021 from defrance/patch-75
add odt feature on supplier admin page
|
2015-11-21 00:24:15 +01:00 |
|
Laurent Destailleur
|
a906774595
|
Merge pull request #3979 from atm-alexis/3.9_NEW_add_billed_status_for_supplier_order
NEW 3.9 add billed status for supplier order
|
2015-11-21 00:20:17 +01:00 |
|
Laurent Destailleur
|
bf2af33b89
|
Merge pull request #4015 from ParisLiakos/develop
Add a trigger for product translation deletion
|
2015-11-21 00:19:40 +01:00 |
|
Laurent Destailleur
|
925b6a7c98
|
Merge pull request #4014 from frederic34/patch-8
Update list.php
|
2015-11-21 00:18:42 +01:00 |
|
Laurent Destailleur
|
5e0b5cb75d
|
Merge pull request #4009 from frederic34/patch-7
Update list.php
|
2015-11-21 00:18:29 +01:00 |
|
Laurent Destailleur
|
e12760bb48
|
Merge pull request #3995 from frederic34/patch-5
Update list.php
|
2015-11-21 00:18:14 +01:00 |
|
Laurent Destailleur
|
552ecbcd95
|
Merge pull request #3964 from aspangaro/develop-hrm3
HRM : Work in progress
|
2015-11-21 00:14:41 +01:00 |
|
Laurent Destailleur
|
401b2a7389
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/theme/md/style.css.php
|
2015-11-20 23:47:07 +01:00 |
|
Laurent Destailleur
|
db27e08b7d
|
Work on md style
|
2015-11-20 23:45:31 +01:00 |
|
Marcos García de La Fuente
|
2dedea8736
|
FIX #4016 User link is not correctly formed in emailing receivers
|
2015-11-20 22:03:44 +01:00 |
|
Marcos García de La Fuente
|
5dba9ef54e
|
FIX #4043 Incorrect translation in error mesage in menu creation admin page
|
2015-11-20 22:00:11 +01:00 |
|
Drosis Nikos
|
ee4eb13fff
|
Update functions2.lib.php
|
2015-11-20 19:05:00 +02:00 |
|
arnaud
|
07226d32ec
|
FIX NB task and percent progress in box project
|
2015-11-20 16:11:48 +01:00 |
|
Florian HENRY
|
b8af7625ff
|
fix new extrafields feature
|
2015-11-20 15:29:31 +01:00 |
|
Florian HENRY
|
87c9132a6d
|
avoid error
|
2015-11-20 13:59:58 +01:00 |
|
Florian HENRY
|
101b45e397
|
Continue extrafeild $ID$ and select feature
|
2015-11-20 13:52:47 +01:00 |
|
Florian HENRY
|
b8cab9f4d9
|
continue extrafeild $ID$ and SELECT feature
|
2015-11-20 13:51:57 +01:00 |
|
Florian HENRY
|
4ff0c22e29
|
continue extrafield ID filter
|
2015-11-20 13:22:45 +01:00 |
|
Florian HENRY
|
eac28076c9
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-20 11:59:39 +01:00 |
|
Florian HENRY
|
1566be35a1
|
NEW : add $ID$ into extrafields management to allow use current object
id on filter for select list from table and checkbox list from table
|
2015-11-20 11:59:28 +01:00 |
|
arnaud
|
4233d24f4b
|
FIX export with category contact extrafields
|
2015-11-19 18:01:58 +01:00 |
|
Frédéric FRANCE
|
47485b39ce
|
Update commande.class.php
|
2015-11-19 16:41:11 +01:00 |
|
Frédéric FRANCE
|
6c8ac1e95c
|
typo
|
2015-11-19 16:31:55 +01:00 |
|
Maxime Kohlhaas
|
9c1545bc1b
|
NEW add info page on product card
|
2015-11-19 14:45:05 +01:00 |
|
Maxime Kohlhaas
|
826592c480
|
Fix info and banner on societe
|
2015-11-19 14:43:00 +01:00 |
|
Maxime Kohlhaas
|
e4125c9802
|
NEW : info function for product card
|
2015-11-19 14:26:32 +01:00 |
|
aspangaro
|
98d5f21787
|
Debug state
|
2015-11-19 06:21:37 +01:00 |
|
Juanjo Menent
|
a627e32fca
|
Merge pull request #4034 from fmarcet/3.7
FIX Not use localtaxes when invoice some orders
|
2015-11-18 23:07:24 +01:00 |
|
Juanjo Menent
|
1f8b05264f
|
Merge pull request #4030 from fmarcet/3.8
FIX #3726 When upload file, don't test PRODUCT_USE_OLD_PATH_FOR_PHOTO
|
2015-11-18 23:07:04 +01:00 |
|
Juanjo Menent
|
6c379029fa
|
Merge pull request #4033 from atm-arnaud/3.7_fix_project_box
FIX product link in project box
|
2015-11-18 23:06:08 +01:00 |
|