Rémi Gaillard
8662ef12b4
// small changes on orders view
2013-10-23 11:59:28 +02:00
PhpMadman
373604fc97
[-] FO: removed width on message product select
...
Limiting select could make the user think the select is not working if they click to much to the left on bigger screens
2013-10-23 11:52:35 +02:00
gRoussac
101b37b40a
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-10-23 11:45:26 +02:00
gRoussac
ad4ecefcf9
[-] FO : Prevent fatal error on getUniqReference when order not loaded
2013-10-23 11:44:12 +02:00
Kevin Granger
5ee716ff9e
// fix admin edit countries
2013-10-23 11:18:31 +02:00
Fabio Chelly
3e999ab591
[-] MO blockcart
...
#PNM-1685 - [CODE] incorrect spelled variable in ajax-cart.js
2013-10-23 10:56:48 +02:00
Fabio Chelly
010ad76e6f
Merge remote-tracking branch 'origin/development' into development
2013-10-23 10:55:35 +02:00
Fabio Chelly
5fd3ad5adf
[*] FO ProductSale: improves calculation of most selled products when there are a lot of products in shop
2013-10-23 10:55:23 +02:00
Jerome Nadaud
45ea4aefad
// Fix Combinations ajax problem
2013-10-23 10:50:18 +02:00
Rémi Gaillard
6cddb57ce3
[-] BO: Synchronize stock available after receipt supply order items #PSCFV-10724
2013-10-23 10:34:00 +02:00
Sarah Lorenzini
9a7af80943
// update mail templates
2013-10-23 10:13:57 +02:00
Vincent Augagneur
c61cec9f2a
//display date on dashproducts && added param date_from & date_to on dashboard hooks
2013-10-23 09:59:16 +02:00
Vincent Augagneur
48a70cc8ac
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-23 09:57:47 +02:00
Vincent Augagneur
3ec3bf587e
//small fix on cache_id in classe Hook
2013-10-23 09:38:22 +02:00
Damien Metzger
9d3f3d1876
// Fixed warning in admin customer tpl
2013-10-23 09:32:48 +02:00
gRoussac
ae63336a37
[-] BO : Fix bug #PSCFV-10638, Admin Import by reference moves products to home category
2013-10-23 01:41:05 +02:00
gRoussac
feca06417f
// definition on addFeatureValueImport
2013-10-23 01:23:35 +02:00
gRoussac
5d28d38a22
[-] BO : Fix bug #PSCFV-7907 AdminImport, add custom field to features
2013-10-23 01:18:09 +02:00
Damien Metzger
a2be0364da
// First draft goals
2013-10-22 19:59:18 +02:00
Gregory Roussac
398548fecf
Merge pull request #864 from samy-r/features-duplication-escaping
...
[-] CORE : pSQL for feature values
2013-10-22 10:20:44 -07:00
Gregory Roussac
83d4d0d258
Merge pull request #872 from ldecoker/patch-11
...
[-] PDF : {else if} instead of {elseif} (B2B invoice template)
2013-10-22 10:19:31 -07:00
Gregory Roussac
c401e61b81
Merge pull request #871 from ldecoker/patch-10
...
[-] PDF : {else if} instead of {elseif}
2013-10-22 10:18:57 -07:00
Gregory Roussac
5bb4d48ddd
Merge pull request #870 from djfm/development
...
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-22 10:17:11 -07:00
Gregory Roussac
e557db6429
Merge pull request #866 from studiokiwik/sk-ps15x-007
...
[-] MO : Loyalty if customer is logged do not recreate it
2013-10-22 10:15:55 -07:00
Jerome Nadaud
2c94e6c042
// Add level depth restriction on blockcategories
2013-10-22 19:13:10 +02:00
Jerome Nadaud
dfa59fa8f7
// Fix blockcategories
2013-10-22 19:04:11 +02:00
ldecoker
ce4170574c
[PDF] [-] {else if} instead of {elseif} (B2B invoice template)
2013-10-22 18:57:12 +02:00
ldecoker
e6e2db8400
[PDF] [-] {else if} instead of {elseif}
2013-10-22 18:55:32 +02:00
Vincent Augagneur
537bfb0520
//dash configuration cancel button added
2013-10-22 18:04:08 +02:00
Jerome Nadaud
766d0e01f4
// Adding reset button to form template
2013-10-22 18:00:39 +02:00
Jerome Nadaud
67fc91e2c9
// Categories thumbnails
2013-10-22 17:43:10 +02:00
Damien Metzger
3539a779f8
// Oops
2013-10-22 17:32:02 +02:00
Damien Metzger
4e8ba711d9
// Oops
2013-10-22 17:15:08 +02:00
Gregory Roussac
70d2e6e10b
Merge pull request #868 from ldecoker/patch-8
...
[-] BO : Notices onBO translation page
2013-10-22 08:03:06 -07:00
ldecoker
7cbaada844
[BO][-] Notice messages when accessing the BO translation page
...
When accessing the translation part with "core translation" , you got 2 errors:
Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in controllers\admin\AdminTranslationsController.php on line 1018
Notice: Use of undefined constant _PS_THEME_SELECTED_DIR_ - assumed '_PS_THEME_SELECTED_DIR_' in \controllers\admin\AdminTranslationsController.php on line 1026
It's because the variable $this->theme_selected is not set for that case.
2013-10-22 17:00:56 +02:00
Gregory Roussac
bc7e8eb355
Merge pull request #867 from PhpMadman/patch-4
...
[-] FO: Removed missplaced </li> on mobile theme
2013-10-22 07:50:21 -07:00
Sarah Lorenzini
cc1dd2510a
// mail template src
2013-10-22 16:24:16 +02:00
Jerome Nadaud
c458e059d5
// Fix hook list problem on multishop
2013-10-22 16:18:50 +02:00
Fabio Chelly
bc38b542fe
Merge remote-tracking branch 'origin/development' into development
2013-10-22 15:53:43 +02:00
Fabio Chelly
2989538ce1
[*] BO Module mailalerts: send e-mail to merchand when product is out of stock
2013-10-22 15:53:20 +02:00
Sarah Lorenzini
32a85007df
// update mail templates
2013-10-22 15:45:33 +02:00
Damien Metzger
04f0545254
// forgot to rename a field
2013-10-22 15:37:33 +02:00
Damien Metzger
1323befe2f
// Add link to profitability conf
2013-10-22 15:36:46 +02:00
Damien Metzger
8ef9e71966
// Refine dashboard net profits
2013-10-22 15:16:22 +02:00
Vincent Augagneur
fea7cd5983
//helper list must be wrapped by a form even if it's a simple header
2013-10-22 14:48:44 +02:00
Damien Metzger
b4499937d8
// Comparison is optionnal
2013-10-22 14:15:10 +02:00
Damien Metzger
a4eeff4cd7
// Shortcuts for chart selection
2013-10-22 14:07:19 +02:00
Jerome Nadaud
a7c7bc68a3
// Fix products form content
2013-10-22 13:38:47 +02:00
PhpMadman
e857fb5978
[*] FO: Removed missplaced </li> on mobile theme
2013-10-22 13:34:52 +02:00
Jerome Nadaud
c307eb7ece
// Date range picker fix
2013-10-22 12:29:17 +02:00
Rémi Gaillard