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 |
|
rMalie
|
aa37be28db
|
// Merge -> revision 8059
|
2011-08-16 09:10:40 +00:00 |
|
rMalie
|
0b28aa8f72
|
// Fix #PSFV-48
|
2011-08-11 14:42:31 +00:00 |
|
rMalie
|
e92657bba2
|
// HTML flag can be used in ObjectModel->getTranslationsFieldsChild() to keep html on language fields
|
2011-08-11 13:39:30 +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
|
accec09c98
|
// Fix Product->setStock()
|
2011-08-11 09:59:23 +00:00 |
|
rMalie
|
7fec565167
|
// Normalization
|
2011-08-11 09:58:20 +00:00 |
|
rMalie
|
59c4f5489d
|
// Fix on shops + remove id_group_shop from stock + fix stock
|
2011-08-11 09:38:24 +00:00 |
|
rMalie
|
792ce71cd4
|
// Merge -> revision 7979
|
2011-08-10 08:36:17 +00:00 |
|
rMalie
|
257b8e40cc
|
[-] Add a new option in admin preference to recompile smarty templates only when they are updated
|
2011-08-09 16:25:40 +00:00 |
|
rMalie
|
f89a713e56
|
// Add cache on products stock
|
2011-08-09 14:50:48 +00:00 |
|
rMalie
|
dd41cb98a2
|
// Add cache on products stock
|
2011-08-09 14:50:30 +00:00 |
|
rMalie
|
d6f6e1726b
|
// Add cache on products stock
|
2011-08-09 14:43:04 +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
|
85a22c5f05
|
[+] Add a route system to personalize rewrited URL
|
2011-08-03 16:02:49 +00:00 |
|
rMalie
|
e2c8d89e41
|
// Merge with revision 7841
|
2011-08-02 11:43:58 +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
|
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
|
1fdf4400b7
|
// Fix minor bugs
|
2011-07-19 14:10:44 +00:00 |
|
rMalie
|
ba2922a823
|
// Context part 13
|
2011-07-19 09:44:10 +00:00 |
|
rMalie
|
ff81f71449
|
// Context in modules + Shop::sql* methods
|
2011-07-19 09:23:10 +00:00 |
|
rMalie
|
4b7dee58b7
|
|
2011-07-18 15:37:31 +00:00 |
|
rMalie
|
e16a8ab8d3
|
// Context part 10
|
2011-07-18 15:27:32 +00:00 |
|
tDidierjean
|
b09c76f5b4
|
// Context part 5
|
2011-07-13 15:24:38 +00:00 |
|
rMalie
|
8981b6aaee
|
// Refactoring of shop class with new context Part 2
|
2011-07-13 12:52:09 +00:00 |
|
tDidierjean
|
375607f8a5
|
// Context part 4
|
2011-07-13 07:51:09 +00:00 |
|
rMalie
|
2d77925e7d
|
// Refactoring of shop class with new context
|
2011-07-12 16:28:20 +00:00 |
|
rMalie
|
286a374353
|
// Context
|
2011-07-12 13:50:15 +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 |
|
rMalie
|
52be7fe939
|
// Some fix + multistore for import tools
|
2011-07-07 12:18:27 +00:00 |
|
rGaillard
|
8fc7f11014
|
|
2011-07-06 10:54:11 +00:00 |
|
rGaillard
|
d1a13007b9
|
|
2011-07-06 10:10:43 +00:00 |
|
fBrignoli
|
b8f460ed46
|
// merge 1.4 => 6117
|
2011-04-29 09:09:38 +00:00 |
|
fBrignoli
|
ff49083fb6
|
// merge 1.4 (5397)
|
2011-04-22 16:00:58 +00:00 |
|