fe0afeadc9
[-] MO : mod='blockmyaccount' missing in blockmyaccountfooter.tpl (translation doesnt work), thanks @mypresta-eu
2013-08-06 11:45:29 +02:00
478e338df0
//added active field on carrier wizard
2013-08-06 11:40:03 +02:00
6449437f58
// norms
2013-08-06 11:38:34 +02:00
084880abda
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 11:38:24 +02:00
16d942b7b6
[*] BO : Do not insert duplicates in product_carrier, thanks @edamart
2013-08-06 11:22:40 +02:00
81e4a5f635
[*] BO : Do not insert duplicates in poruct_carrier, thanks @edamart
2013-08-06 11:19:34 +02:00
c0bc3bda29
// Bug fix template override & admin templates
2013-08-06 11:13:49 +02:00
33bdfa9c96
//added some help
2013-08-06 11:06:36 +02:00
1b93d251aa
Merge pull request #630 from rimas-kudelis/development
...
[*] CORE :ProductCore::addSupplierReference() if a reference already exists update it
2013-08-06 01:51:34 -07:00
edfe77b74f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-06 10:43:14 +02:00
a69d1c6d05
Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug
...
Conflicts:
controllers/admin/AdminPerformanceController.php
install-dev/data/xml/configuration.xml
2013-08-06 10:42:44 +02:00
f557f24df4
// Fixed module cache key (with the country)
2013-08-06 10:41:58 +02:00
77ba55b090
Merge pull request #629 from ChristopheBoucaut/patch-4
...
[-] WS : setFieldsToDisplay() calls $this->resourceConfiguration, never initialized
2013-08-06 01:30:46 -07:00
5bcfc7d4e9
//carrier wizard step validation part 2
2013-08-06 10:30:10 +02:00
83740496de
Update more properties of supplier reference in ProductCore::addSupplierReference() if a reference already exists.
2013-08-06 11:28:42 +03:00
fe58053439
//carrier wizard step validation
2013-08-06 10:27:32 +02:00
0139e3f877
Update WebserviceRequest.php
...
The deleted method calls $this->resourceConfiguration, which is never initialized in specific web services, so if we use the "display" parameter, the webservice returns an error
2013-08-06 10:22:45 +02:00
58cba9f894
// [+] Module - Login Addons
2013-08-06 10:19:43 +02:00
23b9c3b8f9
Merge pull request #627 from davyrolink/upstream
...
[*] CORE : add $smarty to params in smartyHook function
2013-08-06 01:10:41 -07:00
88d4f57894
//carrier range validation fix
2013-08-06 10:04:54 +02:00
29bbe81ae6
// CloudCache removed from AdminPerformanceController
2013-08-06 09:25:47 +02:00
0b99a7b331
added the smarty var to the hook_params, this makes it possible to create modules that can assign variables to the smarty local scope
2013-08-05 23:20:19 +02:00
5f0ef76731
Merge pull request #626 from davyrolink/upstream
...
[-] CORE : id_address_invoice was not updated, updateAddressId method
2013-08-05 14:13:54 -07:00
f3361fbedf
Bug fix: id_address_invoice was not updated, updateAddressId method of the Cart class
2013-08-05 22:53:54 +02:00
bdc9d77c09
// Module List + some design WIP
2013-08-05 20:42:14 +02:00
faec5a9226
// small change on fixtures installation
2013-08-05 20:33:39 +02:00
adceb5ccf5
[-] Fo : Bad date format in order-detail, merge from https://github.com/PrestaShop/PrestaShop/pull/476 thanks @gbelorgey
2013-08-05 19:16:44 +02:00
9f13b9f7b1
Merge pull request #474 from madef/master
...
[*] Project : Add paging to Collections
2013-08-05 09:52:16 -07:00
8be06bba2d
[-] BO : FixBug Multiple list pagination error.
2013-08-05 18:22:30 +02:00
d585b015c1
// move toolbar delete button on AdminProducts
2013-08-05 18:18:35 +02:00
931cfee258
Merge pull request #625 from axometeam/patch-18
...
[-] MO : All fields available in the RSS
2013-08-05 09:06:02 -07:00
ea10b94ef2
//onkeypress enter to validate range
2013-08-05 18:02:08 +02:00
9dfeb1d528
All fields available in the RSS
...
Not just link & title but all available fields
2013-08-05 17:58:49 +02:00
cf9d20f83b
//range overlapping bug fix
2013-08-05 17:43:31 +02:00
9ca9928c58
[-] CORE : Fix for field validation in ObjectModel::validateFieldsLang() when default lang value not set, thanks @rimas-kudelis
2013-08-05 17:17:22 +02:00
5cd75f23ff
[-] CORE : Cast product price to float instead of int when adding supplier reference, thanks @rimas-kudelis
2013-08-05 17:05:07 +02:00
3a75a783f6
//added label on carrier zones && improve range validation
2013-08-05 16:54:36 +02:00
a98740d25c
// small change, switch two buttons in list_header
2013-08-05 16:39:29 +02:00
fc54ddb86f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-05 16:32:55 +02:00
114eb3b78b
[-] BO : FixBug Manufacturer multilist pagination, filter, order problems and manufacturer address filter exception
2013-08-05 16:32:39 +02:00
58b5028147
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-05 16:25:57 +02:00
176c6a8767
[-] Classes : ModuleFrontController updated. Thank you @codeurWeb
2013-08-05 16:25:52 +02:00
48f041f035
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-05 16:12:04 +02:00
b81c021144
[-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist
2013-08-05 16:11:48 +02:00
3317ab878d
[-] WS: add id_address_delivery on cart products association
2013-08-05 15:53:40 +02:00
07181a37f5
Merge pull request #413 from ccauw/patch-9
...
[-] BO : bug color parameter in List
2013-08-05 06:37:46 -07:00
db951f5b76
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-05 15:37:20 +02:00
f217061e27
[-] Classes : ModuleFrontController & templates overrides fixed
2013-08-05 15:37:16 +02:00
f3b87f126a
// Feeder not installed by default
2013-08-05 15:32:52 +02:00
ed887fd5c3
[*] BO : Add filter choices in title of List, thankx to @ccauw
2013-08-05 15:18:42 +02:00
gRoussac