Commit Graph

5386 Commits

Author SHA1 Message Date
lLefevre 2ede4caa48 // added pack.tpl and virtualproduct.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11288 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 17:54:59 +00:00
mMarinetti 1346ca3e46 // when upgrade process (INSTALL_VERSION defined), initialize return now an empty shop object (+ die2Exception)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11287 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 17:42:24 +00:00
dSevere 9a58359cb6 // bug fix with suppliers and warehouses on product save action in back-office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11286 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 17:36:54 +00:00
lBrieu db959d2334 // Fix potential SQL injection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11285 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 17:34:38 +00:00
rMalie 3381a99a0e // Fix bug on collections when an item was deleted in iteration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11284 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 17:27:37 +00:00
rMalie 52df492c25 // Remove retrocompatibility stripslashes in ObjectModel
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11282 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 17:02:55 +00:00
tDidierjean 382bcb986b // Changes to product prices tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11280 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 16:58:28 +00:00
mMarinetti 4053ce9df6 // retrompatibility 1.4 theme
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11279 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 16:52:22 +00:00
rMalie 30ae6fc8e2 // Browse collections as associative arrays and not as iterative arrays anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11278 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 16:48:20 +00:00
sThiebaut d5f3da5550 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11277 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 16:44:44 +00:00
vChabot 7d0942bcc2 [*] BO : Required fields improved (with a white list)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11276 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 16:37:08 +00:00
tDidierjean 79bf1d6d5c // Changes to the product associations page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11275 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 16:36:39 +00:00
mDeflotte b53b621808 // BugFix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11274 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 16:23:04 +00:00
rMalie deb4932850 [*] Classes: refactoring of ObjectModel::validateFields() && ObjectModel::validateFieldsLang()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11273 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 16:19:55 +00:00
tDidierjean 7fcbd00819 // Changes to manufacturers and accessories in BO product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11272 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 15:57:50 +00:00
fBrignoli a252da7448 // pdf configuration fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11271 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 15:51:15 +00:00
mDeflotte 7343f80834 // Some translations + Split multi-shipping activation in two differente option (one for allowing multi-delivering and one for allowing to deliver the available products first)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11270 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 15:26:13 +00:00
rMalie b7abb129c8 // littlefix on ProductDownload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11269 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 15:18:08 +00:00
vChabot f98bb890cf // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11268 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 15:07:10 +00:00
jBreux 1207ab6607 // Fix bad colspan and add form label
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11267 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 15:05:53 +00:00
lLefevre 88eb0e2a95 // fix bug display image in product.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11266 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 14:34:20 +00:00
lLefevre fd1ad0f57a // FO : enable languages if > 1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11265 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 14:30:05 +00:00
jBreux 97a23174af // Fix bad indent
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11264 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 14:28:21 +00:00
lLefevre b13c0c4bae // Bo translation && FO btn add to cart in product.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11263 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 14:22:25 +00:00
dSevere 268a14f425 // bug fix on cart button disply in frotn office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11261 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 14:08:20 +00:00
rMalie 259eeb6c27 // Fix lang bug on collections + use definitions on hydrateCollection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11260 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 13:56:15 +00:00
mDeflotte 86aa61d3c0 // BugFix : Blocklayered little fix with product order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11258 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 13:41:53 +00:00
rMalie 13a70e1044 [*] Classes: ObjectModel::getTranslationsField|Child() is now deprecated, use ObjectModel::getFieldsLang() if need instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11256 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 13:24:03 +00:00
jBreux af2feac665 // Add a note on invoice (icon)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11254 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 11:38:51 +00:00
jBreux cb984199fc [+] BO : Add a note on invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11253 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 11:38:01 +00:00
fSerny 29a90b29d1 [-] BO : Now display a question mark when there is no module logo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11252 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 11:29:59 +00:00
fSerny c3602f3278 [-] PROJECT : Replacing some Context::getContext() by $context in class Hook
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11251 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 11:20:32 +00:00
mMarinetti f5aefc80ad // fixed hook::exec when no controller exists, bis
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11250 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 11:09:34 +00:00
mMarinetti 5aea0ddca0 // fixed hook::exec when no controller exists
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11249 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 11:08:17 +00:00
mDeflotte 5d941ccc26 // BugFix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11247 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 10:50:42 +00:00
fSerny 664ab24dd7 [-] Project - Fix on hook retrocompatibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11246 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 10:49:10 +00:00
dMetzger 6c7337d2cb // Fixed rounding bug on cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11245 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 10:41:00 +00:00
sThiebaut 51e342d140 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11244 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 09:50:56 +00:00
fBrignoli 7c2f4774d1 [*] PDF : You can now enable diskcache
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11241 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 09:05:16 +00:00
fBrignoli c4715dd6a0 [*] PDF : TCPDF Tweak
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11240 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 09:02:28 +00:00
bMancone 89213574d0 // Added one field in Product object, so one product can be managed independantly from the stock management (advanced) if necessary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11239 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 18:49:30 +00:00
aFolletete c16aed3424 // you can define invoice on payment addition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11238 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 18:42:50 +00:00
tDidierjean 92147c45ee // Small changes to product page text/layout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11237 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 18:39:11 +00:00
tDidierjean efd4132415 // Fix some XSS
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11236 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 18:34:59 +00:00
mMarinetti 3fc8ef3d88 [*] BO : optimization of liveEdit system
[+] FO : new theme file for front-office layout.tpl, designers have now more possibilities

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11235 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 18:18:57 +00:00
mMarinetti d905e14fde // removed not useful code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11234 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 18:06:29 +00:00
rMalie 49129f85dc // Format definitions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11230 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 17:21:18 +00:00
vChabot 3f814a3cf0 // little fix about generating first John Doe invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11229 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 17:09:52 +00:00
sThiebaut 8bb31dc34a // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11228 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 17:05:22 +00:00
sThiebaut de5977a415 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11227 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 17:05:07 +00:00