Commit Graph

1555 Commits

Author SHA1 Message Date
Marion Muszynski
b4370e2440 fix quantity sold request in adminPrivatesSaleLogistic 2017-01-18 11:32:54 +01:00
Marion Muszynski
d0dc500502 fix quantity sold request 2017-01-18 11:05:54 +01:00
Marion Muszynski
197e7aab03 add initial stock column in extract vp bulkupdate 2017-01-18 10:29:36 +01:00
Marion Muszynski
9f68ba0e12 Merge branch 'ticket-12256-fixInvoice' 2017-01-17 15:39:59 +01:00
Marion Muszynski
390c7d795f fix gift message on invoice pdf 2017-01-17 15:39:36 +01:00
Marion Muszynski
7f189160dd fix total column 2017-01-17 15:13:12 +01:00
Marion Muszynski
f7ad50aacd modif bdc log 2017-01-17 15:07:07 +01:00
Marion Muszynski
5fe1eeadde moving of block update ean 2017-01-17 13:28:43 +01:00
Marion Muszynski
41f3e18e89 addition of new update of ean 2017-01-17 13:25:37 +01:00
Marion Muszynski
41087356d8 return shipping cost enable when clicking on generateDiscount2 2017-01-17 10:06:26 +01:00
Marion Muszynski
a48649bacc Merge branch 'ticket-11199-RebuildNewsletter' 2017-01-16 17:54:42 +01:00
Marion Muszynski
8b4a8d1e27 changement flux 2017-01-16 17:53:55 +01:00
Marion Muszynski
f3e3ea668c Merge branch 'ticket-10580-LaPosteWSU_fixMobile' 2017-01-16 14:12:33 +01:00
Marion Muszynski
8e86fbe849 addition of mobile phone restriction for wsu la poste 2017-01-16 14:12:15 +01:00
Marion Muszynski
a2d47eec98 Merge branch 'ticket-12256-fixMobile' 2017-01-13 12:47:51 +01:00
Marion Muszynski
217c96b383 fix css 2 2017-01-13 12:47:30 +01:00
Marion Muszynski
360c802846 Merge branch 'ticket-12256-fixMobile' 2017-01-13 12:43:05 +01:00
Marion Muszynski
17bf597781 fix css 2017-01-13 12:42:49 +01:00
Marion Muszynski
de28ff8d87 Merge branch 'ticket-11985-MondialRelay' 2017-01-11 10:55:10 +01:00
Marion Muszynski
4e1f497252 comment mr modif for philea 2017-01-11 10:54:50 +01:00
Marion Muszynski
c86bd93311 Merge branch 'ticket-12215-showDelay' 2017-01-10 18:08:07 +01:00
Marion Muszynski
038dbec401 fix name 2017-01-10 18:06:01 +01:00
Marion Muszynski
f93d4446ca showing delivery delay in vp list 2017-01-10 17:49:21 +01:00
Marion Muszynski
a19179fddc Merge branch 'ticket-12199-PopupAddToCart' 2017-01-10 17:20:49 +01:00
Rodney Figaro
bf9c1e3ab2 fix last changes 2017-01-10 12:06:47 +01:00
Rodney Figaro
f44f955329 fix incompatible php code 2017-01-10 11:59:14 +01:00
Marion Muszynski
00b24f1454 Merge branch 'evo-configurations' 2017-01-09 15:27:33 +01:00
Marion Muszynski
c5359e3899 fix 2017-01-09 15:27:11 +01:00
Marion Muszynski
344c710c28 Merge branch 'evo-configurations' 2017-01-09 15:18:52 +01:00
Marion Muszynski
22b9815c1c changement ant_configuration to store carrier conf in db Configuration 2017-01-09 15:02:14 +01:00
Rodney Figaro
fb852e6301 add img folder, delete folder creation in installer and fix image view in category form 2017-01-09 13:18:54 +01:00
Marion Muszynski
bdb9cf6b29 fix vaucher calue in mail sent 2017-01-09 12:09:25 +01:00
Marion Muszynski
a29a54f41e addition of new discount of 5 for missing product 2017-01-09 12:03:58 +01:00
Marion Muszynski
cbbf8cd284 Merge branch 'ticket-12189-fixColorExpressCart' 2017-01-09 11:21:19 +01:00
Marion Muszynski
b9cff0b01a fix rose color in expressCart tpl 2017-01-09 11:19:37 +01:00
Marion Muszynski
92bb810bb7 fix top again 2017-01-09 11:11:05 +01:00
Marion Muszynski
13f86ed0f5 fix top of add to cart popup 2017-01-09 10:44:12 +01:00
Marion Muszynski
2b27b9659b Merge branch 'ticket-12188-OrderMessage' 2017-01-09 10:16:33 +01:00
Marion Muszynski
228798b4e1 upgrade limit max char for order messages 2017-01-09 10:16:10 +01:00
Marion Muszynski
bc807d22f7 Merge branch 'ticket-11056-addRestriction' 2017-01-06 16:48:17 +01:00
Marion Muszynski
46e655751d fix value for prod 2017-01-06 16:47:55 +01:00
Marion Muszynski
cd4aa777d5 value for dev 2017-01-06 16:32:55 +01:00
Marion Muszynski
6cc03d0287 restriction with carrier priority 2017-01-06 16:25:08 +01:00
Marion Muszynski
ecf1a87507 changement module mr 2017-01-06 10:07:38 +01:00
Marion Muszynski
b250ea6d3d Merge branch 'ticket-11056' 2017-01-05 11:18:19 +01:00
Marion Muszynski
e902c80b60 fix for prod 2017-01-05 11:18:05 +01:00
Marion Muszynski
e93de310ec fix conflicts 2017-01-05 11:14:54 +01:00
Marion Muszynski
cb75e081c3 Merge branch 'ticket-11201-updateAntCreationCategory' 2017-01-05 10:31:11 +01:00
Marion Muszynski
6c12b392eb Merge branch 'ticket-10580-LaPosteWSU' 2017-01-04 16:58:29 +01:00
Marion Muszynski
97a3ec3219 Merge branch 'ticket-braderie-addEmplacement' 2017-01-04 15:10:25 +01:00