Commit Graph

5386 Commits

Author SHA1 Message Date
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
fGaillard d601a74b8b [-] BO : #PSTEST-24 : BugFix date picker for combinations products (display & date format)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11353 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 13:03:22 +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
fGaillard 09d15124b0 [-] BO : #PSTEST-8 : Changed prices.tpl digits precision //last commit omit modification
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11350 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 10:40:13 +00:00
fGaillard 6d6f46ad4d [-] BO : #PSTEST-8 : H.T prices precision changed (2 digits instead of 6)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11349 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 10:34:46 +00:00
tDidierjean 26f835a0ac // Small fixes to BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11348 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 10:33:13 +00:00
mDeflotte 39ee8e03ae // $required_fields must not be static
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11347 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 10:28:53 +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
jmCollin b432570f9d //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11342 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:51:26 +00:00
jmCollin 8bca38ad20 Fix memory bug with Prestafraud configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11340 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:41:39 +00:00
fGaillard 82419c80aa [-] Classes : #PSCFI-4477 : BugFix GSiteMap priority - Decimals no longer take care about local numeric separator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11338 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:37:38 +00:00
mDeflotte 21d4c051bd // Traductions files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11336 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:25:37 +00:00
lLefevre 03c143b316 [-] BO : #PSTEST-52 : update display of pack.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11335 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:21:36 +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
vAugagneur 1d545efe66 //move jquery plugin in the good folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-18 21:17:06 +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 538cb58556 // clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11323 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-17 16:26:59 +00:00
aFolletete 9038c4ea68 // fix calculation issue on product addition
// all elements are correctly updated when we adding, editing or deleting a product

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11322 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-17 16:20:03 +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
fSerny ccc51353ce [-] BO : Warnings are now displayed on Modules Tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11319 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 16:16:30 +00:00
lLefevre a15214a04e [-] BO : #PSTEST-18 : smalls improvements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11316 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 16:03:44 +00:00
lLefevre 26032dc8bd [-] BO : #PSTEST-14 : translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11315 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:46:08 +00:00
aFolletete 41f7ae4d3a // add message when no payment is present
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11314 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:31:14 +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
mDeflotte 3391591fd2 // BugFix : Change footer link
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11310 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:18:48 +00:00
jBreux 3c7de270c5 // Fix orders view icons
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11309 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:18:01 +00:00
tDidierjean 31f3a71b9d // Fix product attributes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11308 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 15:06:53 +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
lLefevre a45921e1ea [-] BO : #PSTEST-15 : translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11304 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 14:44:57 +00:00
lLefevre 8dbd57dd20 // small corrections
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11303 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 14:13:50 +00:00
mDeflotte 3a3684a3ed // BugFix : AdminSearch dont generate urls with good token
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11302 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 14:01:00 +00:00
lLefevre 00b878d868 // added pack.tpl in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11301 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 13:57:27 +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
rGaillard c5c699548a // Fix submit button
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11298 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 10:47:31 +00:00
mDeflotte 14f931f6d5 // BugFix : AdminSearch dont find features
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11297 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 10:36:06 +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 d6c85b63d5 // BugFix : summary-cart + Change a translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11295 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 10:08:17 +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
mDeflotte 879186f936 // BugFix : summary-cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11293 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 09:42:23 +00:00
jBreux 2db96b625d // Fix scroll and add missing image
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11292 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 09:33:36 +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
lLefevre b14b35d67f // update virtual_product.tpl in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11290 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-16 09:12:12 +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