Marion Muszynski
|
d7552c5d21
|
Merge branch 'ticket-12743-SavSupplier' into develop
|
2017-07-13 16:46:26 +02:00 |
|
Marion Muszynski
|
4589c86bb5
|
add module ant supplier demand
|
2017-07-13 16:46:11 +02:00 |
|
Marion Muszynski
|
1ce931d256
|
Merge branch 'ticket-13679-AntCustomGroup' into develop
|
2017-07-12 17:14:49 +02:00 |
|
Marion Muszynski
|
adf8bc8185
|
add module custom group
|
2017-07-12 17:14:30 +02:00 |
|
Marion Muszynski
|
827aac76dc
|
Merge branch 'ticket-11985-MRDeliveryAddress' into develop
|
2017-07-07 12:38:40 +02:00 |
|
Marion Muszynski
|
55d3cd475f
|
add posibility to change mr address
|
2017-07-07 12:38:21 +02:00 |
|
Marion Muszynski
|
05c988412b
|
Merge branch 'ticket-13661-mobileReturn' into develop
|
2017-07-07 11:04:07 +02:00 |
|
Marion Muszynski
|
04ceecce9f
|
Merge branch 'ticket-13521-ExtractProducts'
|
2017-07-06 16:42:54 +02:00 |
|
Marion Muszynski
|
fd18fd3421
|
Merge branch 'ticket11985-invoiceMR'
|
2017-07-05 12:19:31 +02:00 |
|
Marion Muszynski
|
c4193b7119
|
hide error message after 4s
|
2017-07-05 12:19:14 +02:00 |
|
Marion Muszynski
|
4df600b0cc
|
add error message
|
2017-07-05 12:13:40 +02:00 |
|
Marion Muszynski
|
ec2f428160
|
Merge branch 'ticket11985-invoiceMR'
|
2017-07-04 17:51:54 +02:00 |
|
Marion Muszynski
|
a0e0aa7d71
|
change redirect
|
2017-07-04 17:51:34 +02:00 |
|
Marion Muszynski
|
91536bdb4d
|
Merge branch 'ticket11985-invoiceMR'
|
2017-07-04 16:23:26 +02:00 |
|
Marion Muszynski
|
bede4db028
|
Merge branch 'ticket11985-invoiceMR' into develop
|
2017-07-04 15:54:26 +02:00 |
|
Marion Muszynski
|
a38cc1a255
|
remove var dump
|
2017-07-04 15:54:02 +02:00 |
|
Marion Muszynski
|
eef4d0f4b9
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-03 10:15:38 +02:00 |
|
Marion Muszynski
|
c6c5ad32ca
|
fix delete customer
|
2017-06-28 15:00:53 +02:00 |
|
Marion Muszynski
|
bdc241572a
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-28 12:18:17 +02:00 |
|
Marion Muszynski
|
cd390c8fb9
|
add promo banner for ps
|
2017-06-28 12:18:03 +02:00 |
|
Marion Muszynski
|
7ef886ba82
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-27 18:22:46 +02:00 |
|
Marion Muszynski
|
b87d25038f
|
addition of module ant_promobanner
|
2017-06-27 18:22:24 +02:00 |
|
Marion Muszynski
|
45fbaac030
|
Merge branch 'ticket-13166-RetourProcess_3' into develop
|
2017-06-26 11:53:16 +02:00 |
|
Marion Muszynski
|
a2a0385822
|
upgrading of return process
|
2017-06-26 11:52:56 +02:00 |
|
Marion Muszynski
|
1524ec205c
|
Merge branch 'ticket-13532-ProductDisable'
|
2017-06-20 11:46:50 +02:00 |
|
Marion Muszynski
|
a10a145fce
|
Merge branch 'ticket-13532-ProductDisable' into develop
|
2017-06-20 10:59:24 +02:00 |
|
Marion Muszynski
|
92bd1d406d
|
fix css
|
2017-06-20 10:59:11 +02:00 |
|
Marion Muszynski
|
d3e9c70bd8
|
Merge branch 'ticket-13532-ProductDisable' into develop
|
2017-06-20 10:09:22 +02:00 |
|
Marion Muszynski
|
1f971275a0
|
multiple disable/enable product
|
2017-06-20 10:09:07 +02:00 |
|
Marion Muszynski
|
12e744b313
|
Merge branch 'ticket-9103-UrlMetaCategory'
|
2017-06-20 09:51:32 +02:00 |
|
Marion Muszynski
|
d1e71015d5
|
Merge branch 'ticket-13532-ProductDisable' into develop
|
2017-06-19 17:48:53 +02:00 |
|
Marion Muszynski
|
15e76afb93
|
multi disable/enable product
|
2017-06-19 17:48:38 +02:00 |
|
Marion Muszynski
|
2237a0df03
|
start of new extract
|
2017-06-19 17:04:16 +02:00 |
|
Marion Muszynski
|
5e88037ef6
|
Merge branch 'ticket-13516-removeCategoryAddButton' into develop
|
2017-06-19 12:18:42 +02:00 |
|
Marion Muszynski
|
fec2e5ba19
|
remove add buttom
|
2017-06-19 12:18:25 +02:00 |
|
Marion Muszynski
|
8d98b4f8e1
|
Merge branch 'ticket11985-invoiceMR' into develop
|
2017-06-16 17:51:35 +02:00 |
|
Marion Muszynski
|
dadf16f8fb
|
separate la poste invoices and mr invoices
|
2017-06-16 17:51:19 +02:00 |
|
Marion Muszynski
|
dde433e46a
|
start of changement
|
2017-06-16 14:49:10 +02:00 |
|
Marion Muszynski
|
2bee96172e
|
Merge branch 'ticket-11985-statLogMR' into develop
|
2017-06-16 14:20:55 +02:00 |
|
Marion Muszynski
|
27b1222817
|
add mutiple invoice generation for one csv
|
2017-06-16 10:59:02 +02:00 |
|
Marion Muszynski
|
06daeaf29e
|
Merge branch 'ticket-13024-UpdBDC' into develop
|
2017-06-14 17:03:46 +02:00 |
|
Marion Muszynski
|
62e0b6a8f1
|
upgrade adminlog for bdc
|
2017-06-14 17:03:25 +02:00 |
|
Marion Muszynski
|
a4b3b52b27
|
Merge branch 'ticket-13473-IVAForEs' into develop
|
2017-06-14 10:58:42 +02:00 |
|
Marion Muszynski
|
4fb9dc4864
|
Merge branch 'ticket-9103-UrlMetaCategory' into develop
|
2017-06-12 15:30:44 +02:00 |
|
Marion Muszynski
|
645926e5ed
|
fix image legend for es
|
2017-06-12 15:30:27 +02:00 |
|
Marion Muszynski
|
3137429e67
|
Merge branch 'ticket-9103-UrlMetaCategory' into develop
|
2017-06-12 14:42:13 +02:00 |
|
Marion Muszynski
|
3a33250608
|
translate link rewrite category/product
|
2017-06-12 14:41:59 +02:00 |
|
Marion Muszynski
|
b954a729a4
|
addition of return comment
|
2017-06-08 16:05:19 +02:00 |
|
Marion Muszynski
|
d313207099
|
Merge branch 'ticket-9103-saleBg' into develop
|
2017-06-08 11:51:50 +02:00 |
|
Marion Muszynski
|
bed6683539
|
fix and add shipping number list in order
|
2017-06-07 15:07:19 +02:00 |
|