00425a4c1a
[-] FO : fixed bad condition in the dispatcher rules
2013-07-09 10:52:50 +02:00
c0c6c10bba
[-] IN : fixed local install without connection #PSCFV-9286 #PSCFV-9709
2013-07-09 10:21:22 +02:00
18b247be94
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-08 16:07:43 +02:00
f413d9e6e6
[-] Core: Fix #PSCFV-9652 too much payments for multishipping orders
2013-07-08 16:07:20 +02:00
1bdc07be20
[*] FO : removed code specific to multishipping from the no-multishipping process
2013-07-08 11:21:50 +02:00
4b88e8cc06
// John Doe is really a big scammer ! #PSCFV-9434
2013-07-08 11:17:12 +02:00
1a6518689c
Merge pull request #415 from ccauw/patch-11
...
[-] BO : Fix bug #PSCFV-8987 in BO translations when Windows OS
2013-07-08 01:34:48 -07:00
3166573aa9
[-] Class: PaymentModule / Be sure to have the right "TaxCalculationMethod"
2013-07-06 13:50:38 +02:00
1f33638f32
[+] BO Wip BS -> Products + fix
2013-07-05 18:36:42 +02:00
19c9ae0a5c
[-] FO : Fix bug #PSCFV-9653 could not return a custom product
2013-07-05 18:15:27 +02:00
cf849077ed
// small css fix on history
2013-07-05 17:43:10 +02:00
391c7301da
Merge remote-tracking branch 'origin/development' into development
2013-07-05 17:18:50 +02:00
a70d3145cd
[-] MO Blockwishlist : images are displayed in wishlist page loaded through a permalink. Add to cart is restored and quantity is correctly calculated for each product with or without combinations
...
#PNM-573
#PNM-663
#PNM-1268
#PNM-1302
#PNM-1303
#PNM-1313
#PNM-1512
#PNM-1541
2013-07-05 17:18:28 +02:00
9f0867b700
[-] FO : could not see old_price_display when specific price on one combination
2013-07-05 14:42:39 +02:00
62ff976d69
// Removed redundant function calls
2013-07-05 14:25:22 +02:00
91cd196cf6
// remove console.log sorry bad commit
2013-07-05 12:29:29 +02:00
128ceffcc0
[-] FO : Bad specific price for a combination // sorry
2013-07-05 12:28:10 +02:00
268f1fd030
[-] FO : Bad specific price for a combination
2013-07-05 12:11:02 +02:00
2489778b3c
[-] MO Blocknewsletter : deletes e-mail from newsletter table only if newsletter checkbox has been checked on subscription page
...
#PNM-1419
2013-07-05 11:53:04 +02:00
54b882e936
[*] MO : pscleaner reset employees notyfications
...
pscleaner afetr truncating orders, messages and customers reset also employees notyfications
2013-07-05 08:05:51 +02:00
8a7edf3668
[-] FO : Fix bug #PSCFV-9355 dleete button missing for custo in blockcart
2013-07-04 17:42:35 +02:00
58091a3b0e
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-04 17:25:41 +02:00
df7b5c9861
[-] FO : Fix bug #PSCFV-9669, update total price on order-payment
2013-07-04 17:25:00 +02:00
12e7e3a44a
[-] BO: display vat number field should not depends of the vatnumber module #PSCFV-9672
2013-07-04 17:00:27 +02:00
c335115f68
// remove console.log
2013-07-04 16:48:56 +02:00
c360e841b3
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-04 16:48:14 +02:00
0bddd17889
// remove console.log
2013-07-04 16:43:17 +02:00
fd14268da3
// remove .gitattributes
2013-07-04 15:23:39 +02:00
47d343df90
// Fixed module positions in tabs
2013-07-04 09:33:43 +02:00
ae03669541
// Added the possibility to sort the modules in the tabs
2013-07-03 17:50:24 +02:00
ec981b7f86
[*] WS : improved performances
2013-07-03 17:03:33 +02:00
d2440df8ca
[*] FO : added smarty cache on productscategory
2013-07-03 15:49:32 +02:00
f78f3dc3a8
[*] FO : added smarty cache on crossselling module
2013-07-03 15:30:31 +02:00
36e3956267
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-03 15:06:05 +02:00
afda9cdd94
// Small fix
2013-07-03 15:05:22 +02:00
ae0299a6eb
[-] FO :Fix bug #PSCFV-9650 could not see delete href in block cart
2013-07-03 15:04:11 +02:00
16e90488c4
[-] MO : Bug fix - PS Cleaner, check if module favoriteproducts is installed.
...
Fix Bug when favoriteproducts is not install.
2013-07-03 14:55:32 +02:00
1208e45958
[-] BO : products comments impossible if quantity > 0
...
The pull request https://github.com/PrestaShop/PrestaShop/pull/219 makes the module not working properly in v1.5.4.1.
Indeed, after this change, the OosHook works as expected but now, as the product comments module is attached to the OosHook, comments information is only shown when the product is out of stock!
2013-07-03 14:09:44 +02:00
8d3f330b2d
[-] IN : Fixed bug with database creation
2013-07-03 12:19:34 +02:00
5789e6eb51
[*] IN : only display the button to create the database if you can actually create the database
2013-07-03 11:28:55 +02:00
fe660c097c
[*] BO : Correct the getList() request for quantity and id_product
...
Quantity and Id_product should be fixe as Int, else the Mysql request do something like : quantity LIKE "%0%"
When an admin key-in quantity as 0, he want product with quantity as 0, not as 0 / 10 /20 / 30... ect (The same for id_product)
2013-07-03 11:18:04 +02:00
bfa2f33c65
[*] IN : the installer can now attempt to create the database for you
2013-07-03 11:04:34 +02:00
0ad4b44866
// Refactor helper list + fixs
2013-07-02 18:55:43 +02:00
92959311d9
[*] Core : Smarty updated from 3.1.13 to 3.1.14 (cache issues fixed)
2013-07-02 18:45:07 +02:00
c60c3da6a1
[*] WS : improved web service performances
2013-07-02 17:46:11 +02:00
86bdcd99e9
[-] FO: OrderHistory - Unclosed tag
2013-07-02 17:08:49 +02:00
6b71ec8b09
[-] BO: product supplier price should not be converted on product page #PSCFV-9420
2013-07-02 15:45:12 +02:00
854c16997c
[*] FO : improved entity links retrieval (no need to instanciate an object when there is no need... to instanciate un object)
2013-07-02 15:08:56 +02:00
84c88dab65
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-02 14:55:28 +02:00
b8bfdcd3f5
// .gitattributes files added
2013-07-02 14:53:58 +02:00
Damien Metzger