Marion Muszynski
39534bff4b
Merge branch 'ticket-9260' into develop
2016-08-30 14:03:42 +02:00
Marion Muszynski
719f438b41
fix
2016-08-30 14:03:19 +02:00
Marion Muszynski
563b9059de
Merge branch 'ticket-9260' into develop
2016-08-30 13:56:13 +02:00
Marion Muszynski
0dde6b5611
fix for old sales
2016-08-30 13:55:47 +02:00
Marion Muszynski
e2c867f5ed
Merge branch 'ticket-9260' into develop
2016-08-30 13:48:00 +02:00
Marion Muszynski
a96b0018c0
upload vp miniature in adminCategory
2016-08-30 13:47:42 +02:00
Marion Muszynski
0fa7a8b036
Merge branch 'ticket-10758'
2016-08-30 10:54:58 +02:00
Marion Muszynski
46d2f45100
Merge branch 'ticket-10758' into develop
2016-08-30 10:54:32 +02:00
Marion Muszynski
ba0ad41bd5
ini set memory limit to 1G
2016-08-30 10:54:07 +02:00
Marion Muszynski
93e464c78b
Merge branch 'ticket_9890' into develop
2016-08-26 17:16:42 +02:00
Marion Muszynski
0f85417eaf
modif css
2016-08-26 17:16:18 +02:00
Marion Muszynski
c45e018298
Merge branch 'ticket_9890' into develop
2016-08-26 17:08:53 +02:00
Marion Muszynski
bab94ab68b
fix and modif css
2016-08-26 17:08:28 +02:00
Marion Muszynski
1ed3c9df79
Merge branch 'ticket-9599'
2016-08-25 17:18:51 +02:00
Marion Muszynski
ecbce286f5
Merge branch 'ticket-9895'
2016-08-25 17:08:55 +02:00
Marion Muszynski
bcd33c882e
Merge branch 'ticket-9895' into develop
2016-08-25 17:04:47 +02:00
Marion Muszynski
78bc31c542
Merge branch 'ticket-9599' into develop
2016-08-25 17:02:31 +02:00
Rodney Figaro
da3c1aeed5
fix admin product - now no redirection after changing an image
2016-08-25 16:49:16 +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
35deb50531
Merge branch 'ticket-9728'
2016-08-25 13:05:58 +02:00
Marion Muszynski
d251c3f8d6
Merge branch 'ticket-9728' into develop
2016-08-25 13:01:37 +02:00
Marion Muszynski
cf8f32d6c1
Merge branch 'ticket-9895' into develop
2016-08-25 12:48:36 +02:00
Rodney Figaro
b82ca57e10
change single image upload to multiple images upload in admin > catalog edit product
2016-08-25 10:57:15 +02:00
Rodney Figaro
33c5572c08
apply the same confirmation order page to all type of paypal paiements
2016-08-24 17:24:41 +02:00
Marion Muszynski
1943181c4a
Merge branch 'evo-9386'
2016-08-24 14:27:36 +02:00
Marion Muszynski
4756a312ac
Merge branch 'evo-9386' into develop
2016-08-24 12:34:54 +02:00
Marion Muszynski
f91db79159
Merge branch 'fix-tplmobile'
2016-08-23 18:07:48 +02:00
Marion Muszynski
63ee2fb3c9
fix tpl product add to cart
2016-08-23 18:07:24 +02:00
Rodney Figaro
69f6d0dcd0
add column ecotax if any in the PDF invoices
2016-08-23 17:37:35 +02:00
Marion Muszynski
0a0ba98491
Merge branch 'fix-10571'
2016-08-23 15:59:36 +02:00
Marion Muszynski
b963f91154
Merge branch 'evo-10581'
2016-08-23 15:22:25 +02:00
Marion Muszynski
343fc553aa
modif for prod
2016-08-23 15:21:43 +02:00
Marion Muszynski
3d12d226f5
Merge branch 'fix-10571' into develop
2016-08-23 15:02:55 +02:00
Marion Muszynski
cafdba6107
Merge branch 'ticket-8039'
2016-08-23 14:53:45 +02:00
Marion Muszynski
01e7bedfe9
small fix
2016-08-23 14:53:24 +02:00
Marion Muszynski
e5dbd10cef
Merge branch 'ticket-8039'
2016-08-23 14:50:53 +02:00
Marion Muszynski
52e59458d5
petit fix
2016-08-23 14:50:30 +02:00
Rodney Figaro
a2b0ea366d
change the admin invoices selection in database : now saved globally, no more per employee
2016-08-23 14:26:07 +02:00
Marion Muszynski
b3e04efabe
Merge branch 'evo-10581' into develop
2016-08-23 12:32:54 +02:00
Marion Muszynski
e02097858b
fix css conflicts
2016-08-23 12:31:28 +02:00
Rodney Figaro
b335e6adf1
fix original text in product info size in french rather than in spanish
2016-08-23 12:17:56 +02:00
Rodney Figaro
b95db0bb8c
change css of the size info popup for mobile version
2016-08-23 12:06:39 +02:00
Marion Muszynski
41845cd98d
Merge branch 'ticket-8039'
2016-08-23 11:12:04 +02:00
Marion Muszynski
fe434095da
modif for prod
2016-08-23 11:11:28 +02:00
Rodney Figaro
2a2949882d
display informations on sizes in product details
2016-08-23 10:33:48 +02:00
Marion Muszynski
2a82114fa9
fix conflict
2016-08-22 17:10:12 +02:00
Rodney Figaro
ac9aadcdf3
fix js code + texts in english
2016-08-22 10:30:03 +02:00
Rodney Figaro
b9c36ee801
save orders selection for each employee using their id
2016-08-22 09:50:29 +02:00
