Alexandre Simonet
|
fb0b4514a1
|
fix wip
|
2016-03-22 16:38:49 +01:00 |
|
Alexandre Simonet
|
0aade6697d
|
fix wip
|
2016-03-22 16:32:33 +01:00 |
|
Marion Muszynski
|
7b5a052eba
|
Merge branch 'ticket-9642' into develop
|
2016-03-21 10:22:38 +01:00 |
|
Marion Muszynski
|
8dc1943ee4
|
modif getSales with option consumable
|
2016-03-21 10:22:14 +01:00 |
|
Alexandre Simonet
|
9240003ba5
|
Fix
|
2016-03-21 10:07:35 +01:00 |
|
Marion Muszynski
|
1195b73c6e
|
Merge branch 'ticket-9642' into develop
|
2016-03-18 17:06:40 +01:00 |
|
Marion Muszynski
|
7e3fe49847
|
fix price in socolissimo
|
2016-03-18 17:06:08 +01:00 |
|
Alexandre Simonet
|
5d429f51fd
|
fix
|
2016-03-17 11:57:24 +01:00 |
|
Alexandre Simonet
|
fa884bd460
|
ajout quantity
|
2016-03-16 18:05:41 +01:00 |
|
Marion Muszynski
|
2c082e86f8
|
Merge branch 'ticket-9642' into develop
|
2016-03-16 17:56:44 +01:00 |
|
Marion Muszynski
|
086f3f5906
|
add define
|
2016-03-16 17:56:03 +01:00 |
|
Alexandre Simonet
|
32ff09ae0f
|
duplicate attributes
|
2016-03-16 17:49:08 +01:00 |
|
Marion Muszynski
|
a55330abae
|
Merge branch 'ticket-9642' into develop
|
2016-03-16 15:48:29 +01:00 |
|
Marion Muszynski
|
df4be5618d
|
update to see consommables in BO
|
2016-03-16 15:47:25 +01:00 |
|
Marion Muszynski
|
3e64a14e8b
|
Merge branch 'ticket-9642' into develop
|
2016-03-16 15:25:16 +01:00 |
|
Marion Muszynski
|
de06f70738
|
check consommables
|
2016-03-16 15:24:12 +01:00 |
|
Alexandre Simonet
|
1662a5fa70
|
Fix pSQL
|
2016-03-16 12:58:12 +01:00 |
|
Alexandre Simonet
|
3bdec3deda
|
Clone images
|
2016-03-16 12:57:28 +01:00 |
|
Alexandre Simonet
|
58d917bc6a
|
Check si le produit existe deja dans la vente
|
2016-03-16 12:14:19 +01:00 |
|
Thibault UBUNTU
|
7b289bba8a
|
fix divers
|
2016-03-16 11:49:15 +01:00 |
|
Alexandre Simonet
|
2625d7e0f0
|
open in new tab
|
2016-03-15 17:47:45 +01:00 |
|
Alexandre Simonet
|
545c8edf25
|
Intertion dans la braderie ajax
|
2016-03-15 16:07:49 +01:00 |
|
Alexandre Simonet
|
d6e96411e9
|
Boutton voir cette catégorie
|
2016-03-15 15:31:05 +01:00 |
|
Alexandre Simonet
|
18074c115b
|
Insertion d'un produit dans la braderie
|
2016-03-15 15:05:40 +01:00 |
|
Alexandre Simonet
|
5038fd8e1f
|
[WIP] get categories sales
|
2016-03-14 18:06:51 +01:00 |
|
Thibault UBUNTU
|
477aaf257f
|
add braderie select in VP
|
2016-03-14 10:59:58 +01:00 |
|
Thibault UBUNTU
|
fad3dbe3c5
|
fix merge master
|
2016-03-10 10:40:06 +01:00 |
|
Srv Bebeboutik
|
56da5a1b8f
|
fix labelgenerate
|
2016-03-10 09:53:45 +01:00 |
|
Srv Bebeboutik
|
f43730525b
|
add pid on query
|
2016-03-09 16:38:21 +01:00 |
|
Srv Bebeboutik
|
392892f3d2
|
update labelgenerate
|
2016-03-09 16:33:48 +01:00 |
|
Thibault UBUNTU
|
f904640f44
|
change payment img
|
2016-03-07 12:52:42 +01:00 |
|
Thibault GUILLAUME
|
a83a78a462
|
fix contactform
|
2016-03-02 12:36:13 +01:00 |
|
Thibault UBUNTU
|
cd250e37b5
|
Merge branch 'alexandre-contactform' into develop
|
2016-03-02 12:15:13 +01:00 |
|
Thibault UBUNTU
|
0e7cf6413d
|
fix contactform
|
2016-03-02 12:14:34 +01:00 |
|
Srv Bebeboutik
|
20e38fa1be
|
fix trad ES box add to cart
|
2016-03-02 10:52:30 +01:00 |
|
Srv Bebeboutik
|
8c1242b850
|
delte img from repo
|
2016-03-02 10:45:21 +01:00 |
|
Srv Bebeboutik
|
97ec6bff44
|
fix trad add to cart box
|
2016-03-02 10:39:36 +01:00 |
|
Srv Bebeboutik
|
adaecb5c9b
|
hotfix sale stat subcategorie
|
2016-03-02 10:14:16 +01:00 |
|
Alexandre Simonet
|
a245a632ba
|
Remove var_dump
|
2016-03-02 10:06:15 +01:00 |
|
Thibault UBUNTU
|
4960b181e4
|
Merge branch 'alexandre-contactform' into develop
|
2016-03-02 09:59:59 +01:00 |
|
Alexandre Simonet
|
9e1fea3a1f
|
Change mails dir
|
2016-03-01 18:17:17 +01:00 |
|
Alexandre Simonet
|
85b4843d91
|
Fix mail folder
|
2016-03-01 18:11:07 +01:00 |
|
Thibault UBUNTU
|
d90017e968
|
Merge branch 'alexandre-contactform' into develop
|
2016-03-01 17:47:58 +01:00 |
|
Alexandre Simonet
|
c772ed76eb
|
Fix
|
2016-03-01 17:28:36 +01:00 |
|
Thibault UBUNTU
|
5f714a6e3b
|
Merge branch 'alexandre-contactform' into develop
|
2016-03-01 16:17:02 +01:00 |
|
Alexandre Simonet
|
836cdfec59
|
Fix
|
2016-02-25 16:18:37 +01:00 |
|
Alexandre Simonet
|
f4f1b00946
|
Fix var
|
2016-02-25 14:15:51 +01:00 |
|
Alexandre Simonet
|
13d92a6732
|
Fix injection
|
2016-02-25 12:43:33 +01:00 |
|
Alexandre Simonet
|
d74c4003ea
|
Change subject mail
|
2016-02-25 12:32:31 +01:00 |
|
Alexandre Simonet
|
9943a42a9e
|
Fix multi mail config
|
2016-02-25 12:30:06 +01:00 |
|