root
|
72cee7b991
|
test
|
2017-06-19 17:41:42 +02:00 |
|
root
|
cae2d21ea2
|
Merge branch 'addCusto' of gitlab.antadis.net:dev-antadis/roykin into addCusto
|
2017-06-19 17:15:30 +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 |
|
Rodney Figaro
|
e4d60371af
|
fix conflicts
|
2017-06-07 11:06:58 +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
|
1c95a67334
|
12695 - add with adaptations All-In-One Reward module
|
2017-05-18 17:33:50 +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
|
9712c1dcf1
|
fix conflicts
|
2017-05-12 18:29:40 +02:00 |
|
Rodney Figaro
|
39c9259ee2
|
12890 - fix text and translations, hide gift PLV products if in cart
|
2017-05-12 18:28:21 +02:00 |
|
Rodney Figaro
|
be34cd8eb3
|
Merge branch 'ticket/r12695-allinonereward' into dev
|
2017-04-27 18:42:45 +02:00 |
|
Rodney Figaro
|
e6d5829a21
|
12695 - display voucher code input bloc even if voucher has been entered
|
2017-04-27 18:42:37 +02:00 |
|
Rodney Figaro
|
d22dc86e3d
|
Merge branch 'ticket/r12890-upgrade-give-a-gift-2' into dev
|
2017-04-27 17:45:28 +02:00 |
|
Rodney Figaro
|
6782d1212d
|
12890 - fix filtering give a gift by customer group
|
2017-04-27 17:45:19 +02:00 |
|
Rodney Figaro
|
9dd40d2d78
|
Merge branch 'ticket/r12695-allinonereward' into dev
|
2017-04-19 17:16:53 +02:00 |
|
Rodney Figaro
|
a3192820d0
|
12695 - add link to rewards in block account, fix give a gift shopping-cart display issue
|
2017-04-19 17:16:44 +02:00 |
|
Rodney Figaro
|
965382262f
|
Merge branch 'ticket/r12890-upgrade-give-a-gift' into dev
|
2017-04-19 13:01:39 +02:00 |
|
Rodney Figaro
|
582f30ef01
|
12890 - give a gift - filter gifts by customer groups and cart product categories, add BO configuration
|
2017-04-19 13:01:30 +02:00 |
|
root
|
7b3e160f86
|
12756 - fix emails filtering in erp
|
2017-03-29 11:32:53 +00:00 |
|
Rodney Figaro
|
84a0001706
|
Merge branch 'master' into dev
|
2017-03-20 09:19:51 +01:00 |
|
Rodney Figaro
|
8cfae2c019
|
make gift/promo id product configurable in settings.erp.inc
|
2017-03-20 09:19:27 +01:00 |
|
Rodney Figaro
|
5c41070458
|
add all-in-one reward module (not modified, original version)
|
2017-03-16 14:06:13 +01:00 |
|
Rodney Figaro
|
fac0185cd9
|
make erp activable or not, centralize credentials (not in repo)
|
2017-03-16 11:40:07 +01:00 |
|
Rodney Figaro
|
68a4ded2b2
|
use tax in gifts sentences and update translations in french
|
2017-03-13 14:45:19 +01:00 |
|
Rodney Figaro
|
cb3fcbcace
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/roykin into ticket/r12411-giveagift
|
2017-03-10 17:38:19 +01:00 |
|
RoykinPROD
|
c130a76aa1
|
fix phone number checking in erp customer
|
2017-03-10 17:37:05 +01:00 |
|
root
|
730ee28e5c
|
fix giveagift unique selection, but per amount ranges
|
2017-03-03 08:10:09 +00:00 |
|
Rodney Figaro
|
5599c75e4c
|
fix merge branches
|
2017-03-02 17:56:38 +01:00 |
|
Rodney Figaro
|
9221835ce6
|
fix advslider by upgrading flexslider, adding flexslider.css and fixing height in css
|
2017-03-02 13:11:30 +01:00 |
|
root
|
50a175b140
|
#12411 - add theme give a gift and update integration
|
2017-02-17 09:45:59 +00:00 |
|
Rodney Figaro
|
68f8e1eb51
|
add ERP mock objects for testing orders without real ERP
|
2017-02-08 17:31:41 +01:00 |
|
Rodney Figaro
|
71db3fc055
|
enable or disable the erporder in defines.inc.php - disabled here
|
2017-02-08 15:37:01 +01:00 |
|
Rodney Figaro
|
561b023b6e
|
add giveagift module
|
2017-02-08 15:31:34 +01:00 |
|
root
|
3aceec3434
|
#12038 - add advslider and update tpl/css integration to display an advertising block
|
2017-02-03 09:20:22 +00:00 |
|
root
|
2a5c988bce
|
commit changes made during the last 2 months
|
2017-01-26 10:34:09 +01:00 |
|
PLESK5
|
46978baba5
|
update prod
|
2016-10-21 11:41:16 +02:00 |
|
PLESK5
|
821c2c37b7
|
modif b2bill
|
2016-10-21 11:39:06 +02:00 |
|
PLESK5
|
64ecf8aea2
|
update module erp
|
2016-10-21 11:37:36 +02:00 |
|
PLESK5
|
0e091e10c3
|
suppression prestaerp
|
2016-09-19 18:03:12 +02:00 |
|
lamenuit
|
492538cead
|
push prod
|
2016-07-04 11:57:59 +02:00 |
|
Serveur preprod
|
be83006fb6
|
push dev
|
2016-06-01 11:53:40 +02:00 |
|
Serveur preprod
|
642924ae45
|
recette
|
2016-04-28 10:30:36 +02:00 |
|
Alexandre Simonet
|
bb49024ff8
|
fix facture
|
2016-04-21 14:55:08 +02:00 |
|
Alexandre Simonet
|
5ff08b477f
|
[wip] facture
|
2016-04-21 10:23:44 +02:00 |
|
Alexandre Simonet
|
463bb7a8c2
|
taxes, commandes
- Ajout des taxes pour la création de commande dans odoo
- Modification du status à "paiment accepté" pour les nouveau bon de commande odoo
|
2016-04-20 12:55:06 +02:00 |
|
Alexandre Simonet
|
20d178cc26
|
sync order in odoo fix crash
|
2016-04-11 16:13:48 +02:00 |
|
Alexandre Simonet
|
2e5dd9766b
|
sync order in odoo fix crash
|
2016-04-11 16:13:00 +02:00 |
|
Alexandre Simonet
|
a17506ae52
|
done sync order in odoo
|
2016-04-11 14:56:46 +02:00 |
|