antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,610 Commits 124 Branches 0 Tags 108 MiB
07cea80436
Commit Graph

210 Commits

Author SHA1 Message Date
Marion Muszynski
d148fffa70 Merge branch 'ticket-11201-SlowCategoryCreation' 2016-12-26 11:43:23 +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
715db47da4 add manually generation of ntree 2016-12-14 10:28:03 +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
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
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
5b95689b06 small updating 2016-11-02 17:03:58 +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
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
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
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
Marion Muszynski
850222794c adding validatecart with paypal method 2016-07-21 17:29:17 +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
50698ab701 Merge branch 'ticket-6355' 2016-06-30 13:06:37 +02:00
Marion Muszynski
91ca51a960 modif cookie 2016-06-28 15:45:43 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Marion Muszynski
70e5c4a7dd adding cookie for checked sale 2016-06-22 11:48:28 +02:00
Marion Muszynski
3d4d7b16e2 update invoice 2016-06-20 12:49:32 +02:00
Marion Muszynski
389356d129 suite update 2016-06-10 11:41:50 +02:00
Marion Muszynski
b49366dde2 ajout du wholesale_price dans import decli 2016-06-09 12:43:52 +02:00
Marion Muszynski
563896bbcb rename import done 2016-06-07 17:42:59 +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
Marion Muszynski
192b88a451 adding delivery desc in product import 2016-06-03 12:16:33 +02:00
Marion Muszynski
99b35ed57a adding delivery description field for product 2016-06-03 12:07:12 +02:00
Marion Muszynski
8b9edb3d67 modif admin product and import 2016-05-30 13:11:57 +02:00
Marion Muszynski
16d8afa0a8 addind fields to product import 2016-05-26 16:38:36 +02:00
Marion Muszynski
7e7b335749 modif filter adminOrder 2016-05-13 10:41:09 +02:00
Marion Muszynski
ffbb3232b9 modif soflex 2016-05-09 17:43:57 +02:00
Marion Muszynski
23ede34fec suite modif tpl product 2016-05-02 15:19:54 +02:00
Marion Muszynski
2a160422d9 adding desc more for product 2016-04-27 16:11:19 +02:00
Marion Muszynski
d4722a7e81 order in search product 2016-04-14 13:06:06 +02:00
Marion Muszynski
d326f1bb59 update adminProducts order 2016-04-13 10:39:29 +02:00
Marion Muszynski
7a131e2bef correction ordre AdminProduct 2016-04-12 17:39:47 +02:00
Marion Muszynski
43a24d1c7a update braderie and rack 2016-04-12 16:11:08 +02:00
Marion Muszynski
91efe4469e fix conflict adminProduct 2016-04-06 14:46:47 +02:00
Thibault GUILLAUME
5beaf8e77e fix conflict 2016-04-04 11:49:45 +02:00
Thibault GUILLAUME
3d0ebede08 test 2016-04-04 11:47:52 +02:00
Srv Bebeboutik
0ec932fb7f add quote import 2016-04-04 11:44:16 +02:00
Marion Muszynski
5c9f1e5d29 Merge branch 'alexandre-braderie' into develop 2016-04-01 15:23:30 +02:00
Marion Muszynski
0c6bda8578 update reorder 2016-04-01 15:23:01 +02:00
Marion Muszynski
6cd59dce28 fix conflict 2016-04-01 15:07:22 +02:00
Marion Muszynski
815bc77445 adding reorder product 2016-04-01 15:03:40 +02:00
Srv Bebeboutik
e4a9771a82 change int country to varchar 2016-03-31 12:05:30 +02:00
Marion Muszynski
4a4d6d63d2 update trad 2016-03-16 12:18:41 +01:00
Marion Muszynski
f1129c1b0b adding total quantity ticket#9598 2016-03-10 11:04:39 +01:00
Srv Bebeboutik
0918b1e26d push prod 2016-02-24 16:23:27 +01:00
Marion Muszynski
09ee75be23 update AdminCustomerThread for module ant_support_form 2016-02-23 18:07:06 +01:00
Marion Muszynski
58084aa3c7 adding module ant_support et ant_support_form 2016-02-19 15:30:29 +01:00
Srv Bebeboutik
241f738908 updateprod 2016-02-09 10:46:07 +01:00
Srv Bebeboutik
b7fc35d3ae divers ticket 2016-01-27 15:59:19 +01:00
Srv Bebeboutik
d5670d941a update stat BO 2016-01-06 11:53:10 +01:00
Srv Bebeboutik
340bc7c146 push site 2016-01-04 12:48:08 +01:00