Marion Muszynski
|
f2273997dd
|
Merge branch 'ticket-13023-MultilangThumbCat' into develop
|
2017-04-18 12:48:57 +02:00 |
|
Marion Muszynski
|
90dd61b5bb
|
add multilang on category img thumbs
|
2017-04-18 12:48:42 +02:00 |
|
Marion Muszynski
|
d017974d15
|
fix link reply
|
2017-04-13 14:24:42 +02:00 |
|
Marion Muszynski
|
35e33703b7
|
fix conflicts
|
2017-04-13 12:32:44 +02:00 |
|
Marion Muszynski
|
01a8d528e2
|
fix sortable
|
2017-04-11 15:27:46 +02:00 |
|
Marion Muszynski
|
65ea663f75
|
fix conflict
|
2017-04-11 13:06:48 +02:00 |
|
Marion Muszynski
|
8f62586369
|
fix conflict
|
2017-04-11 12:08:19 +02:00 |
|
Marion Muszynski
|
dac13d6486
|
fix when no customer but visitor
|
2017-04-10 17:05:01 +02:00 |
|
Marion Muszynski
|
60c76f16be
|
Merge branch 'ticket-12957-BugCustoms' into develop
|
2017-04-07 11:19:17 +02:00 |
|
Marion Muszynski
|
4aafc8ca10
|
fix
|
2017-04-07 11:18:57 +02:00 |
|
Marion Muszynski
|
946eec61cd
|
Merge branch 'ticket-12957-BugCustoms' into develop
|
2017-04-07 10:22:40 +02:00 |
|
Marion Muszynski
|
83bd4d15c3
|
fix insert product customs
|
2017-04-07 10:22:21 +02:00 |
|
Marion Muszynski
|
89f72c7045
|
Merge branch 'ticket-12462-returnMR'
|
2017-04-06 16:24:22 +02:00 |
|
Marion Muszynski
|
db4bc09667
|
Merge branch 'ticket-12452-SAVMessHistory' into develop
|
2017-04-06 16:18:31 +02:00 |
|
Marion Muszynski
|
db3f82675d
|
fix color
|
2017-04-06 16:18:12 +02:00 |
|
Marion Muszynski
|
6e1bbf4d95
|
Merge branch 'ticket-12452-SAVMessHistory' into develop
|
2017-04-06 16:10:42 +02:00 |
|
Marion Muszynski
|
2b861808e0
|
addition of conversation history in customer thread
|
2017-04-06 16:10:25 +02:00 |
|
Marion Muszynski
|
c919001821
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:57:41 +01:00 |
|
Marion Muszynski
|
24d1d1fb33
|
fix 2
|
2017-03-21 14:57:26 +01:00 |
|
Marion Muszynski
|
f0850ce461
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:54:27 +01:00 |
|
Marion Muszynski
|
b58b5a4f39
|
fix font-size
|
2017-03-21 14:54:06 +01:00 |
|
Marion Muszynski
|
7688c352e2
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:43:05 +01:00 |
|
Marion Muszynski
|
caa8a7a54f
|
fix size
|
2017-03-21 14:42:44 +01:00 |
|
Marion Muszynski
|
2e3d56135e
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:40:02 +01:00 |
|
Marion Muszynski
|
8d08040017
|
addition of delay in sale list
|
2017-03-21 14:39:43 +01:00 |
|
Marion Muszynski
|
0aef5e434f
|
fix conflicts
|
2017-03-21 13:29:38 +01:00 |
|
Marion Muszynski
|
e5a329fc18
|
modif flag and fix update position
|
2017-03-21 13:07:20 +01:00 |
|
Marion Muszynski
|
6b4b4c59ae
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-21 11:22:44 +01:00 |
|
Marion Muszynski
|
db43bc59df
|
modification of instructions
|
2017-03-21 11:22:28 +01:00 |
|
Marion Muszynski
|
031d187ba7
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-07 17:49:51 +01:00 |
|
Marion Muszynski
|
29d133070d
|
fix re-sending return instructions
|
2017-03-07 17:49:34 +01:00 |
|
Marion Muszynski
|
a2160cde3c
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-07 17:33:37 +01:00 |
|
Marion Muszynski
|
29a1b8a743
|
addition of button to resend return instruction
|
2017-03-07 17:33:22 +01:00 |
|
Marion Muszynski
|
b2b75a6fca
|
addition of MR and title/alias fix
|
2017-03-06 12:54:14 +01:00 |
|
Marion Muszynski
|
a6fe73118a
|
Merge branch 'ticket-12591-MarketingModifications' into develop
|
2017-03-03 13:21:23 +01:00 |
|
Marion Muszynski
|
d2e4809912
|
fix warning
|
2017-03-03 12:01:30 +01:00 |
|
Marion Muszynski
|
e152e10882
|
fix warning
|
2017-03-03 11:59:34 +01:00 |
|
Marion Muszynski
|
b988870c40
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-03 10:59:12 +01:00 |
|
Marion Muszynski
|
e120917ca0
|
addition of herper for return order search
|
2017-03-03 10:58:46 +01:00 |
|
Marion Muszynski
|
e621006819
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-02-27 10:40:33 +01:00 |
|
Marion Muszynski
|
a099f27ab0
|
comment paid option for mondial relay return to be enabled later
|
2017-02-27 10:31:48 +01:00 |
|
Marion Muszynski
|
a0b794df37
|
fix conflicts
|
2017-02-24 16:18:45 +01:00 |
|
Marion Muszynski
|
d7f3512dc5
|
fix conflicts
|
2017-02-24 16:12:51 +01:00 |
|
Marion Muszynski
|
f56c80a0ae
|
add of new menu for export of loyalties
|
2017-02-24 16:01:38 +01:00 |
|
Marion Muszynski
|
7a0d101e51
|
Merge branch 'ticket-12391-DiscountForNoneOrder_part2' into develop
|
2017-02-23 13:33:04 +01:00 |
|
Marion Muszynski
|
43ac843d88
|
fix date for export to limit result rows
|
2017-02-23 13:32:42 +01:00 |
|
Marion Muszynski
|
8191e443ff
|
fix conflicts
|
2017-02-23 12:46:49 +01:00 |
|
Marion Muszynski
|
47baf3e7dd
|
addition of export for analysis
|
2017-02-23 12:45:38 +01:00 |
|
Marion Muszynski
|
54f955f882
|
fix conflicts
|
2017-02-22 16:28:25 +01:00 |
|
Marion Muszynski
|
0b3787b14e
|
fix special char in sale export and some css updatings
|
2017-02-22 16:27:11 +01:00 |
|
Marion Muszynski
|
055f7b5ba0
|
update style bulkupdate
|
2017-02-21 18:03:12 +01:00 |
|
Marion Muszynski
|
208f2e2476
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-02-21 14:25:07 +01:00 |
|
Marion Muszynski
|
40596721a0
|
fix conflicts
|
2017-02-21 11:51:37 +01:00 |
|
Marion Muszynski
|
2837aea4a5
|
addition of picto for random product
|
2017-02-21 11:49:55 +01:00 |
|
Marion Muszynski
|
eadaa6320a
|
Merge branch 'ticket-9374-SaveEuroSign' into develop
|
2017-02-09 10:06:20 +01:00 |
|
Marion Muszynski
|
5225e667ad
|
saving euro sign in adminImport
|
2017-02-09 10:06:06 +01:00 |
|
Marion Muszynski
|
3b7bde22db
|
addition of mondial relay return process in adminOrder
|
2017-02-06 16:07:35 +01:00 |
|
Marion Muszynski
|
0817b85066
|
Merge branch 'evo-philea-Destock'
|
2017-02-06 09:45:09 +01:00 |
|
Marion Muszynski
|
54b9bfd989
|
fix conflicts
|
2017-02-03 16:57:12 +01:00 |
|
Marion Muszynski
|
c8523de176
|
Big changement in labelgenerate for new bigger labels
|
2017-02-03 16:55:47 +01:00 |
|
Marion Muszynski
|
a54d3a8224
|
add some css
|
2017-01-30 16:53:12 +01:00 |
|
Marion Muszynski
|
8a2af96f1e
|
update css labelgenerate before updating size of label
|
2017-01-27 15:16:30 +01:00 |
|
Marion Muszynski
|
e49326dd96
|
Merge branch 'update-helperform' into develop
|
2017-01-27 13:09:35 +01:00 |
|
Marion Muszynski
|
877fab90a7
|
fix conflicts
|
2017-01-27 13:09:02 +01:00 |
|
Marion Muszynski
|
c7e3f930c5
|
update helperform including lang managment
|
2017-01-27 13:04:48 +01:00 |
|
Marion Muszynski
|
fa79488d36
|
Merge branch 'ticket-12215-showDelay'
|
2017-01-24 17:32:36 +01:00 |
|
Marion Muszynski
|
25fea84b8c
|
changement how to show sale delay
|
2017-01-24 17:32:22 +01:00 |
|
Marion Muszynski
|
c17a23acf8
|
Merge branch 'ticket-12340-UpdateDeliveryPrice' into develop
|
2017-01-24 14:03:15 +01:00 |
|
Marion Muszynski
|
17ac2cc24c
|
addition of import/export for delivery prices in adminShipping
|
2017-01-24 14:02:45 +01:00 |
|
Marion Muszynski
|
e02f19c21b
|
fix conflict
|
2017-01-24 11:30:02 +01:00 |
|
Marion Muszynski
|
26d6feb522
|
aadition of log when employees update socol address
|
2017-01-24 10:19:01 +01:00 |
|
Marion Muszynski
|
b31b1bd6f0
|
Merge branch 'ticket-12197-NewDiscountAdminOrder'
|
2017-01-19 10:10:22 +01:00 |
|
Marion Muszynski
|
682d0b48f8
|
fix conflicts
|
2017-01-11 15:55:31 +01:00 |
|
Marion Muszynski
|
c4cbe24bb5
|
addition of crons and admin_order tpl for Mondial Relay
|
2017-01-11 15:53:24 +01:00 |
|
Marion Muszynski
|
6590718bcc
|
Merge branch 'ticket-12215-showDelay' into develop
|
2017-01-10 18:06:20 +01:00 |
|
Marion Muszynski
|
038dbec401
|
fix name
|
2017-01-10 18:06:01 +01:00 |
|
Marion Muszynski
|
4767a44021
|
Merge branch 'ticket-12215-showDelay' into develop
|
2017-01-10 17:49:41 +01:00 |
|
Marion Muszynski
|
f93d4446ca
|
showing delivery delay in vp list
|
2017-01-10 17:49:21 +01:00 |
|
Marion Muszynski
|
75d2269f9a
|
fix conflict
|
2017-01-09 15:04:04 +01:00 |
|
Marion Muszynski
|
22b9815c1c
|
changement ant_configuration to store carrier conf in db Configuration
|
2017-01-09 15:02:14 +01:00 |
|
Marion Muszynski
|
ddabc2dd66
|
Merge branch 'ticket-12197-NewDiscountAdminOrder' into develop
|
2017-01-09 12:19:04 +01:00 |
|
Marion Muszynski
|
bdb9cf6b29
|
fix vaucher calue in mail sent
|
2017-01-09 12:09:25 +01:00 |
|
Marion Muszynski
|
1146df59c8
|
Merge branch 'ticket-12197-NewDiscountAdminOrder' into develop
|
2017-01-09 12:04:13 +01:00 |
|
Marion Muszynski
|
a29a54f41e
|
addition of new discount of 5 for missing product
|
2017-01-09 12:03:58 +01:00 |
|
Marion Muszynski
|
783c2f60f0
|
Merge branch 'ticket-11201-updateAntCreationCategory' into develop
|
2017-01-04 13:12:40 +01:00 |
|
Marion Muszynski
|
aa67c3f698
|
addition of image cat in antcreationcategory
|
2017-01-04 13:12:07 +01:00 |
|
Marion Muszynski
|
8269787360
|
fix upload img js
|
2017-01-04 12:42:41 +01:00 |
|
Marion Muszynski
|
2af3b4b9be
|
fix upload js
|
2017-01-04 12:41:10 +01:00 |
|
Marion Muszynski
|
b0f23e0479
|
fix upload image thumbnail
|
2017-01-03 12:39:13 +01:00 |
|
Marion Muszynski
|
ea735e8519
|
css changement
|
2017-01-02 16:49:48 +01:00 |
|
Marion Muszynski
|
966dee6a6e
|
fix switch and css table of sales
|
2017-01-02 15:49:14 +01:00 |
|
Marion Muszynski
|
fee10ec7af
|
Merge branch 'evo-philea-Destock' into develop
|
2017-01-02 11:34:32 +01:00 |
|
Marion Muszynski
|
2e59945370
|
wizard to allow product association to the new sale
|
2017-01-02 11:34:16 +01:00 |
|
Marion Muszynski
|
d634722035
|
destock system like reloading a sale
|
2016-12-30 17:03:44 +01:00 |
|
Marion Muszynski
|
13e343c6ff
|
continuing changement css
|
2016-12-29 15:29:23 +01:00 |
|
Marion Muszynski
|
795aca43a7
|
continuing
|
2016-12-28 17:16:50 +01:00 |
|
Marion Muszynski
|
b6788e7bbd
|
continuing
|
2016-12-28 14:15:20 +01:00 |
|
Marion Muszynski
|
a50e10fd90
|
continuing
|
2016-12-27 11:01:19 +01:00 |
|
Marion Muszynski
|
de693ae3ed
|
start of css changement
|
2016-12-27 10:04:07 +01:00 |
|
Marion Muszynski
|
d148fffa70
|
Merge branch 'ticket-11201-SlowCategoryCreation'
|
2016-12-26 11:43:23 +01:00 |
|