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
Kevin Granger
cd5a308ad7
// login : tabindex + ux
2013-10-11 12:28:01 +02:00
Damien Metzger
c68101653d
// Fixed tabs
2013-10-11 12:10:24 +02:00
Kevin Granger
b61528057a
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/js/admin-theme.js
2013-10-11 11:28:44 +02:00
Kevin Granger
40d4da04bb
// cleaned admin-theme.js - added date range picker
2013-10-11 11:18:27 +02:00
Damien Metzger
49cdfb56c6
// Fix class_index generation
2013-10-11 11:15:14 +02:00
Damien Metzger
f80b348d86
// Default vertical menu in BO
2013-10-11 11:02:35 +02:00
Rémi Gaillard
bb81e892a0
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-11 10:58:23 +02:00
Gregory Roussac
6c739ee2b3
Merge pull request #833 from djfm/development
...
[*] LO : set correct currency format for CHF
2013-10-11 01:58:10 -07:00
Rémi Gaillard
49a9f0bcaa
// unlink class_index tmp file if not rename
2013-10-11 10:58:05 +02:00
Fabio Chelly
5c66ed4791
Merge remote-tracking branch 'origin/development' into development
2013-10-11 10:51:50 +02:00
Fabio Chelly
d1a7ff50d5
[*] BO Module watermark: minimum transparency level is 1 and not 0.
2013-10-11 10:51:28 +02:00
Damien Metzger
f95a4d74df
// Added Google Plus to the BO footer
2013-10-11 10:47:48 +02:00
Damien Metzger
28118cf33a
// Code cleaning (backoffice javascript)
2013-10-11 10:47:48 +02:00
gRoussac
7b02da5fdf
// bad commit sorry
2013-10-11 10:32:30 +02:00
gRoussac
36ca7bc508
[-] BO : AdminImport, fix Group searchByName
2013-10-11 10:23:17 +02:00
Rémi Gaillard
bb35a5b004
// multishop
2013-10-11 10:04:10 +02:00
Damien Metzger
7f5f78a6f3
// Connected footer links and go-top
2013-10-11 09:44:15 +02:00
fchellypresta
075a911cee
Merge pull request #830 from indesign47/patch-5
...
[-] MO : productcomments errors translated in multi-language
2013-10-11 00:40:32 -07:00
Chris