Damien Metzger
8c47ca3edf
[-] BO : fixed sort by currency exchange rate #PSCFV-9840
2013-07-19 11:40:52 +02:00
Damien Metzger
78ddec3ac7
[-] BO : translation copy is now easier #PSCFV-8886
2013-07-18 18:51:37 +02:00
Rémi Gaillard
ac02e5191a
// ups
2013-07-18 18:34:10 +02:00
Rémi Gaillard
354622857f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 18:31:35 +02:00
Rémi Gaillard
958d92c9fa
[*] BO: Add an option to allow iframes on descriptions
2013-07-18 18:31:31 +02:00
gRoussac
e3d9dd89e9
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 18:18:12 +02:00
Jérôme Nadaud
dd78e97b4a
[-] FO : FixBug #PSCFV-7723 Bad manufacturers list pagination
2013-07-18 17:09:44 +02:00
gRoussac
a6b2299ed1
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-18 14:08:36 +02:00
Jérôme Nadaud
a6da3e94f0
[-] BO : FixBug #PSCFV-9723 Exporting quantity in instant stock was not returning all rows
2013-07-18 14:02:22 +02:00
Jérôme Nadaud
69066361a6
[-] BO : FixBug #PSCFV-8234 Products tags not correctly indexed in search
2013-07-18 12:15:42 +02:00
gRoussac
d99a1eba24
[-] BO : Bad return value for AdminCountries::processStatus()
2013-07-18 12:12:05 +02:00
gRoussac
5939f65fac
//norms
2013-07-17 19:05:01 +02:00
Jérôme Nadaud
eecfdae0b6
[-] BO : FixBug #PSCFV-8217 Shop logo image not refresh after change
2013-07-17 18:23:59 +02:00
Jérôme Nadaud
5c6640c258
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 17:34:44 +02:00
Jérôme Nadaud
458838e598
[-] BO : FixBug #PSCFV-9613 Fix product tax to be shop dependent
2013-07-17 17:33:53 +02:00
gRoussac
8d5a632c92
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 16:34:50 +02:00
gRoussac
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
Jérôme Nadaud
6884d7c5de
[-] BO : FixBug #PSCFV-8287 Breadcrumbs label was wrong
2013-07-17 16:19:15 +02:00
gRoussac
24b2e1ec8c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-17 15:36:03 +02:00
gRoussac
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
Jérôme Nadaud
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
Jérôme Nadaud
1199ad8cf2
[-] BO : FixBug #PSCFV-6365 Missing message confirmation for Images modification in Preferences > Images
2013-07-17 10:51:34 +02:00
gRoussac
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
Gregory Roussac
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
dreammeup
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
Rémi Gaillard
8d39f32506
[-] BO: Fix tax rule edition - unique tax rule can't be edited
2013-07-16 11:52:05 +02:00
Damien Metzger
3d283000a0
// Fixed misplaced comma
2013-07-16 10:27:52 +02:00
Jérôme Nadaud
97b16d2726
[-] BO : Fix Bug #PSCFV-9550 Bad URL redirection
2013-07-16 09:59:47 +02:00
Gregory Roussac
272f2ec8f7
Merge pull request #573 from soware/patch-2
...
[*] BO : Update AdminStockManagementController.php
2013-07-15 09:49:17 -07:00
Damien Metzger
d9c2ec37d4
// Code cleaning
2013-07-15 18:13:07 +02:00
Damien Metzger
a3039024e7
// Code cleaning
2013-07-15 18:07:53 +02:00
soware
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
gRoussac
ca4a73ddf4
// avoid copy paste mistake with trailing space
2013-07-15 15:34:34 +02:00
gRoussac
f1dcf02caf
//fix warnings #PSCFV-9786
2013-07-15 14:25:58 +02:00
Cosmin Hutanu
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
Gregory Roussac
c89281166b
Merge pull request #467 from PrestaEdit/patch-40
...
[-] BO : Controller: AdminTranslationsController / Back translations
2013-07-12 09:23:29 -07:00
Rémi Gaillard
4b492046c0
// add another logs information
2013-07-12 10:55:37 +02:00
Damien Metzger
994d43d3e4
// Oops
2013-07-12 09:40:14 +02:00
Piotr Moćko
291cec36ab
Do not limit features value on a list
...
Controller use default method getList with pagination of 50 items. Argument $limit should be set to FALSE to disable limit, because if you have more than 50 values of one feature, then you can not access them in back office.
2013-07-11 18:49:44 +02:00
Damien Metzger
9af2d3946f
// Fixed potential error when deleting a module
2013-07-11 18:46:06 +02:00
Rémi Gaillard
d8a444335f
Merge pull request #524 from ChristopheBoucaut/development
...
Update OrderDetailController.php
2013-07-11 08:26:13 -07:00
Rémi Gaillard
17ee071bdf
Merge pull request #540 from axometeam/patch-7
...
[*] BO : Correct the getList() request for quantity and id_product
2013-07-11 06:40:17 -07:00
Rémi Gaillard
004e833b24
[+] BO: Addition, deletion and edition are now logged
2013-07-11 14:50:23 +02:00
Damien Metzger
d772d97bfa
[-] BO : you can now have different mail topic for one mail template #PSCFV-9617
2013-07-11 14:27:40 +02:00
gRoussac
105ae7e59f
[*] FO : Retrieve invoice address in OPC + guest checkout, thanks @Piotr Moćko
2013-07-10 18:16:09 +02:00
gRoussac
5e0893979b
[-] FO : Fix bug #PSCFV-9021 : bad category id for breadcrumb on product when url rewrite is on
2013-07-09 16:06:21 +02:00
Damien Metzger
bad15211a8
[-] BO : added checks on product attributes properties #PSCFV-9703
2013-07-09 11:30:59 +02:00
Gregory Roussac
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
gRoussac
19c9ae0a5c
[-] FO : Fix bug #PSCFV-9653 could not return a custom product
2013-07-05 18:15:27 +02:00
Rémi Gaillard
12e7e3a44a
[-] BO: display vat number field should not depends of the vatnumber module #PSCFV-9672
2013-07-04 17:00:27 +02:00
