Commit Graph

2154 Commits

Author SHA1 Message Date
rMalie 1977f1d851 // Merge -> revision 8608
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8612 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-15 16:10:59 +00:00
rMalie 8d9309ba23 // Norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8607 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-15 14:32:37 +00:00
vChabot 34c9336b37 [*] FO : display initial price in the cart when a specific price is applied to a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8604 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-15 12:37:44 +00:00
fBrignoli 8c049f8afd // Norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8595 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 16:06:00 +00:00
fBrignoli 1db441bc42 // Norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8588 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 15:50:15 +00:00
fBrignoli 28c187186f // Norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8587 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 15:46:18 +00:00
fBrignoli 7476f5e534 // Norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8584 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 15:39:44 +00:00
fBrignoli 6700cc023e // Norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8581 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 15:33:14 +00:00
rMalie 03eaee9bf4 [+] Project: it's possible to create new genders, "Miss" gender is now added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8578 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 15:15:51 +00:00
aFolletete b3d60e169b [*] Project : Version 2 of Smarty has been removed for using only version 3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8569 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 13:27:32 +00:00
fBrignoli e5703a3d69 // first line was empty
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8567 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 13:11:11 +00:00
fBrignoli 8bcea2496e [-] FO : add to cart broken TaxCalculator::getTaxesRate => getTotalRate
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8566 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 13:09:24 +00:00
vAugagneur 453edf991d [+] BO : now you can sync imap mailbox with the Customer Service (SAV)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8562 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 09:42:53 +00:00
rMalie b7cc6cb72d // Fix & - theme is not w3c valid anymore for now
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8560 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 09:23:32 +00:00
aFolletete 59b55487be [-] Classes : Fixed bug on Feature detachables and Customizations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8557 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 09:18:18 +00:00
fBrignoli facb2318e5 [*] BO : Taxes are now historized
[*] BO : Taxes are no longer stored in the order details row



git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8556 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 09:06:20 +00:00
rMalie 578d6de4b9 // Fix adminMeta (dispatcher notices) + generateHtaccess
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8555 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 08:53:37 +00:00
rMalie 87df41c9d6 // Merge -> revision 8552
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8554 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 08:29:10 +00:00
fBrignoli d74bcee308 // code norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8545 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 16:55:44 +00:00
tDidierjean feabf30c20 [*] BO : product images can now be dragged and dropped to change position (CC021)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8542 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 15:22:29 +00:00
vChabot e4a09c5222 // changing name "available_date_combi" to "available_date" and some features
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8541 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 14:52:42 +00:00
tDidierjean 4e85800d20 // fix validation of available_date field in Product class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8540 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 14:21:59 +00:00
fBrignoli cccdd42735 // debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8539 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 13:59:44 +00:00
lLefevre 5cae5358fa [*] BO : Add reduction groups in the categories, and bug fix: reduction that is not an integer or a percentage (TD001 - TD002 - TD003)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8536 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 13:17:32 +00:00
mMarinetti fc7612f010 // norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8531 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 09:57:19 +00:00
lBrieu 36ffc04d26 [*] BO : Allows to get more details on the notification (customer name, total paid real, etc...)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8527 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 09:06:17 +00:00
rMontagne 0c2521c568 Fix Classe FileUploader
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8523 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 08:25:52 +00:00
vChabot 7564ceb76a [*] BO : add an available date when product is out of stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8520 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 08:07:34 +00:00
vAugagneur aba41c1078 [+] FO : Messages in order detail are now stored in the Customer Service (SAV)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8518 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 07:18:04 +00:00
lBrieu 4f3f180fdd [+] BO : Allows to get more details on the notification (customer name, total paid real, etc...)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8515 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 16:45:18 +00:00
rMalie b50c7e4334 // Merge -> revision 8507
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8513 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 16:17:37 +00:00
rMalie 467313e111 // Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8509 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 15:49:01 +00:00
rMontagne 9fbc821f61 [+] BO : Add Multiple Ajax Upload Image on AdminProduct
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8508 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 15:46:36 +00:00
tDidierjean a3245e4093 [*] BO : Removed size limit for image upload (BL006, CC136)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8482 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 09:14:07 +00:00
rMalie a25f1341ea // Fix discounts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8442 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-09 11:41:02 +00:00
rMalie 24e213cda8 // Merg// Merge -> revision 8395
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8397 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-07 16:23:13 +00:00
rMalie 5aab81dc66 // Fix carrier creation for multistore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8396 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-07 15:47:45 +00:00
rMalie 7ef8474e4c // Fix tryToConnect methods for DB
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8386 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-07 12:25:47 +00:00
rMalie 5a41f08c70 // Fix tryConnection and tryEncoding for MySQL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8383 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-07 09:44:20 +00:00
aFolletete 18c930c28e [-] Classes : fixed sql error on Combination class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8382 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-07 08:46:05 +00:00
rMalie 174947be5b [*] Project: MySQL::trytoconnect() and MySQL::tryUTF8() methods replaced with Db::checkConnection() and Db::checkEncoding()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8380 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-07 08:16:43 +00:00
rMalie 0c7d567451 // Fix carrier bug for virtual products during payment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8368 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-06 13:34:44 +00:00
rMalie 39f2f53db2 // Merge -> revision 8363
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8365 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-06 12:38:55 +00:00
jmCollin 76f895c4d5 // Correct create product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8361 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-06 11:38:47 +00:00
rMalie e7b5cd5b95 // Fix HTML validation on URLs (replace & per &)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8355 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-06 09:58:11 +00:00
rMalie 79fd72e461 // Merge -> revision 8342
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8344 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-05 14:56:02 +00:00
rMalie 371f9a5397 [+] Add native MySQLi support
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8341 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-05 13:55:11 +00:00
rMalie 9032e37b38 // Fix stock for customizable features
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8340 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-05 13:53:39 +00:00
lBrieu 3842a2f473 // Update "$this->context->employee->id" to "Context::getContext()->employee->id"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8334 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-05 09:57:33 +00:00
aFolletete 3eff951265 [+] Project : adding Features detachables in order to improve performance
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8328 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-03 17:21:32 +00:00