Marion Muszynski
|
13576c64d8
|
fix conflicts
|
2017-08-21 11:04:16 +02:00 |
|
Marion Muszynski
|
e4c877bd71
|
precheck gift option in admin invoices
|
2017-08-21 11:00:31 +02:00 |
|
Marion Muszynski
|
4a5aa5c7c4
|
add discount and mr shipping numbers
|
2017-08-17 15:52:58 +02:00 |
|
Marion Muszynski
|
e6a7ab447d
|
add name of product in demand in adminOrder
|
2017-07-28 12:36:49 +02:00 |
|
Marion Muszynski
|
1b1e303364
|
Merge branch 'ticket-13754-fixSalePosition'
|
2017-07-27 12:07:54 +02:00 |
|
Marion Muszynski
|
bd9ff4fe9e
|
fix position of sale with lock position
|
2017-07-27 12:07:35 +02:00 |
|
root
|
74b797960e
|
fix legend from prod
|
2017-07-26 15:34:17 +02:00 |
|
Marion Muszynski
|
3525fdc711
|
Merge branch 'ticket-13775-PreventHacking'
|
2017-07-26 11:10:12 +02:00 |
|
Marion Muszynski
|
4acbde0319
|
add module alerthack to prevent hacker to post
|
2017-07-26 11:09:47 +02:00 |
|
root
|
e75e1e61bb
|
fix from prod
|
2017-07-25 16:56:59 +02:00 |
|
Marion Muszynski
|
06338522e6
|
Merge branch 'ticket-12743-SavSupplier'
|
2017-07-24 16:56:15 +02:00 |
|
Marion Muszynski
|
e1663b365b
|
fixation of sale position
|
2017-07-20 16:51:19 +02:00 |
|
Marion Muszynski
|
4e0938b32e
|
fix sale position
|
2017-07-20 11:37:45 +02:00 |
|
Marion Muszynski
|
4589c86bb5
|
add module ant supplier demand
|
2017-07-13 16:46:11 +02:00 |
|
Marion Muszynski
|
adf8bc8185
|
add module custom group
|
2017-07-12 17:14:30 +02:00 |
|
Marion Muszynski
|
55d3cd475f
|
add posibility to change mr address
|
2017-07-07 12:38:21 +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
|
a38cc1a255
|
remove var dump
|
2017-07-04 15:54:02 +02:00 |
|
Marion Muszynski
|
c6c5ad32ca
|
fix delete customer
|
2017-06-28 15:00:53 +02:00 |
|
Marion Muszynski
|
cd390c8fb9
|
add promo banner for ps
|
2017-06-28 12:18:03 +02:00 |
|
Marion Muszynski
|
b87d25038f
|
addition of module ant_promobanner
|
2017-06-27 18:22:24 +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
|
92bd1d406d
|
fix css
|
2017-06-20 10:59:11 +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
|
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
|
fec2e5ba19
|
remove add buttom
|
2017-06-19 12:18:25 +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
|
27b1222817
|
add mutiple invoice generation for one csv
|
2017-06-16 10:59:02 +02:00 |
|
Marion Muszynski
|
62e0b6a8f1
|
upgrade adminlog for bdc
|
2017-06-14 17:03:25 +02:00 |
|
Marion Muszynski
|
645926e5ed
|
fix image legend for es
|
2017-06-12 15:30:27 +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
|
bed6683539
|
fix and add shipping number list in order
|
2017-06-07 15:07:19 +02:00 |
|
Marion Muszynski
|
be7863e514
|
fix instructions and reasons
|
2017-06-06 11:57:55 +02:00 |
|
Marion Muszynski
|
b615e9eadb
|
addition of order return history
|
2017-05-31 16:58:27 +02:00 |
|
Marion Muszynski
|
66dea81ece
|
addition of label generation to resend parcel
|
2017-05-29 16:17:54 +02:00 |
|
Marion Muszynski
|
6b70af5e17
|
prevent restock when product is in braderie
|
2017-05-02 10:44:13 +02:00 |
|
Marion Muszynski
|
11790c0eff
|
prevent restockage when it s sent by philea
|
2017-04-25 15:03:41 +02:00 |
|
Marion Muszynski
|
8fbeb85cd0
|
fix conflicts
|
2017-04-24 11:28:57 +02:00 |
|
Marion Muszynski
|
6b7d57bb43
|
show join file
|
2017-04-21 13:51:47 +02:00 |
|