Laurent Destailleur
|
6830fdca98
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
Conflicts:
htdocs/product/class/product.class.php
|
2016-12-18 02:12:34 +01:00 |
|
Laurent Destailleur
|
321933f267
|
Fix deletion of product
|
2016-12-18 02:10:26 +01:00 |
|
Laurent Destailleur
|
73e6663230
|
Fix help/messages for emailing to warn users.
|
2016-12-17 14:47:06 +01:00 |
|
Laurent Destailleur
|
c5db333af8
|
Fix translation of error message when sending email
|
2016-12-17 14:00:39 +01:00 |
|
Laurent Destailleur
|
534e2b1282
|
FIX Security to restrict email sending was not efficient
|
2016-12-16 13:46:39 +01:00 |
|
Laurent Destailleur
|
2c4c48ad6f
|
Better fix to add server name into email id.
|
2016-12-15 12:11:39 +01:00 |
|
Laurent Destailleur
|
e4dd020887
|
Fix bad concat
|
2016-12-14 11:23:55 +01:00 |
|
Laurent Destailleur
|
af407a094a
|
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
tracking email.
|
2016-12-14 11:20:44 +01:00 |
|
Laurent Destailleur
|
56b3f2c011
|
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
tracking email.
|
2016-12-14 10:36:11 +01:00 |
|
Laurent Destailleur
|
530d3503f5
|
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
tracking email.
|
2016-12-14 10:32:31 +01:00 |
|
Juanjo Menent
|
5c4ab99a9a
|
Merge pull request #6132 from simnandez/3.9
Fix #5646 Error editing Sell Price on products/services
|
2016-12-11 14:32:00 +01:00 |
|
Laurent Destailleur
|
7fd75c793a
|
FIX Regression when deleting product
|
2016-12-11 10:39:48 +01:00 |
|
Laurent Destailleur
|
b42a2616bc
|
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
|
2016-12-11 02:34:59 +01:00 |
|
Juanjo Menent
|
56aafa4660
|
Fix #5646 Error editing Sell Price on products/services
|
2016-12-10 23:25:13 +01:00 |
|
Laurent Destailleur
|
6e9d6b4e49
|
Merge pull request #6128 from simnandez/3.9
FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1
|
2016-12-10 23:17:33 +01:00 |
|
Juanjo Menent
|
5a2b8ff53c
|
FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1
|
2016-12-10 22:41:53 +01:00 |
|
Laurent Destailleur
|
f49d332b73
|
Merge pull request #6113 from atm-maxime/3.8
Fix : delete product was not possible if batch stock
|
2016-12-10 13:16:50 +01:00 |
|
Laurent Destailleur
|
46d84f8f11
|
Merge pull request #6111 from simnandez/3.8
Fix: Delete surplus migration file
|
2016-12-10 13:16:16 +01:00 |
|
Maxime Kohlhaas
|
97e21cb775
|
Fix : delete product was not possible if batch stock
|
2016-12-10 13:05:46 +01:00 |
|
Juanjo Menent
|
829ff2299e
|
Fix: Delete surplus migration file
|
2016-12-10 12:46:26 +01:00 |
|
Laurent Destailleur
|
c2bee0f937
|
FIX #6088
|
2016-12-07 12:44:56 +01:00 |
|
Laurent Destailleur
|
ad467989bf
|
Merge pull request #6065 from atm-florian/3.9
FIX : delete contract extrafields on contract deletion
|
2016-12-07 11:54:04 +01:00 |
|
florian HENRY
|
de5ad57af4
|
FIX : export extrafields must not include separe type
|
2016-12-02 12:02:08 +01:00 |
|
florian HENRY
|
191474a5db
|
FIX : Update intervention lline crash with PgSQL
|
2016-12-02 11:35:12 +01:00 |
|
florian HENRY
|
5b6d5df159
|
FIX : delete contract extrafields on contract deletion
|
2016-11-30 16:02:55 +01:00 |
|
Laurent Destailleur
|
196428edf5
|
FIX #6051
|
2016-11-28 16:34:38 +01:00 |
|
Laurent Destailleur
|
423391f12d
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-11-26 15:46:55 +01:00 |
|
Laurent Destailleur
|
e539842c28
|
Fix eatdate and selldate not correctly set.
|
2016-11-26 15:46:41 +01:00 |
|
Laurent Destailleur
|
ae36daefbe
|
Merge pull request #5981 from hregis/3.9_bug
Fix: missing encrypt data for llx_const
|
2016-11-12 11:01:47 +01:00 |
|
Regis Houssin
|
a1cccc021e
|
Fix: missing encrypt data for llx_const
|
2016-11-12 09:48:34 +01:00 |
|
Laurent Destailleur
|
f7e780fa9e
|
Merge pull request #5967 from marcosgdf/bug-5966
FIX #5966 Bug: getNomUrl tooltips show Proposal info even if user has no rights to read them
|
2016-11-11 14:07:10 +01:00 |
|
Laurent Destailleur
|
94544fb9ae
|
Merge pull request #5968 from philazerty/patch-6
Update companies.lang
|
2016-11-11 14:06:21 +01:00 |
|
philazerty
|
24c12df356
|
Update companies.lang
Ajout du Gabon
|
2016-11-09 12:16:41 +01:00 |
|
Marcos García de La Fuente
|
c6f96a81d1
|
Little correction
|
2016-11-09 11:30:55 +01:00 |
|
Marcos García de La Fuente
|
0b594eab59
|
FIX #5966 Bug: getNomUrl tooltips show Proposal info even if user has no rights to read them
|
2016-11-09 11:28:05 +01:00 |
|
Laurent Destailleur
|
f0151c5a4c
|
Merge pull request #5955 from hregis/3.9_bug
FIX external access of fckeditor image (external emailing)
|
2016-11-08 14:29:52 +01:00 |
|
Laurent Destailleur
|
75cc6bcf75
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-11-06 14:12:57 +01:00 |
|
Laurent Destailleur
|
f516660c0f
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2016-11-06 14:10:37 +01:00 |
|
Laurent Destailleur
|
73f0159578
|
Fix phpunit
|
2016-11-06 14:08:55 +01:00 |
|
Regis Houssin
|
e33654cc45
|
Merge remote-tracking branch 'origin/3.9' into 3.9_bug
|
2016-11-04 10:22:43 +01:00 |
|
Regis Houssin
|
718adef600
|
Fix: external access of fkeditor image with multicompany
|
2016-11-04 10:21:20 +01:00 |
|
Regis Houssin
|
8b16eeb554
|
Fix: no login are required for fckeditor (external emailing)
|
2016-11-04 10:06:53 +01:00 |
|
Laurent Destailleur
|
b8f8b6dcde
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-10-29 18:45:19 +02:00 |
|
Laurent Destailleur
|
78eaeab168
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-10-29 18:44:55 +02:00 |
|
Laurent Destailleur
|
7c3356baff
|
Merge pull request #5938 from hregis/3.9_bug
Fix: missing path of user photo
|
2016-10-29 17:58:57 +02:00 |
|
Regis Houssin
|
d0bd1d5d36
|
Fix: missing path of user photo
|
2016-10-28 14:22:06 +02:00 |
|
Juanjo Menent
|
7acc14903c
|
Merge pull request #5937 from atm-maxime/fix_supporder_vars_set
Fix : vars were not set after commande function
|
2016-10-28 11:18:15 +02:00 |
|
Juanjo Menent
|
57a8e053b4
|
Merge pull request #5936 from atm-maxime/fix_pdfmuscadet_hook_call
Fix bad parameter in hook call
|
2016-10-28 11:17:21 +02:00 |
|
Maxime Kohlhaas
|
3dbab863a7
|
Fix : vars were not set after commande function
|
2016-10-28 10:24:31 +02:00 |
|
Maxime Kohlhaas
|
be493fcf09
|
Fix bad parameter in hook call
|
2016-10-28 10:16:58 +02:00 |
|