140 Commits

Author SHA1 Message Date
Marion Muszynski
ff0d7651bf fix total product attribute quantities 2016-08-31 11:55:14 +02:00
Rodney Figaro
4808607e56 add purchase guide module - backoffice only 2016-08-30 18:10:44 +02:00
Rodney Figaro
69f6d0dcd0 add column ecotax if any in the PDF invoices 2016-08-23 17:37:35 +02:00
Marion Muszynski
30b39b5776 fix conflicts 2016-06-08 10:53:07 +02:00
Marion Muszynski
7ad38029da adding filter 2016-06-06 17:27:09 +02:00
Marion Muszynski
b332800b77 new fields in product db 2016-06-06 14:35:07 +02:00
Srv Bebeboutik
7085c1b80a update from prod 2016-06-06 12:35:00 +02:00
Marion Muszynski
72545630a3 fix conflicts 2016-06-06 11:32:25 +02:00
Marion Muszynski
5f932e9bcd opti attribute group deletion 2016-06-03 13:06:03 +02:00
Marion Muszynski
13b20adb20 modif validate field OrderDetail 2016-05-18 11:17:41 +02:00
Marion Muszynski
881878e994 modif fdp fix in cart 2016-05-17 14:51:12 +02:00
Srv Bebeboutik
5a7c3a0241 modif cart 2016-05-13 10:37:05 +02:00
Srv Bebeboutik
3a4f5414d8 fix conflict 2016-05-12 12:12:42 +02:00
Srv Bebeboutik
34b34929ef push la modif de cart 2016-05-12 12:10:50 +02:00
Marion Muszynski
ebdd485182 modif id carrier in cart 2016-05-12 10:18:15 +02:00
Marion Muszynski
f0d183580a modif cart 2016-05-09 18:02:20 +02:00
Marion Muszynski
ffbb3232b9 modif soflex 2016-05-09 17:43:57 +02:00
Thibault UBUNTU
f15662e826 paypal suite 2016-05-02 15:30:12 +02:00
Marion Muszynski
35ee4a1c68 many update of module loyalty 2016-04-21 17:41:04 +02:00
Marion Muszynski
c63769824e add 2 new extracts for deb 2016-04-20 11:37:50 +02:00
Marion Muszynski
d4722a7e81 order in search product 2016-04-14 13:06:06 +02:00
Marion Muszynski
0b0ebcb26f fix conflict consommables 2016-04-12 15:17:45 +02:00
Thibault UBUNTU
552b46347e v0.1 paypal billing 2016-04-06 15:52:14 +02:00
Marion Muszynski
26701eeba5 fix conflict 2016-03-23 12:02:14 +01:00
Marion Muszynski
67264249a5 fix quantity and product with attribute 2016-03-23 11:49:34 +01:00
Alexandre Simonet
9240003ba5 Fix 2016-03-21 10:07:35 +01:00
Marion Muszynski
9a3da1848d Merge branch 'ticket-9642' into develop 2016-03-18 15:57:48 +01:00
Marion Muszynski
6feaf9ff28 test carrier cost 2016-03-18 15:57:22 +01:00
Thibault UBUNTU
fad3dbe3c5 fix merge master 2016-03-10 10:40:06 +01:00
Srv Bebeboutik
1426efaff2 change gitignore + class product 2016-03-09 16:33:05 +01:00
Marion Muszynski
5bb7d037a9 fix conflit FrontController 2016-02-24 17:39:59 +01:00
Marion Muszynski
bd3c6cb40c merge frontController/config.inc 2016-02-24 17:23:16 +01:00
Marion Muszynski
ce7462c19e labelgenerate 2016-02-24 17:12:23 +01:00
Srv Bebeboutik
fc61e2ed3a fix truc de merdeeeeeeeeeeee 2016-02-24 16:11:24 +01:00
Thibault UBUNTU
4d81184816 fix conflict 2016-02-24 16:03:29 +01:00
Thibault UBUNTU
d39e27d271 fix conflit 2016-02-24 16:02:43 +01:00
Alexandre Simonet
f778675389 sav 2016-02-23 17:33:08 +01:00
Marion Muszynski
58084aa3c7 adding module ant_support et ant_support_form 2016-02-19 15:30:29 +01:00
Srv Bebeboutik
bfcb4e9aa6 add override class cart to display flag 2016-01-27 16:00:05 +01:00
Srv Bebeboutik
340bc7c146 push site 2016-01-04 12:48:08 +01:00