Commit Graph

51549 Commits

Author SHA1 Message Date
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
Florian HENRY
80f19de223 fix && vs and 2015-11-19 16:32:25 +01:00
Frédéric FRANCE
6c8ac1e95c typo 2015-11-19 16:31:55 +01:00
Frédéric FRANCE
3a2cb63575 Update list.php 2015-11-19 16:20:06 +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
philippe grand
4f280f63d0 [Qual] Uniformize code 2015-11-19 13:59:58 +01:00
Florian HENRY
0c4f7a1b22 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-11-19 12:55:20 +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
Juanjo Menent
3094f9ed32 Merge pull request #4032 from grandoc/develop
[Qual] Uniformize code
2015-11-18 23:05:04 +01:00
Juanjo Menent
5218501c04 Merge pull request #4024 from defrance/patch-81
bad limittoshow usage
2015-11-18 22:31:57 +01:00
Juanjo Menent
9ecdfa8be8 Merge pull request #4017 from apachler/develop
added Regions, Departements and Forme Juridique for Austria
2015-11-18 22:04:19 +01:00
Frédéric FRANCE
dfdc220c6b Update list.php 2015-11-18 18:16:03 +01:00
Frédéric FRANCE
c647ad6425 Update list.php 2015-11-18 18:15:02 +01:00
Frédéric FRANCE
fe7cc95efd Update list.php 2015-11-18 18:13:19 +01:00
fmarcet
f615927d24 FIX Not use localtaxes when invoice some orders 2015-11-18 17:56:04 +01:00
arnaud
85a58f666a FIX product link in project box 2015-11-18 17:22:53 +01:00
philippe grand
42ed3d2bb7 [Qual] Uniformize code 2015-11-18 16:05:41 +01:00
philippe grand
209ec62bfe Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-11-18 15:45:03 +01:00
Florian HENRY
fbe8a181a9 fix pgsql 2015-11-18 14:03:25 +01:00
fmarcet
0cbf8ca1dd FIX #3726 When upload file, don't test if PRODUCT_USE_OLD_PATH_FOR_PHOTO
variable is empty or not
2015-11-18 13:59:25 +01:00
Laurent Destailleur
735c7b7d68 Code comment 2015-11-18 13:57:01 +01:00
Florian HENRY
0ffc2a226c fix pg migration script 2015-11-18 13:53:04 +01:00
Laurent Destailleur
fbd1d2360f Comment 2015-11-18 13:42:38 +01:00
Laurent Destailleur
5c6f7425f1 FIX: List of user to assign a task is not visible 2015-11-18 13:23:01 +01:00
Florian HENRY
28196a5fd9 add pgsql function 2015-11-18 12:24:52 +01:00
aspangaro
1e4d8ec104 New: HRM #3699 Add address informations in user card 2015-11-18 06:34:08 +01:00
aspangaro
ad457b416d Use menu & add mode 'employee' in user/index.php 2015-11-17 22:51:34 +01:00
aspangaro
96d97657fd Remove obsolete code 2015-11-17 22:17:18 +01:00
aspangaro
258ac45519 Remove obsolete code 2015-11-17 22:14:39 +01:00
aspangaro
1f9960d1bb Remove info on employee card 2015-11-17 21:25:07 +01:00
aspangaro
c7df6c15a2 Different display if employee mode 2015-11-17 21:22:45 +01:00
aspangaro
b7b25c9682 Remove some code 2015-11-17 21:04:11 +01:00
aspangaro
a5ca6cb732 Merge remote-tracking branch 'Upstream/develop' into develop-hrm3 2015-11-17 20:34:37 +01:00
Nikos Drosis
5082b1cc66 Fix for utf-8 characters in the mask mercure 2015-11-17 20:22:27 +02:00
Laurent Destailleur
683ad24ece Take number of entry into top menu to defined the trigger to change size
of top menu thumbs
2015-11-17 19:16:40 +01:00
Laurent Destailleur
b1c5768de9 NEW Add fields into llx_cronjobs to be able to use job table to queue
one shot jobs.
2015-11-17 18:22:39 +01:00