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
Chris
3f6139be42
BO: added UPC and EAN search
2013-10-11 21:02:01 +03:00
Jerome Nadaud
d575ba8273
// Adding compare dates to date range picker
2013-10-11 18:30:05 +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
Rémi Gaillard
06c62c1684
[-] WS: Fix #PSCFV-10672 order by ID for non multishop entities
2013-10-11 17:53:15 +02:00
gRoussac
a07733fcec
[-] BO : Could not insert referrer id_connections_source can not be null
2013-10-11 16:52:53 +02:00
Jerome Nadaud
bedcacf0b4
// Starting development of data range picker
2013-10-11 16:12:40 +02:00
Damien Metzger
1849995291
// Code cleaning
2013-10-11 15:35:45 +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
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
Damien Metzger
c68101653d
// Fixed tabs
2013-10-11 12:10:24 +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
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
gRoussac
36ca7bc508
[-] BO : AdminImport, fix Group searchByName
2013-10-11 10:23:17 +02:00
djfm
bb96c8754f
[*] LO : set correct currency format for CHF
2013-10-11 07:14:30 +00:00
Damien Metzger
77551c03f5
// Fixed potential warning
2013-10-10 18:49:27 +02:00
gRoussac
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
Jerome Nadaud
22dcaf246c
// Add icon and specific title to list
2013-10-10 15:36:50 +02:00
Jerome Nadaud
789911184b
[-] BO : FixBug - Remove second email in recipient
2013-10-10 15:04:32 +02:00
Rémi Gaillard
278dc32482
[*] BO: Add an option to autologout to the backoffice after 15 minutes
2013-10-10 12:20:10 +02:00
Jerome Nadaud
067c78f868
// Fix notifications
2013-10-10 11:02:33 +02:00
François Gaillard
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
Damien Metzger
079534f039
// Fix header/footer override in admincontroller
2013-10-09 18:51:31 +02:00
Jerome Nadaud
f6bbb6e241
// Fix duplicate invoice delivery number
2013-10-09 17:43:43 +02:00
Jerome Nadaud
68d84892c7
// remove self::
2013-10-09 16:40:09 +02:00
Jerome Nadaud
2feb5dd8d2
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-10-09 16:31:09 +02:00
Jerome Nadaud
d0a4636966
[-] BO : FixBug #PSCFV-9957 - Duplicate order invoice number
2013-10-09 16:29:15 +02:00
Damien Metzger
1870dd4dd2
// Added order state color in order::getHistory()
2013-10-09 15:33:46 +02:00
Jerome Nadaud
c8347cbc59
// Restore save button on header toolbar
2013-10-09 15:24:19 +02:00
Damien Metzger
c982d08b68
// Removed useless link to the current page in the breadcrumb
2013-10-09 11:12:33 +02:00
Rémi Gaillard
3b677092bf
[*] FO: You can now choose the anchor separator for attributes
2013-10-09 11:01:18 +02:00
Damien Metzger
623b8c7960
// Added expense management to profitability KPI
2013-10-09 10:55:12 +02:00
Sylvain Gougouzian
7a6dea4964
[~] BO : Export DeliverySlip
...
The dates range wasn't using the correct sql fields.
2013-10-09 10:39:24 +02:00
gRoussac and Jerome Nadaud
fcc2930693
[-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop
2013-10-09 09:19:22 +02:00
Damien Metzger
d9b40b8f35
// Added Modules KPIs
2013-10-08 19:39:52 +02:00
Jerome Nadaud
b9cfc24922
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-08 18:42:19 +02:00
Jerome Nadaud
d88857610d
// Toolbar modifs
2013-10-08 18:42:07 +02:00
gRoussac
85946bacbe
// small cast
2013-10-08 18:35:56 +02:00
Rémi Gaillard
f2c6887497
// quickview
2013-10-08 17:44:10 +02:00
Rémi Gaillard
0db2372724
// add color list to some controllers
2013-10-08 15:39:06 +02:00
gRoussac
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
Rémi Gaillard
7d0e9a5f06
// Fix double entities on AdminLog listing #PSCFV-10472
2013-10-07 19:37:58 +02:00
Francois Gaillard
77b2b4b6ca
// Manual merge PS 1.5.6.0
2013-10-07 18:22:55 +02:00
gRoussac
302260539b
// Report from https://github.com/Lupul/PrestaShop/commit/ebf09792e95598c30d8ac2617c4eabdd571be475
2013-10-07 12:08:39 +02:00
Vincent Augagneur
3f4f298ad4
[-] CORE fixed bug #PSCFV-10595 - small fix in function addJqueryPlugin()
2013-10-07 10:01:26 +02:00
Rémi Gaillard
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
kiropowered