Marion Muszynski
|
caa8a7a54f
|
fix size
|
2017-03-21 14:42:44 +01:00 |
|
Marion Muszynski
|
8d08040017
|
addition of delay in sale list
|
2017-03-21 14:39:43 +01:00 |
|
Marion Muszynski
|
e5a329fc18
|
modif flag and fix update position
|
2017-03-21 13:07:20 +01:00 |
|
Marion Muszynski
|
db43bc59df
|
modification of instructions
|
2017-03-21 11:22:28 +01:00 |
|
Marion Muszynski
|
29d133070d
|
fix re-sending return instructions
|
2017-03-07 17:49:34 +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
|
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
|
e120917ca0
|
addition of herper for return order search
|
2017-03-03 10:58:46 +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
|
43ac843d88
|
fix date for export to limit result rows
|
2017-02-23 13:32:42 +01:00 |
|
Marion Muszynski
|
47baf3e7dd
|
addition of export for analysis
|
2017-02-23 12:45:38 +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
|
2837aea4a5
|
addition of picto for random product
|
2017-02-21 11:49:55 +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
|
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
|
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
|
17ac2cc24c
|
addition of import/export for delivery prices in adminShipping
|
2017-01-24 14:02:45 +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
|
c4cbe24bb5
|
addition of crons and admin_order tpl for Mondial Relay
|
2017-01-11 15:53:24 +01:00 |
|
Marion Muszynski
|
038dbec401
|
fix name
|
2017-01-10 18:06:01 +01:00 |
|
Marion Muszynski
|
f93d4446ca
|
showing delivery delay in vp list
|
2017-01-10 17:49:21 +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
|
bdb9cf6b29
|
fix vaucher calue in mail sent
|
2017-01-09 12:09:25 +01:00 |
|
Marion Muszynski
|
a29a54f41e
|
addition of new discount of 5 for missing product
|
2017-01-09 12:03:58 +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
|
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
|
0dd562f216
|
fix bugs
|
2016-12-26 10:58:08 +01:00 |
|
Marion Muszynski
|
3d34054aec
|
changement css
|
2016-12-26 09:36:06 +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
|
2b30de1cce
|
changement, deletion of pdf overrided
|
2016-12-21 12:24:31 +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
|
86e029f18e
|
addition of fields
|
2016-12-16 15:59:35 +01:00 |
|
Marion Muszynski
|
e4d330e372
|
addition of info
|
2016-12-15 17:48:34 +01:00 |
|
Marion Muszynski
|
da45380893
|
addition of module for mutiple category creation
|
2016-12-15 17:11:31 +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
|
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
|
2b5fbe4bb7
|
fix link for es
|
2016-12-02 16:26:34 +01:00 |
|
Marion Muszynski
|
966d6fa2d2
|
if statement according the id_contact
|
2016-12-02 16:18:19 +01:00 |
|
Marion Muszynski
|
7ce5c6905c
|
adjust link reply
|
2016-12-02 16:12:31 +01:00 |
|
Marion Muszynski
|
4b10e0f6e4
|
change reply link
|
2016-12-02 16:00:14 +01:00 |
|
Marion Muszynski
|
ed6002b84b
|
gift management
|
2016-12-02 10:15:51 +01:00 |
|
Marion Muszynski
|
284aeb5903
|
fix img
|
2016-11-30 12:53:19 +01:00 |
|
Marion Muszynski
|
2ac3271169
|
ajusting autocomplete ajax_product search
|
2016-11-30 12:40:27 +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
|
e7413fd51e
|
add of multi delete option
|
2016-11-10 13:21:20 +01:00 |
|
Marion Muszynski
|
7d3c98f79f
|
addition of category checking
|
2016-11-08 13:07:15 +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
|
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
|
f90f499f00
|
css adjusting
|
2016-10-31 14:38:37 +01:00 |
|
Marion Muszynski
|
c6ea6b27cf
|
modif css
|
2016-10-28 17:56:37 +02:00 |
|
Marion Muszynski
|
1f7b49b9b9
|
modifications
|
2016-10-26 15:11:40 +02:00 |
|
Marion Muszynski
|
938fa45de0
|
css
|
2016-10-25 12:23:57 +02:00 |
|
Marion Muszynski
|
67b3583d59
|
addition css
|
2016-10-25 12:20:15 +02:00 |
|
Marion Muszynski
|
7aaf231422
|
integration product list in sav message
|
2016-10-25 12:03:06 +02:00 |
|
Marion Muszynski
|
cb3e299efc
|
addition of multi product choice
|
2016-10-24 18:33:51 +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
|
a598bb04f4
|
modif css
|
2016-10-19 12:51:28 +02:00 |
|
Marion Muszynski
|
47b180afb1
|
continuation of modif
|
2016-10-19 12:44:12 +02:00 |
|
Marion Muszynski
|
1d4435a4ef
|
continuing
|
2016-10-18 17:02:58 +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
|
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
|
047f419b8e
|
addition of img to recognize the product
|
2016-10-05 16:18:52 +02:00 |
|
Marion Muszynski
|
6475f2140c
|
modification of product autocomplete with only enabled products
|
2016-10-05 14:36:15 +02:00 |
|
Marion Muszynski
|
6c927d2266
|
addition of id category of sale in sale management
|
2016-10-05 11:25:43 +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
|
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
|
1ee43aad25
|
generation and print ean via admin product
|
2016-09-22 13:40:56 +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
|
58d2b92b0c
|
continuing braderie upgrade
|
2016-09-20 14:49:02 +02:00 |
|
Marion Muszynski
|
3f2345c222
|
small fix
|
2016-09-15 15:37:44 +02:00 |
|
Marion Muszynski
|
6304de6703
|
fix of unknown function
|
2016-09-15 12:07:03 +02:00 |
|
Marion Muszynski
|
72b189c33d
|
addition of lapostews package checking
|
2016-09-15 11:42:21 +02:00 |
|
Marion Muszynski
|
ac2de48ccc
|
case when it s already in partial and we cancel the last product to send
|
2016-09-15 10:24:53 +02:00 |
|
Marion Muszynski
|
b6a69ec6a3
|
modif current state when product is refund on partial sent order
|
2016-09-12 17:08:25 +02:00 |
|
Marion Muszynski
|
1df6036d99
|
addition of philea module and helper class for admin
|
2016-09-06 15:32:52 +02:00 |
|
Marion Muszynski
|
13e85738e6
|
Merge branch 'ticket-9260'
|
2016-09-05 10:37:24 +02:00 |
|
Rodney Figaro
|
d06391d181
|
fix bug when submitting a product form with no new image added (BO)
|
2016-09-02 10:49:34 +02:00 |
|
Marion Muszynski
|
a96b0018c0
|
upload vp miniature in adminCategory
|
2016-08-30 13:47:42 +02:00 |
|
Rodney Figaro
|
da3c1aeed5
|
fix admin product - now no redirection after changing an image
|
2016-08-25 16:49:16 +02:00 |
|
Rodney Figaro
|
b82ca57e10
|
change single image upload to multiple images upload in admin > catalog edit product
|
2016-08-25 10:57:15 +02:00 |
|
Rodney Figaro
|
a2b0ea366d
|
change the admin invoices selection in database : now saved globally, no more per employee
|
2016-08-23 14:26:07 +02:00 |
|
Rodney Figaro
|
ac9aadcdf3
|
fix js code + texts in english
|
2016-08-22 10:30:03 +02:00 |
|
Rodney Figaro
|
b9c36ee801
|
save orders selection for each employee using their id
|
2016-08-22 09:50:29 +02:00 |
|
Rodney Figaro
|
95a32fc2e3
|
save the selected orders in configuration table in BO
|
2016-08-19 18:08:32 +02:00 |
|
root
|
880d16d5b0
|
updateprod
|
2016-08-18 15:56:46 +02:00 |
|
Marion Muszynski
|
850222794c
|
adding validatecart with paypal method
|
2016-07-21 17:29:17 +02:00 |
|
Marion Muszynski
|
d1c984cb76
|
update sort invoice
|
2016-07-11 14:44:19 +02:00 |
|
Srv Bebeboutik
|
4a93e29747
|
modif prod, remove log email sending to us
|
2016-07-08 15:52:31 +02:00 |
|
Marion Muszynski
|
e489a60c90
|
Merge branch 'ticket-simplemulti_invoice'
|
2016-07-08 10:52:17 +02:00 |
|
Marion Muszynski
|
7f6949043e
|
adding various description blocks in Admin product edit fast
|
2016-07-06 12:14:28 +02:00 |
|
Marion Muszynski
|
9391dd015a
|
adding column in admin invoice for same brand in multi sale
|
2016-07-04 17:51:26 +02:00 |
|
Marion Muszynski
|
4de026d0db
|
add id_employee
|
2016-07-04 17:42:02 +02:00 |
|
Marion Muszynski
|
8dbbf309bf
|
fix
|
2016-07-04 17:33:56 +02:00 |
|
Marion Muszynski
|
276cc9a2b6
|
sending email when order delivery address is modified in BO
|
2016-07-04 17:30:04 +02:00 |
|
Marion Muszynski
|
3be779d03b
|
Merge branch 'ticket-simplemulti_logistic'
|
2016-07-04 16:58:23 +02:00 |
|
Marion Muszynski
|
50698ab701
|
Merge branch 'ticket-6355'
|
2016-06-30 13:06:37 +02:00 |
|