Laurent Destailleur
|
fb70fbdc06
|
Merge pull request #3428 from marcosgdf/bug-3426
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
|
2015-08-31 00:53:04 +02:00 |
|
Marcos García de La Fuente
|
b953d2c466
|
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
Close #3426
|
2015-08-29 19:42:51 +02:00 |
|
Laurent Destailleur
|
c8f12dc5f2
|
Fix PUT method for already formated strings
|
2015-08-29 15:12:31 +02:00 |
|
Laurent Destailleur
|
a3d612a26a
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-08-29 13:45:47 +02:00 |
|
Laurent Destailleur
|
17b69e16d2
|
Fix remove a bad log reporting error when not
|
2015-08-29 13:45:23 +02:00 |
|
Juanjo Menent
|
a7d1a35a56
|
Merge pull request #3420 from aspangaro/3.7-4
Fix #3289 Salaries module shows amounts with currency symbol unlike t…
|
2015-08-28 16:12:36 +02:00 |
|
Juanjo Menent
|
0aba8a1bb1
|
Merge pull request #3421 from grandoc/grandoc_fix_27082015
Grandoc fix 27082015
|
2015-08-28 16:06:43 +02:00 |
|
philippe grand
|
6952084be3
|
it's a mess
|
2015-08-27 17:23:23 +02:00 |
|
aspangaro
|
aff134ab65
|
Fix #3289 Salaries module shows amounts with currency symbol unlike the rest of Dolibarr
|
2015-08-27 16:10:02 +02:00 |
|
philippe grand
|
e9f631d2e3
|
fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'
|
2015-08-27 14:49:12 +02:00 |
|
philippe grand
|
db7defb7c3
|
Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'"
This reverts commit 2527ae263b.
|
2015-08-27 14:43:48 +02:00 |
|
philippe grand
|
2527ae263b
|
fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'
|
2015-08-27 14:28:12 +02:00 |
|
Laurent Destailleur
|
edf05e8d94
|
Merge pull request #3404 from hregis/3.7_bug
Fix: disable hook for avoid errors when object langs is disable
|
2015-08-26 11:24:50 +02:00 |
|
Laurent Destailleur
|
feed3f714c
|
Fix to avoid warning
|
2015-08-24 11:17:11 +02:00 |
|
Regis Houssin
|
7b7fc44b46
|
Fix: disable hook for avoid errors when object langs is disable
|
2015-08-22 09:24:46 +02:00 |
|
Laurent Destailleur
|
da8e71b2c5
|
Fix #3309
|
2015-08-20 16:05:29 +02:00 |
|
Laurent Destailleur
|
1b409538a8
|
Fix #3400
Conflicts:
htdocs/core/lib/date.lib.php
|
2015-08-20 15:51:28 +02:00 |
|
Laurent Destailleur
|
c3fb14855b
|
Try a better fix to replace PR #3297
|
2015-08-20 14:34:48 +02:00 |
|
Laurent Destailleur
|
8f32e8ace8
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-08-19 17:14:21 +02:00 |
|
Laurent Destailleur
|
6e9bf70add
|
Fix bad text into file
|
2015-08-19 15:12:11 +02:00 |
|
Laurent Destailleur
|
5ed3d80103
|
Merge pull request #3385 from marcosgdf/bug-3321
FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
|
2015-08-14 18:10:28 +02:00 |
|
Laurent Destailleur
|
cacfe454a9
|
Merge pull request #3382 from hregis/3.7_bug
Fix: place the form outside the table for avoid errors
|
2015-08-14 18:09:57 +02:00 |
|
Laurent Destailleur
|
343f4086bc
|
Remove dead code
|
2015-08-14 15:12:40 +02:00 |
|
Marcos García de La Fuente
|
b3a7b44046
|
FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
Close #3321
|
2015-08-14 12:29:32 +02:00 |
|
Regis Houssin
|
fdf6c32fbc
|
Fix: place the form outside the table for avoid errors
|
2015-08-13 12:47:04 +02:00 |
|
Laurent Destailleur
|
c73fe965d2
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
|
2015-08-13 03:58:32 +02:00 |
|
Laurent Destailleur
|
1595765ec8
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2015-08-13 03:18:02 +02:00 |
|
Laurent Destailleur
|
af2d63d7e5
|
Merge pull request #3368 from marcosgdf/bug-3211
FIX [ bug #3211 ] Error about sold to pay (Montant encours)
|
2015-08-13 00:15:13 +02:00 |
|
Laurent Destailleur
|
45aed1e0aa
|
Merge branch 'marcosgdf-bug-3313' into 3.5
|
2015-08-13 00:14:17 +02:00 |
|
Laurent Destailleur
|
dc4b429a33
|
Merge branch 'bug-3313' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-3313
Conflicts:
ChangeLog
|
2015-08-13 00:13:36 +02:00 |
|
Laurent Destailleur
|
4b51fc80a6
|
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5
Conflicts:
ChangeLog
|
2015-08-13 00:06:27 +02:00 |
|
Laurent Destailleur
|
a8c2dfd445
|
Merge branch 'marcosgdf-bug-3310' into 3.5
|
2015-08-13 00:05:16 +02:00 |
|
Laurent Destailleur
|
958321b64d
|
Merge pull request #3340 from atm-maxime/3.6
Rowid was missing on expedition line so no origin id when creating an invoice
|
2015-08-12 23:39:43 +02:00 |
|
Laurent Destailleur
|
16ee7b461c
|
Merge pull request #3332 from atm-gauthier/3.7_fix_display_country_name_on_vcard
FIX : Display country name instead of country id (display country id …
|
2015-08-12 23:38:36 +02:00 |
|
Laurent Destailleur
|
d3f004d407
|
Merge pull request #3275 from marcosgdf/bug-3206
Fix: [ bug #3206 ] PropaleLigne, OrderLine and FactureLigne given to triggers through update function does not contain all the information
|
2015-08-12 23:25:29 +02:00 |
|
Juanjo Menent
|
e4a9ca8b45
|
Merge pull request #3373 from hregis/3.7_bug
Fix: missing entity in cache files names
|
2015-08-12 18:38:39 +02:00 |
|
Juanjo Menent
|
5039db3ebf
|
Merge pull request #3375 from josemariagomezroncero/patch-1
Update llx_c_type_resource.sql
|
2015-08-12 18:34:41 +02:00 |
|
josemariagomezroncero
|
e146af3118
|
Update llx_c_type_resource.sql
Error create table, missing incremet type element
|
2015-08-11 22:38:21 +02:00 |
|
Regis Houssin
|
ebe4969723
|
Fix: missing entity in cache files names
|
2015-08-11 10:22:06 +02:00 |
|
Marcos García de La Fuente
|
02f4e9f5cb
|
Merge branch '3.7' into bug-3211
# Conflicts:
# ChangeLog
|
2015-08-11 10:12:36 +02:00 |
|
Juanjo Menent
|
3108523ff2
|
Merge pull request #3361 from hregis/3.7_bug
Fix: remove custom dir creation and update script
|
2015-08-10 20:39:48 +02:00 |
|
Juanjo Menent
|
7d18adebb1
|
Merge pull request #3369 from marcosgdf/minor
Fixed minor problem with error alert when creating user
|
2015-08-10 20:35:03 +02:00 |
|
Juanjo Menent
|
b3f3cdda3a
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2015-08-10 20:16:05 +02:00 |
|
Juanjo Menent
|
374f702ef0
|
Merge pull request #3363 from marcosgdf/bug-3342
Fix [ bug #3342 ]: Taxes dictionary page does not accept localized decimals for localtax2 rate
|
2015-08-10 20:12:48 +02:00 |
|
Marcos García de La Fuente
|
e2797ddd40
|
Merge branch '3.6' into bug-3342
# Conflicts:
# ChangeLog
|
2015-08-10 17:48:18 +02:00 |
|
Marcos García de La Fuente
|
202d12ffef
|
Merge branch '3.7' into bug-3211
# Conflicts:
# ChangeLog
|
2015-08-10 17:42:38 +02:00 |
|
Juanjo Menent
|
9374b4f3e3
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2015-08-10 12:14:18 +02:00 |
|
Juanjo Menent
|
804aec3cbc
|
Merge pull request #3362 from marcosgdf/bug-3341
Fix [ bug #3341 ]: Missing translation in /compta/paiement_charge.php
|
2015-08-10 11:35:19 +02:00 |
|
Juanjo Menent
|
5f70e94905
|
Merge pull request #3360 from marcosgdf/bug-3286
Fix [ bug #3286 ]: Payment types are not translated to English
|
2015-08-10 11:25:20 +02:00 |
|
Juanjo Menent
|
1c32dcf86f
|
Merge pull request #3359 from marcosgdf/bug-3288
Fix: [ bug #3288 ] Tasks box is not properly drawn
|
2015-08-10 11:00:38 +02:00 |
|