dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,853 Commits 9 Branches 19 Tags
665c5d155d05b60c0d4f92fdc19c7552243e1150
Commit Graph
20853 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
djfm 5e407db21e [*] LO : Fixed a few bugs with currency formats in Back-Office orders 2013-10-14 09:30:45 +00:00
Jerome Nadaud 3282bd19e4 // Small fix 2013-10-14 10:59:20 +02:00
Rémi Gaillard 3bc02bbe10 // fields are already correctly formated when they are in a object coming from the database 2013-10-14 10:56:38 +02:00
gRoussac 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
Gregory Roussac 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
Kevin Granger 59435fa2ee // login flip WIP 2013-10-14 09:57:02 +02:00
ldecoker a377ecd571 Update Meta.php 
Use strtolower from Tools class.
 2013-10-14 09:53:50 +02:00
ldecoker 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
Jerome Nadaud 80c8605264 // Adding RTL to calendar helper 2013-10-14 09:14:18 +02:00
Jérôme Nadaud 892516342e // Fix when date is null 2013-10-13 11:47:29 +02:00
gRoussac f9cfde9a05 [-] MO : Trackingfront, could not load employee stats date 2013-10-12 23:24:32 +02:00
gRoussac ee29f4365e [-] FO : Copuld not load datepicker in trackingfront stats.php 2013-10-12 17:54:26 +02:00
kiropowered a10dcab6e7 Update StockMvt.php 
Fix bug if product have attribute
 2013-10-12 14:28:27 +02:00
indesign47 0a441b9a4b Update Alias.php 2013-10-12 11:49:27 +02:00
indesign47 4f9191fe0c Update form.tpl 2013-10-12 11:45:07 +02:00
indesign47 2afbe8fd04 Create alias_import.csv 2013-10-12 11:39:29 +02:00
indesign47 85c6e799c3 [+] BO : AdminImport add entity Alias 2013-10-12 11:33:36 +02:00
Gregory Roussac 418155cf2b Merge pull request #838 from pelTek/patch-1 
BO: added UPC and EAN search
 2013-10-11 11:52:22 -07:00
Chris 3f6139be42 BO: added UPC and EAN search 2013-10-11 21:02:01 +03:00
Jerome Nadaud e47f0a7c68 // Adding stats compare date to employee table 2013-10-11 18:34:20 +02:00
Jerome Nadaud 0fe3630a05 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 18:30:16 +02:00
Jerome Nadaud d575ba8273 // Adding compare dates to date range picker 2013-10-11 18:30:05 +02:00
Kevin Granger 89251a667b // feedback button 2013-10-11 18:26:12 +02:00
Axome 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
Gregory Roussac 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
Rémi Gaillard 06c62c1684 [-] WS: Fix #PSCFV-10672 order by ID for non multishop entities 2013-10-11 17:53:15 +02:00
Jerome Nadaud 0f9c81a683 [-] BO : FixBug #PSCFV-10671 - remove htmlentities on customer message 2013-10-11 17:29:44 +02:00
Kevin Granger cfa4d72eab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 17:22:06 +02:00
Kevin Granger 41f5d9f1f1 // fix datepicker 2013-10-11 17:21:45 +02:00
Jerome Nadaud 18690e4b9a // Adding update for customer message 2013-10-11 17:17:58 +02:00
gRoussac a07733fcec [-] BO : Could not insert referrer id_connections_source can not be null 2013-10-11 16:52:53 +02:00
Mickael Desgranges 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
Fabio Chelly 9fc9df6ba4 Merge remote-tracking branch 'origin/development' into development 2013-10-11 16:38:09 +02:00
Fabio Chelly 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
Damien Metzger eff292731f // Fixed typo 2013-10-11 16:35:49 +02:00
gRoussac 8cfe9a2065 [-] Bo : Could not update mailalert 2.5 with id_lang missing 2013-10-11 16:19:54 +02:00
Damien Metzger d2ecdfb93d // fix dashboard modules upgrade 2013-10-11 16:18:53 +02:00
Damien Metzger 0e91352520 // Dashboard update 2013-10-11 16:18:52 +02:00
Jerome Nadaud 0f28393c8f // Fix data range picker 2013-10-11 16:16:03 +02:00
Jerome Nadaud bedcacf0b4 // Starting development of data range picker 2013-10-11 16:12:40 +02:00
gRoussac 45e9040606 [-] Bo : Could not update mailarler 2.5 with id_mlang 2013-10-11 15:51:02 +02:00
Damien Metzger 1849995291 // Code cleaning 2013-10-11 15:35:45 +02:00
Kevin Granger dcf7e48f6e // datepicker stylesheet 2013-10-11 15:04:14 +02:00
Vincent Augagneur 5bcacf9b48 //statsdata now use boostrap design 2013-10-11 14:38:18 +02:00
Vincent Augagneur 38a7e90eff //referralprogram now use boostrap design 2013-10-11 14:29:56 +02:00
Rémi Gaillard 6b52ada195 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 14:11:28 +02:00
Rémi Gaillard 1316bd7e1f // add check stock value for color list if needed 2013-10-11 14:11:12 +02:00
Damien Metzger 7a5187e84e // Fix module active 2013-10-11 14:11:01 +02:00
Damien Metzger 809eac6308 // Fix upgrade and dashboard 2013-10-11 14:07:03 +02:00
Jerome Nadaud 1a1f3de775 [-] BO: Fixbug #PSCFV-10671 - Double htmlentities. 2013-10-11 13:33:31 +02:00