Marion Muszynski
|
19b28d1e13
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-25 10:56:48 +01:00 |
|
Marion Muszynski
|
420f2d870c
|
fix trad
|
2016-11-25 10:56:23 +01:00 |
|
Marion Muszynski
|
fb7a9616ff
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-25 10:53:08 +01:00 |
|
Marion Muszynski
|
5d963638fa
|
fix
|
2016-11-25 10:52:50 +01:00 |
|
Marion Muszynski
|
3a630a0d93
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-25 10:49:27 +01:00 |
|
Marion Muszynski
|
0e6992f29b
|
changement delivery date estimation
|
2016-11-25 10:49:10 +01:00 |
|
Marion Muszynski
|
d8df8aa34b
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-24 16:34:33 +01:00 |
|
Marion Muszynski
|
f10191c8f3
|
addition of payment method
|
2016-11-24 16:34:12 +01:00 |
|
Marion Muszynski
|
d1874af03f
|
Merge branch 'ticket-7768-UpdateSAV' into develop
|
2016-11-24 16:23:55 +01:00 |
|
Marion Muszynski
|
74f0ab876e
|
fix
|
2016-11-24 16:23:28 +01:00 |
|
Marion Muszynski
|
3ecf54cfcc
|
fix conflicts
|
2016-11-24 16:05:44 +01:00 |
|
Marion Muszynski
|
c17fb91c63
|
addition of orders selection and css modif
|
2016-11-24 16:04:13 +01:00 |
|
Marion Muszynski
|
7295412f54
|
Merge branch 'ticket-10657-SentenceBoxAddToCart' into develop
|
2016-11-24 12:14:06 +01:00 |
|
Marion Muszynski
|
f7bc910547
|
Merge branch 'ticket-10657-SentenceBoxAddToCart'
|
2016-11-24 11:59:45 +01:00 |
|
Marion Muszynski
|
ef27ddd7af
|
changement sentences according delivery delay
|
2016-11-24 11:59:20 +01:00 |
|
Marion Muszynski
|
8cbb4d3f2e
|
Merge branch 'add-tableToLogAction'
|
2016-11-23 16:37:03 +01:00 |
|
Marion Muszynski
|
a1970081c1
|
fix conflict
|
2016-11-23 16:36:24 +01:00 |
|
Marion Muszynski
|
d9feec4ffe
|
addition of db to log action from employee
|
2016-11-23 16:33:55 +01:00 |
|
Marion Muszynski
|
6446727818
|
Merge branch 'ticket-10657-PhileaFixCron'
|
2016-11-23 15:56:09 +01:00 |
|
Marion Muszynski
|
ae340630cc
|
fix send command
|
2016-11-23 15:55:51 +01:00 |
|
Marion Muszynski
|
9597c70898
|
Merge branch 'ticket-10657-PhileaFixCron'
|
2016-11-23 15:20:07 +01:00 |
|
Marion Muszynski
|
31d77b1d60
|
fix cron to send articles to philea
|
2016-11-23 15:19:50 +01:00 |
|
Marion Muszynski
|
73f0233a89
|
Merge branch 'ticket-10657-PhileaPacks' into develop
|
2016-11-23 13:05:14 +01:00 |
|
Marion Muszynski
|
bed6cbcd76
|
fix missing var
|
2016-11-23 13:04:37 +01:00 |
|
Marion Muszynski
|
6f2b7f8732
|
Merge branch 'ticket-10657-PhileaPacks' into develop
|
2016-11-23 12:57:51 +01:00 |
|
Marion Muszynski
|
5578bac1ae
|
addition for packs management
|
2016-11-23 12:57:33 +01:00 |
|
Marion Muszynski
|
c1fcfb5f85
|
Merge branch 'ticket-11756-DelayInConfirmationMail'
|
2016-11-22 11:58:38 +01:00 |
|
Marion Muszynski
|
60577f145a
|
fix conflict
|
2016-11-22 11:53:24 +01:00 |
|
Marion Muszynski
|
8b7875fdb0
|
adaptation of delivery message in confirmation mail
|
2016-11-22 11:51:16 +01:00 |
|
Marion Muszynski
|
05fe2fe40b
|
Merge branch 'ticket-11557-FixLinkSaleCategory'
|
2016-11-21 17:57:20 +01:00 |
|
Marion Muszynski
|
5c5ea81e90
|
comment of insert in ps_product_ps_cache in livestats cron
|
2016-11-21 17:56:57 +01:00 |
|
Marion Muszynski
|
66f778116a
|
Merge branch 'add-css-privatesales'
|
2016-11-21 16:30:44 +01:00 |
|
Marion Muszynski
|
1e6dd3ddda
|
css modification and addition of shipping column
|
2016-11-21 16:29:22 +01:00 |
|
Marion Muszynski
|
ec7d73696b
|
Merge branch 'ticket-10657-PhileaMulti'
|
2016-11-21 15:34:34 +01:00 |
|
Marion Muszynski
|
1d6e27dd40
|
Merge branch 'ticket-10657-PhileaMulti' into develop
|
2016-11-21 15:27:04 +01:00 |
|
Marion Muszynski
|
2dceab8015
|
fix for classic sale
|
2016-11-21 15:26:46 +01:00 |
|
Marion Muszynski
|
ee2c243bc8
|
Merge branch 'ticket-11210-imageVP'
|
2016-11-21 15:06:58 +01:00 |
|
Marion Muszynski
|
a224bfd940
|
Merge branch 'ticket-10657-PhileaMulti'
|
2016-11-21 13:01:13 +01:00 |
|
Marion Muszynski
|
63fcc839e3
|
Merge branch 'ticket-10657-PhileaMulti' into develop
|
2016-11-21 12:56:37 +01:00 |
|
Marion Muszynski
|
c2b5077efe
|
fix
|
2016-11-21 12:56:12 +01:00 |
|
Marion Muszynski
|
894de500bc
|
Merge branch 'ticket-10657-PhileaMulti' into develop
|
2016-11-21 12:45:36 +01:00 |
|
Marion Muszynski
|
66bdae1aef
|
prevent combination of sale exp classic and sale exp before noel
|
2016-11-21 12:45:20 +01:00 |
|
Marion Muszynski
|
2ee444b269
|
Merge branch 'ticket-11211-MultiDeleteImg'
|
2016-11-21 10:36:20 +01:00 |
|
Marion Muszynski
|
8ec2a6ba21
|
Merge branch 'ticket-10657-PhileaMulti'
|
2016-11-21 10:18:38 +01:00 |
|
Marion Muszynski
|
2057327981
|
Merge branch 'add-module-privatesales_shipping'
|
2016-11-21 10:11:54 +01:00 |
|
Marion Muszynski
|
83d3523000
|
addition of module for privatesales shipping
|
2016-11-21 10:11:27 +01:00 |
|
Marion Muszynski
|
603045e422
|
Merge branch 'ticket-11247-MailParrainageFix'
|
2016-11-21 10:07:44 +01:00 |
|
Marion Muszynski
|
a8cb07e932
|
remove mail sending for log
|
2016-11-21 10:07:20 +01:00 |
|
Marion Muszynski
|
a10aceb571
|
Merge branch 'ticket-10657-PhileaMulti' into develop
|
2016-11-18 17:27:12 +01:00 |
|
Marion Muszynski
|
f5a841a2f1
|
adjust for exp Noel
|
2016-11-18 17:26:53 +01:00 |
|