Commit Graph

864 Commits

Author SHA1 Message Date
Marion Muszynski
bab94ab68b fix and modif css 2016-08-26 17:08:28 +02:00
Marion Muszynski
b9ff9ead70 fix to loop the correct product array 2016-08-26 16:37:19 +02:00
Marion Muszynski
064072bfb8 modification to reprint label with multi products 2016-08-26 16:35:02 +02:00
Marion Muszynski
9e2007dfe8 adding re print label option 2016-08-26 12:00:54 +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
fdc8a91a61 suite 2016-08-25 16:59:26 +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
ed4df2bd73 continuing 2016-08-25 12:14:34 +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
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
Marion Muszynski
ce0e4e89b4 start ticket 2016-08-23 18:05:47 +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
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
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
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
Rodney Figaro
95a32fc2e3 save the selected orders in configuration table in BO 2016-08-19 18:08:32 +02:00
root
880d16d5b0 updateprod 2016-08-18 15:56:46 +02:00
Marion Muszynski
51e726856d Merge branch 'ticket-modifNameCarrierEs' 2016-07-29 13:45:01 +02:00
Marion Muszynski
39fa6390f7 modif name in order summary 2016-07-29 13:41:55 +02:00
Marion Muszynski
9d3083eb23 update carrier name when es 2016-07-29 13:31:12 +02:00
Marion Muszynski
0904afd11c Merge branch 'ticket-criteo' 2016-07-28 13:36:06 +02:00
Marion Muszynski
854d8fe6f0 fix price 2016-07-28 13:35:24 +02:00
Marion Muszynski
141dbfda94 Merge branch 'ticket-criteo' 2016-07-28 13:27:45 +02:00
Marion Muszynski
2fe135dbce little mod 2016-07-28 13:26:58 +02:00
Marion Muszynski
794c5e7844 Merge branch 'ticket-criteo' 2016-07-28 12:31:10 +02:00
Marion Muszynski
285c610784 fix order 2016-07-28 12:29:45 +02:00
Marion Muszynski
08ab57a1f1 Merge branch 'ticket-criteo' 2016-07-28 12:12:10 +02:00
Marion Muszynski
de5ea0a04a fix price quantity 2016-07-28 12:06:25 +02:00
Marion Muszynski
d9c89a94cc Merge branch 'ticket-criteo' 2016-07-28 11:54:34 +02:00
Marion Muszynski
7985bf0b78 small fix 2016-07-28 11:53:17 +02:00