152 Commits

Author SHA1 Message Date
Marion Muszynski
b991eaa016 modif 2016-11-02 17:41:06 +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
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
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
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
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
e63bb8b2d3 fix report request 2016-10-21 14:06:32 +02:00
Marion Muszynski
3b42caa07c save sending in syncreport 2016-10-21 13:39:56 +02:00
Marion Muszynski
7b599a0f08 fix show reports 2016-10-20 11:30:23 +02:00
Marion Muszynski
fcd5f537f6 active cron 2016-10-20 09:52:42 +02:00
Marion Muszynski
4c8f727932 fix 2016-10-20 09:43:37 +02:00
Marion Muszynski
c0110a6618 modif css and fix alert missing quantity in orders 2016-09-30 13:06:24 +02:00
Marion Muszynski
d9fd7547d1 addition of preparation report 2016-09-29 18:08:23 +02:00
Marion Muszynski
4acbb1dcf6 fix recept_expe 2016-09-28 18:11:07 +02:00
Marion Muszynski
b36c40446d addition of CRE and CRP management 2016-09-28 16:56:19 +02:00
Marion Muszynski
16e16d6596 update CRE 2016-09-28 10:41:39 +02:00
Marion Muszynski
fa825f9cc7 modif css 2016-09-19 15:39:50 +02:00
Marion Muszynski
d9b117774d css fix 2016-09-19 15:33:43 +02:00
Marion Muszynski
a51cf6fb55 continuing to add some stuff 2016-09-19 11:58:14 +02:00
Marion Muszynski
e1f82aba03 small fix 2016-09-16 17:33:23 +02:00
Marion Muszynski
4e42740019 message modification 2016-09-16 17:17:41 +02:00
Marion Muszynski
56136b51ec addition of report management 2016-09-16 16:36:16 +02:00
Marion Muszynski
0980058b1d matching ART CDC 2016-09-15 16:29:54 +02:00
Marion Muszynski
50cc5511ac fix about phone number 2016-09-08 12:40:32 +02:00
Marion Muszynski
d839706175 modif code article 2016-09-07 17:42:06 +02:00
Marion Muszynski
a6fc45e479 adjust send_commande 2016-09-07 16:17:03 +02:00
Marion Muszynski
df7b6dbc05 small fix 2016-09-07 15:10:28 +02:00
Marion Muszynski
88b3c10898 fix 2016-09-07 15:03:58 +02:00
Marion Muszynski
0c118717af small addition 2016-09-07 12:03:31 +02:00
Marion Muszynski
f790336c29 big modif 2016-09-07 11:42:38 +02:00
Marion Muszynski
3caeacffae modif send_article according bbb account 2016-09-06 18:05:54 +02:00
Marion Muszynski
01c77b3901 modif send_commande according bbb settings 2016-09-06 16:48:13 +02:00