Commit Graph

1120 Commits

Author SHA1 Message Date
tDidierjean dac7c7795c // Fix bug with specific prices creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11358 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 13:53:56 +00:00
lLefevre 373232aa93 // small bugs in combinaitions of virtual products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11356 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 13:20:30 +00:00
rMalie 5e60b5eada // Protect $table and $alias in DbQuery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11354 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 13:15:53 +00:00
rMalie b7ae37f6d7 // Change prototype of methods from(), leftJoin(), innerJoin(), leftOuterJoin() and naturalJoin() for DbQuery class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11351 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 11:13:13 +00:00
fBrignoli 2139d3983d [*] CO : Additional Shipping Cost / Purchase Price / Reduction Amount texc in OrderDetails
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11345 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 10:16:04 +00:00
mDeflotte d33fcc2da6 // DisplayDate don't have to 'die' if date == '0000-00-00'
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11344 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 10:14:42 +00:00
mDeflotte 9688e7741f // Fixing bugs in admin cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11343 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:51:59 +00:00
bMancone f0a1fc667b // StockMvt : added id_warehouse as part of the params of getNegativeStockMvts()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11334 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:10:21 +00:00
aFolletete 92805dc869 [+] BO : on order edition, you can add a discount
[+] BO : on order edition, you can delete a discount
// Adding two new columns in order_cart_rule table: id_order_invoice, value_tax_excl

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11330 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-18 17:18:54 +00:00
aFolletete d446d77261 // fix bug on Cart rule update in validateOrder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11326 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-17 17:13:48 +00:00
aFolletete 073e0fbbc4 // clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11325 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-17 16:53:50 +00:00
aFolletete 4b4a4bbfce // fix notice error on payment validation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11324 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-17 16:44:48 +00:00
aFolletete 8415b8136d // fixed bug on automatic payment addition when put the order to a paid status
// fix "Free shipping" when create a new invoice

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11321 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 17:17:13 +00:00
aFolletete 896b62978f // fix bug on tracking number value
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11311 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:22:38 +00:00
aFolletete 5a4bc80867 // improve invoice and order payment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11306 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:00:43 +00:00
rMalie eb14c43722 // Norm + improve ObjectModel
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11305 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 14:55:05 +00:00
fSerny e390031c83 // Adding an error message in class Module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11300 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 10:57:50 +00:00
fSerny 2ab9ff175d [-] PROJECT : Cleaning Class Module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11299 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 10:52:45 +00:00
aFolletete 6f03353f96 [*] BO : no payment is registered on order creation for check and bankwire payment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11296 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 10:10:48 +00:00
mDeflotte 1d393f8e97 // BugFix : Adding some backquote to protect SQL reserved word
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11294 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 09:57:03 +00:00
jBreux 8a73986a76 [*] BO : Improvement invoices management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11291 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 09:14:11 +00:00
fSerny 5f639b3319 [-] PROJECT : Modules now handle PrestaShop version compliancy and dependencies check
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11289 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 20:11:43 +00:00
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
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
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
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
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
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
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
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 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 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
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
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 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
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
bMancone 4e8fa347f7 // Updated type in definition for product_supplier_reference (Thanks R.)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11226 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:57:40 +00:00
bMancone 2a888cbd8a // Reverted modifications on product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11225 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 16:55:12 +00:00