Commit Graph

15 Commits

Author SHA1 Message Date
rMalie 82c9dead2a // Merge -> 10309 2011-11-21 11:05:10 +00:00
dMetzger 4fbb25168e // Retro compatibility and updater improved for Discount/CartRules 2011-11-02 14:23:44 +00:00
rMalie 9510337b1d // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names 2011-10-10 12:18:56 +00:00
rMalie 91083e190c // Merge -> revision 8800 2011-09-27 14:30:06 +00:00
rMalie 66d4533e68 // Merge -> revision 8097 2011-08-17 16:10:20 +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
tDidierjean 9213581a03 // Context part 27 2011-07-29 14:29:57 +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
rGaillard 8fc7f11014 2011-07-06 10:54:11 +00:00
rGaillard d1a13007b9 2011-07-06 10:10:43 +00:00
aFolletete 05a58f53e6 // 1.5 branche creation 2011-04-12 18:24:40 +00:00