Marion Muszynski
|
f5b5640f90
|
Merge branch 'ticket-11201-updateAntCreationCategory' into develop
|
2017-01-04 14:45:34 +01:00 |
|
Marion Muszynski
|
d12cfab04c
|
fix trigger change of selec parent
|
2017-01-04 14:45:16 +01:00 |
|
Marion Muszynski
|
ecddce3f6e
|
Merge branch 'ticket-11201-updateAntCreationCategory' into develop
|
2017-01-04 14:36:35 +01:00 |
|
Marion Muszynski
|
11c89f6fc9
|
addition of sub category selection as parent
|
2017-01-04 14:36:09 +01:00 |
|
Marion Muszynski
|
783c2f60f0
|
Merge branch 'ticket-11201-updateAntCreationCategory' into develop
|
2017-01-04 13:12:40 +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
|
306e61920d
|
Merge branch 'ticket-11985-MondialRelay' into develop
|
2017-01-02 12:26:11 +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
|
fee10ec7af
|
Merge branch 'evo-philea-Destock' into develop
|
2017-01-02 11:34:32 +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
|
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 |
|
Marion Muszynski
|
1ad30ee09c
|
Merge branch 'change-AdminInvoice' into develop
|
2016-12-26 10:58:26 +01:00 |
|
Marion Muszynski
|
0dd562f216
|
fix bugs
|
2016-12-26 10:58:08 +01:00 |
|
Marion Muszynski
|
f07dd8c316
|
Merge branch 'change-AdminInvoice' into develop
|
2016-12-26 09:36:38 +01:00 |
|
Marion Muszynski
|
3d34054aec
|
changement css
|
2016-12-26 09:36:06 +01:00 |
|
Marion Muszynski
|
7f6770d003
|
Merge branch 'ticket-11210-update'
|
2016-12-23 15:02:43 +01:00 |
|
Marion Muszynski
|
831d916bc2
|
Merge branch 'ticket-12122-ModifNewStatus'
|
2016-12-23 14:03:39 +01:00 |
|
Marion Muszynski
|
4f3b7c2b15
|
Merge branch 'ticket-12122-ModifNewStatus' into develop
|
2016-12-23 14:00:01 +01:00 |
|
Marion Muszynski
|
589ed49b8a
|
keeping new status for the first order
|
2016-12-23 13:59:26 +01:00 |
|
Marion Muszynski
|
a965103db4
|
continuing changement
|
2016-12-23 13:04:16 +01:00 |
|