ae5b6b79ee
[*] BO : #PSCFV-8498 You can now use 0% in groups category rules in order to not apply discount on this category
2013-07-16 17:42:38 +02:00
e7eae03508
Merge pull request #575 from dreammeup/development
...
[-] BO : Correcting errors in order graph at admin home
2013-07-16 07:17:03 -07:00
82c7e3eeff
Correcting errors in order graph at admin home
...
The SQL request was returning multiple lines for every days. This modification change the request to have one line for the 7 days of the week.
So it corrects the number who was totally wrong.
2013-07-16 15:34:52 +02:00
145df5a26e
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-16 13:08:36 +00:00
8d39f32506
[-] BO: Fix tax rule edition - unique tax rule can't be edited
2013-07-16 11:52:05 +02:00
d2ff50ddb7
[*] CORE : Fix bug #PSCFV-9811 doc on display404Error
2013-07-16 10:50:27 +02:00
3d283000a0
// Fixed misplaced comma
2013-07-16 10:27:52 +02:00
672f2d9dd1
[-] BO : Fix bug #PSCFV-9395 Missing vertical separation between flags
2013-07-16 10:18:54 +02:00
97b16d2726
[-] BO : Fix Bug #PSCFV-9550 Bad URL redirection
2013-07-16 09:59:47 +02:00
e48b2a411e
[-] INSTALLER : Errors in upgrader
2013-07-15 22:01:41 +02:00
a6d0ef744e
Merge remote-tracking branch 'origin/development' into development
2013-07-15 19:37:19 +02:00
b67ffb1a50
[-] MO loyalty : categories are now taken into account when creating discount vouchers
...
#PNM-1492
#PNM-1191
#PNM-1223
2013-07-15 19:36:32 +02:00
272f2ec8f7
Merge pull request #573 from soware/patch-2
...
[*] BO : Update AdminStockManagementController.php
2013-07-15 09:49:17 -07:00
d9c2ec37d4
// Code cleaning
2013-07-15 18:13:07 +02:00
a3039024e7
// Code cleaning
2013-07-15 18:07:53 +02:00
66f64c1baa
// update order tab
2013-07-15 17:58:23 +02:00
c253a8edf4
Update AdminStockManagementController.php
...
Hi, I altered these values to make default on the radio button.
I think is better because is a value more frequent in stock management form.
2013-07-15 12:45:00 -03:00
7a27b11309
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-15 17:31:17 +02:00
f9c5bf0bf2
[-] Fix bug #PSCFV-9633 again could not see delete href in block cart
2013-07-15 17:29:08 +02:00
f6ef6f5d0e
Merge pull request #572 from PrestaEdit/patch-47
...
[-] Class : Media / Correct jquery_ui_dependencies fileName
2013-07-15 07:41:07 -07:00
01bad90b29
// Welcome 2013
2013-07-15 16:36:54 +02:00
4b8a756add
[-] Class: Media / Correct jquery_ui_dependencies fileName
...
Even if not used...
2013-07-15 16:34:51 +02:00
ca4a73ddf4
// avoid copy paste mistake with trailing space
2013-07-15 15:34:34 +02:00
1a056d5e33
[-] BO : Fix bug #PSCFV-9310 bad type for input in helper thankx @Piotr Moćko
2013-07-15 14:47:38 +02:00
f1dcf02caf
//fix warnings #PSCFV-9786
2013-07-15 14:25:58 +02:00
e30e15d76d
[-] INSTALER: Fix bug #PSCFV-9762 marketing tab disapear after upgrade
2013-07-15 12:29:51 +02:00
27571f4d06
//update module tab
2013-07-15 12:02:03 +02:00
0c4a5bd984
// update module tab positions & payment
2013-07-15 11:55:06 +02:00
ee1187d821
[-] BO: Delete specific price after combination deletion && fix SpecificPrice::getByProductId() sql query
2013-07-15 11:00:35 +02:00
db7f0da746
// Improved display in pscleaner
2013-07-15 10:48:48 +02:00
cf7f72fc30
// Fixed AdminMarketing position in upgrade
2013-07-15 10:11:40 +02:00
6ea4a2c553
[-] FO : Fix bug #PSCFV-9662 udpate payments means after delete thanks @maofree
2013-07-15 10:08:16 +02:00
324dff0595
ParentOrderController->setMedia() proper order for typewatch and cart-summary
...
In the original class, typewatch is inserted after cart-summary, but it is used for the quantity input in cart-summary.js, so we need to have typewatch first.
2013-07-15 00:56:56 +03:00
795976cadb
[*] FO: display Error500 if no database access
...
Sometimes, we have some problems with the MySQL Database and a Fatal Error is done. With this, we show the error500 template.
2013-07-14 14:59:25 +02:00
b8babdadb3
// products wip
2013-07-12 19:17:51 +02:00
e34289b0b7
// fix product warehouses
2013-07-12 18:53:22 +02:00
22b73a7339
[*] BO : upgraded cover icon management in product > images
2013-07-12 18:43:49 +02:00
c89281166b
Merge pull request #467 from PrestaEdit/patch-40
...
[-] BO : Controller: AdminTranslationsController / Back translations
2013-07-12 09:23:29 -07:00
5083cd6b5e
Merge pull request #466 from PrestaEdit/patch-39
...
[*] BO: hook displayAdminForm / add param fieldset
2013-07-12 08:56:42 -07:00
e23854d143
// Add currency ID on default modules cache id
2013-07-12 17:49:38 +02:00
4919d6d81a
// update positions module tab
2013-07-12 17:48:07 +02:00
5b6c6a3ce9
Merge pull request #561 from BigZ/patch-5
...
[-] PDF : Get correct prefix for invoices
2013-07-12 08:44:24 -07:00
39a23e1494
Merge pull request #560 from BigZ/patch-4
...
[-] PDF : Develivery slip should use prefix
2013-07-12 08:42:16 -07:00
b25b88cf33
Merge pull request #559 from BigZ/patch-3
...
[-] PDF : Invoice prefix wasn't used in filename
2013-07-12 08:41:37 -07:00
0453698f50
Merge pull request #557 from BigZ/patch-1
...
[-] BO : Update documents listing to display proper prefix
2013-07-12 08:37:21 -07:00
c12ce3dd29
// Products
2013-07-12 17:27:25 +02:00
9c44faf295
[-] FO : Fix bug #PSCFV-9754 do not use back url on cart summary link in steps
2013-07-12 16:59:11 +02:00
4e0723b3cc
[-] BO : fixed charts and grids in multishop #PSCFV-8978
2013-07-12 16:29:31 +02:00
105b1422a3
Merge pull request #562 from axometeam/patch-14
...
[*] BO : Do not increment stock if statut change fom Error to Canceled
2013-07-12 07:22:50 -07:00
38b32f7e1a
[-] MO : fixed disappearing form in sekeyword #PSCFV-9743
2013-07-12 15:56:54 +02:00
Jérôme Nadaud