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 |
|
Laurent Destailleur
|
5e7c72068d
|
Merge pull request #5923 from olsesacl/#5907
FIX: #5907 No translation string for PDF Proposal
|
2016-10-26 10:56:15 +02:00 |
|
Sergio Sanchis Climent
|
2a4517e1bc
|
FIX: #5907
|
2016-10-24 19:21:41 +02:00 |
|
Laurent Destailleur
|
e4da87d31c
|
Merge pull request #5903 from atm-gauthier/FIX_thirdparty_margin
FIX : margin tab on customer card must filter on current entity invoices
|
2016-10-24 03:18:37 +02:00 |
|
Laurent Destailleur
|
acf8874c6a
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
Conflicts:
htdocs/core/lib/functions.lib.php
|
2016-10-24 02:11:49 +02:00 |
|
Laurent Destailleur
|
a6c2758ca2
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
Conflicts:
htdocs/core/lib/functions.lib.php
|
2016-10-24 02:10:17 +02:00 |
|
Laurent Destailleur
|
adb05ec05b
|
Merge pull request #5887 from simnandez/3.9
Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x
|
2016-10-24 01:01:42 +02:00 |
|
Laurent Destailleur
|
fe71c0cb2d
|
Merge pull request #5886 from simnandez/3.8
Fix: Bad localtaxes calc for Spain if VAT is 0
|
2016-10-24 01:01:04 +02:00 |
|
gauthier
|
a814e02d53
|
FIX : margin tab on customer card must filter on current entity invoices
|
2016-10-21 12:40:19 +02:00 |
|
Juanjo Menent
|
f28c7bbc6d
|
Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x
|
2016-10-18 10:20:09 +02:00 |
|
Juanjo Menent
|
6a944bb6a3
|
Fix: Bad localtaxes calc for Spain if VAT is 0
|
2016-10-18 10:11:42 +02:00 |
|
Laurent Destailleur
|
47ed731242
|
Fix group by
|
2016-10-17 10:37:01 +02:00 |
|
Laurent Destailleur
|
ab34885a89
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-10-16 18:34:31 +02:00 |
|
Laurent Destailleur
|
3d1ddbb923
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-10-16 18:34:20 +02:00 |
|
Juanjo Menent
|
87e8ac51be
|
Merge pull request #5843 from simnandez/3.8
FIX: Error when CATEGORIE_RECURSIV_ADD is enabled and new category is daughter of an already linked to object
|
2016-10-15 17:18:35 +02:00 |
|
Laurent Destailleur
|
dda248cb57
|
Merge pull request #5870 from olsesacl/#5340
FIX: #5340 Importing Tiers problem with capital field
|
2016-10-15 02:16:00 +02:00 |
|
Sergio Sanchis Climent
|
567f7e5365
|
FIX: #5340
|
2016-10-14 00:43:10 +02:00 |
|
Juanjo Menent
|
ffd486e3d6
|
Fix #5843 best way fixing
|
2016-10-07 22:54:08 +02:00 |
|
Juanjo Menent
|
45dfb8ca62
|
Fix #5843 best way fixing
|
2016-10-07 22:32:11 +02:00 |
|
Juanjo Menent
|
298e5cee61
|
Fix #5843 best way fixing
|
2016-10-07 22:21:50 +02:00 |
|
Juanjo Menent
|
b7b18e3355
|
FIX: Error when CATEGORIE_RECURSIV_ADD is enabled and new category is daughter of an already linked to object
|
2016-10-07 10:12:25 +02:00 |
|
Laurent Destailleur
|
b19b624908
|
Merge pull request #5834 from simnandez/3.8
FIX: only show projects of related third if external user
|
2016-10-06 23:58:24 +02:00 |
|
Laurent Destailleur
|
02f4f6d039
|
Merge pull request #5839 from atm-florian/3.9
FIX : missing column into SQL on thridparty list
|
2016-10-06 23:56:18 +02:00 |
|
florian HENRY
|
ee20704a8a
|
FIX : missing column into SQL on thridparty list
|
2016-10-05 17:20:56 +02:00 |
|
Juanjo Menent
|
56245e2c9a
|
FIX: only show projects of related third if external user
|
2016-10-04 16:51:44 +02:00 |
|
Laurent Destailleur
|
0b49d6316e
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-09-29 10:48:14 +02:00 |
|
Laurent Destailleur
|
a90111cbf3
|
Merge pull request #5804 from simnandez/3.8
FIX: Failed to export contact categories with contact extra fields
|
2016-09-28 18:18:29 +02:00 |
|
Juanjo Menent
|
30050b51f0
|
FIX: Failed to export contact categories with contact extra fields
|
2016-09-28 10:15:41 +02:00 |
|
Laurent Destailleur
|
5d7f182f59
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
|
2016-09-26 14:14:56 +02:00 |
|