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 |
|
Marion Muszynski
|
b36c40446d
|
addition of CRE and CRP management
|
2016-09-28 16:56:19 +02:00 |
|
Marion Muszynski
|
e7d82a7a30
|
fix js slider
|
2016-09-28 15:05:05 +02:00 |
|
Marion Muszynski
|
09b85f428f
|
Merge branch 'ticket-payboxAgreement'
|
2016-09-28 13:03:12 +02:00 |
|
Marion Muszynski
|
7fff52b3b8
|
fix utf8
|
2016-09-28 13:02:55 +02:00 |
|
Rodney Figaro
|
da5a017c06
|
add scrolling/slide when products have more than 3 accessories
|
2016-09-28 12:44:25 +02:00 |
|
Marion Muszynski
|
6ec5d67fa3
|
fix conflict
|
2016-09-28 11:50:08 +02:00 |
|
Marion Muszynski
|
5fb300b503
|
modif css
|
2016-09-28 11:47:25 +02:00 |
|
Marion Muszynski
|
2aad574498
|
Merge branch 'ticket-payboxAgreement'
|
2016-09-28 10:49:44 +02:00 |
|
Marion Muszynski
|
a96bc923d1
|
restrict mail sending to our ip
|
2016-09-28 10:49:22 +02:00 |
|
Marion Muszynski
|
16e16d6596
|
update CRE
|
2016-09-28 10:41:39 +02:00 |
|
Marion Muszynski
|
8ff008b8bf
|
Merge branch 'ticket-payboxAgreement'
|
2016-09-27 12:07:51 +02:00 |
|
Marion Muszynski
|
f4ecfd644b
|
adjusting response data for paybox payment information
|
2016-09-27 12:07:24 +02:00 |
|
Marion Muszynski
|
7b294b493c
|
Merge branch 'ticket-payboxAgreement'
|
2016-09-27 11:37:56 +02:00 |
|
Marion Muszynski
|
829137c244
|
small fix
|
2016-09-27 11:37:17 +02:00 |
|
Marion Muszynski
|
7018bd81eb
|
save refabonne
|
2016-09-27 11:36:41 +02:00 |
|
Marion Muszynski
|
2f21284be4
|
fix conflict
|
2016-09-27 10:34:47 +02:00 |
|
Marion Muszynski
|
6f89c44d2c
|
prepare tests prod
|
2016-09-27 10:28:39 +02:00 |
|
Marion Muszynski
|
0c5950b71d
|
addition of a teston group before open save cb to every customer
|
2016-09-26 17:51:14 +02:00 |
|
Marion Muszynski
|
2d855a0071
|
remove tests for prod
|
2016-09-26 17:23:26 +02:00 |
|
Marion Muszynski
|
edc56267ca
|
test on dev env
|
2016-09-26 15:52:37 +02:00 |
|
Marion Muszynski
|
c0ed5c5499
|
Merge branch 'fix-socolXSS'
|
2016-09-26 12:24:18 +02:00 |
|