Commit Graph

79 Commits

Author SHA1 Message Date
vChabot
83fc0977c9 [*] BO : Features are now sortable.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8751 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 15:45:40 +00:00
rMalie
7c85e104de // Merge -> revision 8734
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8740 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 14:06:47 +00:00
fBrignoli
f8989018a7 // Tax::initializeAddress =>Address::initialize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8700 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 15:43:12 +00:00
rMalie
1d6a3e90c8 // Remove Tools::buildQuery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8698 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 15:36:23 +00:00
vAugagneur
8b6ec916e0 [+] BO : now you can choose type of attribute group (select , color, radio)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8691 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 14:29:32 +00:00
vChabot
d0102a81b7 [*] BO : groups attributes are now sortable
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8683 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 10:04:54 +00:00
bMancone
22707acfae // Fixed setStock(): Quantity is now set correctly
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8681 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 09:47:30 +00:00
rMalie
7eef9391af // Improve DbQuery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8670 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-20 16:49:22 +00:00
rMalie
95233f9df5 [+] Classes: add DbQuery class in order to build queries (usefull when working with chunks of queries)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8668 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-20 16:14:19 +00:00
vChabot
a88c90fbe1 [*] BO : Product attributes are now sortable.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8639 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-19 13:11:00 +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
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
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
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
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
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
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
tDidierjean
c2258ae8e9 //// Merge -> revision 8290
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8295 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-01 09:53:43 +00:00
rMalie
2c60ea0863 // Fix multi virtual uri on same domain for htaccess + products on multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8196 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-25 15:27:49 +00:00
rMalie
b12bf222a9 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8179 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-24 15:57:10 +00:00
rMalie
22d23f8324 // Merge -> revision 8149
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8151 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-22 16:22:16 +00:00
rMalie
382584ad35 // Fix all category_lang sql restrictions with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8124 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 14:21:45 +00:00
rMalie
7cadad5d3e // Fix all product_lang sql restrictions with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8121 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-19 14:01:23 +00:00
fBrignoli
f371f3e3bc [*] Project : US + CA TaxSystem
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8105 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-18 10:10:50 +00:00
rMalie
0aada6cc1e // Merge -> revision 8097
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8100 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 16:10:20 +00:00
rMalie
21ca4d15d7 // Merge -> revision 8059
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8062 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 09:10:40 +00:00
rMalie
49468717c2 // Fix #PSFV-48
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8032 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 14:42:31 +00:00
rMalie
3ab2ba9a75 // HTML flag can be used in ObjectModel->getTranslationsFieldsChild() to keep html on language fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8026 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 13:39:30 +00:00
rMalie
52d1d13891 // Merge -> revision 8014
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8021 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 12:00:05 +00:00
rMalie
d1d4d57eca // Revert normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8019 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 10:20:59 +00:00
rMalie
a01a13274a // Fix Product->setStock()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8018 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 09:59:23 +00:00
rMalie
f62cdb1963 // Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8017 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 09:58:20 +00:00
rMalie
e093ecd554 // Fix on shops + remove id_group_shop from stock + fix stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8015 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 09:38:24 +00:00
rMalie
7411db9a69 // Merge -> revision 7979
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7981 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-10 08:36:17 +00:00
rMalie
671162a5f5 [-] Add a new option in admin preference to recompile smarty templates only when they are updated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7976 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-09 16:25:40 +00:00
rMalie
f48b1ffc45 // Add cache on products stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7966 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-09 14:50:48 +00:00
rMalie
6e46649631 // Add cache on products stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7965 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-09 14:50:30 +00:00
rMalie
269121a9c4 // Add cache on products stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7963 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-09 14:43:04 +00:00
rMalie
239f92eaf1 // Merge -> revision 7906
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7909 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-05 13:26:44 +00:00
rMalie
f2b5ee338b // Merge -> revision 7875
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-03 16:16:49 +00:00
rMalie
6f08bcb12e [+] Add a route system to personalize rewrited URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7876 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-03 16:02:49 +00:00
rMalie
ffeb22bfb9 // Merge with revision 7841
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-02 11:43:58 +00:00
rMalie
ab5fc723b4 // Routes for dispatcher (part 4) + some fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7830 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-01 13:28:02 +00:00
rMalie
a875fecb20 // MERGE with 1.4 r7770
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 09:20:57 +00:00
rMalie
be4811aa6e // REVERT MERGE
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 13:35:06 +00:00
rMalie
e159c925d8 // MERGE with trunk revision 7754
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 12:48:42 +00:00
tDidierjean
4ade3a0ea0 // remove 1.4 deprecated functions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7755 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 09:51:43 +00:00
tDidierjean
d05d16d399 // Context part 21
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7742 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-26 16:40:17 +00:00