Commit Graph

802 Commits

Author SHA1 Message Date
Marion Muszynski
91fc9ee7dc update order invoice 2016-07-08 16:03:19 +02:00
Srv Bebeboutik
4a93e29747 modif prod, remove log email sending to us 2016-07-08 15:52:31 +02:00
Dylan Travers
c2d4fb13c9 Show only if product.quantity > 0 2016-07-08 15:37:30 +02:00
Marion Muszynski
e489a60c90 Merge branch 'ticket-simplemulti_invoice' 2016-07-08 10:52:17 +02:00
Marion Muszynski
d7f6930236 Merge branch 'ticket-simplemulti_bdc' 2016-07-08 10:47:49 +02:00
Srv Bebeboutik
7701a95063 fix from prod 2016-07-06 16:07:22 +02:00
Marion Muszynski
0f05a15e94 Merge branch 'ticket-preheaderRSS' 2016-07-06 15:33:48 +02:00
Marion Muszynski
7366285f76 Merge branch 'ticket-editFast' 2016-07-06 15:23:26 +02:00
Marion Muszynski
7f6949043e adding various description blocks in Admin product edit fast 2016-07-06 12:14:28 +02:00
Marion Muszynski
86810cdb1e Merge branch 'ticket-10377' 2016-07-06 11:20:42 +02:00
Marion Muszynski
0ee8479f3c remove grey border on shipping menu of product tpl 2016-07-06 11:18:06 +02:00
Marion Muszynski
cc0b9ce4a3 Merge branch 'ticket-10363' 2016-07-05 15:15:01 +02:00
Marion Muszynski
e79421073d adding pending orders to stock report 2016-07-05 15:11:33 +02:00
Marion Muszynski
95b176601a adding preheader rss emarsys 2016-07-04 18:20:03 +02:00
Marion Muszynski
9391dd015a adding column in admin invoice for same brand in multi sale 2016-07-04 17:51:26 +02:00
Marion Muszynski
45bf5e67b9 Merge branch 'adding-log-bo' 2016-07-04 17:43:25 +02:00
Marion Muszynski
4de026d0db add id_employee 2016-07-04 17:42:02 +02:00
Marion Muszynski
2d5f691dcf Merge branch 'adding-log-bo' 2016-07-04 17:36:29 +02:00
Marion Muszynski
8dbbf309bf fix 2016-07-04 17:33:56 +02:00
Marion Muszynski
276cc9a2b6 sending email when order delivery address is modified in BO 2016-07-04 17:30:04 +02:00
Marion Muszynski
3be779d03b Merge branch 'ticket-simplemulti_logistic' 2016-07-04 16:58:23 +02:00
Marion Muszynski
ff715abd60 Merge branch 'modif-css' 2016-07-01 16:44:13 +02:00
Marion Muszynski
47335062aa Merge branch 'ticket-ecotax' 2016-07-01 12:27:13 +02:00
Marion Muszynski
6a87ea0460 modif add button 2016-07-01 11:29:00 +02:00
Marion Muszynski
e40768c734 modif img reduction on product list 2016-07-01 11:18:52 +02:00
Marion Muszynski
50698ab701 Merge branch 'ticket-6355' 2016-06-30 13:06:37 +02:00
Srv Bebeboutik
c48e673922 fix prod 2016-06-30 11:31:11 +02:00
Marion Muszynski
699a06db48 fix conflict 2016-06-30 11:15:14 +02:00
Marion Muszynski
f99cacd293 small update for mobile site 2016-06-30 10:47:46 +02:00
Marion Muszynski
760bd50c06 adding sentence according delivery delay 2016-06-29 15:52:03 +02:00
Marion Muszynski
20896d3bbf adding popup error for mobile 2016-06-29 09:59:03 +02:00
Marion Muszynski
afebcee8af Merge branch 'ticket-blockbestsellerProduct' 2016-06-28 16:17:23 +02:00
Marion Muszynski
e6585427ee fix 2016-06-28 16:15:41 +02:00
Marion Muszynski
10ad346ad5 modif idcombination 2016-06-28 16:07:29 +02:00
Marion Muszynski
dd9831daa5 Merge branch 'ticket-blockbestsellerProduct' 2016-06-28 15:55:39 +02:00
Marion Muszynski
91ca51a960 modif cookie 2016-06-28 15:45:43 +02:00
Marion Muszynski
f8af1f0a71 modif tpl trad 2016-06-28 15:19:31 +02:00
Marion Muszynski
163cc3ac04 adding html bind 2016-06-28 15:03:07 +02:00
Marion Muszynski
8a0b80e15e pop error cart 2016-06-28 14:45:48 +02:00
Dylan Travers
c3f3e05427 Change pink color and modify comportement (Use All_quantities and not product_quantity 2016-06-27 12:25:22 +02:00
Marion Muszynski
ced379c219 ecotax sentence 2016-06-24 14:34:15 +02:00
Marion Muszynski
43646dd4bd modif 2016-06-24 13:54:50 +02:00
Marion Muszynski
985bf52e83 update to add product with attribute to cart from bestsellers 2016-06-24 12:41:46 +02:00
Srv Bebeboutik
3b72e67b19 fix from prod 2016-06-24 10:09:27 +02:00
Marion Muszynski
7b74de5aac Merge branch 'ticket-tplProduct2' 2016-06-23 10:16:29 +02:00
Marion Muszynski
03dd90bec5 update product tpl css 2016-06-23 10:16:07 +02:00
Marion Muszynski
d2d845a4d8 small fix 2016-06-22 17:50:52 +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
a9d9613b37 Merge branch 'ticket-tplproduct' 2016-06-22 16:12:32 +02:00