Marion Muszynski
|
d38c7816ff
|
Merge branch 'ticket-14486-MRinvoice' into develop
|
2017-10-12 15:03:33 +02:00 |
|
Marion Muszynski
|
ff34c7b32e
|
add mr and dropshipping sended check for invoice
|
2017-10-12 15:03:08 +02:00 |
|
Christophe Latour
|
d959f0c515
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-12 14:00:17 +02:00 |
|
Marion Muszynski
|
f33d4403a5
|
fix conflict
|
2017-10-12 13:59:34 +02:00 |
|
Marion Muszynski
|
13843bc270
|
integration for white bg
|
2017-10-12 13:58:41 +02:00 |
|
Marion Muszynski
|
1bc46e9610
|
Merge branch 'ticket-14447-AF'
|
2017-10-12 10:01:13 +02:00 |
|
Christophe Latour
|
6f4cf378db
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-12 09:59:16 +02:00 |
|
Marion Muszynski
|
abd2344c77
|
fix conflict
|
2017-10-12 09:58:55 +02:00 |
|
Marion Muszynski
|
8d0392bd44
|
fix pink color
|
2017-10-12 09:57:46 +02:00 |
|
Marion Muszynski
|
8b9c4b4812
|
Merge branch 'ticket-14460-BugReturnProcess'
|
2017-10-11 16:18:58 +02:00 |
|
Christophe Latour
|
b93e3951b1
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-11 16:16:53 +02:00 |
|
Marion Muszynski
|
e300ed0dfc
|
Merge branch 'ticket-14460-BugReturnProcess' into develop
|
2017-10-11 16:15:14 +02:00 |
|
Marion Muszynski
|
5600a6da36
|
fix returnable qty
|
2017-10-11 16:14:59 +02:00 |
|
Christophe Latour
|
b083d9a115
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-11 15:31:15 +02:00 |
|
Marion Muszynski
|
5c27461185
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 15:31:02 +02:00 |
|
Marion Muszynski
|
e09626b751
|
dont save shipping number in order for dropshipping
|
2017-10-11 15:30:45 +02:00 |
|
Christophe Latour
|
864e9a8635
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-11 15:26:45 +02:00 |
|
Marion Muszynski
|
35848aba51
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 15:26:30 +02:00 |
|
Marion Muszynski
|
b54fe1d1a0
|
fix translations
|
2017-10-11 15:26:13 +02:00 |
|
Christophe Latour
|
3aabcd7210
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-11 13:30:05 +02:00 |
|
Marion Muszynski
|
33e179bb96
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-11 13:25:06 +02:00 |
|
Marion Muszynski
|
902de142ed
|
indication of shipping everywhere
|
2017-10-11 13:24:49 +02:00 |
|
Marion Muszynski
|
1e0b72be2c
|
Merge branch 'ticket-14392-BugUploadImg'
|
2017-10-10 15:29:49 +02:00 |
|
Marion Muszynski
|
bd9cdc9cad
|
add button to clean image positions
|
2017-10-10 15:29:25 +02:00 |
|
Marion Muszynski
|
c7053872c7
|
Merge branch 'ticket-14402-LimitCaractForAddress'
|
2017-10-09 16:00:31 +02:00 |
|
Marion Muszynski
|
e7af6fd655
|
limit address characters
|
2017-10-09 16:00:13 +02:00 |
|
Marion Muszynski
|
2575b6ffee
|
Merge branch 'ticket-updateTracking'
|
2017-10-04 18:00:06 +02:00 |
|
Marion Muszynski
|
61865a956c
|
fix style
|
2017-10-04 17:59:51 +02:00 |
|
Marion Muszynski
|
842315f516
|
Merge branch 'ticket-updateTracking'
|
2017-10-04 17:55:48 +02:00 |
|
Marion Muszynski
|
4d5dd0a75d
|
fix front
|
2017-10-04 17:55:35 +02:00 |
|
Marion Muszynski
|
d636934b5a
|
Merge branch 'ticket-frederic-updateStock'
|
2017-10-04 16:54:40 +02:00 |
|
Marion Muszynski
|
529b36298a
|
refont stat log
|
2017-10-04 16:54:25 +02:00 |
|
Marion Muszynski
|
6e95bd6d4d
|
Merge branch 'update-CreationCat'
|
2017-10-04 15:36:47 +02:00 |
|
Marion Muszynski
|
ab39a55b63
|
change trad
|
2017-10-04 15:36:36 +02:00 |
|
Marion Muszynski
|
e3b752ba76
|
Merge branch 'update-CreationCat'
|
2017-10-04 15:35:28 +02:00 |
|
Christophe Latour
|
1a33750744
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-04 13:26:00 +02:00 |
|
Marion Muszynski
|
2a5b0712e9
|
Merge branch 'update-CreationCat' into develop
|
2017-10-04 13:25:50 +02:00 |
|
Marion Muszynski
|
f7057346be
|
add creation category in adminprivatesalesale
|
2017-10-04 13:25:32 +02:00 |
|
Marion Muszynski
|
8627c2f53c
|
Merge branch 'fix-messageClient'
|
2017-10-04 12:59:08 +02:00 |
|
Marion Muszynski
|
73e88054bd
|
fix when customer is deleted
|
2017-10-04 12:58:54 +02:00 |
|
Marion Muszynski
|
504721d8c0
|
Merge branch 'ticket-14392-BugUploadImg'
|
2017-10-04 11:08:23 +02:00 |
|
Christophe Latour
|
426e822df5
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-04 11:07:33 +02:00 |
|
Marion Muszynski
|
008f049633
|
Merge branch 'ticket-14392-BugUploadImg' into develop
|
2017-10-04 11:07:16 +02:00 |
|
Marion Muszynski
|
d762e3e613
|
fix delete thumb image when uploading image cat
|
2017-10-04 11:06:59 +02:00 |
|
Michael RICOIS
|
c48408c2db
|
Add new value to detect full refund
|
2017-10-02 17:00:14 +02:00 |
|
Michael RICOIS
|
fe15bbc6cd
|
New voucher after refund
|
2017-10-02 17:00:13 +02:00 |
|
Christophe Latour
|
8f75d08bad
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-02 13:24:54 +02:00 |
|
Marion Muszynski
|
97ec6492c6
|
Merge branch 'ticket-14285-Dropshipping' into develop
|
2017-10-02 13:24:32 +02:00 |
|
Marion Muszynski
|
c5db353391
|
fix sale conbination
|
2017-10-02 13:24:15 +02:00 |
|
Christophe Latour
|
3442442c3d
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-10-02 12:50:30 +02:00 |
|