5939f65fac
//norms
2013-07-17 19:05:01 +02:00
eecfdae0b6
[-] BO : FixBug #PSCFV-8217 Shop logo image not refresh after change
2013-07-17 18:23:59 +02:00
1537f0e9eb
Merge pull request #566 from PrestaEdit/patch-45
...
[*] FO: display Error500 if no database access
2013-07-17 09:02:28 -07:00
312e066751
Merge pull request #550 from PrestaEdit/patch-44
...
[-] Class: PaymentModule / Be sure to have the right "TaxCalculationMeth...
2013-07-17 09:01:32 -07:00
cf04c18ce6
Merge pull request #537 from PrestaEdit/patch-43
...
[-] FO: OrderHistory - Unclosed tag
2013-07-17 08:53:31 -07:00
8d5027a89b
Merge pull request #530 from PrestaEdit/patch-42
...
[-] BO: remove old icon into New Version block
2013-07-17 08:44:49 -07:00
5c6640c258
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 17:34:44 +02:00
458838e598
[-] BO : FixBug #PSCFV-9613 Fix product tax to be shop dependent
2013-07-17 17:33:53 +02:00
ffb62426d8
Merge pull request #516 from PrestaEdit/patch-41
...
[*] BO: more than one image in HelperForm
2013-07-17 07:44:26 -07:00
8d5a632c92
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 16:34:50 +02:00
014758d1d8
Merge branch 'PrestaEdit-translate' into development
2013-07-17 16:34:26 +02:00
3f7bf5c6b0
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 16:34:03 +02:00
c9d2cf8ed2
Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate
...
Conflicts:
admin-dev/header.inc.php
2013-07-17 16:31:49 +02:00
6884d7c5de
[-] BO : FixBug #PSCFV-8287 Breadcrumbs label was wrong
2013-07-17 16:19:15 +02:00
24b2e1ec8c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 15:36:03 +02:00
d55f31d3b5
Merge branch 'tools-fileAttachment' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-tools-fileAttachment
...
Conflicts:
classes/Tools.php
controllers/front/ContactController.php
2013-07-17 15:35:18 +02:00
2d1ec5f642
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 15:14:05 +02:00
421c199e1f
[-] BO : FixBug #PSCFV-8229 Default country value set to manufacturer country
...
Default country value set to manufacturer country
Click on manufacturer address line now redirect to manufacturer address
edition
2013-07-17 15:13:34 +02:00
1b9892b944
// removed deprecated message
2013-07-17 13:42:45 +02:00
899dc30097
[-] Class : AdminController - Object id fixed
2013-07-17 11:33:33 +02:00
1199ad8cf2
[-] BO : FixBug #PSCFV-6365 Missing message confirmation for Images modification in Preferences > Images
2013-07-17 10:51:34 +02:00
ea89c2235d
[-] BO : Fix bug #PSCFV-9722, do not propose adding root categories in categories when there is only one shop
2013-07-16 19:01:05 +02:00
d66f407fcb
[-] BO : Use only 0% reduction from category in group
2013-07-16 18:28:11 +02:00
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
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
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
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
gRoussac