Commit Graph

160 Commits

Author SHA1 Message Date
Marion Muszynski
6e0dd8141c modif to stay in category 2016-05-18 17:07:19 +02:00
Marion Muszynski
12314f4f95 add cron to clean csv 2016-05-18 16:26:31 +02:00
Marion Muszynski
15ccb40b9e ajout export sale dans BDC 2016-05-18 16:14:24 +02:00
Marion Muszynski
a8e7c0c14a update special char replace in ws for label 2016-05-18 12:14:17 +02:00
Marion Muszynski
796b0af17c modif for update socol address in BO order 2016-05-18 10:30:17 +02:00
Marion Muszynski
cbec52936b modif 2016-05-17 17:50:49 +02:00
Marion Muszynski
0b077c192a modif 2016-05-17 17:48:55 +02:00
Marion Muszynski
77a757859b modif ip for module cheque 2016-05-17 17:43:14 +02:00
Marion Muszynski
30410a5fc8 supp des fdp fix pour vente consommable 2016-05-17 14:31:41 +02:00
Marion Muszynski
bd6dc8f8cb Merge branch 'ticket-newImport' 2016-05-17 14:13:55 +02:00
Marion Muszynski
6580dbc6a2 modif restrict ean for alphanum 2016-05-13 16:13:39 +02:00
Marion Muszynski
85c5e03a39 adapte for prod 2016-05-13 15:50:44 +02:00
Marion Muszynski
f542a268e7 pre checked carriers sale 2016-05-13 15:48:09 +02:00
Marion Muszynski
19ed76d6ba Merge branch 'ticket-flexibilite' 2016-05-12 12:06:43 +02:00
Marion Muszynski
51a8fd9437 adding of new import for product customs 2016-05-11 10:13:20 +02:00
Marion Muszynski
f8e85b7a41 hotfix trim email 2016-05-10 16:28:32 +02:00
Marion Muszynski
ffbb3232b9 modif soflex 2016-05-09 17:43:57 +02:00
Alexandre Simonet
cc86b7849d add rss fluxcatalogue 2016-05-03 12:20:54 +02:00
Marion Muszynski
e82357544c Merge branch 'ticket-newExtract' 2016-04-27 18:07:18 +02:00
Marion Muszynski
397a73d037 modif product price for DEB exp 2016-04-27 18:04:42 +02:00
Marion Muszynski
caa68a4c2f Merge branch 'ticket-newExtract' 2016-04-27 12:10:03 +02:00
Marion Muszynski
9e2c4c5c39 adding origin product to DEB exp 2016-04-27 12:08:22 +02:00
Marion Muszynski
ae1687a105 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik 2016-04-27 11:35:03 +02:00
Srv Bebeboutik
6a1fd27e32 optimize stat 2016-04-27 11:31:43 +02:00
Marion Muszynski
5f96303fe9 modif for multi generation of csv in same time 2016-04-27 11:11:23 +02:00
Marion Muszynski
54bbfd5248 modif extract 2016-04-25 17:16:29 +02:00
Marion Muszynski
dde198080d modif extract custom 2016-04-25 16:50:51 +02:00
Marion Muszynski
72a3792897 fix bug double adding 2016-04-25 10:43:24 +02:00
Marion Muszynski
811ba9b3a9 Merge branch 'ticket-newExtracts' 2016-04-20 16:40:37 +02:00
Marion Muszynski
4b80f9f7a6 correction 2016-04-20 16:40:12 +02:00
Marion Muszynski
ef33e2cbc7 Merge branch 'ticket-newExtracts' 2016-04-20 16:05:20 +02:00
Marion Muszynski
753b17fcba petite rectification quantity_sold 2016-04-20 15:58:47 +02:00
Marion Muszynski
21f1ada2d1 Merge branch 'ticket-landingpage' 2016-04-20 15:35:16 +02:00
Marion Muszynski
4c4c069588 modif width button 2016-04-20 12:35:20 +02:00
Marion Muszynski
ecf913626f update extract names 2016-04-20 11:59:02 +02:00
Marion Muszynski
c63769824e add 2 new extracts for deb 2016-04-20 11:37:50 +02:00
Marion Muszynski
219b6dabb3 Merge branch 'ticket-consumable' 2016-04-18 16:17:30 +02:00
Marion Muszynski
cbbaf9c8e0 modif left_img.tpl 2016-04-18 16:14:19 +02:00
Marion Muszynski
1c0d70688c modif categoryimg 2016-04-18 16:03:17 +02:00
Marion Muszynski
d7b7e7abc6 modif connect button in landing page 2016-04-18 15:22:00 +02:00
Marion Muszynski
e2cc8ff3fd Merge branch 'ticket-extract' 2016-04-15 16:48:37 +02:00
Marion Muszynski
f0e2a7481a fix to order image by position 2016-04-15 12:38:31 +02:00
Marion Muszynski
cdd8b21bfe add nc8 id_country into export sales 2016-04-15 12:05:25 +02:00
Marion Muszynski
2d1d12c07e update extract 2016-04-13 12:22:55 +02:00
Marion Muszynski
43a24d1c7a update braderie and rack 2016-04-12 16:11:08 +02:00
Marion Muszynski
0b0ebcb26f fix conflict consommables 2016-04-12 15:17:45 +02:00
Marion Muszynski
19baa665a4 update braderie 2016-04-11 12:13:41 +02:00
Marion Muszynski
b287dc89de begin ticket export ventes 2016-04-11 11:31:57 +02:00
Marion Muszynski
559042b904 Merge branch 'ticket-9791' 2016-04-08 16:16:13 +02:00
Marion Muszynski
2c371bb94d update width bdc 2016-04-08 16:14:46 +02:00