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 |
|
Alexandre Simonet
|
772e64cc79
|
[wip] sync order in odoo
|
2016-04-11 13:09:57 +02:00 |
|
Alexandre Simonet
|
258924d143
|
[WIP] sync order odoo
|
2016-04-08 15:07:34 +02:00 |
|
Alexandre Simonet
|
8f20cf19af
|
fix confict
|
2016-04-07 16:31:24 +02:00 |
|
Alexandre Simonet
|
68c3d8a4c5
|
comment hook sync order odoo
|
2016-04-07 15:38:45 +02:00 |
|
Serveur preprod
|
c76cb65813
|
fix erreur
|
2016-04-07 15:36:41 +02:00 |
|
Serveur preprod
|
97a974a8cf
|
modif sur la preprod
|
2016-04-07 14:48:59 +02:00 |
|
Alexandre Simonet
|
61be8d96a4
|
[WIP] sync order odoo
|
2016-04-06 16:45:41 +02:00 |
|
Alexandre Simonet
|
91cfa505e0
|
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/roykin
|
2016-04-06 11:53:04 +02:00 |
|
Romuald
|
2d4367818b
|
notification ajout panier
|
2016-04-05 15:53:35 +02:00 |
|
Alexandre Simonet
|
7f83f8664b
|
[WIP] sync order odoo
|
2016-04-05 12:02:44 +02:00 |
|
Alexandre Simonet
|
37ed7b336e
|
Merged branch master into master
|
2016-04-05 10:29:58 +02:00 |
|
Alexandre Simonet
|
d847f44340
|
[WIP] sync order in odoo
|
2016-04-05 09:31:31 +02:00 |
|
Romuald
|
d4aec6d1fb
|
fin desktop
|
2016-04-04 12:45:47 +02:00 |
|
Romuald
|
2542c54c59
|
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/roykin
|
2016-03-31 16:40:33 +02:00 |
|
Romuald
|
67002b8bf8
|
category + panier
|
2016-03-31 16:40:09 +02:00 |
|
Serveur preprod
|
31ae74554d
|
fix erp
|
2016-03-21 15:05:13 +01:00 |
|
Thibault UBUNTU
|
7965ab1f95
|
push erp test
|
2016-03-18 10:53:04 +01:00 |
|
Thibault UBUNTU
|
3d7f60a05e
|
push site
|
2016-03-03 10:33:17 +01:00 |
|