837ca34e7e
[-] Core: Product::getPriceStatic called with 1 quantity return the specific price for 1 qty if called with id_cart = 0
2013-10-15 10:30:48 +02:00
dec9ef40a8
Merge pull request #841 from indesign47/patch-10
...
[+] BO : AdminImport add entity Alias
2013-10-15 01:03:33 -07:00
fd2dc4ff64
[-] Classes : Modules listing and case insensitive
2013-10-15 09:14:49 +02:00
f25a418785
Update Alias.php
2013-10-14 19:20:38 +02:00
6f4b85430c
// Fix listings and sort
2013-10-14 18:52:48 +02:00
f3755e2d0a
Merge pull request #843 from ldecoker/patch-10
...
[-] BO : AdminMeta - make sure module and controller name are in lowercase
2013-10-14 07:46:56 -07:00
bce6e8f09f
Merge pull request #837 from axometeam/patch-21
...
[-] BO : bad query when filtering on status + sorting by quantity in the AdminProducts getList
2013-10-14 07:45:52 -07:00
cc8ec4fd45
[-] CORE : Fix bug #PSCFV-10687 bad conversion for accentuated Y and W, thanks @mike15
2013-10-14 16:03:50 +02:00
3282bd19e4
// Small fix
2013-10-14 10:59:20 +02:00
af9182dad5
[-] CORE , follow up https://github.com/kiropowered/PrestaShop/commit/b87e934a66a15d4f68e573f5afa9494505a60e28 and https://github.com/kiropowered/PrestaShop/commit/a10dcab6e74d138a2f3a3f558ec7d66b1e9d9e10
2013-10-14 10:51:17 +02:00
3539eb3697
Merge pull request #842 from kiropowered/patch-1
...
[-] CORE : StockMvt Fix bug if product have attribute
2013-10-14 01:30:30 -07:00
a377ecd571
Update Meta.php
...
Use strtolower from Tools class.
2013-10-14 09:53:50 +02:00
8d7e96176c
SEO - make sure module and controller name are in lowercase
...
For module controller, make sure that the name of the controller and the module are saved in lowercase. Otherwise the route will not be found in getModuleLink.
2013-10-14 09:38:04 +02:00
f9cfde9a05
[-] MO : Trackingfront, could not load employee stats date
2013-10-12 23:24:32 +02:00
a10dcab6e7
Update StockMvt.php
...
Fix bug if product have attribute
2013-10-12 14:28:27 +02:00
0a441b9a4b
Update Alias.php
2013-10-12 11:49:27 +02:00
3f6139be42
BO: added UPC and EAN search
2013-10-11 21:02:01 +03:00
9d5a9225e5
Correct some "bad query" in the admin products getList
...
Here the wrong Sql generated :
SELECT SQL_CALC_FOUND_ROWS a.`id_product`,b.name as name,`reference`,a.price as price,a.active as active , MAX(i.id_image) id_image,cl.name `name_category` , a.`price`, 0 AS price_final, sav.`quantity` as sav_quantity, a.`active` FROM `ps_product` a LEFT JOIN `ps_product_lang` b ON (b.`id_product` = a.`id_product` AND b.`id_lang` = 2 AND b.`id_shop` = 1) LEFT JOIN `ps_image` i ON (i.`id_product` = a.`id_product` AND i.cover=1)LEFT JOIN `ps_category_lang` cl ON (a.`id_category_default` = cl.`id_category` AND b.`id_lang` = cl.`id_lang` AND cl.id_shop = 1) LEFT JOIN `ps_stock_available` sav ON (sav.`id_product` = a.`id_product` AND sav.`id_product_attribute` = 0 AND sav.id_shop = 1 ) WHERE 1 AND a.`active` = 0 GROUP BY a.id_product ORDER BY quantity desc LIMIT 0,50
'quantity' is ambigus (for the ORDER BY)
2013-10-11 18:17:55 +02:00
06c62c1684
[-] WS: Fix #PSCFV-10672 order by ID for non multishop entities
2013-10-11 17:53:15 +02:00
a07733fcec
[-] BO : Could not insert referrer id_connections_source can not be null
2013-10-11 16:52:53 +02:00
1a1f3de775
[-] BO: Fixbug #PSCFV-10671 - Double htmlentities.
2013-10-11 13:33:31 +02:00
6c739ee2b3
Merge pull request #833 from djfm/development
...
[*] LO : set correct currency format for CHF
2013-10-11 01:58:10 -07:00
36ca7bc508
[-] BO : AdminImport, fix Group searchByName
2013-10-11 10:23:17 +02:00
bb96c8754f
[*] LO : set correct currency format for CHF
2013-10-11 07:14:30 +00:00
286084c42d
Merge branch 'master' of https://github.com/DarkHack/PrestaShop into contrib/master
...
Conflicts:
controllers/admin/AdminImportController.php
2013-10-10 17:06:13 +02:00
789911184b
[-] BO : FixBug - Remove second email in recipient
2013-10-10 15:04:32 +02:00
8d1bca5542
Merge pull request #768 from enumag/patch-4
...
[-] Classes : Hook - Display payment method & custommer currency bug fix
2013-10-09 13:52:09 -07:00
f6bbb6e241
// Fix duplicate invoice delivery number
2013-10-09 17:43:43 +02:00
68d84892c7
// remove self::
2013-10-09 16:40:09 +02:00
2feb5dd8d2
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-10-09 16:31:09 +02:00
d0a4636966
[-] BO : FixBug #PSCFV-9957 - Duplicate order invoice number
2013-10-09 16:29:15 +02:00
7a6dea4964
[~] BO : Export DeliverySlip
...
The dates range wasn't using the correct sql fields.
2013-10-09 10:39:24 +02:00
85946bacbe
// small cast
2013-10-08 18:35:56 +02:00
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
7d0e9a5f06
// Fix double entities on AdminLog listing #PSCFV-10472
2013-10-07 19:37:58 +02:00
77b2b4b6ca
// Manual merge PS 1.5.6.0
2013-10-07 18:22:55 +02:00
302260539b
// Report from https://github.com/Lupul/PrestaShop/commit/ebf09792e95598c30d8ac2617c4eabdd571be475
2013-10-07 12:08:39 +02:00
3f4f298ad4
[-] CORE fixed bug #PSCFV-10595 - small fix in function addJqueryPlugin()
2013-10-07 10:01:26 +02:00
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
121fcdc39f
// Fix list start
2013-10-04 16:56:35 +02:00
a4b7fc942f
[-] CORE : #PSCFV-10389 Avoid eventual empty Specific Price Rule
2013-10-04 14:11:42 +02:00
fef8d2beac
// Fix group reduction per category
2013-10-04 14:00:42 +02:00
f100027e5d
[-] FO: packages should be splitted with advanced stock management when carrier is not associated to multiple warehouse
2013-10-03 19:21:49 +02:00
62d946ea68
[-] CORE : Fix bug #PSCFV-10179 Duplicate specific price records when updating a product
2013-10-03 18:41:06 +02:00
7f32e8d187
[-] BO : Fix bug #PSCFV-10064, could not import feature in multilang, thanks @E.Bigfoot
2013-10-03 16:09:43 +02:00
e38d808a85
[*] BO: wrong description on getIdOrderCarrier
2013-10-03 15:51:27 +02:00
6e0c3e1aa2
// addFeatureValueImport partial fix
2013-10-03 12:24:35 +02:00
3585bf33c8
// Fix supply order change state save button
2013-10-03 11:49:16 +02:00
43a60f1b57
[-] BO : FixBug #PSCFV-9044 - Missing state in new order, and now you can edit customer addresses
2013-10-03 11:06:08 +02:00
d87c816038
[*] CORE : Increasing the length of link_rewrite & name in Category.php
...
In database this fields have varchar(128) so let's give the user full size of fields
2013-10-03 10:20:45 +02:00
Rémi Gaillard