Juanjo Menent
|
d39b6a6bfa
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-10 20:46:35 +02:00 |
|
Juanjo Menent
|
cc32b9387b
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2015-08-10 20:43:11 +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
|
e1f627ca8e
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2015-08-10 20:37:44 +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
|
c96573dcb4
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2015-08-10 20:29:36 +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 |
|
Juanjo Menent
|
e6a568bd83
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-10 12:23:40 +02:00 |
|
Juanjo Menent
|
97b69ab85e
|
Merge remote-tracking branch 'origin/3.7' into 3.8
# Conflicts:
# htdocs/compta/paiement_charge.php
|
2015-08-10 12:22:30 +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
|
3823744e8e
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-10 11:32:55 +02:00 |
|
Juanjo Menent
|
ae25846e25
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2015-08-10 11:31:38 +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
|
63d77b2ddd
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-10 11:11:43 +02:00 |
|
Juanjo Menent
|
b2f5ae7aa8
|
Merge remote-tracking branch 'origin/3.7' into 3.8
# Conflicts:
# htdocs/core/boxes/box_task.php
|
2015-08-10 11:09:22 +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
|
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
|
a11962454f
|
Best way to change ref and ref_supplier
|
2015-08-07 18:18:07 +02:00 |
|
Juanjo Menent
|
28a1612b8d
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-07 18:05:09 +02:00 |
|
Juanjo Menent
|
fd6f7dfa61
|
Fix #3355
|
2015-08-07 18:01:13 +02:00 |
|
Juanjo Menent
|
841cc0fe5e
|
Fix #3355
|
2015-08-07 17:52:21 +02:00 |
|
Juanjo Menent
|
0d1b4e6911
|
Update fr_FR and es_ES printing message. Transifex works only for develop branch...
|
2015-08-07 17:09:36 +02:00 |
|
Juanjo Menent
|
f695b5cd11
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-07 13:01:53 +02:00 |
|
Juanjo Menent
|
38afb1a4e6
|
Merge remote-tracking branch 'origin/3.7' into 3.8
# Conflicts:
# htdocs/core/modules/modBarcode.class.php
|
2015-08-07 12:57:16 +02:00 |
|
Juanjo Menent
|
12b83fd3e8
|
Fix #3304
|
2015-08-07 12:45:27 +02:00 |
|
Juanjo Menent
|
af55c8467b
|
Merge remote-tracking branch 'origin/3.8' into develop
# Conflicts:
# htdocs/printing/admin/printing.php
|
2015-08-07 10:14:30 +02:00 |
|
Juanjo Menent
|
ef6b96b4c7
|
Fix #3236
|
2015-08-07 10:12:10 +02:00 |
|
Juanjo Menent
|
9f2b4c503e
|
Fix #3236
|
2015-08-07 09:57:43 +02:00 |
|
Juanjo Menent
|
9610a493c9
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-07 09:29:36 +02:00 |
|
Juanjo Menent
|
5177c5f227
|
fix #3338 broken links on shippment card
|
2015-08-07 09:27:46 +02:00 |
|
Juanjo Menent
|
1fdf4b69f8
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-06 22:14:45 +02:00 |
|
Juanjo Menent
|
eb33624b99
|
Merge pull request #3291 from GPCsolutions/hookslogging
NEW: log hooks loading
|
2015-08-06 22:11:40 +02:00 |
|
Juanjo Menent
|
c759a9662a
|
Merge pull request #3345 from defrance/patch-72
unit price not used if qty = 1
|
2015-08-06 18:38:11 +02:00 |
|
Juanjo Menent
|
b91edcc9d7
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-06 18:30:13 +02:00 |
|
Juanjo Menent
|
761c50a885
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2015-08-06 18:22:29 +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 |
|
Juanjo Menent
|
d65d501750
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-06 18:04:42 +02:00 |
|
Juanjo Menent
|
0e49f80035
|
Merge pull request #3333 from fmarcet/3.8
FIX: Missing interventions headers
|
2015-08-06 18:03:35 +02:00 |
|
Juanjo Menent
|
98072ec73e
|
Merge remote-tracking branch 'origin/3.8' into develop
|
2015-08-06 18:00:59 +02:00 |
|
Juanjo Menent
|
0c8ed503fa
|
Merge pull request #3331 from FHenry/3.8
FIX : better fetchAll method into skeleton_class.class.php
|
2015-08-06 17:57:38 +02:00 |
|
Juanjo Menent
|
df1d997540
|
Merge pull request #3330 from IonAgorria/patch-1
Added EvalMath library to COPYRIGHT
|
2015-08-06 17:56:35 +02:00 |
|