Commit Graph

407 Commits

Author SHA1 Message Date
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 a835a4aa8c //oups sql
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8564 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 12:17:49 +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 79d16b8d9a // ignore cache and complie content directories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8559 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 09:21:46 +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
tDidierjean aa05a52c9b // change image drag&drop to look like other drag&drop lists
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8546 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 17:14:58 +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 0c49b5b416 // fix image drag&drop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8543 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 15:34:41 +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
fBrignoli fa63f24cd3 [-] BO : John Doe cart's address are incorrect!
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8538 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 13:53:56 +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 97aa51eb20 [+] BO : Add translations for notifications messages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8528 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 09:06:46 +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
lBrieu bf480eb45e [*] BO : Shows more details for each notification
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8525 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 09:05:30 +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 8c23f118f1 // assign variables to display cart from payment method choice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8522 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 08:24:40 +00:00
tDidierjean 74f7dda09e // fix ajax fileuploader error with duplicate positions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8521 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 08:21:26 +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
vChabot 602bfdfdec // conflict removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8517 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-13 07:13:25 +00:00
lBrieu da410fa260 [*] BO : Shows more details for each notification
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8516 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 16:46:07 +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 3df03aa2bb // Merge -> revision 8507
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8514 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 16:20:30 +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
rMontagne 3c6a0944fa [*] BO : Update Translation Error for Multiple Upload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8512 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 16:00:20 +00:00
rMontagne 712a8cd21d [*] BO : Add Style Multiple Upload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8511 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 15:56:22 +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
aFolletete 4bacf38897 // revert
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8505 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 15:25:21 +00:00
fBrignoli c9de718503 [-] Installer : Removed AdminCounty
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8501 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 14:37:32 +00:00
lLefevre 7869976b39 // fixed commit 8499 : change css to div.hint
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8500 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 14:01:40 +00:00
lLefevre 90724761b0 [*] B0 : change the tooltip (CC014)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8499 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 13:21:48 +00:00
vAugagneur a318f6e081 //added tools/smarty/cache AND tools/smarty/compile in ignore list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8497 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 12:52:57 +00:00
vAugagneur 480678b81a [-] FO : fixed small js error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8494 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 12:35:29 +00:00
vAugagneur 625920282a [-] FO : ajax request to send message in order detail now use index.php?controller=order-detail
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8492 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 12:21:44 +00:00
lLefevre 80d8b0a1a9 [*] BO : change a number of character by short description(BL007)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8489 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 11:57:30 +00:00
vAugagneur fbfe491903 [-] Controller : fixed sql bug in contact controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8484 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 09:15:50 +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
lBrieu 77a4815ef0 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8446 b9a71923-0436-4b27-9f14-aed3839534dd 2011-09-09 13:14:47 +00:00
lBrieu 0f64fbb542 [+] Add translations for labels (Notifications on BO)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8445 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-09 13:14:30 +00:00