gRoussac
008c6ce759
[-] FO : Fix bug #PSCFV-10497 cart_block hooked on column disappearing
2013-10-08 18:37:50 +02:00
gRoussac
85946bacbe
// small cast
2013-10-08 18:35:56 +02:00
Gregory Roussac
cd8af9ae67
Merge pull request #824 from Prestaworks/patch-14
...
[-] BO : Fixes issue where path is not printed when error with email template saves occur.
2013-10-08 05:57:21 -07:00
Daniel
fa88a0bd93
Update AdminTranslationsController.php
...
Fixes issue where path is not printed when error with email template saves occur.
2013-10-08 20:54:52 +08:00
Rémi Gaillard
2899dfba5e
// Fix AdminTranslationsController::addNewTabs()
2013-10-08 14:53:02 +02:00
Krystian Podemski
ae7d33effe
[*] CORE: Add phone_mobile to address format
...
I honestly do not know why you decided by default to show only the first field of the phone :)
Users often ask me why they don't see their mobile phone on orders in BO.
2013-10-08 11:11:24 +02:00
gRoussac
e4a642128a
[-] FO : Fix bug #PSCFV-10606 could not have correct taxCalculationMethod when vat number in customer address
2013-10-08 11:09:52 +02:00
Zollner Robert
30adb0932d
[-] BO : pass correct typed parameter to setCurrency
2013-10-07 23:42:26 +03:00
Rémi Gaillard
7d0e9a5f06
// Fix double entities on AdminLog listing #PSCFV-10472
2013-10-07 19:37:58 +02:00
Gregory Roussac
4daaa206d2
Merge pull request #818 from cedricfontaine/patch-2
...
[-] MO : Price should apply tax as in configuration.
2013-10-07 09:55:35 -07:00
Gregory Roussac
644e38c05f
Merge pull request #817 from cedricfontaine/patch-1
...
[-] MO :Loyalty voucher should be without taxes, otherwise points would be negative.
2013-10-07 09:54:22 -07:00
Francois Gaillard
77b2b4b6ca
// Manual merge PS 1.5.6.0
2013-10-07 18:22:55 +02:00
cedricfontaine
d63288affd
Update loyalty.php
...
Price should apply tax as in configuration.
2013-10-07 12:14:13 -04:00
Damien Metzger
c51fe5b22d
// Changelog 1.5.6.0
2013-10-07 18:07:25 +02:00
cedricfontaine
717e195f57
Update LoyaltyModule.php
...
Voucher should be without taxes, otherwise points would be negative.
2013-10-07 12:07:03 -04:00
Gregory Roussac
f78a093a1c
Merge pull request #815 from PrestanceDesign/development
...
[*] TR : Italian translation of the country instead of English
2013-10-07 08:39:39 -07:00
PrestanceDesign
f9f5a4b090
Italian translation of the country instead of English
2013-10-07 16:45:22 +02:00
Gregory Roussac
92ffb1eab1
Merge pull request #812 from djfm/release
...
[*] TR : updated Russian installer
2013-10-07 03:25:42 -07:00
Francois Gaillard
f4610c06e0
[-] BO : Bug fix - Modules confirmation messages
2013-10-07 12:21:16 +02:00
Francois Gaillard
68cba08303
[-] BO : Bug fix - Modules confirmation messages
2013-10-07 12:18:44 +02:00
djfm
2969a7f74c
// updated Russian installer
2013-10-07 10:14:43 +00:00
Rémi Gaillard
1ed26e2d4e
// default perms profiles
2013-10-07 12:13:59 +02:00
gRoussac
302260539b
// Report from https://github.com/Lupul/PrestaShop/commit/ebf09792e95598c30d8ac2617c4eabdd571be475
2013-10-07 12:08:39 +02:00
gRoussac
d125ca0a36
[-] FO : isVirtualCart was forced to false
2013-10-07 12:06:28 +02:00
gRoussac
adb1779764
[-] FO : isVirtualCart was forced to false
2013-10-07 12:02:47 +02:00
Fabio Chelly
a652590885
Merge remote-tracking branch 'origin/development' into development
2013-10-07 11:34:56 +02:00
Fabio Chelly
2515d81bdd
[*] BO Module search: Quick search can now search modules by name and not only display name
2013-10-07 11:34:16 +02:00
Gregory Roussac
bf65404413
Merge pull request #810 from studiokiwik/sk-ps15x-001
...
[-] MO : button tag on line 56 weren't closed
2013-10-07 02:29:19 -07:00
gRoussac
e3db5570d0
[-] BO : Retro compat, PS_ADMIN_DIR not defined //bad commit sorry
2013-10-07 11:24:42 +02:00
Gregory Roussac
68131dc28b
Merge pull request #811 from studiokiwik/sk-ps15x-002
...
[-] TR : typo fixed in polish installer translation (line 85)
2013-10-07 01:59:10 -07:00
gRoussac
7a7da1097d
[-] BO : Employee's default_tab may not exists, switching to AdminOrders
2013-10-07 10:53:03 +02:00
gRoussac
df0a24d63c
[-] BO : Retro compat, PS_ADMIN_DIR not defined
2013-10-07 10:47:41 +02:00
Tomasz Slominski
4254ae6edc
typo fixed in polish installer translation (line 85)
2013-10-07 10:05:43 +02:00
Vincent Augagneur
3f4f298ad4
[-] CORE fixed bug #PSCFV-10595 - small fix in function addJqueryPlugin()
2013-10-07 10:01:26 +02:00
Gregory Roussac
2a475d066f
Merge pull request #803 from ldecoker/patch-8
...
[-] BO : Missing $php_self variable in OrderDetailController.php
2013-10-07 01:00:42 -07:00
Tomasz Slominski
b941ac007b
bugfix: button tag on line 56 weren't closed
2013-10-07 09:57:55 +02:00
Damien Metzger
d6ffb45eb1
Merge pull request #809 from djfm/kill_miss
...
[*] LO : Removed 'Miss' from the default genders because too country specific
2013-10-07 00:57:13 -07:00
djfm
b6bba0c787
[*] LO : Removed 'Miss' from the default genders because too country specific
2013-10-07 07:53:19 +00:00
Rémi Gaillard
3477cac1e0
Merge pull request #800 from Ha99y/20131004_retro-compat.js.php
...
__DIR__ is available since PHP 5.3
2013-10-07 00:35:02 -07:00
indesign47
d3d0897012
[-] MO : productcomments round average up not down
...
200 comments with 5 stars and only 1 with 4 stars give only 4 stars
Thanks to manit4c
2013-10-07 04:02:42 +02:00
indesign47
e0978a0b84
[-] MO : productcomments errors translated in multi-language
2013-10-07 03:18:56 +02:00
ldecoker
148348855e
Update OrderDetailController.php
...
Missing $php_self variable
2013-10-06 16:31:54 +02:00
indesign47
b61e3e68b9
Update AdminImportController.php
2013-10-05 10:50:19 +02:00
ha99y
98aea24fc3
__DIR__ was never defined
...
The JS files would not lode, when in dev mode because __DIR__ was not
defined
2013-10-04 17:18:23 -07:00
Zollner Robert
1787923c4c
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency (changed NULL to lowercase)
2013-10-05 00:42:29 +03:00
Zollner Robert
481cb5c28a
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency
2013-10-04 23:30:24 +03:00
Rémi Gaillard
b2b0c4f00b
// remove debug
2013-10-04 18:45:18 +02:00
Rémi Gaillard
2aee99c0b0
[-] FO: Fix display of quantity discounts on product pages if the customer is allowable for multiple discount for the same quantity #PSCFV-10580
2013-10-04 18:37:30 +02:00
Fabio Chelly
48f20a4393
Merge remote-tracking branch 'origin/development' into development
2013-10-04 18:15:32 +02:00
Fabio Chelly
139a74e4cd
[*] BO Module search: the PHP search has been replace by a quick search in JS to display results instantly
2013-10-04 18:15:12 +02:00
gRoussac