98 Commits

Author SHA1 Message Date
Marion Muszynski
5fa1fa042c Merge branch 'evo-philea-Destock' 2017-02-06 10:19:22 +01:00
Marion Muszynski
f94a974cb1 updating categories search in step 3 2017-02-06 10:19:06 +01:00
Marion Muszynski
0817b85066 Merge branch 'evo-philea-Destock' 2017-02-06 09:45:09 +01:00
Marion Muszynski
4e1f497252 comment mr modif for philea 2017-01-11 10:54:50 +01:00
Marion Muszynski
9047143c5b addition of new v of mondialrelay and start of chamgements to include mr in philea 2017-01-02 12:25:33 +01:00
Marion Muszynski
2e59945370 wizard to allow product association to the new sale 2017-01-02 11:34:16 +01:00
Marion Muszynski
d634722035 destock system like reloading a sale 2016-12-30 17:03:44 +01:00
Marion Muszynski
b0d7f2ddb3 changement date from for send_commande to philea 2016-12-26 14:58:42 +01:00
Marion Muszynski
edd3a55c0a fix bug add sale in db 2016-12-23 10:57:27 +01:00
Marion Muszynski
c3ff8d4935 changement visuel 2016-12-14 16:04:08 +01:00
Marion Muszynski
7f724c2012 css changement and optimisation db philea_sent 2016-12-14 15:17:32 +01:00
Marion Muszynski
692cfc1d20 prevent multi same update of order state 2016-12-14 11:30:09 +01:00
Marion Muszynski
ff56848987 optimization 2016-12-13 14:52:58 +01:00
Marion Muszynski
eb837ac915 addidtion of simpleDate for helperFormBootstrap 2016-12-13 10:15:43 +01:00
Marion Muszynski
4aa99c4bfb changements 2016-12-12 18:27:45 +01:00
Marion Muszynski
38f6a0daba fix 2016-12-08 15:48:08 +01:00
Marion Muszynski
f4e2256c65 fix conflicts 2016-12-08 15:46:19 +01:00
Marion Muszynski
3352dfb3e3 last changements for prod 2016-12-08 15:23:33 +01:00
Marion Muszynski
e807437a10 finition 2016-12-08 13:25:39 +01:00
Marion Muszynski
d4f4452c43 changement 2016-12-08 12:31:06 +01:00
Marion Muszynski
e55202c0d0 addition of help sentence 2016-12-08 11:54:04 +01:00
Marion Muszynski
0569cdea43 addition of data in export 2016-12-08 11:46:35 +01:00
Marion Muszynski
bf7666a730 restriction for testing 2016-12-08 11:29:31 +01:00
Marion Muszynski
b6e13fc8c8 adjusting extract 2016-12-08 11:28:05 +01:00
Marion Muszynski
08a2023fb8 addition of new export 2016-12-08 10:34:49 +01:00
Marion Muszynski
7cb36d6b0d changement for pack gestion 2016-12-07 14:29:33 +01:00
Marion Muszynski
0a9afab232 pack gestion at expedition reception 2016-12-07 10:36:03 +01:00
Marion Muszynski
ef4a76b327 log with mail sending 2016-12-06 16:11:12 +01:00
Marion Muszynski
58776438d1 continuing 2016-12-06 15:45:47 +01:00
Marion Muszynski
5bd20c72d3 continuing 2016-12-06 10:07:54 +01:00
Marion Muszynski
8df93121a8 continuing pack management 2016-12-05 10:13:27 +01:00
Marion Muszynski
192cd79a6b continuing packs 2016-12-02 15:34:57 +01:00
Marion Muszynski
a8045cfefa Merge branch 'ticket-10657-PhileaMulti' 2016-11-30 11:38:34 +01:00
Marion Muszynski
807bd6d30e add log mail 2016-11-30 11:38:16 +01:00
Marion Muszynski
5f30b92b59 send all the products of multi order in one time 2016-11-30 11:35:55 +01:00
Marion Muszynski
56ee44f425 fix selected orders according status 2016-11-30 10:55:00 +01:00
Marion Muszynski
0dc8db8d58 addition of packs 2016-11-28 17:07:43 +01:00
Marion Muszynski
d9feec4ffe addition of db to log action from employee 2016-11-23 16:33:55 +01:00
Marion Muszynski
ae340630cc fix send command 2016-11-23 15:55:51 +01:00
Marion Muszynski
31d77b1d60 fix cron to send articles to philea 2016-11-23 15:19:50 +01:00
Marion Muszynski
5578bac1ae addition for packs management 2016-11-23 12:57:33 +01:00
Marion Muszynski
58dbc97845 adjusting in adminPhilea 2016-11-18 12:09:00 +01:00
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
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