Benjamin Perche e94f8e9591 Fix error while rebasing ...

modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php

2014-08-01 12:48:03 +02:00

..

Action

Merge pull request #560 from roadster31/coupon-fix

2014-08-01 10:19:47 +02:00

Cart

change price if needed when customer log in or log out

2014-04-29 11:35:10 +02:00

Command

Code review following pull request comments

2014-06-10 11:43:06 +02:00

Condition

Using taxed cart total instead of untaxed price

2014-07-30 16:57:58 +02:00

Config

Add import_categories and imports load in XML

2014-08-01 12:48:03 +02:00

Controller

Fix error while rebasing

2014-08-01 12:48:03 +02:00

Core

Add import_categories and imports load in XML

2014-08-01 12:48:03 +02:00

Coupon

Added isInUse() method to the CouponInterface

2014-07-22 18:59:58 +02:00

Exception

Add XML export and export_category definition and Fix CS

2014-08-01 12:48:03 +02:00

Files

Fixed "with the close or save and close button you get an exception"

2014-07-07 22:44:39 +02:00

Form

Add XML export and export_category definition and Fix CS

2014-08-01 12:48:03 +02:00

ImportExport

Add import_categories and imports load in XML

2014-08-01 12:48:03 +02:00

Install

various fixes from insight

2014-06-18 09:33:32 +02:00

Log

Translate french named variabled "origine" and "prefixe"

2014-06-26 09:28:51 +02:00

Mailer

change license header

2014-04-18 09:36:41 +02:00

Model

Add import_categories and imports load in XML

2014-08-01 12:48:03 +02:00

Module

add route parameters to redirectToRoute method in BaseFrontController

2014-04-23 20:48:17 +02:00

Rewriting

change license header

2014-04-18 09:36:41 +02:00

TaxEngine

Remove useless usage of loadRequirements

2014-06-27 14:20:00 +02:00

Tests

Finish export forms

2014-08-01 12:48:02 +02:00

Tools

Revert files

2014-08-01 12:48:02 +02:00

Type

Fixed method to display options in the current local and not en_US.

2014-07-16 18:39:09 +02:00