ad27dbe8d1
Update Cart.php
...
The field "id_address_delivery" is missing in getWsCartRows.
Since id_address_delivery is required in the web service field definition.
2013-10-16 10:14:14 +08:00
2157311f11
// Some improvement for range datepicker
2013-10-15 18:04:28 +02:00
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
7d85b21e92
// Pagination fix
2013-10-14 18:22:55 +02:00
7e4329a4dc
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 17:31:50 +02:00
7e9cdbb163
// Pagination fix
2013-10-14 17:30:56 +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
7742020606
// small fix
2013-10-14 15:59:48 +02:00
fa6d09a756
// Fixed warning
2013-10-14 15:56:53 +02:00
4da04275fe
//small fix related to 1316bd7e1f
2013-10-14 15:07:50 +02:00
67dc7aac04
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/filters.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/orders/form.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
classes/Category.php
classes/controller/AdminController.php
controllers/admin/AdminAttributesGroupsController.php
controllers/admin/AdminFeaturesController.php
controllers/admin/AdminImportController.php
controllers/admin/AdminLogsController.php
install-dev/install_version.php
install-dev/langs/ru/data/tab.xml
js/admin_carrier_wizard.js
modules/loyalty/loyalty.php
2013-10-14 12:21:29 +02:00
833091674c
// Adding translations and PHP date format for datepicker
2013-10-14 11:34:04 +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
80c8605264
// Adding RTL to calendar helper
2013-10-14 09:14:18 +02:00
892516342e
// Fix when date is null
2013-10-13 11:47:29 +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
d575ba8273
// Adding compare dates to date range picker
2013-10-11 18:30:05 +02: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
bedcacf0b4
// Starting development of data range picker
2013-10-11 16:12:40 +02:00
1849995291
// Code cleaning
2013-10-11 15:35:45 +02:00
1316bd7e1f
// add check stock value for color list if needed
2013-10-11 14:11:12 +02:00
809eac6308
// Fix upgrade and dashboard
2013-10-11 14:07:03 +02:00
1a1f3de775
[-] BO: Fixbug #PSCFV-10671 - Double htmlentities.
2013-10-11 13:33:31 +02:00
c68101653d
// Fixed tabs
2013-10-11 12:10:24 +02:00
49cdfb56c6
// Fix class_index generation
2013-10-11 11:15:14 +02:00
f80b348d86
// Default vertical menu in BO
2013-10-11 11:02:35 +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
49a9f0bcaa
// unlink class_index tmp file if not rename
2013-10-11 10:58:05 +02: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
77551c03f5
// Fixed potential warning
2013-10-10 18:49:27 +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
22dcaf246c
// Add icon and specific title to list
2013-10-10 15:36:50 +02:00
789911184b
[-] BO : FixBug - Remove second email in recipient
2013-10-10 15:04:32 +02:00
278dc32482
[*] BO: Add an option to autologout to the backoffice after 15 minutes
2013-10-10 12:20:10 +02:00
MustangZhong