757 Commits

Author SHA1 Message Date
Marion Muszynski
04a004954c addition of checking if product sale cache cron is processing 2016-11-04 10:24:04 +01:00
Marion Muszynski
5686b5395c bug fixes 2016-11-03 17:20:09 +01:00
Marion Muszynski
830246cb5d allowing of cron sync auto 2016-11-03 11:58:23 +01:00
Marion Muszynski
b744f47d4d fixes 2016-11-03 10:28:57 +01:00
Marion Muszynski
b991eaa016 modif 2016-11-02 17:41:06 +01:00
Marion Muszynski
c7754309fe Merge branch 'ticket-AideContact-SAV' 2016-11-02 17:04:44 +01:00
Marion Muszynski
5b95689b06 small updating 2016-11-02 17:03:58 +01:00
Marion Muszynski
3946f6ceac fix conflict 2016-11-02 12:43:27 +01:00
Marion Muszynski
1fa6860786 allowing sending of mails 2016-11-02 12:29:20 +01:00
Marion Muszynski
ede0f691a8 fix conflicts 2016-11-02 12:11:44 +01:00
Marion Muszynski
f9f3f329f6 Merge branch 'ticket-philea2' 2016-11-02 11:26:40 +01:00
Marion Muszynski
0b744bb04a fixes 2016-11-02 11:26:25 +01:00
Marion Muszynski
dff70fac60 fix vim bug 2016-11-02 10:31:47 +01:00
Marion Muszynski
e2f3cc3804 ftp connection 2016-11-02 10:31:03 +01:00
Marion Muszynski
7ffd4a7f8f Merge branch 'ticket-philea2' 2016-11-02 10:27:09 +01:00
Marion Muszynski
8384d69056 css adjusting 2016-11-02 10:26:40 +01:00
Marion Muszynski
8e37d90b44 fix update reason 2016-10-31 13:09:02 +01:00
Marion Muszynski
39a950f2fe addition of saved card info in paybox order 2016-10-31 11:52:05 +01:00
Marion Muszynski
f2582c4681 Merge branch 'ticket-philea2' 2016-10-28 13:09:35 +02:00
Marion Muszynski
193f66bfcd adjust css 2016-10-28 13:09:19 +02:00
Marion Muszynski
48b8737e46 Merge branch 'ticket-philea2' 2016-10-28 12:09:00 +02:00
Marion Muszynski
b62579b376 fix report 2016-10-28 12:08:46 +02:00
Marion Muszynski
38745aab7f Merge branch 'ticket-philea2' 2016-10-28 12:06:15 +02:00
Marion Muszynski
a56a6ed0c9 fix report receive 2016-10-28 12:05:58 +02:00
Marion Muszynski
7a884115d5 Merge branch 'ticket-philea2' 2016-10-28 11:51:58 +02:00
Marion Muszynski
a2a52f7a85 fixes 2016-10-28 11:51:40 +02:00
Marion Muszynski
0aeb9395ff Merge branch 'ticket-philea2' 2016-10-28 11:38:01 +02:00
Marion Muszynski
68a3e84659 fix addCDC 2016-10-28 11:37:41 +02:00
Marion Muszynski
e83a9dc746 allow braderie to sending management 2016-10-28 10:54:34 +02:00
Marion Muszynski
9be6952c8d Merge branch 'ticket-philea2' 2016-10-27 12:32:58 +02:00
Marion Muszynski
befa294c44 addition of product sale cache updating 2016-10-27 12:26:49 +02:00
Marion Muszynski
6eefb4a672 addition of order info 2016-10-26 16:54:52 +02:00
Marion Muszynski
1f7b49b9b9 modifications 2016-10-26 15:11:40 +02:00
Marion Muszynski
7aaf231422 integration product list in sav message 2016-10-25 12:03:06 +02:00
Marion Muszynski
e7c2734a8a addition ajax 2016-10-25 10:56:15 +02:00
Marion Muszynski
82681a378b Merge branch 'ticket-philea' 2016-10-25 09:34:48 +02:00
Marion Muszynski
74883a6ab8 fix 2016-10-25 09:34:32 +02:00
Marion Muszynski
cb3e299efc addition of multi product choice 2016-10-24 18:33:51 +02:00
Marion Muszynski
bfbfd14bd6 addition of signals about price and nb product 2016-10-24 14:27:50 +02:00
Marion Muszynski
23f29a55d6 modif css 2016-10-21 16:16:12 +02:00
Marion Muszynski
06a303fb6a modif css 2016-10-21 16:06:36 +02:00
Marion Muszynski
a8efd305e4 modif css 2016-10-21 15:39:59 +02:00
Marion Muszynski
630c05310d Merge branch 'ticket-philea' 2016-10-21 14:06:46 +02:00
Marion Muszynski
e63bb8b2d3 fix report request 2016-10-21 14:06:32 +02:00
Marion Muszynski
5beb5233c6 Merge branch 'ticket-philea' 2016-10-21 13:40:27 +02:00
Marion Muszynski
3b42caa07c save sending in syncreport 2016-10-21 13:39:56 +02:00
Marion Muszynski
6f00da4000 addition of success message 2016-10-21 11:57:17 +02:00
Marion Muszynski
2292e0da7a Merge branch 'ticket-philea' 2016-10-20 11:30:38 +02:00
Marion Muszynski
7b599a0f08 fix show reports 2016-10-20 11:30:23 +02:00
Marion Muszynski
af298a194d Merge branch 'ticket-philea' 2016-10-20 09:53:01 +02:00