010ad76e6f
Merge remote-tracking branch 'origin/development' into development
2013-10-23 10:55:35 +02:00
5fd3ad5adf
[*] FO ProductSale: improves calculation of most selled products when there are a lot of products in shop
2013-10-23 10:55:23 +02:00
6cddb57ce3
[-] BO: Synchronize stock available after receipt supply order items #PSCFV-10724
2013-10-23 10:34:00 +02:00
ae63336a37
[-] BO : Fix bug #PSCFV-10638, Admin Import by reference moves products to home category
2013-10-23 01:41:05 +02:00
feca06417f
// definition on addFeatureValueImport
2013-10-23 01:23:35 +02:00
5d28d38a22
[-] BO : Fix bug #PSCFV-7907 AdminImport, add custom field to features
2013-10-23 01:18:09 +02:00
398548fecf
Merge pull request #864 from samy-r/features-duplication-escaping
...
[-] CORE : pSQL for feature values
2013-10-22 10:20:44 -07:00
83d4d0d258
Merge pull request #872 from ldecoker/patch-11
...
[-] PDF : {else if} instead of {elseif} (B2B invoice template)
2013-10-22 10:19:31 -07:00
c401e61b81
Merge pull request #871 from ldecoker/patch-10
...
[-] PDF : {else if} instead of {elseif}
2013-10-22 10:18:57 -07:00
5bb4d48ddd
Merge pull request #870 from djfm/development
...
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-22 10:17:11 -07:00
e557db6429
Merge pull request #866 from studiokiwik/sk-ps15x-007
...
[-] MO : Loyalty if customer is logged do not recreate it
2013-10-22 10:15:55 -07:00
ce4170574c
[PDF] [-] {else if} instead of {elseif} (B2B invoice template)
2013-10-22 18:57:12 +02:00
e6e2db8400
[PDF] [-] {else if} instead of {elseif}
2013-10-22 18:55:32 +02:00
70d2e6e10b
Merge pull request #868 from ldecoker/patch-8
...
[-] BO : Notices onBO translation page
2013-10-22 08:03:06 -07:00
7cbaada844
[BO][-] Notice messages when accessing the BO translation page
...
When accessing the translation part with "core translation" , you got 2 errors:
Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in controllers\admin\AdminTranslationsController.php on line 1018
Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in \controllers\admin\AdminTranslationsController.php on line 1026
It's because the variable $this->theme_selected is not set for that case.
2013-10-22 17:00:56 +02:00
bc7e8eb355
Merge pull request #867 from PhpMadman/patch-4
...
[-] FO: Removed missplaced </li> on mobile theme
2013-10-22 07:50:21 -07:00
bc38b542fe
Merge remote-tracking branch 'origin/development' into development
2013-10-22 15:53:43 +02:00
2989538ce1
[*] BO Module mailalerts: send e-mail to merchand when product is out of stock
2013-10-22 15:53:20 +02:00
e857fb5978
[*] FO: Removed missplaced </li> on mobile theme
2013-10-22 13:34:52 +02:00
1ae587475b
[-] MO : Fix bug #PSCFV-10787, cms associated to all shops
2013-10-22 12:19:58 +02:00
d20aea0563
[-] BO : Fix bug #PSCFV-10767, could not retrieve feature value when product IDs not forced
2013-10-22 11:27:45 +02:00
ce8d01ad4c
[-] MO : if customer is logged we do not recreate it
2013-10-22 11:09:53 +02:00
2aa52356ad
[-] BO : Fix bug #PSCFV-10607 one upload name
2013-10-22 09:39:59 +02:00
c1ecf43be8
[-] MO : Fix bug #PSCFV-10775, could not upload .jpeg in TinyMCE
2013-10-21 17:39:20 +02:00
16ffbd8ee5
// norms
2013-10-21 16:46:22 +02:00
61884ec223
// norms
2013-10-21 16:31:56 +02:00
a05c748e81
// addJqueryPlugin receives array in first argument
2013-10-21 15:05:03 +02:00
a9e45fccf3
[-] MO : ScrollTo not loaded
2013-10-21 14:35:23 +02:00
d25b41ef97
[-] BO : wrong csv files name
2013-10-21 14:34:59 +02:00
5d8c0a0fc2
duplicateFeatures doesn't protect feature values
...
The features values are not protected using pSQL during the features
duplication
2013-10-21 14:08:30 +02:00
15cd0b9fbc
[-] BO : Report of https://github.com/PrestaShop/PrestaShop/commit/fd86a29c5c369ec5da0f91bbe97c584a00d02d0d
2013-10-21 12:21:49 +02:00
3dea171047
Merge pull request #862 from PhpMadman/patch-3
...
[-] PDF : Removed unused code in FrontOffice PDF Invoice
2013-10-21 01:15:39 -07:00
35df3f463c
Removed unsed code
...
I looked through the code. And I can't see that that code is used. everything is handled in PDF class.
2013-10-21 10:10:28 +02:00
198e75245d
[-] FO: Don't auto detect language if it not associated to the shop #PSCFV-10273
2013-10-21 09:41:00 +02:00
8ef22c3548
Merge pull request #823 from kpodemski/patch-8
...
[*] IN: Add phone_mobile to address format
2013-10-20 16:40:16 -07:00
9b8a7edad8
// small refacto
2013-10-21 01:05:18 +02:00
332c8ff49f
[-] CORE : Fix bug #PSCFV-10687 again, #PSCFV-10752 replaceAccentedChars() // sorry for that
2013-10-21 00:28:41 +02:00
c9d20f35b3
// norms
2013-10-21 00:00:17 +02:00
f2d70076bd
[-] : Fix bug #PSCFV-4859, could not register invoice address or invoice country in OPC as guest, and phone not required in standard registration
2013-10-20 23:52:48 +02:00
c36625a136
Merge pull request #851 from PrestanceDesign/patch-1
...
[*] BO : Adding a title tag to display the module name on hover like PS ...
2013-10-18 09:42:57 -07:00
5daa79c1e1
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-10-18 18:36:51 +02:00
8ef1e043af
[*] BO : chmod 664 to config.xml file
2013-10-18 18:36:30 +02:00
6965bb29c1
[*] BO : Adding a title tag to display the module name on hover like PS 1.4
2013-10-18 18:20:15 +02:00
72ccc90cc9
Merge remote-tracking branch 'origin/development' into development
2013-10-18 17:49:14 +02:00
7133e74c17
[-] MO mailalerts: module mailalerts shows all messages regarding the order
...
PNM-1632 - MailAlert does not show Paypal error message if order has comments
2013-10-18 17:49:00 +02:00
2e2151a1bb
[-] CORE : error_get_last > PHP 5.1
2013-10-18 15:29:12 +02:00
8a682081de
// typo
2013-10-18 12:17:51 +02:00
6747d3bbac
[-] BO: Default country should be overriden in the context in multishop
2013-10-18 10:23:06 +02:00
b8273a13e6
//
2013-10-17 18:30:22 +02:00
3a38af9982
[-] FO : Could not redirect back to url in adress.php
2013-10-17 14:16:54 +02:00
Fabio Chelly