2a28e47650
Merge pull request #799 from Lupul/development
...
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency
2013-10-14 08:37:28 -07: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
80f6f4e223
[-] FO : Fix bug #PSCFV-10688, bad priceDisplay in order-carrier
2013-10-14 15:34:47 +02:00
50002ec714
[-] FO : Fix #PSCFV-10690 again, change just on directories
2013-10-14 14:23:26 +02:00
c6e3e28894
[-] FO : Fix bug #PSCFV-10690 could not index a category beacause of robot.txt
2013-10-14 14:20:11 +02:00
f8edca8ac8
[-] IN : Fix bug #PSCFV-10539 duplicate "address" url rewrite in meta.xml for Russian
2013-10-14 13:59:19 +02:00
2a54296b96
[-] BO : Fix bug #PSCFV-10692, AdminImport bad utf8 cars for subst
2013-10-14 12:11:47 +02:00
1adfa1584c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-10-14 11:37:51 +02:00
1358c696cd
[-] BO : Fix #PSCFV-10678 warning in chrome
2013-10-14 11:37:15 +02:00
3282bd19e4
// Small fix
2013-10-14 10:59:20 +02:00
3bc02bbe10
// fields are already correctly formated when they are in a object coming from the database
2013-10-14 10:56:38 +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
ee29f4365e
[-] FO : Copuld not load datepicker in trackingfront stats.php
2013-10-12 17:54:26 +02:00
a10dcab6e7
Update StockMvt.php
...
Fix bug if product have attribute
2013-10-12 14:28:27 +02:00
418155cf2b
Merge pull request #838 from pelTek/patch-1
...
BO: added UPC and EAN search
2013-10-11 11:52:22 -07: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
0dbaa59985
Merge pull request #836 from mkdgs/patch-1
...
[*] MO : blocktopmenu adding clear cache of AddAfter hook for Cms, Supplier, Manufaturer and Product
2013-10-11 09:05:15 -07:00
06c62c1684
[-] WS: Fix #PSCFV-10672 order by ID for non multishop entities
2013-10-11 17:53:15 +02:00
0f9c81a683
[-] BO : FixBug #PSCFV-10671 - remove htmlentities on customer message
2013-10-11 17:29:44 +02:00
a07733fcec
[-] BO : Could not insert referrer id_connections_source can not be null
2013-10-11 16:52:53 +02:00
1786f8e907
Update blocktopmenu.php
...
Fix: block top menu is not updated when content is added in CMS
adding support of AddAfter hook for Cms, Supplier, Manufaturer and Product
2013-10-11 16:42:21 +02:00
9fc9df6ba4
Merge remote-tracking branch 'origin/development' into development
2013-10-11 16:38:09 +02:00
9e3b82e8ed
[*] BO Module productcomments: JS variables are correctly escaped. Padding in error message has also been pushed to theme tpl
2013-10-11 16:37:26 +02:00
8cfe9a2065
[-] Bo : Could not update mailalert 2.5 with id_lang missing
2013-10-11 16:19:54 +02:00
45e9040606
[-] Bo : Could not update mailarler 2.5 with id_mlang
2013-10-11 15:51:02 +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
5c66ed4791
Merge remote-tracking branch 'origin/development' into development
2013-10-11 10:51:50 +02:00
d1a7ff50d5
[*] BO Module watermark: minimum transparency level is 1 and not 0.
2013-10-11 10:51:28 +02:00
7b02da5fdf
// bad commit sorry
2013-10-11 10:32:30 +02:00
36ca7bc508
[-] BO : AdminImport, fix Group searchByName
2013-10-11 10:23:17 +02:00
075a911cee
Merge pull request #830 from indesign47/patch-5
...
[-] MO : productcomments errors translated in multi-language
2013-10-11 00:40:32 -07:00
6f878353a6
Merge pull request #831 from indesign47/patch-7
...
[-] MO : productcomments round average up not down
2013-10-11 00:29:37 -07:00
bb96c8754f
[*] LO : set correct currency format for CHF
2013-10-11 07:14:30 +00:00
dc1632a8b0
[-] BO : Adminimport, id_specific key_price not defined
2013-10-10 22:04:42 +02:00
a87bbf84b4
Merge pull request #825 from indesign47/patch-4
...
[-] BO : AdminImport add available fields to Products
2013-10-10 10:22:43 -07:00
4505387046
// Try to fix regexp issues with some PHP configurations
2013-10-10 18:41:50 +02: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
39a543188a
[-] BO : Fix bug #PSCFV-10660, could not delete csv file on NT
2013-10-10 14:54:12 +02:00
9bae53a4d9
Merge pull request #828 from djfm/development
...
// fixed name of gender 2 in English
2013-10-10 03:08:40 -07:00
819dac6622
// fixed name of gender 2 in English
2013-10-10 09:36:05 +00: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
Gregory Roussac