Marion Muszynski
|
1bfd79afb9
|
Merge branch 'ticket-simplemulti_bdc' into develop
|
2016-06-20 11:02:00 +02:00 |
|
Srv Bebeboutik
|
e7e7f8381c
|
push prod modif carrier
|
2016-06-20 10:42:30 +02:00 |
|
Marion Muszynski
|
30b39b5776
|
fix conflicts
|
2016-06-08 10:53:07 +02:00 |
|
Marion Muszynski
|
7065edffe4
|
fix conflict
|
2016-06-06 17:42:00 +02:00 |
|
Marion Muszynski
|
7ad38029da
|
adding filter
|
2016-06-06 17:27:09 +02:00 |
|
Marion Muszynski
|
b332800b77
|
new fields in product db
|
2016-06-06 14:35:07 +02:00 |
|
Srv Bebeboutik
|
7085c1b80a
|
update from prod
|
2016-06-06 12:35:00 +02:00 |
|
Marion Muszynski
|
72545630a3
|
fix conflicts
|
2016-06-06 11:32:25 +02:00 |
|
Marion Muszynski
|
5f932e9bcd
|
opti attribute group deletion
|
2016-06-03 13:06:03 +02:00 |
|
Marion Muszynski
|
76f698ee8f
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-03 12:07:42 +02:00 |
|
Marion Muszynski
|
99b35ed57a
|
adding delivery description field for product
|
2016-06-03 12:07:12 +02:00 |
|
Marion Muszynski
|
332ac320fb
|
modif for prod
|
2016-06-02 12:19:24 +02:00 |
|
Marion Muszynski
|
83ac3dbe3f
|
fix conflcit
|
2016-06-01 12:45:33 +02:00 |
|
Marion Muszynski
|
d59e49e3ba
|
update scrollbar color and more
|
2016-06-01 12:43:12 +02:00 |
|
Marion Muszynski
|
5bf7b1f7e1
|
Merge branch 'ticket-dropshipping' into develop
|
2016-06-01 11:24:01 +02:00 |
|
Marion Muszynski
|
3e0ad8592d
|
update link
|
2016-06-01 11:23:37 +02:00 |
|
Marion Muszynski
|
42c7bf13b4
|
Merge branch 'ticket-dropshipping' into develop
|
2016-06-01 10:58:05 +02:00 |
|
Marion Muszynski
|
96ca86fe85
|
modif error message
|
2016-06-01 10:57:31 +02:00 |
|
Marion Muszynski
|
2b14f9bd61
|
Merge branch 'ticket-dropshipping' into develop
|
2016-05-30 15:42:50 +02:00 |
|
Marion Muszynski
|
d63a2d7d5a
|
addind field to config if delivery of sale is enabled only in fr
|
2016-05-30 15:42:20 +02:00 |
|
Marion Muszynski
|
5c6f243d6b
|
fix conflict
|
2016-05-19 13:17:54 +02:00 |
|
Marion Muszynski
|
eb441d8edf
|
adding autocomplete postcode
|
2016-05-19 13:13:47 +02:00 |
|
Marion Muszynski
|
37c9b988b1
|
Merge branch 'ticket-deplaceExtract' into develop
|
2016-05-18 16:14:58 +02:00 |
|
Marion Muszynski
|
03c743985c
|
modif for prod
|
2016-05-18 11:19:27 +02:00 |
|
Marion Muszynski
|
a876e577e8
|
Merge branch 'ticket-modifEan' into develop
|
2016-05-18 11:18:04 +02:00 |
|
Marion Muszynski
|
13b20adb20
|
modif validate field OrderDetail
|
2016-05-18 11:17:41 +02:00 |
|
Marion Muszynski
|
97ef053f1f
|
update for prod
|
2016-05-18 10:33:23 +02:00 |
|
Marion Muszynski
|
e2fa90e008
|
Merge branch 'ticket-modifAddress' into develop
|
2016-05-18 10:30:54 +02:00 |
|
Marion Muszynski
|
796b0af17c
|
modif for update socol address in BO order
|
2016-05-18 10:30:17 +02:00 |
|
Marion Muszynski
|
3db1f64164
|
Merge branch 'ticket-modifAddress' into develop
|
2016-05-17 17:43:49 +02:00 |
|
Marion Muszynski
|
adbe272c7b
|
modif for prod
|
2016-05-17 16:05:20 +02:00 |
|
Marion Muszynski
|
1cb1c7398e
|
fix conflict css
|
2016-05-17 15:57:59 +02:00 |
|
Marion Muszynski
|
b7f247729f
|
modif tpl carrier et css
|
2016-05-17 15:56:27 +02:00 |
|
Marion Muszynski
|
881878e994
|
modif fdp fix in cart
|
2016-05-17 14:51:12 +02:00 |
|
Marion Muszynski
|
d571de9d0a
|
modif for prod
|
2016-05-17 14:32:35 +02:00 |
|
Marion Muszynski
|
30410a5fc8
|
supp des fdp fix pour vente consommable
|
2016-05-17 14:31:41 +02:00 |
|
Marion Muszynski
|
6a2b2199de
|
Merge branch 'ticket-newEan' into develop
|
2016-05-13 16:14:05 +02:00 |
|
Marion Muszynski
|
348be7d6f4
|
Merge branch 'ticket-modifCarriers' into develop
|
2016-05-13 15:41:23 +02:00 |
|
Marion Muszynski
|
6e124300d2
|
adapte carrier for dev
|
2016-05-13 15:40:56 +02:00 |
|
Marion Muszynski
|
dbb4656f42
|
adapte carrier for prod
|
2016-05-13 14:36:51 +02:00 |
|
Marion Muszynski
|
b90cc78d1b
|
Merge branch 'ticket-modifCarriers' into develop
|
2016-05-13 14:19:59 +02:00 |
|
Marion Muszynski
|
acc8ded407
|
adapte carrier for dev
|
2016-05-13 14:19:35 +02:00 |
|
Marion Muszynski
|
44829771cf
|
fix conflict css
|
2016-05-13 13:33:44 +02:00 |
|
Marion Muszynski
|
7e7feb5a52
|
ajust css and opti restrict addresses
|
2016-05-13 13:31:50 +02:00 |
|
Marion Muszynski
|
e7a93aa24e
|
Merge branch 'ticket-filterOrders' into develop
|
2016-05-13 10:41:38 +02:00 |
|
Srv Bebeboutik
|
5a7c3a0241
|
modif cart
|
2016-05-13 10:37:05 +02:00 |
|
Srv Bebeboutik
|
3a4f5414d8
|
fix conflict
|
2016-05-12 12:12:42 +02:00 |
|
Srv Bebeboutik
|
34b34929ef
|
push la modif de cart
|
2016-05-12 12:10:50 +02:00 |
|
Marion Muszynski
|
7affaf4a41
|
Merge branch 'ticket-flexibilite' into develop
|
2016-05-12 10:18:44 +02:00 |
|
Marion Muszynski
|
ebdd485182
|
modif id carrier in cart
|
2016-05-12 10:18:15 +02:00 |
|