Commit Graph

1780 Commits

Author SHA1 Message Date
hAitmansour 2d1a1a473c [*] FO BO MO : rename function isMultiShopActivated by isFeatureActive
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9449 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 11:52:26 +00:00
dSevere 382f4678bf // Add currency to the warehouse - optimisation of form, list and option init in AdminController - list bug fix on StockManager
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9448 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 11:11:30 +00:00
hAitmansour d8509b2829 [*] FO BO MO : rename function isMultiShopActivated by isFeatureActive
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9444 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:36:12 +00:00
mMarinetti be31f53773 // fixed path to jquery plugin
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9443 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:34:08 +00:00
tDidierjean de59e7b432 [*] BO : #PSFV-94 - added AdminCurrencuesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9442 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:29:49 +00:00
mMarinetti ab1594fb7e [-] BO : fixed bug with Search:indexation when editing product (id_shop was missing)
// end of line style fix


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9441 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:29:00 +00:00
lLefevre 65de510dfa // Fixed bug position in HelperList
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9439 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 08:40:47 +00:00
rMalie 42564ca3d0 // Merge -> revision 9435
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9438 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 08:14:42 +00:00
dSevere d2e9af38eb // GetList function : Add the possibility to not use LIMIT in the SQL request
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9433 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 17:42:11 +00:00
dSevere c65af0c1f3 // Stock: Add Stock Management in admin tabs - extend HelperList to render simple lists without filter, sorting, pagination, ...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9432 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 17:11:13 +00:00
mDeflotte 886fcda18e // Decrement stock available on order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9430 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 15:43:28 +00:00
tDidierjean 38ac02496c // fix AdminController::loadObject()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9428 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 15:22:45 +00:00
mDeflotte 8ad7b9a283 // Add title for details action link
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9426 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 14:04:35 +00:00
vChabot 6517b06539 [+] FO : you can access to a product combination with its own url (e.g: http://www.myshop.com/index.php?controller=product&id_product=1#disk-space=16go&color=yellow)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9425 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 14:03:02 +00:00
tDidierjean 730e5e4d96 [*] BO : #PSFV-94 - added AdminContactsController, fix flags display for option lists
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9424 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 14:00:27 +00:00
dSevere 7b2c4b0f06 // Update the way to skip actions for rows in list mode + code refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9420 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 13:15:46 +00:00
tDidierjean 9f92e7941c [*] BO : #PSFV-94 - added AdminBackupController and some changes to AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9417 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 12:40:35 +00:00
bMancone dafba9ea02 // Stock: removed id_currency. Warehouse: added id_currency. StockManager: fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9416 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 12:31:34 +00:00
bMancone 54e25793fd // Stock & StockMvt : added round()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9415 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 12:11:31 +00:00
bMancone 6e2827418f // StockAvailable : cleaned & fixed save()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9414 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 12:10:26 +00:00
bMancone 3638cdc3c9 // Attribute: fixed checkAttributeQty()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9410 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 09:46:13 +00:00
rMalie 30835cb4c8 [*] Classes: Tools::property_exists() is deprecated, since PrestaShop now requires 5.1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9408 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 09:02:57 +00:00
bMancone e5ae345855 // Stock : fixed Pack & Product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9406 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 08:59:31 +00:00
dSevere f895c0c65b // Debug use of HelperList with listKkip arrays
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9402 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 17:17:58 +00:00
lLefevre 96844f2d92 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminStoresController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9401 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 16:37:21 +00:00
mDeflotte 651e2d72b9 // Improving admin list action "details"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9400 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 15:50:54 +00:00
mDeflotte a5486b7875 // Adding a new admin list action "details"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9399 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 15:19:25 +00:00
bMancone 23a24b58e2 // Removed occurences of setStock / getStock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9395 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 15:03:15 +00:00
tDidierjean 643346b806 [-] Classes : fixed image folders rights
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9393 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 14:57:58 +00:00
dSevere 2e34e7cadd //Stock : Update Warehouse management - use of new adminController - add the possibility to associate shops and carriers to a warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9389 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 12:51:22 +00:00
rMalie a7bc16dadd // Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9384 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:46:08 +00:00
dSevere 6c9158a305 // Code review and refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9382 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:35:51 +00:00
lLefevre e1c52879af // fixed bug property currentIndex
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9378 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 08:32:31 +00:00
tDidierjean 92565efe43 // Add HelperOptions to generate preferences forms
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9369 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 14:30:07 +00:00
dSevere 5bd7821915 // HelperList: add possibility to create custom action for each row
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9368 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 14:19:45 +00:00
lLefevre 50cb82f508 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminGenderController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9364 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 12:59:26 +00:00
fBrignoli da97c9237c [*] CO : Remove last separators
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9360 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 09:23:48 +00:00
vSchoener 6235389101 [*] CORE : AddressFormat, Add the possibility to doesn't specify a patternRules (avoid type) and fix empty content
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9357 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 09:08:15 +00:00
lLefevre b58fb34c97 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminQuickAccessesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9355 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 08:57:52 +00:00
rMalie 45645f1f50 // Merge -> revision 9352
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9354 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 08:20:54 +00:00
mDeflotte 2ea57df6cb // Add stock avaibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9339 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:37:07 +00:00
dSevere ef6805a8a1 // stock: update stockMvt
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9335 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:25:40 +00:00
dSevere f1c26377a5 // stock: add warehouse tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9334 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:19:10 +00:00
bMancone ae43d7f86b // Stock : updated Stock & StockMvt & StockMvtReason
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9329 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:06:09 +00:00
lLefevre cf8cb50631 [*] BO #PSFV-94 : update of the displayform method by helperForm in AdminOrderMessageController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9328 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 16:01:44 +00:00
mDeflotte 205e54c31c // Add stock avaibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9327 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:58:29 +00:00
jmCollin c4391df038 // fix bug with virtual product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9325 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:44:33 +00:00
bMancone cc24b5abc0 // Stock : removed references to the actual stock management in AdminOrders/Product in order to merge with the new stock management system
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9322 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:32:06 +00:00
mDeflotte da6641ca10 // Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9321 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:27:41 +00:00
mDeflotte 7d7d3bfdd4 // Replace tab by a space between keyword "function" and the function name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9320 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:26:39 +00:00