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
|
cbbf8cd284
|
Merge branch 'ticket-12189-fixColorExpressCart'
|
2017-01-09 11:21:19 +01:00 |
|
Marion Muszynski
|
b9cff0b01a
|
fix rose color in expressCart tpl
|
2017-01-09 11:19:37 +01:00 |
|
Marion Muszynski
|
2b27b9659b
|
Merge branch 'ticket-12188-OrderMessage'
|
2017-01-09 10:16:33 +01:00 |
|
Marion Muszynski
|
228798b4e1
|
upgrade limit max char for order messages
|
2017-01-09 10:16:10 +01:00 |
|
Marion Muszynski
|
bc807d22f7
|
Merge branch 'ticket-11056-addRestriction'
|
2017-01-06 16:48:17 +01:00 |
|
Marion Muszynski
|
46e655751d
|
fix value for prod
|
2017-01-06 16:47:55 +01:00 |
|
Marion Muszynski
|
cd4aa777d5
|
value for dev
|
2017-01-06 16:32:55 +01:00 |
|
Marion Muszynski
|
6cc03d0287
|
restriction with carrier priority
|
2017-01-06 16:25:08 +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
|
cb75e081c3
|
Merge branch 'ticket-11201-updateAntCreationCategory'
|
2017-01-05 10:31:11 +01:00 |
|
Marion Muszynski
|
6c12b392eb
|
Merge branch 'ticket-10580-LaPosteWSU'
|
2017-01-04 16:58:29 +01:00 |
|
Marion Muszynski
|
97a3ec3219
|
Merge branch 'ticket-braderie-addEmplacement'
|
2017-01-04 15:10:25 +01:00 |
|
Marion Muszynski
|
6234476bc7
|
upgrade emplacement limit
|
2017-01-04 15:10:09 +01:00 |
|
Marion Muszynski
|
d12cfab04c
|
fix trigger change of selec parent
|
2017-01-04 14:45:16 +01:00 |
|
Marion Muszynski
|
11c89f6fc9
|
addition of sub category selection as parent
|
2017-01-04 14:36:09 +01:00 |
|
Marion Muszynski
|
aa67c3f698
|
addition of image cat in antcreationcategory
|
2017-01-04 13:12:07 +01:00 |
|
Marion Muszynski
|
2af3b4b9be
|
fix upload js
|
2017-01-04 12:41:10 +01:00 |
|
Marion Muszynski
|
7651ba4cb2
|
Merge branch 'ticket-11201-fixGroup'
|
2017-01-02 15:55:48 +01:00 |
|
Marion Muszynski
|
0477106ede
|
fix groups in second filedset
|
2017-01-02 15:55:31 +01:00 |
|
Marion Muszynski
|
ed64d1d699
|
Merge branch 'fix-fatal'
|
2016-12-28 14:22:55 +01:00 |
|
Marion Muszynski
|
f01129f45d
|
fix require
|
2016-12-28 14:22:31 +01:00 |
|
Marion Muszynski
|
ec0414a008
|
Merge branch 'ticket-12132-evoBDCLogistics'
|
2016-12-27 16:27:21 +01:00 |
|
Marion Muszynski
|
1e596eb4de
|
addition sort by ref and decli
|
2016-12-27 16:27:03 +01:00 |
|
Marion Muszynski
|
4fc0bd423c
|
Merge branch 'ticket-12132-EvoGeneratLabel'
|
2016-12-27 15:26:43 +01:00 |
|
Marion Muszynski
|
2d3d3a4b7c
|
fix margin
|
2016-12-27 15:25:33 +01:00 |
|
Marion Muszynski
|
699c710e3a
|
Merge branch 'ticket-12132-EvoGeneratLabel'
|
2016-12-27 14:49:43 +01:00 |
|
Marion Muszynski
|
c770900dac
|
fix size and margin
|
2016-12-27 14:49:18 +01:00 |
|
Marion Muszynski
|
a0ec4c1617
|
Merge branch 'ticket-12132-EvoGeneratLabel'
|
2016-12-27 12:20:39 +01:00 |
|
Marion Muszynski
|
53143929e2
|
fix blank cell
|
2016-12-27 12:20:22 +01:00 |
|
Marion Muszynski
|
f383f79621
|
Merge branch 'ticket-12132-EvoGeneratLabel'
|
2016-12-27 12:05:54 +01:00 |
|
Marion Muszynski
|
d5e35359bf
|
fix name decli
|
2016-12-27 12:05:38 +01:00 |
|
Marion Muszynski
|
e11a899492
|
Merge branch 'ticket-12132-EvoGeneratLabel'
|
2016-12-27 12:02:02 +01:00 |
|
Marion Muszynski
|
0b8839f4c4
|
addition of multi sort of products
|
2016-12-27 12:01:47 +01:00 |
|
Marion Muszynski
|
09aff7c3b0
|
Merge branch 'ticket-12132-EvoGeneratLabel'
|
2016-12-27 11:33:12 +01:00 |
|
Marion Muszynski
|
b73dffc79b
|
fix size
|
2016-12-27 11:33:01 +01:00 |
|
Marion Muszynski
|
cd4e9f14a7
|
Merge branch 'ticket-12132-EvoGeneratLabel'
|
2016-12-27 10:34:16 +01:00 |
|
Marion Muszynski
|
b8be593c91
|
addition of generate reference only
|
2016-12-27 10:33:56 +01:00 |
|
Marion Muszynski
|
4c173725ca
|
Merge branch 'add-conf'
|
2016-12-26 14:58:56 +01:00 |
|
Marion Muszynski
|
b0d7f2ddb3
|
changement date from for send_commande to philea
|
2016-12-26 14:58:42 +01:00 |
|
Marion Muszynski
|
a7a78b4d8f
|
Merge branch 'add-conf'
|
2016-12-26 14:43:29 +01:00 |
|
Marion Muszynski
|
52d36e2125
|
fix and opti
|
2016-12-26 14:43:11 +01:00 |
|
Marion Muszynski
|
3376e0ac27
|
Merge branch 'add-conf'
|
2016-12-26 12:32:00 +01:00 |
|
Marion Muszynski
|
7df71fc8ff
|
addition of reassociation of product ps cache for specific default category
|
2016-12-26 12:31:43 +01:00 |
|
Marion Muszynski
|
d148fffa70
|
Merge branch 'ticket-11201-SlowCategoryCreation'
|
2016-12-26 11:43:23 +01:00 |
|
Marion Muszynski
|
2e30a3e4ff
|
Merge branch 'add-module-ant_creationcategories'
|
2016-12-26 11:42:22 +01:00 |
|
Marion Muszynski
|
fa07f444a0
|
Merge branch 'change-AdminInvoice'
|
2016-12-26 10:59:54 +01:00 |
|