Commit Graph

2154 Commits

Author SHA1 Message Date
rGaillard e39c4c2304 // Fix bug on HelperOption
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9496 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 12:13:14 +00:00
rGaillard 7ff90aec1c // Fix helperform displaying on multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9495 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 10:21:25 +00:00
lLefevre 286535500b [*] BO #PSFV-94 : Added AdminCountriesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9492 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 09:32:13 +00:00
vSchoener b2cab5d3f4 - Same fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9490 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 09:14:19 +00:00
vSchoener 2d5635187e - Fix private name method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9489 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 09:13:45 +00:00
mDeflotte 78ddaa120c // Stock decrementation when order is shipped
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9486 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 09:08:59 +00:00
tDidierjean 06564db555 // moved displayflags to options template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9485 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 09:08:55 +00:00
vSchoener 6a6fe4bb5f - Fix norme and php Doc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9484 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 09:04:32 +00:00
bMancone eb2e1826e5 // StockManager: added test for time_left in getProductCoverage()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9480 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 16:33:34 +00:00
vSchoener cef6e4f65a [-] CORE: Refactoring of the ValidateOrder method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9479 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 16:33:07 +00:00
bMancone 3f15c80a82 // StockManagerInterface : fixed comment..
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9478 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 16:25:38 +00:00
bMancone 5ce693bd87 // StockManager: updated security and added getProductCoverage()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9477 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 16:24:26 +00:00
mMarinetti 32344a5c3f // fixed smarty bug (template_dir) created by commit r9468
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9475 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 16:08:40 +00:00
tDidierjean ba6de70fc5 [*] BO : #PSFV-94 - added AdminEmailsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9474 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 15:38:57 +00:00
vSchoener eb9654e1ea [-] CORE: Fix regex for isDate and isDateFormat (0000-00-00 00:00:00 is now allowed)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9471 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 15:22:11 +00:00
rGaillard 2a22c9a502 [*] Core: Upgrade smarty to version 3.1.3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9469 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 15:16:52 +00:00
rMalie dd9257d008 // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9466 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 14:58:33 +00:00
lLefevre 74788d0959 // revert commit 9463
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9465 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 14:47:37 +00:00
lLefevre 5f4ee34f0f //FIxed Added Controller AdminCarrierController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9464 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 14:36:25 +00:00
rMalie 8b4f3d0cf6 [+] Classes: Db::autoExecute() can now use SQL functions as values (use array('type' => 'sql', 'value' => 'SQL_FCT()')
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9463 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 14:35:05 +00:00
lLefevre 2f9e2b313f [*] BO #PSFV-94 : Added AdminCarrierController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9462 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 14:34:37 +00:00
mMarinetti af9dc8707a // added order_by for smarty in helper list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9457 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 13:48:08 +00:00
tDidierjean 6303b68d51 [*] BO : #PSFV-94 - added AdminDbController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9452 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 13:18:51 +00:00
bMancone 4c2e1ca2c8 // Fixed setProductLocation()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9451 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 12:40:01 +00:00
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