Alexandre Simonet
|
91cfa505e0
|
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/roykin
|
2016-04-06 11:53:04 +02:00 |
|
Romuald
|
87d7f43903
|
padding permanent pour le deroulé en bas de page
|
2016-04-06 10:08:26 +02:00 |
|
Romuald
|
183ad35f79
|
event click sur mobile
|
2016-04-06 09:58:55 +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
|
02622546c9
|
fix update address for id_erp
|
2016-04-05 09:49:49 +02:00 |
|
Alexandre Simonet
|
d847f44340
|
[WIP] sync order in odoo
|
2016-04-05 09:31:31 +02:00 |
|
Romuald
|
b36d68f1f6
|
tablette portrait
|
2016-04-04 18:42:41 +02:00 |
|
Romuald
|
28a40a4a4e
|
tablette paysage
|
2016-04-04 15:56:14 +02:00 |
|
Romuald
|
87fa03dd87
|
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/roykin
|
2016-04-04 12:46:04 +02:00 |
|
Romuald
|
d4aec6d1fb
|
fin desktop
|
2016-04-04 12:45:47 +02:00 |
|
Alexandre Simonet
|
ca9f733b18
|
can't update if address is erp
|
2016-04-01 10:26:38 +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 |
|
Thibault UBUNTU
|
a821e6153d
|
finalisation script update stock
|
2016-03-31 16:27:50 +02:00 |
|
Alexandre Simonet
|
93a916b072
|
refactor update stock
|
2016-03-31 16:11:33 +02:00 |
|
Alexandre Simonet
|
571da0469f
|
update stock
|
2016-03-25 11:57:28 +01:00 |
|
Alexandre Simonet
|
e674a598ba
|
update product
|
2016-03-25 11:35:08 +01:00 |
|
Alexandre Simonet
|
f86dfc50bc
|
add assoc table for variants and fix variant price impact
|
2016-03-25 10:29:59 +01:00 |
|
Thibault UBUNTU
|
daaa4ab9be
|
fix
|
2016-03-24 16:34:45 +01:00 |
|
Thibault UBUNTU
|
7ef6dbc644
|
erp facture
|
2016-03-24 16:32:35 +01:00 |
|
Thibault UBUNTU
|
ce37bdd5a7
|
fix merge
|
2016-03-24 16:32:24 +01:00 |
|
Alexandre Simonet
|
3676fdf9a7
|
wip
|
2016-03-24 12:47:11 +01:00 |
|
Alexandre Simonet
|
607e2deb77
|
add image
|
2016-03-24 11:02:01 +01:00 |
|
Alexandre Simonet
|
a22dbd2a1c
|
wip
|
2016-03-23 17:49:18 +01:00 |
|
Alexandre Simonet
|
f89d4c5147
|
add product
|
2016-03-23 12:33:30 +01:00 |
|
Alexandre Simonet
|
7febb004bd
|
wip
|
2016-03-22 14:32:58 +01:00 |
|
Thibault UBUNTU
|
273c5089f7
|
Merge branch 'erp-sync-products' of gitlab.antadis.fr:dev-antadis/roykin into erp-sync-products
|
2016-03-22 10:37:34 +01:00 |
|
Alexandre Simonet
|
b465b27075
|
wip
|
2016-03-22 09:58:50 +01:00 |
|
Thibault UBUNTU
|
fe552a0b49
|
create address if not exist
|
2016-03-21 15:07:02 +01:00 |
|
Serveur preprod
|
31ae74554d
|
fix erp
|
2016-03-21 15:05:13 +01:00 |
|
Thibault UBUNTU
|
6a55b9f37e
|
update erp customer
|
2016-03-21 14:45:17 +01:00 |
|
Thibault UBUNTU
|
3ee25b9192
|
suite erp
|
2016-03-21 10:13:36 +01:00 |
|
Thibault UBUNTU
|
7965ab1f95
|
push erp test
|
2016-03-18 10:53:04 +01:00 |
|
Romuald
|
d3a528d1e2
|
Merge branch 'redirect' of gitlab.antadis.fr:dev-antadis/roykin into redirect
|
2016-03-16 17:03:53 +01:00 |
|
Romuald
|
098996ca8f
|
login
|
2016-03-16 16:59:24 +01:00 |
|
Alexandre Simonet
|
df44038d42
|
fix error
|
2016-03-16 15:04:15 +01:00 |
|
Alexandre Simonet
|
180cd59878
|
redirection
|
2016-03-16 14:59:33 +01:00 |
|
Romuald
|
4ccd91d486
|
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/roykin
|
2016-03-16 12:54:47 +01:00 |
|
Romuald
|
fb30557cf3
|
theme pour faire plaisir a copain Tibo :3
|
2016-03-16 12:54:05 +01:00 |
|
Thibault UBUNTU
|
cd92e800fe
|
fix dev
|
2016-03-16 12:52:54 +01:00 |
|
Alexandre Simonet
|
2d24a16256
|
Override layout
|
2016-03-04 12:33:55 +01:00 |
|
Alexandre Simonet
|
0dd9f8cc4a
|
Force template if user is not logged
|
2016-03-04 10:03:04 +01:00 |
|
Alexandre Simonet
|
6e71c8e1cc
|
Override FrontController
|
2016-03-03 16:52:27 +01:00 |
|
Alexandre Simonet
|
2491eac2ac
|
Remove dump
|
2016-03-03 16:42:00 +01:00 |
|
Alexandre Simonet
|
4f38474372
|
Do redirection for user not logged and registration request
|
2016-03-03 16:41:30 +01:00 |
|
Thibault UBUNTU
|
3d7f60a05e
|
push site
|
2016-03-03 10:33:17 +01:00 |
|