Commit Graph

5386 Commits

Author SHA1 Message Date
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
vChabot 7cbd4c20f2 // removing ajaxProcess, now useless because the process doesn't need ajax anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9483 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 08:04:41 +00:00
bMancone aae41922b5 // StockCover : fixed l function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9482 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 16:59:17 +00:00
bMancone 1777dee8e9 // Stock: added StockCoverController - stock coverage
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9481 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 16:39:17 +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
rGaillard 41a4ccbc4c // Fix smarty BackOffice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9473 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 15:34:18 +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
rGaillard b22fe70288 // Smarty update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9468 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 15:13:01 +00:00
lLefevre c98eefef0d //fixed bug update duplicate call HelperOptions()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9467 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 15:12:22 +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
mMarinetti 5af9dce752 // fix token in ajax calls
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9456 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 13:42:09 +00:00
mMarinetti 3f2a2c99c6 // bugfix arrow switch order_way
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9455 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 13:40:23 +00:00
tDidierjean 433a771bfe //delete AdminRequestSql.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9453 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 13:23:19 +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
mDeflotte c43af9ca20 // Improve Stock Instant states tab in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9450 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 11:58:41 +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
mDeflotte af8cac9d64 // Improve details action link
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9447 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:48:16 +00:00
lLefevre bfd36393b7 //added option maxlength in input text and added field input checkbox
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9446 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:45:08 +00:00
mDeflotte 5fc60a0864 // Improve details action link
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9445 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:42:00 +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 8aa35a9196 //Fixed bug var list_skip_actions in list_content.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9440 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:17:56 +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
fBrignoli 43958d54e7 // invalid id for "Stock ... " in PREFIX_tab_lang
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9437 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 07:56:45 +00:00
vAugagneur c044f5796b //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9436 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 07:40:38 +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
mDeflotte 243387c4e0 // Add table prefix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9429 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 15:26:49 +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