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
|
0b28aa8f72
|
// Fix #PSFV-48
|
2011-08-11 14:42:31 +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 |
|
rMalie
|
2b71b8be68
|
// Fix on discounts with multishop + index?controller=index fixed to be only index.php
|
2011-08-08 08:29:32 +00:00 |
|
rMalie
|
66eab15a18
|
// Routes for dispatcher (part 4) + some fix
|
2011-08-01 13:28:02 +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 |
|
tDidierjean
|
21017fb5d8
|
// remove 1.4 deprecated functions
|
2011-07-27 09:51:43 +00:00 |
|
tDidierjean
|
ea890721e8
|
// Context part 21
|
2011-07-26 16:40:17 +00:00 |
|
tDidierjean
|
a64edf3ff6
|
// Context part 20
|
2011-07-26 15:55:04 +00:00 |
|
tDidierjean
|
112b465f96
|
// Context part 17
|
2011-07-22 09:35:28 +00:00 |
|
rMalie
|
3f9a9e41d7
|
// id_shop on cart product (for links) + change Shop::sqlAsso() + share_order
|
2011-07-22 08:57:51 +00:00 |
|
tDidierjean
|
89bcfec297
|
// fix delete customization
|
2011-07-21 16:41:12 +00:00 |
|
tDidierjean
|
a264942b1a
|
// removing cookie from product customization
|
2011-07-21 14:38:04 +00:00 |
|
rMalie
|
73d6f4267b
|
// Context part 16 (shops)
|
2011-07-20 12:08:15 +00:00 |
|
rMalie
|
02a738dce1
|
// Context part 15
|
2011-07-19 16:17:14 +00:00 |
|
rMalie
|
ba2922a823
|
// Context part 13
|
2011-07-19 09:44:10 +00:00 |
|
rMalie
|
e16a8ab8d3
|
// Context part 10
|
2011-07-18 15:27:32 +00:00 |
|
rMalie
|
2d77925e7d
|
// Refactoring of shop class with new context
|
2011-07-12 16:28:20 +00:00 |
|
tDidierjean
|
89920e17fd
|
// Context part 2
|
2011-07-12 12:50:00 +00:00 |
|
tDidierjean
|
139bb84f87
|
// Context - first commit
|
2011-07-11 14:32:05 +00:00 |
|
tDidierjean
|
9b288cecf5
|
// revert previous commit
|
2011-07-08 16:12:27 +00:00 |
|
tDidierjean
|
af4c7605de
|
// cancel commit
|
2011-07-08 15:43:24 +00:00 |
|
rGaillard
|
8fc7f11014
|
|
2011-07-06 10:54:11 +00:00 |
|
rGaillard
|
d1a13007b9
|
|
2011-07-06 10:10:43 +00:00 |
|
fBrignoli
|
ff49083fb6
|
// merge 1.4 (5397)
|
2011-04-22 16:00:58 +00:00 |
|
aNiassy
|
75abdd5acb
|
[-] FO : #PSCFI-1374 Fixed a bug concerning the cart without taxes
|
2011-04-21 09:14:34 +00:00 |
|
aFolletete
|
fbc1882f85
|
[*] Core : clean all deprecated methods
|
2011-04-12 18:50:26 +00:00 |
|
aFolletete
|
05a58f53e6
|
// 1.5 branche creation
|
2011-04-12 18:24:40 +00:00 |
|