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
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
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
Damien Metzger
9af2d3946f
// Fixed potential error when deleting a module
2013-07-11 18:46:06 +02: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
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
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
Axome
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
Rémi Gaillard
6b71ec8b09
[-] BO: product supplier price should not be converted on product page #PSCFV-9420
2013-07-02 15:45:12 +02:00
Damien Metzger
006e8718f2
// Improved label of IETF language tag
2013-07-01 12:35:32 +02:00
Damien Metzger
56aab3c676
// Fixed references to a "conversion rate" that was in fact the "exchange rate"
2013-07-01 12:14:50 +02:00
gRoussac
f824b537cf
[-] BO : Fix bug #PSCFV-8619 update order weight when modifying products
2013-07-01 11:32:09 +02:00
Rémi Gaillard
ec3095ac32
[-] BO: Fix manufacturer addresses duplication #PSCFV-9601
2013-06-28 10:18:49 +02:00
Damien Metzger
8f01b35f46
[-] BO : fixed translation and languages issues
2013-06-27 17:51:25 +02:00
Vincent Augagneur
374de1b6c8
Merge pull request #515 from axometeam/patch-3
...
[-] BO : remove robots.txt rules preventing Google shopping indexing
2013-06-27 06:52:11 -07:00
Rémi Gaillard
9bafc25878
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-06-27 15:41:57 +02:00
Rémi Gaillard
17579de481
[-] FO: Fix #PSCFV-9325 all was included on 301 for root deprecated controllers
2013-06-27 15:41:37 +02:00
Vincent Augagneur
1f5c1927c6
Merge pull request #521 from misthero/patch-1
...
Update AdminCustomerThreadsController.php
2013-06-27 06:01:40 -07:00
Vincent Augagneur
453bb826ef
[-] BO : fixed bug #PSCFV-9586 - Unable to sort CMS page in back office
2013-06-27 10:19:22 +02:00
Rémi Gaillard
9257dc80c2
[-] BO: Fix #PSCFV-9455 stock was resetted if adv stock management is enable and product preference is submited on shop context
2013-06-26 14:17:45 +02:00
misthero
00ee8ad4ef
Update AdminCustomerThreadsController.php
...
$contact->name can be an array throwing a warning Warning: preg_match() expects parameter 2 to be string when answering to a customer
2013-06-26 10:32:54 +02:00
gRoussac
64f615a061
[-] BO : Fix warnings when product not available in Shop
2013-06-25 18:16:06 +02:00
Rémi Gaillard
f73eb070ab
// small fix
2013-06-25 15:50:36 +02:00
Rémi Gaillard
36c7b9df48
[-] BO: This is now not possible to move a tab with id_parent = 0 to an another tab
2013-06-24 18:25:38 +02:00
gRoussac
b421d469d2
[-] Fix bug #PSCFV-8109 country creation/activation regarding payment modules restrictions
2013-06-24 16:45:10 +02:00
gRoussac
50c88dc4de
[-] BO : Fix bug #PSCFV-7353 can not see the thumb for a scene
2013-06-24 14:50:10 +02:00
Damien Metzger
84860a1b2a
// Added recommendation for the logo size
2013-06-24 10:40:03 +02:00
Axome
c8f3985347
[-] BO : remove "utm_*" rules preventing Google services from indexing the shop
...
Google shopping refuses all products having their URL blocked by the robots.txt file
2013-06-21 17:22:03 +02:00
