Marion Muszynski
|
be66a5cb5a
|
Merge branch 'ticket-10133' into develop
|
2016-09-15 12:07:24 +02:00 |
|
Marion Muszynski
|
6304de6703
|
fix of unknown function
|
2016-09-15 12:07:03 +02:00 |
|
Marion Muszynski
|
445227062e
|
Merge branch 'ticket-10133' into develop
|
2016-09-15 11:42:52 +02:00 |
|
Marion Muszynski
|
72b189c33d
|
addition of lapostews package checking
|
2016-09-15 11:42:21 +02:00 |
|
Marion Muszynski
|
1128f0583c
|
Merge branch 'ticket-10133' into develop
|
2016-09-15 10:25:14 +02:00 |
|
Marion Muszynski
|
ac2de48ccc
|
case when it s already in partial and we cancel the last product to send
|
2016-09-15 10:24:53 +02:00 |
|
Marion Muszynski
|
b6a69ec6a3
|
modif current state when product is refund on partial sent order
|
2016-09-12 17:08:25 +02:00 |
|
Marion Muszynski
|
1e751507ab
|
Merge branch 'ticket-philea' into develop
|
2016-09-06 15:34:55 +02:00 |
|
Marion Muszynski
|
1df6036d99
|
addition of philea module and helper class for admin
|
2016-09-06 15:32:52 +02:00 |
|
Marion Muszynski
|
13e85738e6
|
Merge branch 'ticket-9260'
|
2016-09-05 10:37:24 +02:00 |
|
Marion Muszynski
|
fb0cf0f757
|
Merge branch 'fix-10796' into develop
|
2016-09-02 11:23:34 +02:00 |
|
Rodney Figaro
|
d06391d181
|
fix bug when submitting a product form with no new image added (BO)
|
2016-09-02 10:49:34 +02:00 |
|
Marion Muszynski
|
e2c867f5ed
|
Merge branch 'ticket-9260' into develop
|
2016-08-30 13:48:00 +02:00 |
|
Marion Muszynski
|
a96b0018c0
|
upload vp miniature in adminCategory
|
2016-08-30 13:47:42 +02:00 |
|
Marion Muszynski
|
bcd33c882e
|
Merge branch 'ticket-9895' into develop
|
2016-08-25 17:04:47 +02:00 |
|
Rodney Figaro
|
da3c1aeed5
|
fix admin product - now no redirection after changing an image
|
2016-08-25 16:49:16 +02:00 |
|
Marion Muszynski
|
cf8f32d6c1
|
Merge branch 'ticket-9895' into develop
|
2016-08-25 12:48:36 +02:00 |
|
Rodney Figaro
|
b82ca57e10
|
change single image upload to multiple images upload in admin > catalog edit product
|
2016-08-25 10:57:15 +02:00 |
|
Marion Muszynski
|
3d12d226f5
|
Merge branch 'fix-10571' into develop
|
2016-08-23 15:02:55 +02:00 |
|
Rodney Figaro
|
a2b0ea366d
|
change the admin invoices selection in database : now saved globally, no more per employee
|
2016-08-23 14:26:07 +02:00 |
|
Marion Muszynski
|
2a82114fa9
|
fix conflict
|
2016-08-22 17:10:12 +02:00 |
|
Rodney Figaro
|
ac9aadcdf3
|
fix js code + texts in english
|
2016-08-22 10:30:03 +02:00 |
|
Rodney Figaro
|
b9c36ee801
|
save orders selection for each employee using their id
|
2016-08-22 09:50:29 +02:00 |
|
Rodney Figaro
|
95a32fc2e3
|
save the selected orders in configuration table in BO
|
2016-08-19 18:08:32 +02:00 |
|
root
|
880d16d5b0
|
updateprod
|
2016-08-18 15:56:46 +02:00 |
|
Marion Muszynski
|
a7fdab4e49
|
Merge branch 'ticket-cartValidate' into develop
|
2016-07-21 17:29:40 +02:00 |
|
Marion Muszynski
|
850222794c
|
adding validatecart with paypal method
|
2016-07-21 17:29:17 +02:00 |
|
Marion Muszynski
|
d4739925e0
|
Merge branch 'ticket-invoiceOrderBy' into develop
|
2016-07-11 14:44:45 +02:00 |
|
Marion Muszynski
|
d1c984cb76
|
update sort invoice
|
2016-07-11 14:44:19 +02:00 |
|
Marion Muszynski
|
4874515f50
|
Merge branch 'ticket-updatePendingOrder' into develop
|
2016-07-11 12:36:06 +02:00 |
|
Srv Bebeboutik
|
4a93e29747
|
modif prod, remove log email sending to us
|
2016-07-08 15:52:31 +02:00 |
|
Marion Muszynski
|
e489a60c90
|
Merge branch 'ticket-simplemulti_invoice'
|
2016-07-08 10:52:17 +02:00 |
|
Marion Muszynski
|
115ef349c6
|
fix conflict where I deleted my modif !
|
2016-07-06 12:43:18 +02:00 |
|
Marion Muszynski
|
200ab432b5
|
fix conflicts
|
2016-07-06 12:38:35 +02:00 |
|
Marion Muszynski
|
7f6949043e
|
adding various description blocks in Admin product edit fast
|
2016-07-06 12:14:28 +02:00 |
|
Marion Muszynski
|
6e2d4dff6e
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-07-04 17:51:51 +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
|
2215524cc8
|
Merge branch 'adding-log-bo' into develop
|
2016-07-04 17:42:24 +02:00 |
|
Marion Muszynski
|
4de026d0db
|
add id_employee
|
2016-07-04 17:42:02 +02:00 |
|
Marion Muszynski
|
125944c83f
|
Merge branch 'adding-log-bo' into develop
|
2016-07-04 17:34:16 +02:00 |
|
Marion Muszynski
|
8dbbf309bf
|
fix
|
2016-07-04 17:33:56 +02:00 |
|
Marion Muszynski
|
f1bf9ee3c1
|
Merge branch 'adding-log-bo' into develop
|
2016-07-04 17:30:47 +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
|
50698ab701
|
Merge branch 'ticket-6355'
|
2016-06-30 13:06:37 +02:00 |
|
Marion Muszynski
|
9fb4d1786c
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-28 15:46:05 +02:00 |
|
Marion Muszynski
|
91ca51a960
|
modif cookie
|
2016-06-28 15:45:43 +02:00 |
|
Marion Muszynski
|
f3fdc49173
|
fix conflict
|
2016-06-22 16:11:15 +02:00 |
|
Marion Muszynski
|
77b9c22014
|
fix conflicts
|
2016-06-22 15:03:36 +02:00 |
|
Marion Muszynski
|
94dc4f3b40
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-22 11:48:50 +02:00 |
|