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
|
0dd562f216
|
fix bugs
|
2016-12-26 10:58:08 +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
|
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 |
|
Marion Muszynski
|
b200eff972
|
begining of changement css
|
2016-12-23 12:06:36 +01:00 |
|
Marion Muszynski
|
d427dab61c
|
fix bug vi
|
2016-12-23 10:58:18 +01:00 |
|
Marion Muszynski
|
edd3a55c0a
|
fix bug add sale in db
|
2016-12-23 10:57:27 +01:00 |
|
Marion Muszynski
|
469a0497ae
|
fix sub families
|
2016-12-21 14:31:41 +01:00 |
|
Marion Muszynski
|
7279c17f48
|
Merge branch 'ticket-12052-PreventDelivery'
|
2016-12-21 12:54:21 +01:00 |
|
Marion Muszynski
|
d329b24250
|
fix trad 2
|
2016-12-21 12:53:59 +01:00 |
|
Marion Muszynski
|
7d889ee10c
|
Merge branch 'ticket-12052-PreventDelivery'
|
2016-12-21 12:50:52 +01:00 |
|
Marion Muszynski
|
9d79455930
|
fix trad
|
2016-12-21 12:50:35 +01:00 |
|
Marion Muszynski
|
6c822a0e12
|
fix
|
2016-12-21 12:39:35 +01:00 |
|
Marion Muszynski
|
2b30de1cce
|
changement, deletion of pdf overrided
|
2016-12-21 12:24:31 +01:00 |
|
Marion Muszynski
|
408a58409c
|
modif and fix
|
2016-12-19 18:32:06 +01:00 |
|
Marion Muszynski
|
3eced865d5
|
fix bug
|
2016-12-19 17:30:11 +01:00 |
|
Marion Muszynski
|
d0db786f0b
|
addition of section of family catégory
|
2016-12-19 17:23:37 +01:00 |
|
Marion Muszynski
|
3b17e24180
|
Merge branch 'fix-cronLapostepr'
|
2016-12-19 11:45:47 +01:00 |
|
Marion Muszynski
|
0f199ebc44
|
fix missing Http host
|
2016-12-19 11:45:29 +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
|
a23e7dc2c2
|
add module
|
2016-12-15 17:30:05 +01:00 |
|
Marion Muszynski
|
da45380893
|
addition of module for mutiple category creation
|
2016-12-15 17:11:31 +01:00 |
|
Marion Muszynski
|
a8f9690ecf
|
Merge branch 'ticket-12052-PreventDelivery'
|
2016-12-15 12:10:30 +01:00 |
|
Marion Muszynski
|
a13396baa8
|
restriction for delivery to ceuta and melina
|
2016-12-15 12:02:32 +01:00 |
|
Marion Muszynski
|
9500f86e9d
|
changement
|
2016-12-15 11:47:40 +01:00 |
|
Marion Muszynski
|
3756a2d4b7
|
modification regenerateTree to limit to active categories
|
2016-12-14 18:12:08 +01:00 |
|
Marion Muszynski
|
d8da391eec
|
Merge branch 'ticket-10657-PhileaOptimization'
|
2016-12-14 16:04:27 +01:00 |
|
Marion Muszynski
|
c3ff8d4935
|
changement visuel
|
2016-12-14 16:04:08 +01:00 |
|
Marion Muszynski
|
2a833ef331
|
Merge branch 'ticket-10657-PhileaOptimization'
|
2016-12-14 15:17:50 +01:00 |
|
Marion Muszynski
|
7f724c2012
|
css changement and optimisation db philea_sent
|
2016-12-14 15:17:32 +01:00 |
|
Marion Muszynski
|
199c56337b
|
Merge branch 'ticket-10657-PhileaOptimization'
|
2016-12-14 11:30:42 +01:00 |
|
Marion Muszynski
|
692cfc1d20
|
prevent multi same update of order state
|
2016-12-14 11:30:09 +01:00 |
|
Marion Muszynski
|
715db47da4
|
add manually generation of ntree
|
2016-12-14 10:28:03 +01:00 |
|
Marion Muszynski
|
cb8ec32ad3
|
Merge branch 'add-ConfSectionForAntadis'
|
2016-12-13 14:53:54 +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
|
f8b1556ad6
|
Merge branch 'add-ConfSectionForAntadis'
|
2016-12-13 10:29:30 +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
|
c93bf04685
|
Merge branch 'add-ConfSectionForAntadis'
|
2016-12-12 16:24:04 +01:00 |
|