Marion Muszynski
|
22a8b5cac1
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:23:56 +02:00 |
|
Marion Muszynski
|
7043f4b24a
|
other fix
|
2016-06-22 17:23:34 +02:00 |
|
Marion Muszynski
|
224267f45c
|
Merge branch 'ticket-8039' into develop
|
2016-06-22 17:08:37 +02:00 |
|
Marion Muszynski
|
a6c46f9077
|
petit fix before prod
|
2016-06-22 17:08:09 +02:00 |
|
Marion Muszynski
|
f3fdc49173
|
fix conflict
|
2016-06-22 16:11:15 +02:00 |
|
Marion Muszynski
|
3e65d4ed6d
|
fix css
|
2016-06-22 15:50:00 +02:00 |
|
Marion Muszynski
|
77b9c22014
|
fix conflicts
|
2016-06-22 15:03:36 +02:00 |
|
Marion Muszynski
|
53af527187
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-22 12:53:47 +02:00 |
|
Marion Muszynski
|
f5cb833c6e
|
put description more over description short
|
2016-06-22 12:53:17 +02:00 |
|
Marion Muszynski
|
94dc4f3b40
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-22 11:48:50 +02:00 |
|
Marion Muszynski
|
70e5c4a7dd
|
adding cookie for checked sale
|
2016-06-22 11:48:28 +02:00 |
|
Marion Muszynski
|
f41acac7ad
|
Merge branch 'ticket-simplemulti_logistic' into develop
|
2016-06-22 11:27:13 +02:00 |
|
Marion Muszynski
|
ae50025d14
|
continuing updating
|
2016-06-22 11:26:51 +02:00 |
|
Marion Muszynski
|
56c4006da3
|
Merge branch 'ticket-simplemulti_logistic' into develop
|
2016-06-21 17:18:51 +02:00 |
|
Marion Muszynski
|
8ebec9fb3e
|
addind admin pending orders
|
2016-06-21 17:18:24 +02:00 |
|
Marion Muszynski
|
c442173cb8
|
add nex adminTab
|
2016-06-20 18:27:54 +02:00 |
|
Marion Muszynski
|
6dfa3c18b1
|
Merge branch 'ticket-simplemulti_logistic' into develop
|
2016-06-20 15:32:28 +02:00 |
|
Marion Muszynski
|
c29d8725ac
|
add status modify button
|
2016-06-20 15:32:06 +02:00 |
|
Marion Muszynski
|
9ddab586a1
|
Merge branch 'ticket-10254'
|
2016-06-20 15:14:50 +02:00 |
|
Marion Muszynski
|
fcc0b6e2fc
|
Merge branch 'ticket-10254' into develop
|
2016-06-20 15:13:43 +02:00 |
|
Marion Muszynski
|
a11f4ad97e
|
modif button color
|
2016-06-20 15:13:18 +02:00 |
|
Marion Muszynski
|
6265c1b2af
|
begin update adminlogistic
|
2016-06-20 15:09:13 +02:00 |
|
Marion Muszynski
|
50010e70c3
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-20 12:57:23 +02:00 |
|
Marion Muszynski
|
ad30bb51a4
|
modif in Sale function for M2
|
2016-06-20 12:56:59 +02:00 |
|
Marion Muszynski
|
ff30aab5d5
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-20 12:49:51 +02:00 |
|
Marion Muszynski
|
3d4d7b16e2
|
update invoice
|
2016-06-20 12:49:32 +02:00 |
|
Marion Muszynski
|
1bfd79afb9
|
Merge branch 'ticket-simplemulti_bdc' into develop
|
2016-06-20 11:02:00 +02:00 |
|
Marion Muszynski
|
56163f32ab
|
update bdc log
|
2016-06-20 11:01:39 +02:00 |
|
Srv Bebeboutik
|
e7e7f8381c
|
push prod modif carrier
|
2016-06-20 10:42:30 +02:00 |
|
Marion Muszynski
|
62009ba633
|
Merge branch 'ticket-8039' into develop
|
2016-06-10 16:50:05 +02:00 |
|
Marion Muszynski
|
7af6d9ccd7
|
adding bg for sale
|
2016-06-10 16:49:43 +02:00 |
|
Marion Muszynski
|
6c3e87c85a
|
Merge branch 'ticket-8251'
|
2016-06-10 14:53:46 +02:00 |
|
Marion Muszynski
|
2c07f5a0b2
|
good fix this time
|
2016-06-10 14:52:32 +02:00 |
|
Marion Muszynski
|
50eff4bc6c
|
Merge branch 'ticket-8251'
|
2016-06-10 14:46:04 +02:00 |
|
Marion Muszynski
|
9f39cdffe4
|
petit fix
|
2016-06-10 14:45:46 +02:00 |
|
Marion Muszynski
|
7ea4968d08
|
fix
|
2016-06-10 14:44:45 +02:00 |
|
Marion Muszynski
|
ce9af872f7
|
Merge branch 'ticket-8251'
|
2016-06-10 14:39:59 +02:00 |
|
Marion Muszynski
|
3c7f40ba5c
|
Merge branch 'ticket-8251' into develop
|
2016-06-10 14:38:03 +02:00 |
|
Marion Muszynski
|
e3bc588287
|
update function expe48hbis
|
2016-06-10 14:37:34 +02:00 |
|
Marion Muszynski
|
b276ca2f68
|
Merge branch 'ticket-8251'
|
2016-06-10 12:24:33 +02:00 |
|
Marion Muszynski
|
1386f8460f
|
modif for prod
|
2016-06-10 12:19:45 +02:00 |
|
Marion Muszynski
|
bafeacf546
|
Merge branch 'ticket-9875'
|
2016-06-10 11:55:33 +02:00 |
|
Marion Muszynski
|
40ab87cd45
|
update request deb expe
|
2016-06-10 11:55:09 +02:00 |
|
Marion Muszynski
|
9b9e586d0f
|
Merge branch 'ticket-8251' into develop
|
2016-06-10 11:42:32 +02:00 |
|
Marion Muszynski
|
389356d129
|
suite update
|
2016-06-10 11:41:50 +02:00 |
|
Marion Muszynski
|
2d776eae51
|
Merge branch 'ticket-9875'
|
2016-06-10 10:22:49 +02:00 |
|
Marion Muszynski
|
182a608e3b
|
little update in request
|
2016-06-10 10:22:26 +02:00 |
|
Marion Muszynski
|
c48154134d
|
Merge branch 'ticket-6355' into develop
|
2016-06-09 12:44:16 +02:00 |
|
Marion Muszynski
|
b49366dde2
|
ajout du wholesale_price dans import decli
|
2016-06-09 12:43:52 +02:00 |
|
Marion Muszynski
|
62a5f4cc32
|
Merge branch 'tiket-productTemplate' into develop
|
2016-06-09 11:49:55 +02:00 |
|