Commit Graph

99 Commits

Author SHA1 Message Date
Marion Muszynski
76e3fd9334 fix philea 2017-08-31 15:25:19 +02:00
Marion Muszynski
abd8e88343 addition of new delivery delay and cleaning of sale combination 2017-08-17 11:22:54 +02:00
Marion Muszynski
1b1e303364 Merge branch 'ticket-13754-fixSalePosition' 2017-07-27 12:07:54 +02:00
Marion Muszynski
bd9ff4fe9e fix position of sale with lock position 2017-07-27 12:07:35 +02:00
root
e75e1e61bb fix from prod 2017-07-25 16:56:59 +02:00
Marion Muszynski
61cf5b99de add link to banner 2017-07-24 11:49:58 +02:00
Marion Muszynski
8a1b3793da resort sales after addition of new one 2017-07-21 11:17:05 +02:00
Marion Muszynski
e1663b365b fixation of sale position 2017-07-20 16:51:19 +02:00
Marion Muszynski
4e0938b32e fix sale position 2017-07-20 11:37:45 +02:00
Marion Muszynski
91536bdb4d Merge branch 'ticket11985-invoiceMR' 2017-07-04 16:23:26 +02:00
root
c23288a05b push from prod for trad 2017-07-04 15:43:19 +02:00
Marion Muszynski
cd390c8fb9 add promo banner for ps 2017-06-28 12:18:03 +02:00
Marion Muszynski
b87d25038f addition of module ant_promobanner 2017-06-27 18:22:24 +02:00
Marion Muszynski
dadf16f8fb separate la poste invoices and mr invoices 2017-06-16 17:51:19 +02:00
Marion Muszynski
35bcc57509 upload fr img for es when only fr sale bg is loaded 2017-06-08 11:51:34 +02:00
Marion Muszynski
de1c8e211e addition of new landing page on home 2017-04-28 11:05:12 +02:00
Marion Muszynski
0a3c45ef95 addition of flux generation for tomorrow news 2017-04-26 15:51:12 +02:00
Marion Muszynski
2bbc6d5fa6 addition of carrier filter for active ones 2017-04-19 12:36:41 +02:00
Marion Muszynski
841b995299 clean admin ps 2017-04-13 12:55:09 +02:00
Marion Muszynski
8d8c46d7b6 fix adminPrivateSaleSales 2017-04-12 09:52:43 +02:00
Marion Muszynski
01a8d528e2 fix sortable 2017-04-11 15:27:46 +02:00
Marion Muszynski
65ea663f75 fix conflict 2017-04-11 13:06:48 +02:00
Marion Muszynski
8f62586369 fix conflict 2017-04-11 12:08:19 +02:00
Marion Muszynski
647a917f7d fix js id_category change 2017-03-21 15:45:45 +01:00
Marion Muszynski
24d1d1fb33 fix 2 2017-03-21 14:57:26 +01:00
Marion Muszynski
b58b5a4f39 fix font-size 2017-03-21 14:54:06 +01:00
Marion Muszynski
ac57693101 fix css 2017-03-21 14:44:39 +01:00
Marion Muszynski
8d08040017 addition of delay in sale list 2017-03-21 14:39:43 +01:00
Marion Muszynski
e5a329fc18 modif flag and fix update position 2017-03-21 13:07:20 +01:00
Marion Muszynski
52a3477a1e fix //static 2017-03-09 11:07:11 +01:00
Marion Muszynski
b2b75a6fca addition of MR and title/alias fix 2017-03-06 12:54:14 +01:00
Marion Muszynski
25fea84b8c changement how to show sale delay 2017-01-24 17:32:22 +01:00
Marion Muszynski
5192561bac update BlockOrderSummary, AdminPrivateSalesSale, ParentOrderController, AdminLogistic, logistic, OrderDetailController, order_detail tpl, mondial relay tpl for Mondial Relay 2017-01-11 15:33:44 +01:00
Marion Muszynski
038dbec401 fix name 2017-01-10 18:06:01 +01:00
Marion Muszynski
f93d4446ca showing delivery delay in vp list 2017-01-10 17:49:21 +01:00
Marion Muszynski
c5359e3899 fix 2017-01-09 15:27:11 +01:00
Marion Muszynski
22b9815c1c changement ant_configuration to store carrier conf in db Configuration 2017-01-09 15:02:14 +01:00
Marion Muszynski
b250ea6d3d Merge branch 'ticket-11056' 2017-01-05 11:18:19 +01:00
Marion Muszynski
e902c80b60 fix for prod 2017-01-05 11:18:05 +01:00
Marion Muszynski
e93de310ec fix conflicts 2017-01-05 11:14:54 +01:00
Marion Muszynski
b0f23e0479 fix upload image thumbnail 2017-01-03 12:39:13 +01:00
Marion Muszynski
49bc6e77f5 addition of carrier s options 2017-01-02 17:13:46 +01:00
Marion Muszynski
7b6239eee4 changement css for btn-group 2017-01-02 17:07:35 +01:00
Marion Muszynski
23116193ed fix groups selected and css changements for tags 2017-01-02 16:44:29 +01:00
Marion Muszynski
966dee6a6e fix switch and css table of sales 2017-01-02 15:49:14 +01:00
Marion Muszynski
13e343c6ff continuing changement css 2016-12-29 15:29:23 +01:00
Marion Muszynski
795aca43a7 continuing 2016-12-28 17:16:50 +01:00
Marion Muszynski
b6788e7bbd continuing 2016-12-28 14:15:20 +01:00
Marion Muszynski
a50e10fd90 continuing 2016-12-27 11:01:19 +01:00
Marion Muszynski
de693ae3ed start of css changement 2016-12-27 10:04:07 +01:00