Marion Muszynski
|
8191e443ff
|
fix conflicts
|
2017-02-23 12:46:49 +01:00 |
|
Marion Muszynski
|
47baf3e7dd
|
addition of export for analysis
|
2017-02-23 12:45:38 +01:00 |
|
Marion Muszynski
|
54f955f882
|
fix conflicts
|
2017-02-22 16:28:25 +01:00 |
|
Marion Muszynski
|
0b3787b14e
|
fix special char in sale export and some css updatings
|
2017-02-22 16:27:11 +01:00 |
|
Marion Muszynski
|
055f7b5ba0
|
update style bulkupdate
|
2017-02-21 18:03:12 +01:00 |
|
Marion Muszynski
|
0817b85066
|
Merge branch 'evo-philea-Destock'
|
2017-02-06 09:45:09 +01:00 |
|
Marion Muszynski
|
54b9bfd989
|
fix conflicts
|
2017-02-03 16:57:12 +01:00 |
|
Marion Muszynski
|
c8523de176
|
Big changement in labelgenerate for new bigger labels
|
2017-02-03 16:55:47 +01:00 |
|
Marion Muszynski
|
a54d3a8224
|
add some css
|
2017-01-30 16:53:12 +01:00 |
|
Marion Muszynski
|
8a2af96f1e
|
update css labelgenerate before updating size of label
|
2017-01-27 15:16:30 +01:00 |
|
Marion Muszynski
|
e49326dd96
|
Merge branch 'update-helperform' into develop
|
2017-01-27 13:09:35 +01:00 |
|
Marion Muszynski
|
c7e3f930c5
|
update helperform including lang managment
|
2017-01-27 13:04:48 +01:00 |
|
Marion Muszynski
|
75d2269f9a
|
fix conflict
|
2017-01-09 15:04:04 +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
|
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
|
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
|
2e30a3e4ff
|
Merge branch 'add-module-ant_creationcategories'
|
2016-12-26 11:42:22 +01:00 |
|
Marion Muszynski
|
3d34054aec
|
changement css
|
2016-12-26 09:36:06 +01:00 |
|
Marion Muszynski
|
b200eff972
|
begining of changement css
|
2016-12-23 12:06:36 +01:00 |
|
Marion Muszynski
|
d0db786f0b
|
addition of section of family catégory
|
2016-12-19 17:23:37 +01:00 |
|
Marion Muszynski
|
6bc6d54b50
|
continuing
|
2016-12-19 11:42:37 +01:00 |
|
Marion Muszynski
|
b690325325
|
continuing
|
2016-12-17 20:12:09 +01:00 |
|
Marion Muszynski
|
86e029f18e
|
addition of fields
|
2016-12-16 15:59:35 +01:00 |
|
Marion Muszynski
|
e4d330e372
|
addition of info
|
2016-12-15 17:48:34 +01:00 |
|
Marion Muszynski
|
da45380893
|
addition of module for mutiple category creation
|
2016-12-15 17:11:31 +01:00 |
|
Marion Muszynski
|
7f724c2012
|
css changement and optimisation db philea_sent
|
2016-12-14 15:17:32 +01:00 |
|
Marion Muszynski
|
124f7ebaed
|
addition of js
|
2016-12-13 14:53:30 +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
|
0ccd7ae611
|
add new section for antadis administration
|
2016-12-12 15:35:45 +01:00 |
|
Marion Muszynski
|
e55202c0d0
|
addition of help sentence
|
2016-12-08 11:54:04 +01: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
|
c90126baa8
|
addition of styled select
|
2016-10-21 15:54:52 +02:00 |
|
Marion Muszynski
|
1df6036d99
|
addition of philea module and helper class for admin
|
2016-09-06 15:32:52 +02:00 |
|