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 |
|
Marion Muszynski
|
21925a54ea
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-06-06 11:58:17 +02:00 |
|
Marion Muszynski
|
be7863e514
|
fix instructions and reasons
|
2017-06-06 11:57:55 +02:00 |
|
Marion Muszynski
|
eebeaa26e8
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-05-31 17:00:14 +02:00 |
|
Marion Muszynski
|
b615e9eadb
|
addition of order return history
|
2017-05-31 16:58:27 +02:00 |
|
Marion Muszynski
|
518c5d4329
|
Merge branch 'ticket-13166-ReturnProcess' into develop
|
2017-05-29 16:18:14 +02:00 |
|
Marion Muszynski
|
66dea81ece
|
addition of label generation to resend parcel
|
2017-05-29 16:17:54 +02:00 |
|
Marion Muszynski
|
8afad2627e
|
Merge branch 'ticket-12965-PreventRestokBraderie' into develop
|
2017-05-02 10:44:31 +02:00 |
|
Marion Muszynski
|
6b70af5e17
|
prevent restock when product is in braderie
|
2017-05-02 10:44:13 +02:00 |
|
Marion Muszynski
|
f280695772
|
fix conflicts
|
2017-04-25 15:04:54 +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
|
c2cbe1347a
|
Merge branch 'ticket-12455-SAVjoinFile' into develop
|
2017-04-21 13:52:01 +02:00 |
|
Marion Muszynski
|
6b7d57bb43
|
show join file
|
2017-04-21 13:51:47 +02:00 |
|
Marion Muszynski
|
63fc399fbf
|
Merge branch 'ticket-12455-SAVjoinFile' into develop
|
2017-04-21 13:08:04 +02:00 |
|
Marion Muszynski
|
72a2a1f74f
|
save file name in db for mess
|
2017-04-21 13:07:45 +02:00 |
|
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 |
|
Marion Muszynski
|
2e30a3e4ff
|
Merge branch 'add-module-ant_creationcategories'
|
2016-12-26 11:42:22 +01:00 |
|
Marion Muszynski
|
fa07f444a0
|
Merge branch 'change-AdminInvoice'
|
2016-12-26 10:59:54 +01:00 |
|
Marion Muszynski
|
1ad30ee09c
|
Merge branch 'change-AdminInvoice' into develop
|
2016-12-26 10:58:26 +01:00 |
|
Marion Muszynski
|
0dd562f216
|
fix bugs
|
2016-12-26 10:58:08 +01:00 |
|
Marion Muszynski
|
f07dd8c316
|
Merge branch 'change-AdminInvoice' into develop
|
2016-12-26 09:36:38 +01:00 |
|
Marion Muszynski
|
3d34054aec
|
changement css
|
2016-12-26 09:36:06 +01:00 |
|
Marion Muszynski
|
4f3b7c2b15
|
Merge branch 'ticket-12122-ModifNewStatus' into develop
|
2016-12-23 14:00:01 +01:00 |
|
Marion Muszynski
|
589ed49b8a
|
keeping new status for the first order
|
2016-12-23 13:59:26 +01:00 |
|
Marion Muszynski
|
a965103db4
|
continuing changement
|
2016-12-23 13:04:16 +01:00 |
|
Marion Muszynski
|
b200eff972
|
begining of changement css
|
2016-12-23 12:06:36 +01:00 |
|
Marion Muszynski
|
9a9d363b87
|
Merge branch 'ticket-11208-FactureCadeau' into develop
|
2016-12-21 12:24:48 +01:00 |
|
Marion Muszynski
|
2b30de1cce
|
changement, deletion of pdf overrided
|
2016-12-21 12:24:31 +01:00 |
|
Marion Muszynski
|
8eb99e47fb
|
Merge branch 'add-module-ant_creationcategories' into develop
|
2016-12-19 17:23:58 +01:00 |
|
Marion Muszynski
|
d0db786f0b
|
addition of section of family catégory
|
2016-12-19 17:23:37 +01:00 |
|
Marion Muszynski
|
6bc6d54b50
|
continuing
|
2016-12-19 11:42:37 +01:00 |
|
Marion Muszynski
|
b690325325
|
continuing
|
2016-12-17 20:12:09 +01:00 |
|
Marion Muszynski
|
a31f38a486
|
Merge branch 'add-module-ant_creationcategories' into develop
|
2016-12-16 15:59:53 +01:00 |
|
Marion Muszynski
|
86e029f18e
|
addition of fields
|
2016-12-16 15:59:35 +01:00 |
|
Marion Muszynski
|
18259bfaa0
|
Merge branch 'add-module-ant_creationcategories' into develop
|
2016-12-15 17:48:51 +01:00 |
|
Marion Muszynski
|
e4d330e372
|
addition of info
|
2016-12-15 17:48:34 +01:00 |
|
Marion Muszynski
|
c75677fcb7
|
Merge branch 'add-module-ant_creationcategories' into develop
|
2016-12-15 17:12:36 +01:00 |
|
Marion Muszynski
|
79a1d1ec71
|
Merge branch 'ticket-11201-SlowCategoryCreation' into develop
|
2016-12-15 17:12:09 +01:00 |
|
Marion Muszynski
|
da45380893
|
addition of module for mutiple category creation
|
2016-12-15 17:11:31 +01:00 |
|
Marion Muszynski
|
b3b9d7313f
|
Merge branch 'ticket-12052-PreventDelivery' into develop
|
2016-12-15 12:02:48 +01:00 |
|
Marion Muszynski
|
7f724c2012
|
css changement and optimisation db philea_sent
|
2016-12-14 15:17:32 +01:00 |
|
Marion Muszynski
|
715db47da4
|
add manually generation of ntree
|
2016-12-14 10:28:03 +01:00 |
|
Marion Muszynski
|
124f7ebaed
|
addition of js
|
2016-12-13 14:53:30 +01:00 |
|
Marion Muszynski
|
ff56848987
|
optimization
|
2016-12-13 14:52:58 +01:00 |
|
Marion Muszynski
|
eb837ac915
|
addidtion of simpleDate for helperFormBootstrap
|
2016-12-13 10:15:43 +01:00 |
|
Marion Muszynski
|
4aa99c4bfb
|
changements
|
2016-12-12 18:27:45 +01:00 |
|
Marion Muszynski
|
b5f2e365ad
|
fix conflicts
|
2016-12-12 16:09:07 +01:00 |
|
Marion Muszynski
|
0ccd7ae611
|
add new section for antadis administration
|
2016-12-12 15:35:45 +01:00 |
|
Marion Muszynski
|
e55202c0d0
|
addition of help sentence
|
2016-12-08 11:54:04 +01:00 |
|
Marion Muszynski
|
a44bca43b9
|
Merge branch 'ticket-11935-SuiviConversation' into develop
|
2016-12-02 16:26:51 +01:00 |
|
Marion Muszynski
|
2b5fbe4bb7
|
fix link for es
|
2016-12-02 16:26:34 +01:00 |
|
Marion Muszynski
|
900d2dcb2c
|
Merge branch 'ticket-11935-SuiviConversation' into develop
|
2016-12-02 16:18:53 +01:00 |
|
Marion Muszynski
|
966d6fa2d2
|
if statement according the id_contact
|
2016-12-02 16:18:19 +01:00 |
|
Marion Muszynski
|
62783a9214
|
Merge branch 'ticket-11935-SuiviConversation' into develop
|
2016-12-02 16:12:58 +01:00 |
|
Marion Muszynski
|
7ce5c6905c
|
adjust link reply
|
2016-12-02 16:12:31 +01:00 |
|
Marion Muszynski
|
24a06175ba
|
Merge branch 'ticket-11935-SuiviConversation' into develop
|
2016-12-02 16:00:29 +01:00 |
|
Marion Muszynski
|
4b10e0f6e4
|
change reply link
|
2016-12-02 16:00:14 +01:00 |
|
Marion Muszynski
|
f95fc836e5
|
Merge branch 'ticket-11208-FactureCadeau' into develop
|
2016-12-02 10:16:13 +01:00 |
|
Marion Muszynski
|
ed6002b84b
|
gift management
|
2016-12-02 10:15:51 +01:00 |
|
Marion Muszynski
|
0ed2132386
|
Merge branch 'fix-fatal-ajax_product_list' into develop
|
2016-11-30 12:53:37 +01:00 |
|
Marion Muszynski
|
284aeb5903
|
fix img
|
2016-11-30 12:53:19 +01:00 |
|
Marion Muszynski
|
a3f697a0be
|
fix conflict
|
2016-11-30 12:42:16 +01:00 |
|
Marion Muszynski
|
2ac3271169
|
ajusting autocomplete ajax_product search
|
2016-11-30 12:40:27 +01:00 |
|
Marion Muszynski
|
3ecf54cfcc
|
fix conflicts
|
2016-11-24 16:05:44 +01:00 |
|
Marion Muszynski
|
c17fb91c63
|
addition of orders selection and css modif
|
2016-11-24 16:04:13 +01:00 |
|
Marion Muszynski
|
1e6dd3ddda
|
css modification and addition of shipping column
|
2016-11-21 16:29:22 +01:00 |
|
Marion Muszynski
|
bf529276dd
|
Merge branch 'ticket-11211-MultiDeleteImg' into develop
|
2016-11-10 13:21:35 +01:00 |
|
Marion Muszynski
|
e7413fd51e
|
add of multi delete option
|
2016-11-10 13:21:20 +01:00 |
|
Marion Muszynski
|
c9dd7475bc
|
Merge branch 'ticket-11279-CategoryTestImport' into develop
|
2016-11-08 13:07:32 +01:00 |
|
Marion Muszynski
|
7d3c98f79f
|
addition of category checking
|
2016-11-08 13:07:15 +01:00 |
|
Marion Muszynski
|
853ae921ec
|
fix conflict
|
2016-11-07 15:30:22 +01:00 |
|
Marion Muszynski
|
45a39353ab
|
addition of shipping number in admin order
|
2016-11-03 11:27:56 +01:00 |
|
Marion Muszynski
|
c7754309fe
|
Merge branch 'ticket-AideContact-SAV'
|
2016-11-02 17:04:44 +01:00 |
|
Marion Muszynski
|
b915ed8649
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-11-02 17:04:16 +01:00 |
|
Marion Muszynski
|
5b95689b06
|
small updating
|
2016-11-02 17:03:58 +01:00 |
|
Marion Muszynski
|
3946f6ceac
|
fix conflict
|
2016-11-02 12:43:27 +01:00 |
|
Marion Muszynski
|
f038f52798
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-31 14:38:55 +01:00 |
|
Marion Muszynski
|
f90f499f00
|
css adjusting
|
2016-10-31 14:38:37 +01:00 |
|
Marion Muszynski
|
7ea5ccc290
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-28 17:56:52 +02:00 |
|
Marion Muszynski
|
c6ea6b27cf
|
modif css
|
2016-10-28 17:56:37 +02:00 |
|
Marion Muszynski
|
1435ab43c9
|
fix
|
2016-10-27 12:28:12 +02:00 |
|
Marion Muszynski
|
3ae711d543
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-26 15:12:02 +02:00 |
|
Marion Muszynski
|
1f7b49b9b9
|
modifications
|
2016-10-26 15:11:40 +02:00 |
|
Marion Muszynski
|
1176b6f173
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-25 12:24:16 +02:00 |
|
Marion Muszynski
|
938fa45de0
|
css
|
2016-10-25 12:23:57 +02:00 |
|
Marion Muszynski
|
880198366f
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-25 12:20:33 +02:00 |
|
Marion Muszynski
|
67b3583d59
|
addition css
|
2016-10-25 12:20:15 +02:00 |
|
Marion Muszynski
|
82558bd166
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-25 12:03:19 +02:00 |
|
Marion Muszynski
|
7aaf231422
|
integration product list in sav message
|
2016-10-25 12:03:06 +02:00 |
|
Marion Muszynski
|
4ad4ae47bc
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-24 18:34:13 +02:00 |
|
Marion Muszynski
|
cb3e299efc
|
addition of multi product choice
|
2016-10-24 18:33:51 +02:00 |
|
Marion Muszynski
|
70ca285df7
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-24 14:28:08 +02:00 |
|
Marion Muszynski
|
bfbfd14bd6
|
addition of signals about price and nb product
|
2016-10-24 14:27:50 +02:00 |
|
Marion Muszynski
|
23f29a55d6
|
modif css
|
2016-10-21 16:16:12 +02:00 |
|
Marion Muszynski
|
06a303fb6a
|
modif css
|
2016-10-21 16:06:36 +02:00 |
|
Marion Muszynski
|
c90126baa8
|
addition of styled select
|
2016-10-21 15:54:52 +02:00 |
|
Marion Muszynski
|
f04d4c2b38
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-19 12:51:48 +02:00 |
|
Marion Muszynski
|
a598bb04f4
|
modif css
|
2016-10-19 12:51:28 +02:00 |
|
Marion Muszynski
|
85ea947a11
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-19 12:44:51 +02:00 |
|
Marion Muszynski
|
47b180afb1
|
continuation of modif
|
2016-10-19 12:44:12 +02:00 |
|
Marion Muszynski
|
3db72e00f4
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-18 17:07:37 +02:00 |
|
Marion Muszynski
|
1d4435a4ef
|
continuing
|
2016-10-18 17:02:58 +02:00 |
|
Marion Muszynski
|
6c51d23463
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-18 16:12:31 +02:00 |
|
Marion Muszynski
|
85650ffaba
|
fix
|
2016-10-18 16:12:13 +02:00 |
|
Marion Muszynski
|
b7b982305f
|
continuation
|
2016-10-18 15:25:52 +02:00 |
|
Marion Muszynski
|
3550b68bc5
|
add custom message
|
2016-10-18 14:43:12 +02:00 |
|
Marion Muszynski
|
b5916c5a74
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-18 12:12:27 +02:00 |
|
Marion Muszynski
|
84f2643e53
|
continuation sav
|
2016-10-18 12:12:06 +02:00 |
|
Marion Muszynski
|
6e0cfd7635
|
modif
|
2016-10-17 17:29:37 +02:00 |
|
Marion Muszynski
|
27a62959a6
|
start refund sav page
|
2016-10-14 18:30:05 +02:00 |
|
Marion Muszynski
|
bb95ffcaa1
|
Merge branch 'ticket-11056' into develop
|
2016-10-14 13:11:15 +02:00 |
|
Marion Muszynski
|
9edcc64a82
|
modification of delivery mode selection
|
2016-10-14 13:10:56 +02:00 |
|
Marion Muszynski
|
ead50a26c4
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 18:12:19 +02:00 |
|
Marion Muszynski
|
4a19fa9288
|
modif css accessories
|
2016-10-05 18:12:04 +02:00 |
|
Marion Muszynski
|
6e515c5207
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 17:51:08 +02:00 |
|
Marion Muszynski
|
6a415ac50f
|
modif css
|
2016-10-05 17:50:45 +02:00 |
|
Marion Muszynski
|
e1a3654411
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 16:19:10 +02:00 |
|
Marion Muszynski
|
047f419b8e
|
addition of img to recognize the product
|
2016-10-05 16:18:52 +02:00 |
|
Marion Muszynski
|
77222b5026
|
Merge branch 'ticket-AssociateProducts' into develop
|
2016-10-05 14:36:33 +02:00 |
|
Marion Muszynski
|
6475f2140c
|
modification of product autocomplete with only enabled products
|
2016-10-05 14:36:15 +02:00 |
|
Marion Muszynski
|
541a0ed663
|
fix conflict
|
2016-10-05 11:27:50 +02:00 |
|
Marion Muszynski
|
6c927d2266
|
addition of id category of sale in sale management
|
2016-10-05 11:25:43 +02:00 |
|
Marion Muszynski
|
a33e2da7ca
|
Merge branch 'ticket-10805' into develop
|
2016-09-23 17:16:50 +02:00 |
|
Marion Muszynski
|
7ca4e6918b
|
addition has to clean function to see if there are products to clean
|
2016-09-23 17:16:26 +02:00 |
|
Marion Muszynski
|
5edc9724a3
|
Merge branch 'ticket-10805' into develop
|
2016-09-23 17:00:11 +02:00 |
|
Marion Muszynski
|
4d2f0e1f9a
|
fix bug updateposition on big product list
|
2016-09-23 16:59:49 +02:00 |
|
Marion Muszynski
|
47db67e6b5
|
Merge branch 'ticket-printProductEan'
|
2016-09-23 13:21:06 +02:00 |
|
Marion Muszynski
|
1a3ce467c5
|
Merge branch 'ticket-printProductEan' into develop
|
2016-09-22 13:41:39 +02:00 |
|
Marion Muszynski
|
1ee43aad25
|
generation and print ean via admin product
|
2016-09-22 13:40:56 +02:00 |
|
Marion Muszynski
|
73a3127d3e
|
Merge branch 'ticket-eanUpgrade' into develop
|
2016-09-22 11:13:52 +02:00 |
|
Marion Muszynski
|
02a9fb3dbf
|
Merge branch 'ticket-eanUpgrade'
|
2016-09-22 11:13:12 +02:00 |
|
Marion Muszynski
|
7a8d2c9339
|
move of comment block
|
2016-09-22 11:12:49 +02:00 |
|
Marion Muszynski
|
6373ce6e24
|
Merge branch 'ticket-eanUpgrade'
|
2016-09-22 10:42:26 +02:00 |
|
Marion Muszynski
|
cde8f42b60
|
fix
|
2016-09-22 10:22:19 +02:00 |
|
Marion Muszynski
|
b040fa269b
|
fix
|
2016-09-22 09:47:14 +02:00 |
|
Marion Muszynski
|
e6e0e55633
|
fix missing argument in getFieldValue
|
2016-09-22 09:44:06 +02:00 |
|
Marion Muszynski
|
a2591680b7
|
addition of hook
|
2016-09-22 09:37:19 +02:00 |
|
Marion Muszynski
|
430cabc449
|
Merge branch 'ticket-eanUpgrade' into develop
|
2016-09-20 14:49:30 +02:00 |
|
Marion Muszynski
|
58d2b92b0c
|
continuing braderie upgrade
|
2016-09-20 14:49:02 +02:00 |
|
Marion Muszynski
|
443b054b7e
|
Merge branch 'ticket-eanUpgrade' into develop
|
2016-09-19 17:50:32 +02:00 |
|
Marion Muszynski
|
3f2345c222
|
small fix
|
2016-09-15 15:37:44 +02:00 |
|
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 |
|