Commit Graph

1031 Commits

Author SHA1 Message Date
Marion Muszynski
27a62959a6 start refund sav page 2016-10-14 18:30:05 +02:00
Marion Muszynski
bcffb2088f Merge branch 'ticket-updateStat' 2016-10-12 18:20:12 +02:00
Marion Muszynski
cd7a64735a fix 2016-10-12 18:18:21 +02:00
Marion Muszynski
8f6decb643 addition of id sale in export 2016-10-12 18:13:45 +02:00
Marion Muszynski
855d8ba529 Merge branch 'ticket-payboxAgreement' 2016-10-11 14:49:49 +02:00
Marion Muszynski
c0b23b26c3 fix number card 2016-10-11 14:49:32 +02:00
Marion Muszynski
b33b709bed Merge branch 'ticket-payboxAgreement' 2016-10-11 11:56:05 +02:00
Marion Muszynski
2a524a6262 openning save card to everyone 2016-10-11 11:48:25 +02:00
Marion Muszynski
1ff084929e fix conflict 2016-10-11 11:41:40 +02:00
Marion Muszynski
a93a5b14f2 modif css 2016-10-11 11:40:18 +02:00
Marion Muszynski
da8f9e0c1f Merge branch 'ticket-GAnalytics' 2016-10-10 10:38:46 +02:00
Marion Muszynski
5cf27fac91 adjusting carrier name sent to GA 2016-10-10 10:38:22 +02:00
Marion Muszynski
401db0a5b2 Merge branch 'ticket-GAnalytics' 2016-10-10 10:19:57 +02:00
Marion Muszynski
ba150d8ed9 adjusting payment type sent to GA 2016-10-10 10:19:40 +02:00
Marion Muszynski
46deb152f6 Merge branch 'ticket-GAnalytics' 2016-10-07 15:14:07 +02:00
Marion Muszynski
88e42535a7 fix redirect 2016-10-07 15:11:25 +02:00
Marion Muszynski
0f666b08fc fix when ga is blocked 2016-10-07 15:03:45 +02:00
Marion Muszynski
797b0e499f Merge branch 'ticket-GAnalytics' 2016-10-07 13:57:15 +02:00
Marion Muszynski
2b7ee09f88 fix 2016-10-07 13:57:01 +02:00
Marion Muszynski
46cae17534 fix conflict 2016-10-06 16:00:32 +02:00
Marion Muszynski
71a4bcdd52 fix name of payment type 2016-10-06 15:58:50 +02:00
Marion Muszynski
31bea61242 fix conflict 2016-10-06 15:29:09 +02:00
Marion Muszynski
016fbd8353 small fix 2016-10-06 15:25:25 +02:00
Marion Muszynski
b2df0d740f Merge branch 'ticket-payboxAgreement' 2016-10-06 15:15:10 +02:00
Marion Muszynski
9a20001d73 small fix 2016-10-06 14:53:29 +02:00
Marion Muszynski
cfc9e5cf3d adjusting refabonne to allow multi saved cards for the same account 2016-10-06 14:46:50 +02:00
Marion Muszynski
e0ed73f324 Merge branch 'ticket-AssociateProducts' 2016-10-05 16:22:11 +02:00
Marion Muszynski
047f419b8e addition of img to recognize the product 2016-10-05 16:18:52 +02:00
Marion Muszynski
6475f2140c modification of product autocomplete with only enabled products 2016-10-05 14:36:15 +02:00
Marion Muszynski
a81410ea2b Merge branch 'ticket-AssociateProducts' 2016-10-05 12:31:06 +02:00
Marion Muszynski
cb5cd4f1b4 adjust lenght of slider 2016-10-05 12:29:10 +02:00
Marion Muszynski
5c359e8cd3 Merge branch 'ticket-10662' 2016-10-05 11:28:18 +02:00
Marion Muszynski
6c927d2266 addition of id category of sale in sale management 2016-10-05 11:25:43 +02:00
Marion Muszynski
13385c964d Merge branch 'ticket-philea' 2016-09-30 13:08:22 +02:00
Marion Muszynski
c0110a6618 modif css and fix alert missing quantity in orders 2016-09-30 13:06:24 +02:00
Marion Muszynski
8369aa187f Merge branch 'ticket-philea' 2016-09-29 18:08:48 +02:00
Marion Muszynski
d9fd7547d1 addition of preparation report 2016-09-29 18:08:23 +02:00
Marion Muszynski
c554c573f4 Merge branch 'fix-printEan' 2016-09-29 16:11:22 +02:00
Marion Muszynski
4b7d6ac5ae fix print single attribute 2016-09-29 16:11:06 +02:00
Marion Muszynski
5f54f95770 Merge branch 'fix-printEan' 2016-09-29 15:56:35 +02:00
Marion Muszynski
9e8a975d2f test for code 128 print 2016-09-29 15:56:17 +02:00
Marion Muszynski
1ef60ede89 Merge branch 'fix-printEan' 2016-09-29 14:25:21 +02:00
Marion Muszynski
14b6ee9e33 fix 2016-09-29 14:24:57 +02:00
Marion Muszynski
842a3445bf Merge branch 'fix-printEan' 2016-09-29 10:33:13 +02:00
Marion Muszynski
b47cf63cdd fix continuing 2016-09-29 10:32:10 +02:00
Marion Muszynski
da5e08f67b Merge branch 'fix-printEan' 2016-09-29 10:17:32 +02:00
Marion Muszynski
e6f254dbcd fix to print ean whatever if length is 13 2016-09-29 10:17:12 +02:00
Marion Muszynski
5b3ac86cc5 Merge branch 'ticket-philea' 2016-09-28 18:11:43 +02:00
Marion Muszynski
4acbb1dcf6 fix recept_expe 2016-09-28 18:11:07 +02:00
Marion Muszynski
e6fdac5dbe Merge branch 'ticket-8048' 2016-09-28 16:57:04 +02:00