Commit Graph

88 Commits

Author SHA1 Message Date
rMalie fd25111d74 // Merge -> revision 8114 2011-08-19 09:46:12 +00:00
fBrignoli 8f8ac0670d [*] Project : US + CA TaxSystem 2011-08-18 10:10:50 +00:00
rMalie 66d4533e68 // Merge -> revision 8097 2011-08-17 16:10:20 +00:00
tDidierjean c28051ae93 // Context part 32 2011-08-17 13:40:05 +00:00
rMalie fc2e036fc2 // Fix display of breadcrumb (dont show categories disabled) + it's now impossible to browse categories outside of root category for shops 2011-08-17 12:32:04 +00:00
tDidierjean 3d733ae6e2 // Context part 31 2011-08-17 10:07:12 +00:00
rMalie a9a1706085 // Fix homefeatured products for multishop 2011-08-17 09:41:28 +00:00
rMalie cba5631db0 // Merge -> revision 8076 2011-08-17 08:15:38 +00:00
rMalie aa37be28db // Merge -> revision 8059 2011-08-16 09:10:40 +00:00
gBrunier c83977874c //Changing version 2011-08-12 14:47:18 +00:00
gBrunier d5bebc7095 [-] MO : Duplicate condition 2011-08-12 11:57:11 +00:00
gBrunier 631ebe4592 [-] MO : Replace ps_ by _DB_PREFIX_ 2011-08-12 10:11:11 +00:00
gBrunier d98b438d5a [+] MO : Adding the favoriteproducts module - Part2 2011-08-12 08:14:09 +00:00
rMalie 0b28aa8f72 // Fix #PSFV-48 2011-08-11 14:42:31 +00:00
gBrunier abbcf84e6d [*] MO : Review of the productcomments module - Part3 2011-08-11 12:07:25 +00:00
rMalie d0dbb5c185 // Merge -> revision 8014 2011-08-11 12:00:05 +00:00
rMalie 2bb147128b // Revert normalization 2011-08-11 10:20:59 +00:00
rMalie 7fec565167 // Normalization 2011-08-11 09:58:20 +00:00
gBrunier 4f1e8fc2d5 [*] MO : Review of the productcomments module - Part2 2011-08-11 09:48:49 +00:00
rMalie 59c4f5489d // Fix on shops + remove id_group_shop from stock + fix stock 2011-08-11 09:38:24 +00:00
tDidierjean d8cbb2bafc // changes to header and footer 2011-08-10 13:11:56 +00:00
rMalie 792ce71cd4 // Merge -> revision 7979 2011-08-10 08:36:17 +00:00
gBrunier 9259271bc6 [+] MO : Adding the favoriteproducts module - Part1 2011-08-09 16:35:11 +00:00
tDidierjean 767cab5c66 // fix loyalty module 2011-08-09 14:54:17 +00:00
rMalie 62802f459d // Fix Shop::SHARE_ORDER and Shop::SHARE_CUSTOMER on statistics 2011-08-09 13:42:03 +00:00
rMalie c61b127f66 // Merge -> revision 7941 2011-08-08 16:01:47 +00:00
tDidierjean 0310674fe0 // Context part 29 2011-08-08 13:17:12 +00:00
gBrunier 9570d3d44f [*] MO : Review of the productcomments module - Part1 2011-08-05 15:09:46 +00:00
fBrignoli d9fa602cc3 [~] Hook::get replaced by Hook::getIdByName 2011-08-05 14:49:18 +00:00
rMalie 1816946216 // Fix on module product comment for context 2011-08-05 14:21:16 +00:00
rMalie 90fcde2539 // Merge -> revision 7906 2011-08-05 13:26:44 +00:00
rMalie 83734c7bb9 // Merge -> revision 7875 2011-08-03 16:16:49 +00:00
rMalie 5c849dfa6d // Move theme choice from AdminTheme page to Shop page 2011-08-02 13:47:34 +00:00
rMalie e2c8d89e41 // Merge with revision 7841 2011-08-02 11:43:58 +00:00
rMalie 3c8c85b1cd // Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script 2011-08-02 09:54:23 +00:00
rMalie 66eab15a18 // Routes for dispatcher (part 4) + some fix 2011-08-01 13:28:02 +00:00
dMetzger 33bbb70bfa [+] BO : you can now set detailed permissions for each module in the back end 2011-07-31 16:39:53 +00:00
tDidierjean 55c1a0afeb // Context part 28 2011-07-29 15:06:20 +00:00
tDidierjean 9213581a03 // Context part 27 2011-07-29 14:29:57 +00:00
tDidierjean cac7807513 // Context part 26 2011-07-28 16:37:50 +00:00
rMalie b59d2200f6 // Fix #PSFV-30 + context part 24 2011-07-28 14:12:17 +00:00
rMalie c17e7c236d // MERGE with 1.4 r7770 2011-07-28 09:20:57 +00:00
rMalie 5f6f018885 // REVERT MERGE 2011-07-27 13:35:06 +00:00
rMalie 233c0076b7 // MERGE with trunk revision 7754 2011-07-27 12:48:42 +00:00
rMalie 8bb4c75411 // Fix #PSFV-21 2011-07-27 08:15:21 +00:00
rMalie 03b5d8ae50 // Fix #PSFV-20 2011-07-27 08:12:31 +00:00
tDidierjean a96064b13d // Context part 19 2011-07-25 16:42:48 +00:00
rMalie 0aba3ba000 // Carrier association + discount association 2011-07-22 15:53:07 +00:00
rMalie 8d3e36c904 // Fix strict standard on paymentModule + fix stats SQL bug 2011-07-22 09:49:29 +00:00
rMalie 3f9a9e41d7 // id_shop on cart product (for links) + change Shop::sqlAsso() + share_order 2011-07-22 08:57:51 +00:00