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
|
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 |
|
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 |
|
Marcos García de La Fuente
|
8a1c5450c2
|
Fixed minor problem with error alert when creating user
|
2015-08-09 18:26:12 +02:00 |
|
Marcos García de La Fuente
|
2f6587b48e
|
FIX [ bug #3211 ] Error about sold to pay (Montant encours)
Close #3211
|
2015-08-09 18:08:22 +02:00 |
|
Marcos García de La Fuente
|
2f921b6431
|
Fix [ bug #3342 ]: Taxes dictionary page does not accept localized decimals for localtax2 rate
Close #3342
|
2015-08-09 13:46:48 +02:00 |
|
Marcos García de La Fuente
|
a24f29ba8b
|
Fix [ bug #3341 ]: Missing translation in /compta/paiement_charge.php
Close #3341
|
2015-08-09 13:37:05 +02:00 |
|
Regis Houssin
|
94ac0f5305
|
Fix: remove custom dir creation
|
2015-08-09 13:25:09 +02:00 |
|
Marcos García de La Fuente
|
e725d44565
|
Fix [ bug #3286 ]: Payment types are not translated to English
Close #3286
|
2015-08-09 13:24:23 +02:00 |
|
Marcos García de La Fuente
|
cccc543065
|
Fix: [ bug #3288 ] Tasks box is not properly drawn
Close #3288
|
2015-08-09 13:16:55 +02:00 |
|
Juanjo Menent
|
12b83fd3e8
|
Fix #3304
|
2015-08-07 12:45:27 +02:00 |
|
Juanjo Menent
|
63f62a1fa2
|
Merge pull request #3344 from fmarcet/3.7
FIX: Not showing task extrafields when creating from left menu
|
2015-08-06 18:15:30 +02:00 |
|
Juanjo Menent
|
46a9381f0b
|
Merge pull request #3335 from GPCsolutions/3.7-3322
Fix #3322 Use title for alt if no alt is provided
|
2015-08-06 18:12:25 +02:00 |
|
fmarcet
|
62ad7d4d34
|
FIX: Not showing task extrafields when creating from left menu
|
2015-08-04 13:32:44 +02:00 |
|
Raphaël Doursenaud
|
2cf9d9f583
|
Fix #3322 Use title for alt if no alt is provided
alt has priority over title, so it should be filled if title is filled.
Use the title value to fill alt.
Unit test updated accordingly.
|
2015-08-03 10:30:10 +02:00 |
|
Juanjo Menent
|
2a67bd1f38
|
Fix #3314 Display state in bank account card
|
2015-08-01 14:43:04 +02:00 |
|
Juanjo Menent
|
22b4bfd1a4
|
Merge pull request #3334 from GPCsolutions/3.6-3314
Fix #3314 Display state in bank account card
|
2015-08-01 14:40:42 +02:00 |
|
Laurent Destailleur
|
13dee1876a
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/resultat/clientfourn.php
|
2015-07-30 15:07:22 +02:00 |
|
Laurent Destailleur
|
6adc3ba604
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
|
2015-07-30 14:54:33 +02:00 |
|
Raphaël Doursenaud
|
3b9c8a685b
|
Fix #3314 Display state in bank account card
|
2015-07-29 19:29:18 +02:00 |
|
Gauthier
|
cc8eac67d9
|
FIX : Display country name instead of country id (display country id makes no sense on vcard files)
|
2015-07-29 12:29:33 +02:00 |
|
Laurent Destailleur
|
cc49b39eb6
|
Merge pull request #3329 from atm-gauthier/3.7_fix_add_user_on_event_in_create_mode
FIX : When we add an user on event in create mode, we lose linked object
|
2015-07-28 18:37:19 +02:00 |
|
Laurent Destailleur
|
c2eb47f3a1
|
Merge pull request #3325 from atm-ph/3.6_fix_timespent_id
FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE
|
2015-07-28 18:36:48 +02:00 |
|
Laurent Destailleur
|
565b0861d9
|
Merge pull request #3323 from fmarcet/3.6
Fix: Not showing product's supplier reference when page break
|
2015-07-28 18:36:01 +02:00 |
|
Laurent Destailleur
|
bd4a31c45d
|
Merge pull request #3320 from fmarcet/3.7
Fix: Not showing delivery date on rouget pdf (expedition)
|
2015-07-28 18:34:19 +02:00 |
|
Laurent Destailleur
|
c42e952ce9
|
Merge pull request #3319 from FHenry/3.7
FIX : #3318
|
2015-07-28 18:30:19 +02:00 |
|
Laurent Destailleur
|
a3b379476b
|
Merge pull request #3308 from atm-gauthier/3.7_fix_display_extraf_text_line_break
FIX : Line break display as a block
|
2015-07-28 18:19:07 +02:00 |
|
Gauthier
|
aaa9d85d07
|
FIX : When we add an user on event in create mode, we lose linked object
|
2015-07-28 17:25:33 +02:00 |
|
Gauthier
|
556d01ff8a
|
FIX : Line break display as a block
|
2015-07-28 15:14:54 +02:00 |
|
Florian HENRY
|
517e9094da
|
FIX : Avoid warning strict mode when hosting server do not have
php5_curl installed
|
2015-07-27 22:34:30 +02:00 |
|
Florian HENRY
|
d78292b9af
|
FIX : if multicompany enabled, call to undifend method _setCookie
instead of setCookie
|
2015-07-27 22:08:33 +02:00 |
|
phf
|
824da6d2b0
|
FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE
|
2015-07-27 17:38:27 +02:00 |
|
fmarcet
|
6676114501
|
Fix: Not showing product supplier reference when page break
|
2015-07-27 16:31:40 +02:00 |
|
fmarcet
|
e130af8033
|
Fix: Not showing delivery date on rouget pdf (expedition)
|
2015-07-27 13:11:07 +02:00 |
|
Florian HENRY
|
c0412acdea
|
FIX : #3318
|
2015-07-27 13:03:47 +02:00 |
|
Laurent Destailleur
|
6b2d7f7d19
|
Merge pull request #3200 from atm-maxime/3.5
Fix #3188 SQL error if qty or discount is not a number on proposal ad…
|
2015-07-23 22:53:44 +02:00 |
|