root
|
c50a5c760c
|
Revert "Ajout du module pour ajouter des clients à l'espace professionnel"
This reverts commit 77752af3d1.
|
2017-06-19 17:43:00 +02:00 |
|
root
|
72cee7b991
|
test
|
2017-06-19 17:41:42 +02:00 |
|
root
|
8c13f2ddba
|
fix frontcontroller
|
2017-06-19 17:28:07 +02:00 |
|
root
|
cae2d21ea2
|
Merge branch 'addCusto' of gitlab.antadis.net:dev-antadis/roykin into addCusto
|
2017-06-19 17:15:30 +02:00 |
|
root
|
96b2e8d790
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/roykin into addCusto
|
2017-06-19 17:14:35 +02:00 |
|
Valentin
|
77752af3d1
|
Ajout du module pour ajouter des clients à l'espace professionnel
|
2017-06-16 12:15:06 +02:00 |
|
Valentin
|
b564cf2ab1
|
Ajout du site de base
|
2017-06-14 11:41:31 +02:00 |
|
RoykinPROD
|
6cead6e18d
|
fix roykin id as default category
|
2017-06-07 15:21:29 +02:00 |
|
Rodney Figaro
|
967ca30a6f
|
Merge branch 'levest_merge' into dev
|
2017-06-07 12:32:05 +02:00 |
|
Rodney Figaro
|
049dd002aa
|
fix default menu
|
2017-06-07 12:31:42 +02:00 |
|
Rodney Figaro
|
1a760d8bf0
|
Merge branch 'levest_merge' into dev
|
2017-06-07 11:23:33 +02:00 |
|
Rodney Figaro
|
e4d60371af
|
fix conflicts
|
2017-06-07 11:06:58 +02:00 |
|
Rodney Figaro
|
f63fb84af8
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-06-02 16:42:18 +02:00 |
|
root
|
74f51c4e3f
|
change bg submenu
|
2017-06-02 16:37:21 +02:00 |
|
Rodney Figaro
|
6d0d4e4c59
|
13372 - change default subcategory of TPD Belge
|
2017-05-31 09:07:19 +02:00 |
|
Rodney Figaro
|
46f9628ebb
|
13372 - add category TPD Belge in menu
|
2017-05-31 09:05:10 +02:00 |
|
Rodney Figaro
|
72e8320cc8
|
13372 - add PLV and PLV_ALL categories
|
2017-05-30 18:36:44 +02:00 |
|
Rodney Figaro
|
179dd86c83
|
Merge branch 'ticket/r13265-2-fix-label-bottle' into dev
|
2017-05-30 18:23:55 +02:00 |
|
Rodney Figaro
|
582faf57d1
|
13265 - in shopping cart, replace "bottle" by product unity
|
2017-05-30 18:22:42 +02:00 |
|
Rodney Figaro
|
652bcc3c46
|
Merge branch 'ticket/r13265-2-fix-label-bottle' into dev
|
2017-05-30 18:19:06 +02:00 |
|
Rodney Figaro
|
62ade27516
|
13265 - replace text "bottle" by product unity in product list
|
2017-05-30 18:18:12 +02:00 |
|
Rodney Figaro
|
07c8d42616
|
Merge branch 'ticket/r13144-bug-double-orders' into dev
|
2017-05-29 16:18:02 +02:00 |
|
Rodney Figaro
|
e33755356c
|
13144 - fix double click bug when validating bankwire and cheque payment (causes 2 orders to be created)
|
2017-05-29 16:17:47 +02:00 |
|
Rodney Figaro
|
7e51bf6ab2
|
Merge branch 'ticket/r13144-bug-double-orders' into dev
|
2017-05-29 12:26:03 +02:00 |
|
Rodney Figaro
|
b3e4001f3b
|
13144 - fix form closed twice in payment bankwire tpl
|
2017-05-29 12:23:42 +02:00 |
|
Rodney Figaro
|
265669090f
|
13144 - fix undefined variable in ripcord
|
2017-05-24 16:40:09 +02:00 |
|
Rodney Figaro
|
107558f0aa
|
Merge branch 'ticket/r13144-bug-double-orders' into dev
|
2017-05-24 12:07:41 +02:00 |
|
Rodney Figaro
|
8a95c6e742
|
13144 - fix null variable used as an array in be2bill
|
2017-05-24 12:07:21 +02:00 |
|
Rodney Figaro
|
4754304b28
|
Merge branch 'fix_erp_mailer'
|
2017-05-24 10:54:49 +02:00 |
|
Rodney Figaro
|
e8016490ed
|
Merge branch 'ticket/r13161-remove-guest-in-emails'
|
2017-05-24 10:51:00 +02:00 |
|
Rodney Figaro
|
e747d2b070
|
Merge branch 'ticket/r13265-hide-product-text'
|
2017-05-22 18:38:57 +02:00 |
|
Rodney Figaro
|
290e1070e6
|
Merge branch 'ticket/r13161-remove-guest-in-emails' into dev
|
2017-05-19 15:52:23 +02:00 |
|
Rodney Figaro
|
c1f17ce187
|
13161 - remove "guest" mentions in all emails
|
2017-05-19 15:52:15 +02:00 |
|
Rodney Figaro
|
0a310d3eeb
|
fix conflict
|
2017-05-19 15:51:46 +02:00 |
|
Rodney Figaro
|
69616fc8b1
|
12695 - add link "my rewards" in block account
|
2017-05-18 17:49:30 +02:00 |
|
Rodney Figaro
|
1c95a67334
|
12695 - add with adaptations All-In-One Reward module
|
2017-05-18 17:33:50 +02:00 |
|
Rodney Figaro
|
c033432a7c
|
Merge branch 'ticket/r12890-upgrade-give-a-gift-2'
|
2017-05-18 17:09:17 +02:00 |
|
Rodney Figaro
|
ffd2b0398e
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-17 11:16:01 +02:00 |
|
Rodney Figaro
|
8dbf4f6ade
|
13161 - changes pictos/icons (mails, site) and texts
|
2017-05-17 11:15:52 +02:00 |
|
Rodney Figaro
|
a8c83bf508
|
fix conflicts
|
2017-05-16 16:31:36 +02:00 |
|
Rodney Figaro
|
9e506a1a3c
|
13161 - changes texts
|
2017-05-16 16:30:33 +02:00 |
|
Rodney Figaro
|
e82e8c4d12
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-15 11:04:47 +02:00 |
|
Rodney Figaro
|
645bf55797
|
13161 - rewrite comments in override payment module
|
2017-05-15 11:04:37 +02:00 |
|
Rodney Figaro
|
ec46216f7f
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-15 10:59:20 +02:00 |
|
Rodney Figaro
|
7857dd6278
|
13161 - add id_category_default in payment module to sort by brands in emails
|
2017-05-15 10:59:04 +02:00 |
|
Rodney Figaro
|
d795a8e236
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-15 10:55:33 +02:00 |
|
Rodney Figaro
|
db09be33ce
|
13161 - fix bug in payment module
|
2017-05-15 10:55:24 +02:00 |
|
Rodney Figaro
|
c97dbd5b54
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-15 10:53:43 +02:00 |
|
Rodney Figaro
|
621da01bd8
|
13161 - simplify paymentmodule override
|
2017-05-15 10:53:35 +02:00 |
|
Rodney Figaro
|
9d614a89ec
|
Merge branch 'ticket/r13161-Fusion-Levest-Roykin' into dev
|
2017-05-15 10:42:03 +02:00 |
|