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 |
|
Marion Muszynski
|
445227062e
|
Merge branch 'ticket-10133' into develop
|
2016-09-15 11:42:52 +02:00 |
|
Marion Muszynski
|
72b189c33d
|
addition of lapostews package checking
|
2016-09-15 11:42:21 +02:00 |
|
Marion Muszynski
|
1128f0583c
|
Merge branch 'ticket-10133' into develop
|
2016-09-15 10:25:14 +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
|
1e751507ab
|
Merge branch 'ticket-philea' into develop
|
2016-09-06 15:34:55 +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 |
|
Marion Muszynski
|
fb0cf0f757
|
Merge branch 'fix-10796' into develop
|
2016-09-02 11:23:34 +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
|
e2c867f5ed
|
Merge branch 'ticket-9260' into develop
|
2016-08-30 13:48:00 +02:00 |
|
Marion Muszynski
|
a96b0018c0
|
upload vp miniature in adminCategory
|
2016-08-30 13:47:42 +02:00 |
|
Marion Muszynski
|
bcd33c882e
|
Merge branch 'ticket-9895' into develop
|
2016-08-25 17:04:47 +02:00 |
|
Rodney Figaro
|
da3c1aeed5
|
fix admin product - now no redirection after changing an image
|
2016-08-25 16:49:16 +02:00 |
|
Marion Muszynski
|
cf8f32d6c1
|
Merge branch 'ticket-9895' into develop
|
2016-08-25 12:48:36 +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 |
|
Marion Muszynski
|
3d12d226f5
|
Merge branch 'fix-10571' into develop
|
2016-08-23 15:02:55 +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 |
|
Marion Muszynski
|
2a82114fa9
|
fix conflict
|
2016-08-22 17:10:12 +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
|
a7fdab4e49
|
Merge branch 'ticket-cartValidate' into develop
|
2016-07-21 17:29:40 +02:00 |
|
Marion Muszynski
|
850222794c
|
adding validatecart with paypal method
|
2016-07-21 17:29:17 +02:00 |
|
Marion Muszynski
|
d4739925e0
|
Merge branch 'ticket-invoiceOrderBy' into develop
|
2016-07-11 14:44:45 +02:00 |
|
Marion Muszynski
|
d1c984cb76
|
update sort invoice
|
2016-07-11 14:44:19 +02:00 |
|
Marion Muszynski
|
4874515f50
|
Merge branch 'ticket-updatePendingOrder' into develop
|
2016-07-11 12:36:06 +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
|
115ef349c6
|
fix conflict where I deleted my modif !
|
2016-07-06 12:43:18 +02:00 |
|
Marion Muszynski
|
200ab432b5
|
fix conflicts
|
2016-07-06 12:38:35 +02:00 |
|
Marion Muszynski
|
7f6949043e
|
adding various description blocks in Admin product edit fast
|
2016-07-06 12:14:28 +02:00 |
|
Marion Muszynski
|
6e2d4dff6e
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-07-04 17:51:51 +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
|
2215524cc8
|
Merge branch 'adding-log-bo' into develop
|
2016-07-04 17:42:24 +02:00 |
|
Marion Muszynski
|
4de026d0db
|
add id_employee
|
2016-07-04 17:42:02 +02:00 |
|
Marion Muszynski
|
125944c83f
|
Merge branch 'adding-log-bo' into develop
|
2016-07-04 17:34:16 +02:00 |
|
Marion Muszynski
|
8dbbf309bf
|
fix
|
2016-07-04 17:33:56 +02:00 |
|
Marion Muszynski
|
f1bf9ee3c1
|
Merge branch 'adding-log-bo' into develop
|
2016-07-04 17:30:47 +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 |
|
Marion Muszynski
|
9fb4d1786c
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-28 15:46:05 +02:00 |
|
Marion Muszynski
|
91ca51a960
|
modif cookie
|
2016-06-28 15:45:43 +02:00 |
|
Marion Muszynski
|
f3fdc49173
|
fix conflict
|
2016-06-22 16:11:15 +02:00 |
|
Marion Muszynski
|
77b9c22014
|
fix conflicts
|
2016-06-22 15:03:36 +02:00 |
|
Marion Muszynski
|
94dc4f3b40
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-22 11:48:50 +02:00 |
|
Marion Muszynski
|
70e5c4a7dd
|
adding cookie for checked sale
|
2016-06-22 11:48:28 +02:00 |
|
Marion Muszynski
|
56c4006da3
|
Merge branch 'ticket-simplemulti_logistic' into develop
|
2016-06-21 17:18:51 +02:00 |
|
Marion Muszynski
|
8ebec9fb3e
|
addind admin pending orders
|
2016-06-21 17:18:24 +02:00 |
|
Marion Muszynski
|
ff30aab5d5
|
Merge branch 'ticket-simplemulti_invoice' into develop
|
2016-06-20 12:49:51 +02:00 |
|
Marion Muszynski
|
3d4d7b16e2
|
update invoice
|
2016-06-20 12:49:32 +02:00 |
|
Marion Muszynski
|
62009ba633
|
Merge branch 'ticket-8039' into develop
|
2016-06-10 16:50:05 +02:00 |
|
Marion Muszynski
|
2c07f5a0b2
|
good fix this time
|
2016-06-10 14:52:32 +02:00 |
|
Marion Muszynski
|
9f39cdffe4
|
petit fix
|
2016-06-10 14:45:46 +02:00 |
|
Marion Muszynski
|
7ea4968d08
|
fix
|
2016-06-10 14:44:45 +02:00 |
|
Marion Muszynski
|
3c7f40ba5c
|
Merge branch 'ticket-8251' into develop
|
2016-06-10 14:38:03 +02:00 |
|
Marion Muszynski
|
e3bc588287
|
update function expe48hbis
|
2016-06-10 14:37:34 +02:00 |
|
Marion Muszynski
|
1386f8460f
|
modif for prod
|
2016-06-10 12:19:45 +02:00 |
|
Marion Muszynski
|
9b9e586d0f
|
Merge branch 'ticket-8251' into develop
|
2016-06-10 11:42:32 +02:00 |
|
Marion Muszynski
|
389356d129
|
suite update
|
2016-06-10 11:41:50 +02:00 |
|
Marion Muszynski
|
c48154134d
|
Merge branch 'ticket-6355' into develop
|
2016-06-09 12:44:16 +02:00 |
|
Marion Muszynski
|
b49366dde2
|
ajout du wholesale_price dans import decli
|
2016-06-09 12:43:52 +02:00 |
|
Marion Muszynski
|
dbe607dccc
|
modif invoices for multi expe48h
|
2016-06-09 10:31:52 +02:00 |
|
Marion Muszynski
|
cf10bd3be0
|
fix conflicts
|
2016-06-08 17:15:28 +02:00 |
|
Marion Muszynski
|
77023fdbcb
|
invoice for multi 48h
|
2016-06-08 16:56:43 +02:00 |
|
Marion Muszynski
|
4148656a60
|
Merge branch 'ticket-8041' into develop
|
2016-06-07 17:43:19 +02:00 |
|
Marion Muszynski
|
563896bbcb
|
rename import done
|
2016-06-07 17:42:59 +02:00 |
|
Marion Muszynski
|
7065edffe4
|
fix conflict
|
2016-06-06 17:42:00 +02:00 |
|
Marion Muszynski
|
b332800b77
|
new fields in product db
|
2016-06-06 14:35:07 +02:00 |
|
Srv Bebeboutik
|
7085c1b80a
|
update from prod
|
2016-06-06 12:35:00 +02:00 |
|
Marion Muszynski
|
72545630a3
|
fix conflicts
|
2016-06-06 11:32:25 +02:00 |
|