Marion Muszynski
13e343c6ff
continuing changement css
2016-12-29 15:29:23 +01:00
Marion Muszynski
795aca43a7
continuing
2016-12-28 17:16:50 +01:00
Marion Muszynski
b6788e7bbd
continuing
2016-12-28 14:15:20 +01:00
Marion Muszynski
a50e10fd90
continuing
2016-12-27 11:01:19 +01:00
Marion Muszynski
de693ae3ed
start of css changement
2016-12-27 10:04:07 +01:00
Marion Muszynski
c8464f4ec1
Merge branch 'ticket-11210-update' into develop
2016-11-28 14:36:03 +01:00
Marion Muszynski
e8df7cedba
update to load es img with fr img
2016-11-28 14:34:52 +01:00
Marion Muszynski
60577f145a
fix conflict
2016-11-22 11:53:24 +01:00
Marion Muszynski
1e6dd3ddda
css modification and addition of shipping column
2016-11-21 16:29:22 +01:00
Marion Muszynski
ee2c243bc8
Merge branch 'ticket-11210-imageVP'
2016-11-21 15:06:58 +01:00
Marion Muszynski
3f7d969371
Merge branch 'ticket-10657-PhileaMulti' into develop
2016-11-18 12:09:17 +01:00
Marion Muszynski
03c169aca4
Merge branch 'ticket-11210-imageVP' into develop
2016-11-18 10:55:05 +01:00
Marion Muszynski
d91720a2d4
adapt the modif to thumb img
2016-11-18 10:54:38 +01:00
Marion Muszynski
4ac4753900
begining of updatings
2016-11-18 09:50:04 +01:00
Marion Muszynski
40497ffb14
fix conflict
2016-11-14 14:20:50 +01:00
Marion Muszynski
a13a8813ea
comment sending mail
2016-11-10 16:25:56 +01:00
Marion Muszynski
d8d9dcf9af
Merge branch 'ticket-11210-imageVP' into develop
2016-11-10 16:09:28 +01:00
Marion Muszynski
e34bef4bd2
small fix
2016-11-10 16:09:09 +01:00
Marion Muszynski
fe03ca4ed1
Merge branch 'ticket-11210-imageVP' into develop
2016-11-10 10:36:37 +01:00
Marion Muszynski
ca38824e83
restriction on liston and listoff
2016-11-10 10:36:14 +01:00
Marion Muszynski
a9c19b6c6c
Merge branch 'ticket-11210-imageVP' into develop
2016-11-09 17:50:56 +01:00
Marion Muszynski
9a9a222552
simplification of img uploaded in privatesale
2016-11-09 17:50:41 +01:00
Marion Muszynski
d0f52b3070
Merge branch 'ticket-11557-FixLinkSaleCategory' into develop
2016-11-09 11:19:33 +01:00
Marion Muszynski
a1f1eca990
addition of mail sending to check bad behaviours
2016-11-09 11:19:05 +01:00
Marion Muszynski
b4eaebddcf
fix vi bugs
2016-11-07 15:35:57 +01:00
Marion Muszynski
54427ea473
new delay added in choice in ps management
2016-11-07 15:35:15 +01:00
Marion Muszynski
49aeb076ac
Merge branch 'ticket-11056' into develop
2016-10-20 14:03:30 +02:00
Marion Muszynski
37d7422d08
fix js
2016-10-20 14:03:15 +02:00
Marion Muszynski
593166c883
Merge branch 'ticket-11056' into develop
2016-10-20 13:49:19 +02:00
Marion Muszynski
302ba040d1
modif expedition
2016-10-20 13:48:55 +02:00
Marion Muszynski
bb95ffcaa1
Merge branch 'ticket-11056' into develop
2016-10-14 13:11:15 +02:00
Marion Muszynski
9edcc64a82
modification of delivery mode selection
2016-10-14 13:10:56 +02:00
Marion Muszynski
541a0ed663
fix conflict
2016-10-05 11:27:50 +02:00
Marion Muszynski
6c927d2266
addition of id category of sale in sale management
2016-10-05 11:25:43 +02:00
Marion Muszynski
b4ff3a8ee5
addition of remove img option in adminPrivateSalesSales
2016-09-06 11:07:40 +02:00
Rodney Figaro
6ec43fe75d
move the cron task to another dedicated file
2016-08-25 16:12:13 +02:00
Rodney Figaro
4ca5bc73a9
fix cron script
2016-08-25 15:20:38 +02:00
Rodney Figaro
7f18d590a0
add in private sales cron a sales promotional sentence update task
...
the "jusqu'à N%" of a sale promotional field is updated with
the maximum reduction percentage found for every product in the sale.
The cron affect only sales that begin the day when the cron is executed after midnight.
2016-08-25 15:16:44 +02:00
Marion Muszynski
41845cd98d
Merge branch 'ticket-8039'
2016-08-23 11:12:04 +02:00
root
880d16d5b0
updateprod
2016-08-18 15:56:46 +02:00
Marion Muszynski
df1e423c9c
modif order way
2016-07-11 17:06:11 +02:00
Marion Muszynski
ebd46063eb
small mod
2016-07-11 16:15:04 +02:00
Marion Muszynski
fce857f676
update order way M2
2016-07-11 16:13:21 +02:00
Marion Muszynski
d1c984cb76
update sort invoice
2016-07-11 14:44:19 +02:00
Marion Muszynski
91fc9ee7dc
update order invoice
2016-07-08 16:03:19 +02:00
Marion Muszynski
7043f4b24a
other fix
2016-06-22 17:23:34 +02:00
Marion Muszynski
a6c46f9077
petit fix before prod
2016-06-22 17:08:09 +02:00
Marion Muszynski
ad30bb51a4
modif in Sale function for M2
2016-06-20 12:56:59 +02:00
Marion Muszynski
3d4d7b16e2
update invoice
2016-06-20 12:49:32 +02:00
Marion Muszynski
7af6d9ccd7
adding bg for sale
2016-06-10 16:49:43 +02:00
