savoirfairelinux-openerp team mailing list archive

["Guewen Baconnier @ Camptocamp" <guewen.baconnier@xxxxxxxxxxxxxx>]

Guewen Baconnier @ Camptocamp has proposed merging lp:~openerp-connector-community/openerp-connector-magento/7.0-invoice-payment-method-cleanings-gbr into lp:~jan-philipp-fischer/openerp-connector-magento/7.0-invoice-payment-method.

Requested reviews:
  Jan-Philipp Fischer (jan-philipp-fischer)

For more details, see:
https://code.launchpad.net/~openerp-connector-community/openerp-connector-magento/7.0-invoice-payment-method-cleanings-gbr/+merge/211695

cleanings
-- 
https://code.launchpad.net/~openerp-connector-community/openerp-connector-magento/7.0-invoice-payment-method-cleanings-gbr/+merge/211695
Your team OpenERP Connector Community is subscribed to branch lp:~openerp-connector-community/openerp-connector-magento/7.0-invoice-payment-method-cleanings-gbr.

=== modified file 'magentoerpconnect/AUTHORS'
--- magentoerpconnect/AUTHORS	2013-11-01 08:50:27 +0000
+++ magentoerpconnect/AUTHORS	2014-03-19 10:37:13 +0000
@@ -1,15 +1,15 @@
-Last update: Fri Nov  1 09:49:10 CET 2013
+Last update: Tue Jan 14 15:17:34 CET 2014
 
-* 2013 Guewen Baconnier at Camptocamp
-* 2013 Alexandre Fayolle at Camptocamp
-* 2013 Joel Grand-Guillaume at Camptocamp
-* 2013 Sebastien Beau at Akretion
-* 2013 Benoit Guillot at Akretion
-* 2013 Chafique Delli at Akretion
-* 2013 David Beal at Akretion
-* 2013 Brendan Clune at Logic Supply
-* 2013 Allison Miller at Logic Supply
-* 2013 Augustin Cisterne-Kaas at Elico Corp
-* 2013 Alexis de Lattre at Akretion (tiny change)
-* 2013 Olivier Distexhe at Akilon (tiny change)
-* 2013 Romain Deheele at Camptocamp
+* Guewen Baconnier at Camptocamp
+* Alexandre Fayolle at Camptocamp
+* Joel Grand-Guillaume at Camptocamp
+* Sebastien Beau at Akretion
+* Benoit Guillot at Akretion
+* Chafique Delli at Akretion
+* David Beal at Akretion
+* Brendan Clune at Logic Supply
+* Allison Miller at Logic Supply
+* Augustin Cisterne-Kaas at Elico Corp
+* Alexis de Lattre at Akretion (tiny change)
+* Olivier Distexhe at Akilon (tiny change)
+* Romain Deheele at Camptocamp

=== modified file 'magentoerpconnect/CHANGES.rst'
--- magentoerpconnect/CHANGES.rst	2013-11-22 13:12:24 +0000
+++ magentoerpconnect/CHANGES.rst	2014-03-19 10:37:13 +0000
@@ -1,8 +1,26 @@
 Changelog
 ---------
 
-2.2.1.dev0
-~~~~~~~~~~
+
+2.3.1 (2014-01-23)
+~~~~~~~~~~~~~~~~~~
+
+*  Do not fail when a None value is given instead of a float when importing special lines of sales orders. (https://launchpad.net/bugs/1271537)
+
+
+2.3.0 (2014-01-15 warning: API changes)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Compatibility with the Connector Framework: listeners 'on_record_create' receives
+  an additional argument 'vals'; 'on_record_write's named argument 'fields' becomes 'vals'
+  and receives the full dictionary of values
+* Fix: wrong main image imported on products (https://launchpad.net/bugs/1258418)
+* Changes calls to Mapper according to the new API of the Mappers.
+  See branch: https://code.launchpad.net/~openerp-connector-core-editors/openerp-connector/7.0-connector-mapper-refactor
+* Fix: mismatch between tax excluding and tax including amount, new configuration option (https://launchpad.net/bugs/1234117)
+* Fix: mismatch between tax excluding and tax including amount, new configuration option (https://launchpad.net/bugs/1234117)
+* Implements the new API (connector_ecommerce) for the special order lines:
+  https://code.launchpad.net/~openerp-connector-core-editors/openerp-connector/7.0-e-commerce-addons-refactor-so-extra-lines/+merge/194629
 
 
 2.2.1 (2013.11.22)

=== modified file 'magentoerpconnect/__openerp__.py'
--- magentoerpconnect/__openerp__.py	2014-01-14 11:32:02 +0000
+++ magentoerpconnect/__openerp__.py	2014-03-19 10:37:13 +0000
@@ -21,7 +21,7 @@
 ##############################################################################
 
 {'name': 'Magento Connector',
- 'version': '2.2.1',
+ 'version': '2.3.1',
  'category': 'Connector',
  'depends': ['account',
              'product',
@@ -33,7 +33,7 @@
  'external_dependencies': {
      'python': ['magento'],
  },
- 'author': 'MagentoERPconnect Core Editors',
+ 'author': 'Connector Core Editors',
  'license': 'AGPL-3',
  'website': 'https://launchpad.net/magentoerpconnect',
  'description': """
@@ -46,7 +46,7 @@
 it can be extended or modified easily from separate addons, a factor of
 success when the implementations of Magento vary a lot.
 
-Magento OpenERP Connector is mainly developed by the Magentoerpconnect Core
+Magento OpenERP Connector is mainly developed by the Connector Core
 Editors, these being Camptocamp_ and Akretion_. The `source is on
 launchpad`_.
 
@@ -108,7 +108,7 @@
 
 
 .. _connector: https://code.launchpad.net/openerp-connector
-.. _connector_ecommerce: https://code.launchpad.net/openerp-connector
+.. _connector_ecommerce: https://code.launchpad.net/openerp-connector-ecommerce
 .. _Camptocamp: http://www.camptocamp.com
 .. _Akretion: http://www.akretion.com
 .. _`source is on launchpad`: https://launchpad.net/magentoerpconnect

=== modified file 'magentoerpconnect/consumer.py'
--- magentoerpconnect/consumer.py	2013-05-02 12:30:40 +0000
+++ magentoerpconnect/consumer.py	2014-03-19 10:37:13 +0000
@@ -36,7 +36,7 @@
 
 @on_record_create(model_names=_BIND_MODEL_NAMES)
 @on_record_write(model_names=_BIND_MODEL_NAMES)
-def delay_export(session, model_name, record_id, fields=None):
+def delay_export(session, model_name, record_id, vals):
     """ Delay a job which export a binding record.
 
     (A binding record being a ``magento.res.partner``,
@@ -44,11 +44,12 @@
     """
     if session.context.get('connector_no_export'):
         return
+    fields = vals.keys()
     export_record.delay(session, model_name, record_id, fields=fields)
 
 
 @on_record_write(model_names=_MODEL_NAMES)
-def delay_export_all_bindings(session, model_name, record_id, fields=None):
+def delay_export_all_bindings(session, model_name, record_id, vals):
     """ Delay a job which export all the bindings of a record.
 
     In this case, it is called on records of normal models and will delay
@@ -59,6 +60,7 @@
     model = session.pool.get(model_name)
     record = model.browse(session.cr, session.uid,
                           record_id, context=session.context)
+    fields = vals.keys()
     for binding in record.magento_bind_ids:
         export_record.delay(session, binding._model._name, binding.id,
                             fields=fields)

=== modified file 'magentoerpconnect/doc/conf.py'
--- magentoerpconnect/doc/conf.py	2013-11-06 09:47:38 +0000
+++ magentoerpconnect/doc/conf.py	2014-03-19 10:37:13 +0000
@@ -30,6 +30,7 @@
                 'webclient/addons',
                 'addons',
                 'openerp-connector',
+                'openerp-connector-ecommerce',
                 'e-commerce-addons',
                 'openerp-connector-magento')
 pathes = [os.path.join(BASE_PATH, path) for path in ADDONS_PATHS]

=== modified file 'magentoerpconnect/doc/guides/installation_guide.rst'
--- magentoerpconnect/doc/guides/installation_guide.rst	2013-11-06 08:53:30 +0000
+++ magentoerpconnect/doc/guides/installation_guide.rst	2014-03-19 10:37:13 +0000
@@ -10,8 +10,7 @@
 Installation
 ************
 
-The installation steps assume that you already have a working OpenERP
-setup with all the OpenERP pre-requisites.
+The installation steps assume that you already have a functioning OpenERP server.
 
 If you are a developer, you may want to install the Connector using our
 buildout configuration, head over :ref:`installation-with-buildout`.
@@ -27,17 +26,25 @@
 OpenERP
 =======
 
-Download the branches where you installed OpenERP::
+Download the branches below in a path where you chosed to store the addons::
 
     $ bzr branch lp:openerp-connector/7.0 openerp-connector
-    $ bzr branch lp:openerp-connector/7.0-e-commerce-addons e-commerce-addons
+    $ bzr branch lp:openerp-connector-ecommerce/7.0 openerp-connector-ecommerce
     $ bzr branch lp:openerp-connector-magento/7.0 openerp-connector-magento
+    $ bzr branch lp:e-commerce-addons/7.0 e-commerce-addons
     $ bzr branch lp:openerp-product-attributes/7.0 openerp-product-attributes
     $ bzr branch lp:sale-wkfl/7.0 sale-wkfl
 
+.. important:: Keep the Bazaar branches entire. Do not copy-paste the modules
+               in another directory.
+
 Add the branches in the addons path, either using the server command
 line or adding them in the OpenERP server configuration file.
 
+Example using the command line argument::
+
+    $ /path/to/openerp-server --addons-path /path/to/openerp-connector,/path/to/openerp-connector-ecommerce,/path/to/openerp-connector-magento,/path/to/e-commerce-addons,/path/to/openerp-product-attributes,/path/to/sale-wkfl
+
 You also need to install the ``magento`` Python package.
 So install it with either pip or either easy_install::
 
@@ -75,6 +82,12 @@
 #. Flush the Magento cache from the admin panel or by removing everything in
    `magento_root/var/cache`
 
+
+.. important:: Please check if you have installed Magento on PHP with a *5.4.x** version.
+               Magento is **not compatible** with this version and would prevent the API to
+               behave normally. In that case, you must retrograde to PHP 5.3.x or apply the
+               patch provided by Magento (see http://magento.com/resources/system-requirements)
+
 Configuring the Magento web-services
 ====================================
 

=== modified file 'magentoerpconnect/doc/guides/tutorial_customize.rst'
--- magentoerpconnect/doc/guides/tutorial_customize.rst	2013-08-23 20:43:32 +0000
+++ magentoerpconnect/doc/guides/tutorial_customize.rst	2014-03-19 10:37:13 +0000
@@ -186,10 +186,12 @@
 ===============
 
 The mappings of the fields are defined in subclasses of
-:py:class:`connector.connector.unit.mapper.ImportMapper` or
-:py:class:`connector.connector.unit.mapper.ExportMapper`, respectively
+:py:class:`connector.unit.mapper.ImportMapper` or
+:py:class:`connector.unit.mapper.ExportMapper`, respectively
 for the imports and the exports.
 
+See the documentation about :py:class:`~connector.unit.mapper.Mapper`.
+
 .. note:: The connector almost never works with the OpenERP Models
           directly. Instead, it works with its own models, which
           ``_inherits`` (note the final ``s``) the base models. For
@@ -201,7 +203,7 @@
 
 When you need to change the mappings, you'll need to dive in the
 ``magentoerpconnect``'s code and locate the class which does this job for
-your model. You won't change anything on this class, but you'll extend
+your model. You won't change anything in this class, but you'll extend
 it so you need to have a look on it.  For example, the mapping for
 ``magento.res.partner`` in ``magentoerpconnect`` is the following
 (excerpt)::

=== modified file 'magentoerpconnect/doc/guides/tutorial_development.rst'
--- magentoerpconnect/doc/guides/tutorial_development.rst	2013-04-10 11:27:07 +0000
+++ magentoerpconnect/doc/guides/tutorial_development.rst	2014-03-19 10:37:13 +0000
@@ -30,12 +30,12 @@
 
 In ``magentoerpconnect/consumer.py``, some consumers are already
 defined. You can add your one, it should be decorated by
-:py:func:`magentoerpconnect.consumer.magento_consumer` and by the event
+:py:func:`openerp.addons.magentoerpconnect.consumer.magento_consumer` and by the event
 which has to fire it::
 
     @on_record_write(model_names=['my.model'])
     @magento_consumer
-    def my_consumer(session, model_name, record_id, fields=None):
+    def my_consumer(session, model_name, record_id, vals=None):
         print 'Yeah'
 
 .. note:: The consumers always start with the arguments ``session`` and
@@ -76,11 +76,27 @@
           attribute. It means that you can access to the environment
           from a synchronizer with ``self.environment``.
 
+When you are inside a ``ConnectorUnit`` you can use the shortcuts::
+
+    # for the current model
+    importer = self.get_connector_unit_for_model(MagentoImportSynchronizer)
+    # for another model
+    importer = self.get_connector_unit_for_model(MagentoImportSynchronizer,
+                                                 'another.model')
+
+As the binders are the most used ``ConnectorUnit`` classes, they have a
+dedicated shortcut::
+
+    # for the current model
+    binder = self.get_binder_for_model()
+    # for another model
+    binder = self.get_binder_for_model('another.model')
+
 
 Create an import
 ----------------
 
-You'll need to work on at least 4 connector units:
+You'll probably need to work with 4 connector units:
 
 * a Synchronizer (presumably 2, we'll see why soon)
 * a Mapper
@@ -101,7 +117,8 @@
 phases:
 
 1. The first synchronizer searches the list of all the ids to import.
-2. The second synchronizer imports all the ids atomically.
+2. The second synchronizer imports all the ids atomically (in separate
+   jobs).
 
 We'll see in details a simple import: customer groups.
 Customer groups are importer as categories of partners
@@ -157,6 +174,13 @@
                 readonly=True),
         }
 
+        def copy_data(self, cr, uid, id, default=None, context=None):
+            if default is None:
+                default = {}
+            default['magento_bind_ids'] = False
+            return super(res_partner_category, self).copy_data(
+                cr, uid, id, default=default, context=context)
+
 That's the only thing we need to change (besides the view) on the
 OpenERP category!
 
@@ -300,7 +324,7 @@
 
 Observations:
 
-* Decorated by :py:class:`connector.connector.queue.job.job`, allow to
+* Decorated by :py:class:`connector.queue.job.job`, allow to
   ``delay`` the function.
 * We create a new environment and ask for the good importer, respectively
   for batch imports and record imports. The environment returns an
@@ -317,7 +341,7 @@
 
 The import of customer groups is so simple that it can use a generic
 class
-:py:class:`magentoerpconnect.unit.import_synchronizer.SimpleRecordImport`.
+:py:class:`openerp.addons.magentoerpconnect.unit.import_synchronizer.SimpleRecordImport`.
 We just need to add the model in the ``_model_name`` attribute::
 
     @magento
@@ -336,15 +360,15 @@
 (``_import_dependencies``, ``_after_import`` for example).
 Refers to the importers already created in the module and to the base
 class
-:py:class:`magentoerpconnect.unit.import_synchronizer.MagentoImportSynchronizer`.
+:py:class:`openerp.addons.magentoerpconnect.unit.import_synchronizer.MagentoImportSynchronizer`.
 
-The synchronizer asks to the appropriate **Mapper** to transform the data
-(in ``_map_data``). Here is how we'll create the **Mapper**.
+The synchronizer asks to the appropriate :py:class:`~connector.unit.mapper.Mapper`  to transform the data
+(in ``_map_data``). Here is how we'll create the :py:class:`~connector.unit.mapper.Mapper`.
 
 Mapper
 ''''''
 
-The mapper takes the record from Magento, and generates the OpenERP
+The :py:class:`connector.unit.mapper.Mapper` takes the record from Magento, and generates the OpenERP
 record. (or the reverse for the export Mappers)
 
 The mapper for the customer groups is as follows::
@@ -353,10 +377,9 @@
     class PartnerCategoryImportMapper(connector.ImportMapper):
         _model_name = 'magento.res.partner.category'
 
-        direct = [
-                ('customer_group_code', 'name'),
-                ('tax_class_id', 'tax_class_id'),
-                ]
+        direct = [('customer_group_code', 'name'),
+                  ('tax_class_id', 'tax_class_id'),
+                  ]
 
         @mapping
         def magento_id(self, record):
@@ -371,14 +394,16 @@
 
 * Some mappings are in ``direct`` and some use a method with a
   ``@mapping`` decorator.
-* Methods allow to have more complex mappings.
+* Methods allow to have more complex mappings. (see documentation on
+  :py:class:`~connector.unit.mapper.Mapper`)
+
 
 Binder
 ''''''
 
 For the last piece of the construct, it will be an easy one, because
 normally all the Magento Models will use the same Binder, the so called
-:py:class:`magentoerpconnect.unit.binder.MagentoModelBinder`.
+:py:class:`~openerp.addons.magentoerpconnect.unit.binder.MagentoModelBinder`.
 
 We just need to add our model in the ``_model_name`` attribute::
 

=== modified file 'magentoerpconnect/doc/howto/configure_payment_methods.rst'
--- magentoerpconnect/doc/howto/configure_payment_methods.rst	2013-04-16 09:10:41 +0000
+++ magentoerpconnect/doc/howto/configure_payment_methods.rst	2014-03-19 10:37:13 +0000
@@ -6,7 +6,7 @@
 ################################
 
 Find the configuration in the menu
-`Sales > Configuration > Sales > E-Commerce Payment Methods`.
+`Sales > Configuration > Sales > Payment Methods`.
 
 The name of the payment method is the code of the payment in Magento,
 for instance: `checkmo`.

=== added file 'magentoerpconnect/doc/howto/configure_taxes.rst'
--- magentoerpconnect/doc/howto/configure_taxes.rst	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/doc/howto/configure_taxes.rst	2014-03-19 10:37:13 +0000
@@ -0,0 +1,20 @@
+.. _configure-taxes:
+
+
+########################
+How to configure taxes
+########################
+
+The connector imports products prices and sale order
+line unit prices with taxes excluded by default.
+
+If Magento is configured with prices including taxes,
+you have to activate the checkbox ``Prices included tax``
+in ``Connectors > Magento > Backends`` in the tab ``Advanced
+Configuration``.
+
+.. warning:: This option should respect the same
+             configuration than Magento.  Pay
+             attention to the taxes on the products,
+             which should surely include prices when
+             this option is activated.

=== modified file 'magentoerpconnect/doc/index.rst'
--- magentoerpconnect/doc/index.rst	2013-11-06 09:43:16 +0000
+++ magentoerpconnect/doc/index.rst	2014-03-19 10:37:13 +0000
@@ -105,6 +105,7 @@
    howto/configure_shipping_methods
    howto/configure_emails
    howto/configure_schedulers
+   howto/configure_taxes
    guides/connector_checkpoint
    guides/monitor_resolve_jobs
    howto/modify_an_order

=== modified file 'magentoerpconnect/doc/project/contribute.rst'
--- magentoerpconnect/doc/project/contribute.rst	2013-11-06 11:24:43 +0000
+++ magentoerpconnect/doc/project/contribute.rst	2014-03-19 10:37:13 +0000
@@ -32,13 +32,19 @@
 
 So we highly recommend to use this recipe for development.
 
+.. note:: The buildout recipe uses ``bzr`` to get the branches.
+          Ensure that ``bzr`` is configured with the launchpad login
+          and the SSH key, or it may fail to get the branches.
+
 In order to use it, first get the branch::
 
     $ bzr branch lp:openerp-connector-magento/7.0-buildout
 
+.. warning:: System dependencies to build the eggs: libxml2-dev libxslt1-dev
+
 Then bootstrap it::
 
-    $ python2.6 -S bootstrap.py  # or python, it depends on the distrib
+    $ python -S bootstrap.py
 
 Then run the buildout on the configuration file (eventually change options)::
 
@@ -62,7 +68,7 @@
 Start OpenERP
 =============
 
-All the commands are run from the root of the buildout.
+All the commands are launched from the root directory of the buildout.
 
 In standalone mode::
 
@@ -80,7 +86,7 @@
 
     $ bin/supervisord
 
-The default configuration is to start OpenERP with 4 workers and 2 Connector
+The default configuration starts OpenERP with 4 workers and 2 Connector
 workers. This can be changed in the buildout.cfg file in the ``supervisor`` section.
 
 The services can be managed on::
@@ -90,21 +96,17 @@
 Run the tests
 =============
 
-The Magento Connector and the Connector do not use YAML tests, but only
+The Magento Connector and the Connector framework do not use YAML tests, but only
 ``unittest2`` tests. The following command lines will run them::
 
     $ bin/rununittests -m connector
     $ bin/rununittests -m magentoerpconnect
 
-Use the helps for more information about the options::
+Use the help arguments for more information about the options::
 
     $ bin/rununittests --help
     $ bin/rununittests --help-oe
 
-.. note:: There is a known bug which make the tests fails under undetermined
-          circumstances (seems related to the initialization of the registry),
-          launching again the test suite should work.
-
 Build the documentation
 =======================
 
@@ -123,9 +125,9 @@
 
 If you want to develop a generic feature on the Magento Connector, we recommend
 to use the `ak-magento vagrant box`_.  It installs Magento 1.7 with the demo
-data and the Magento part of the Connector.
+data and the Magento (PHP) part of the Connector.
 
-The project's page describe the installation process, just follow them.
+The project's page on Github describe the installation process, just follow them.
 
 We also use this box as a reference for the data of the tests.
 
@@ -219,7 +221,15 @@
 `Submit merge proposals for features or fixes`_ instructions.
 
 The other way is to use the Launchpad's translation system on
-https://translations.launchpad.net/openerp-connector-magento (maybe not activated as of today)
+
+Magento Connector
+  https://translations.launchpad.net/openerp-connector-magento
+
+Connector E-Commerce
+  https://translations.launchpad.net/openerp-connector-ecommerce
+
+Connector
+  https://translations.launchpad.net/openerp-connector
 
 OpenERP's guide on translations: https://doc.openerp.com/7.0/contribute/07_improving_translations/
 
@@ -240,7 +250,7 @@
 Thus, in the ``tests`` folder, you will find files with only data, and the
 others with the tests.
 
-In order to record, data, you can proceed as follows:
+In order to record data, you can proceed as follows:
 
 In ``magentoerpconnect/unit/backend_adapter.py`` at lines 130,130:
 

=== added file 'magentoerpconnect/i18n/de.po'
--- magentoerpconnect/i18n/de.po	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/i18n/de.po	2014-03-19 10:37:13 +0000
@@ -0,0 +1,1060 @@
+# German translation for openerp-connector-magento
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openerp-connector-magento package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-connector-magento\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-01 12:45+0000\n"
+"PO-Revision-Date: 2014-02-26 21:07+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+"Language-Team: German <de@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-02-27 06:35+0000\n"
+"X-Generator: Launchpad (build 16935)\n"
+
+#. module: magentoerpconnect
+#: help:magento.backend,pricelist_id:0
+msgid "The price list used to define the prices of the products in Magento."
+msgstr ""
+"Die Preisliste wird benutzt, um die Preise der Produkte in Magento zu "
+"definieren."
+
+#. module: magentoerpconnect
+#: help:magento.store,send_invoice_paid_mail:0
+msgid ""
+"Does the invoice export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+"Soll bei Erstellung/Export der Rechnung eine E-Mail aus Magento versendet "
+"werden  ?"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import sales orders from all store views"
+msgstr "Importiere Aufträge von allen Store Views"
+
+#. module: magentoerpconnect
+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
+msgid ""
+"The tax amount computed in OpenERP doesn't match with the tax amount in "
+"Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+msgstr ""
+"Die in OpenERP errechnete Steuer stimmt nicht mit der Magento Steuer "
+"überein.\n"
+"\n"
+"Grund:\n"
+"Vermutlich sind die Steuersätze in OpenERP und Magento nicht identisch.  "
+"Durch eine entsprechende Steuerzuordnung wurde möglicherweise der Endpreis "
+"verändert.\n"
+"\n"
+"Lösung: \n"
+"Überprüfen Sie die Steuern und auch Zuordnungen und korrigieren Sie diese "
+"dann bei Bedarf."
+
+#. module: magentoerpconnect
+#: help:magento.backend,warehouse_id:0
+msgid "Warehouse used to compute the stock quantities."
+msgstr "Zentrallager zur Bestände Berechnung"
+
+#. module: magentoerpconnect
+#: field:magento.account.invoice,sync_date:0
+#: field:magento.address,sync_date:0
+#: field:magento.binding,sync_date:0
+#: field:magento.product.category,sync_date:0
+#: field:magento.product.product,sync_date:0
+#: field:magento.res.partner,sync_date:0
+#: field:magento.res.partner.category,sync_date:0
+#: field:magento.sale.order,sync_date:0
+#: field:magento.sale.order.line,sync_date:0
+#: field:magento.stock.picking.out,sync_date:0
+#: field:magento.store,sync_date:0
+#: field:magento.storeview,sync_date:0
+#: field:magento.website,sync_date:0
+msgid "Last synchronization date"
+msgstr "Letzte Synchronisierung"
+
+#. module: magentoerpconnect
+#: help:magento.backend,default_category_id:0
+msgid ""
+"If a default category is selected, products imported without a category will "
+"be linked to it."
+msgstr ""
+"Durch eine vor-eingestellte Standard Kategorie, werden alle Produkte, ohne "
+"irgendeine Kategorie dann mit dieser verlinkt."
+
+#. module: magentoerpconnect
+#: help:magento.storeview,import_orders_from_date:0
+msgid ""
+"do not consider non-imported sale orders before this date. Leave empty to "
+"import all sale orders"
+msgstr ""
+"Vernachlässigen Sie die nicht-importierten Aufträge vor diesem Datum. Bitte "
+"tragen Sie nichts ein, um sämtliche  Aufträge zu importieren."
+
+#. module: magentoerpconnect
+#: help:magento.store,send_picking_done_mail:0
+msgid ""
+"Does the picking export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+"Soll bei Erstellung / Export eines Lieferscheins eine E-Mail aus Magento "
+"versendet werden ?"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,manage_stock:0
+msgid "Do Not Manage Stock"
+msgstr "Kein Lager verwalten"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "Handle the product's catalog (not implemented)"
+msgstr "Verwalre den Produktkatalog (nicht implementiert)"
+
+#. module: magentoerpconnect
+#: field:res.partner,company:0
+msgid "Company"
+msgstr "Unternehmen"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.website:0
+msgid "A website with the same ID on Magento already exists."
+msgstr "Eine Webseite mit der gleichen ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_categories_from_date:0
+msgid "Import categories from date"
+msgstr "Importiere Kategorien ab Datum"
+
+#. module: magentoerpconnect
+#: view:account.invoice:0
+#: field:account.invoice,magento_bind_ids:0
+#: view:product.category:0
+#: field:product.category,magento_bind_ids:0
+#: view:product.product:0
+#: field:product.product,magento_bind_ids:0
+#: view:res.partner:0
+#: field:res.partner,magento_bind_ids:0
+#: field:res.partner.category,magento_bind_ids:0
+#: field:sale.order,magento_bind_ids:0
+#: field:sale.order.line,magento_bind_ids:0
+#: field:sale.shop,magento_bind_ids:0
+#: field:stock.picking,magento_bind_ids:0
+#: view:stock.picking.out:0
+#: field:stock.picking.out,magento_bind_ids:0
+msgid "Magento Bindings"
+msgstr "Magento Verbindungen"
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "This installs the module magentoerpconnect_catalog."
+msgstr "Dies installiert das Modul magentoerpconnect_catalog"
+
+#. module: magentoerpconnect
+#: field:magento.address,is_magento_order_address:0
+msgid "Address from a Magento Order"
+msgstr "Adresse von einer Magento Bestellung"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_order_id:0
+msgid "Magento Order ID"
+msgstr "Magento Bestell ID"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
+msgid "magentoerpconnect.installed"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "This installs the module magentoerpconnect_export_partner."
+msgstr "Dies installiert das Modul magentoerpconnect_export_partner."
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,notes:0
+msgid "Notes"
+msgstr "Notizen"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,openerp_id:0
+msgid "Sale Order"
+msgstr "VK-Auftrag"
+
+#. module: magentoerpconnect
+#: field:magento.stock.picking.out,openerp_id:0
+msgid "Stock Picking"
+msgstr "Lagerpackauftrag"
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Extensions"
+msgstr "Erweiterungen"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Advanced Configuration"
+msgstr "Erweiterte Einstellungen"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,group_id:0
+msgid "Magento Group (Category)"
+msgstr "Magento Gruppe (Kategorie)"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
+#: view:magento.website:0
+#: field:magento.website,store_ids:0
+msgid "Stores"
+msgstr "Stores"
+
+#. module: magentoerpconnect
+#: field:magento.backend,product_stock_field_id:0
+msgid "Stock Field"
+msgstr "Lagerfeld"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner.category,openerp_id:0
+msgid "Partner Category"
+msgstr "Partnerkategorie"
+
+#. module: magentoerpconnect
+#: help:magento.product.product,magento_qty:0
+msgid "Last computed quantity to send on Magento."
+msgstr "Zuletzt errechnete Anzahl die zu Magento geschickt wird."
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
+#: view:res.partner.category:0
+msgid "Magento"
+msgstr "Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
+msgid "connector.config.settings"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_products_from_date:0
+msgid "Import products from date"
+msgstr "Importiere Produkte vom Datum"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_res_partner
+#: field:magento.address,openerp_id:0
+#: field:magento.res.partner,openerp_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_order
+msgid "Sales Order"
+msgstr "VK-Auftrag"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr "Auslieferungsaufträge"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Auftragsposition"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_pricing:0
+msgid "Prices are managed in OpenERP with pricelists"
+msgstr "Preise sind in OpenERP mit Preislisten verwaltet"
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_shipping:0
+msgid "Default Shipping"
+msgstr "Vorgegebener Versand"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.stock.picking.out:0
+msgid "A stock picking with same ID on Magento already exists."
+msgstr "Ein Packauftrag mit der gleichen ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid ""
+"By clicking on the buttons,\n"
+"                                    you will initiate the synchronizations\n"
+"                                    with Magento.\n"
+"                                    Note that the import or exports\n"
+"                                    won't be done directly,\n"
+"                                    they will create 'Jobs'\n"
+"                                    executed as soon as possible."
+msgstr ""
+"Beim Klicken des Buttons,\n"
+"                                      weden Sie die Synchronisation mit "
+"Magento initialisieren.\n"
+"                                      Beachten Sie dass Im- und Exporte "
+"nicht direkt erldedigt werden. \n"
+"                                      Es werden 'Arbeitsschritte' erstellt, "
+"die dies so früh wie möglich erledigen."
+
+#. module: magentoerpconnect
+#: help:magento.backend,product_stock_field_id:0
+msgid ""
+"Choose the field of the product which will be used for stock inventory "
+"updates.\n"
+"If empty, Quantity Available is used."
+msgstr ""
+"Wählen Sie das Feld des Produktes, welches für Lagerinventar Updates benutzt "
+"wird. \n"
+"Wenn leer, wird die verfügbare Menge benutzt."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.product:0
+msgid "A product with the same ID on Magento already exists"
+msgstr "Ein Produkt mit der gleichen ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
+msgid "Backends"
+msgstr "Backends"
+
+#. module: magentoerpconnect
+#: field:magento.backend,location:0
+msgid "Location"
+msgstr "Standort"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking
+msgid "Picking List"
+msgstr "Entnahmeliste"
+
+#. module: magentoerpconnect
+#: field:magento.backend,warehouse_id:0
+msgid "Warehouse"
+msgstr "Lager"
+
+#. module: magentoerpconnect
+#: field:magento.backend,catalog_price_tax_included:0
+msgid "Prices include tax"
+msgstr "Preise inkl. Steuer"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products categories since"
+msgstr "Importiere Produktkategorien seit"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,openerp_id:0
+msgid "Sale Order Line"
+msgstr "Verkaufsauftragsposition"
+
+#. module: magentoerpconnect
+#: field:magento.backend,username:0
+msgid "Username"
+msgstr "Benutzername"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_product_category
+#: field:magento.product.category,openerp_id:0
+msgid "Product Category"
+msgstr "Produktkategorie"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,guest_customer:0
+msgid "Guest Customer"
+msgstr "Gastkunde"
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_pricing:0
+msgid ""
+"Prices are set in OpenERP and exported to Magento.\n"
+"\n"
+"This installs the module magentoerpconnect_pricing."
+msgstr ""
+"Preise sind in OpenERP gesetzt und zu Magento exportiert.\n"
+"\n"
+"Dies installier das Modul magentoerpconnect_pricing."
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_carrier_code:0
+msgid "Magento Base Carrier Code"
+msgstr "Magento Basisspediteur Code"
+
+#. module: magentoerpconnect
+#: view:magento.website:0
+msgid "Import partners since"
+msgstr "Importiere Partner seit"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.website:0
+msgid "Import in background"
+msgstr "Importiere im Hintergrund"
+
+#. module: magentoerpconnect
+#: field:magento.account.invoice,magento_id:0
+#: field:magento.address,magento_id:0
+#: field:magento.binding,magento_id:0
+#: field:magento.product.category,magento_id:0
+#: field:magento.product.product,magento_id:0
+#: field:magento.res.partner,magento_id:0
+#: field:magento.res.partner.category,magento_id:0
+#: field:magento.sale.order,magento_id:0
+#: field:magento.sale.order.line,magento_id:0
+#: field:magento.stock.picking.out,magento_id:0
+#: field:magento.store,magento_id:0
+#: field:magento.storeview,magento_id:0
+#: field:magento.website,magento_id:0
+msgid "ID on Magento"
+msgstr "ID in Magento"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
+msgid "Magento Stores"
+msgstr "Magento Stores"
+
+#. module: magentoerpconnect
+#: field:magento.backend,pricelist_id:0
+#: field:magento.website,pricelist_id:0
+msgid "Pricelist"
+msgstr "Preisliste"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,total_amount:0
+msgid "Total amount"
+msgstr "Gesamtbetrag"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_product_category
+#: view:magento.product.category:0
+msgid "Magento Product Category"
+msgstr "Magento Produktkategorie"
+
+#. module: magentoerpconnect
+#: view:magento.product.product:0
+msgid "(recompute)"
+msgstr "(neuberechnen)"
+
+#. module: magentoerpconnect
+#: field:magento.store,openerp_id:0
+msgid "Sale Shop"
+msgstr "Verkaufsshop"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,manage_stock:0
+msgid "Manage Stock Level"
+msgstr "Verwalte Lager Level"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_backend
+#: field:magento.account.invoice,backend_id:0
+#: field:magento.address,backend_id:0
+#: view:magento.backend:0
+#: field:magento.binding,backend_id:0
+#: field:magento.product.category,backend_id:0
+#: field:magento.product.product,backend_id:0
+#: field:magento.res.partner,backend_id:0
+#: field:magento.res.partner.category,backend_id:0
+#: field:magento.sale.order,backend_id:0
+#: field:magento.sale.order.line,backend_id:0
+#: field:magento.stock.picking.out,backend_id:0
+#: field:magento.store,backend_id:0
+#: field:magento.storeview,backend_id:0
+#: field:magento.website,backend_id:0
+msgid "Magento Backend"
+msgstr "Magento Backend"
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders"
+msgstr "Importiere VK-Aufträge"
+
+#. module: magentoerpconnect
+#: field:magento.stock.picking.out,picking_method:0
+msgid "Picking Method"
+msgstr "Packmethode"
+
+#. module: magentoerpconnect
+#: view:res.partner:0
+#: field:res.partner,magento_address_bind_ids:0
+msgid "Magento Address Bindings"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.store,send_invoice_paid_mail:0
+msgid "Send email notification on invoice paid"
+msgstr "Sende E-Mail bei bezahlter Rechnung"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_storeview
+msgid "Magento Storeviews"
+msgstr "Magento Storeviews"
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders since"
+msgstr "Importiere VK-Aufträge seit"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "Sell Quantity < 0"
+msgstr "Verkaufmenge < 0"
+
+#. module: magentoerpconnect
+#: help:magento.sale.order,magento_order_id:0
+msgid "'order_id' field in Magento"
+msgstr "'order_id' Feld in Magento"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,magento_parent_id:0
+msgid "Magento Parent Category"
+msgstr "Magento Überkategorie"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,emailid:0
+msgid "E-mail address"
+msgstr "E-Mail Adresse"
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Partial"
+msgstr "Teilweise"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_shop
+msgid "Sales Shop"
+msgstr "Verkaufsshop"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,total_amount_tax:0
+msgid "Total amount w. tax"
+msgstr "Gesamtbetrag inkl. Steuern"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_storeview
+#: view:magento.storeview:0
+msgid "Magento Storeview"
+msgstr "Magento Storeview"
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_lang_id:0
+msgid "Default Language"
+msgstr "Standardsprache"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_parent_id:0
+msgid "Parent Magento Order"
+msgstr "Übergeordneter Vk-Auftrag"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_address
+#: view:magento.address:0
+msgid "Magento Address"
+msgstr "Magento Adresse"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Update"
+msgstr "Update"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_storeview
+#: view:magento.store:0
+#: field:magento.store,storeview_ids:0
+msgid "Storeviews"
+msgstr "Storeviews"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+#: selection:magento.product.product,manage_stock:0
+msgid "Use Default Config"
+msgstr "Verwende Standartkonfiguration"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,store_id:0
+msgid "Store"
+msgstr "Store"
+
+#. module: magentoerpconnect
+#: field:magento.backend,website_ids:0
+msgid "Website"
+msgstr "Webseite"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Magento Configuration"
+msgstr "Magento Konfiguration"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Update all the products stock quantities"
+msgstr "Update alle Lagerstückzahlen"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import partners from all websites"
+msgstr "Importiere Partner von allen Webseiten"
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Magentoerpconnect"
+msgstr "Magentoerpconnect"
+
+#. module: magentoerpconnect
+#: view:magento.store:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Options"
+msgstr "Optionen"
+
+#. module: magentoerpconnect
+#: field:res.partner,birthday:0
+msgid "Birthday"
+msgstr "Geburtstag"
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_category_id:0
+msgid "Default Product Category"
+msgstr "Voreingestellte Produktkategorie"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,magento_qty:0
+msgid "Computed Quantity"
+msgstr "Errechnete Menge"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_website
+msgid "Magento Websites"
+msgstr "Magento Webseiten"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order_line
+msgid "Magento Sale Order Line"
+msgstr "Magento Auftragszeile"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.category:0
+msgid "A product category with same ID on Magento already exists."
+msgstr ""
+"Eine Produktkategorie mit der gleichen ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: field:magento.product.product,product_type:0
+msgid "Magento Product Type"
+msgstr "Magento Produkttyp"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,lang_id:0
+msgid "Language"
+msgstr "Sprache"
+
+#. module: magentoerpconnect
+#: field:magento.address,created_at:0
+#: field:magento.product.product,created_at:0
+#: field:magento.res.partner,created_at:0
+msgid "Created At (on Magento)"
+msgstr "Erstellt am (in Magento)"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_export_tracking:0
+msgid "Export tracking numbers"
+msgstr "Exportiere Sendungsverfolgungsnummern"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,sort_order:0
+#: field:magento.website,sort_order:0
+msgid "Sort Order"
+msgstr "Sortiere VK-Auftrag"
+
+#. module: magentoerpconnect
+#: field:magento.backend,product_binding_ids:0
+#: field:magento.website,product_binding_ids:0
+msgid "Magento Products"
+msgstr "Magento Produkte"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,import_orders_from_date:0
+msgid "Import sale orders from date"
+msgstr "Importiere VK-Aufträge vom Datum"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_res_partner_category
+msgid "Partner Categories"
+msgstr "Partnerkategorien"
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_billing:0
+msgid "Default Invoice"
+msgstr "Voreingestellte Rechnung"
+
+#. module: magentoerpconnect
+#: view:magento.store:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Informations"
+msgstr "Informationen"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,code:0
+#: field:magento.website,code:0
+msgid "Code"
+msgstr "Code"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,tax_rate:0
+msgid "Tax Rate"
+msgstr "Steuersatz"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Imports"
+msgstr "Importe"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_backend
+msgid "Magento Backends"
+msgstr "Magento Backends"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,magento_child_ids:0
+msgid "Magento Child Categories"
+msgstr "Untergeordnete Magento Kategorien"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "Export Partners to Magento (experimental)"
+msgstr "Exportiere Partner zu Magento (experimentell)"
+
+#. module: magentoerpconnect
+#: field:magento.backend,version:0
+msgid "Version"
+msgstr "Version"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_account_invoice
+#: field:magento.account.invoice,openerp_id:0
+msgid "Invoice"
+msgstr "Rechnung"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_code:0
+msgid "Magento Carrier Code"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner.category:0
+msgid "A partner tag with same ID on Magento already exists."
+msgstr "Ein Partner Tag mit der gleichen ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,taxvat:0
+msgid "Magento VAT"
+msgstr "Magento VAT"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner.category,tax_class_id:0
+msgid "Tax Class ID"
+msgstr "Steuersatz ID"
+
+#. module: magentoerpconnect
+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount
+msgid "Total Amount differs from Magento"
+msgstr "Gesamtwert unterscheidet sich zu Magento"
+
+#. module: magentoerpconnect
+#: field:magento.store,send_picking_done_mail:0
+msgid "Send email notification on picking done"
+msgstr "Sende Versandbestätigung per E-Mail"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_binding
+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner_category
+msgid "Magento Binding (abstract)"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_account_invoice
+msgid "Magento Account Invoice"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.store:0
+msgid "A store with the same ID on Magento already exists."
+msgstr "Ein Store mit der ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner
+#: field:magento.address,magento_partner_id:0
+#: view:magento.res.partner:0
+msgid "Magento Partner"
+msgstr "Magento Partner"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.storeview:0
+msgid "A storeview with same ID on Magento already exists."
+msgstr "Ein Storeview mit der ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_stock_picking_out
+#: view:magento.stock.picking.out:0
+msgid "Magento Delivery Order"
+msgstr "Magento Versandauftrag"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products since"
+msgstr "Importiere/Update Produkte seit"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,description:0
+msgid "Description"
+msgstr "Beschreibung"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "Sell Quantity < 0 and Use Customer Notification"
+msgstr "Verkaufsmenge < 0 und benutzte Kundenbenachrichtigungen"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.account.invoice:0
+msgid "An invoice with the same ID on Magento already exists."
+msgstr "Eine Rechnung mit der ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner:0
+msgid "A partner with same ID on Magento already exists for this website."
+msgstr ""
+"Ein Partner mit der ID existiert in Magento bereits für diese Webseite."
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "e.g. http://my.magento.com";
+msgstr "e.g. http://my.magento.com";
+
+#. module: magentoerpconnect
+#: view:magento.account.invoice:0
+msgid "Magento Invoice"
+msgstr "Magento Rechnung"
+
+#. module: magentoerpconnect
+#: field:magento.backend,password:0
+msgid "Password"
+msgstr "Passwort"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Main Configuration"
+msgstr "Hauptkonfiguration"
+
+#. module: magentoerpconnect
+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount
+msgid ""
+"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+msgstr ""
+"Die in OpenERP errechnete Summe stimmt nicht mit der aus Magento überein.\n"
+"\n"
+"Grund:\n"
+"Die Steuern sind evtl. verschieden zwischen OpenERP und Magento. Eine "
+"Finanzposition hat die Endsumme evtl. verändert.\n"
+"\n"
+"Lösung:\n"
+"Überprüfen Sie Steuern und Finanzpositionen und korrigieren Sie diese, falls "
+"nötig."
+
+#. module: magentoerpconnect
+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount_tax
+msgid "Total Tax Amount differs from Magento"
+msgstr "Steuersumme unterscheidet sich zu Magento"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import all customer groups"
+msgstr "Importiere alle Kundengruppen"
+
+#. module: magentoerpconnect
+#: field:magento.backend,name:0
+#: field:magento.storeview,name:0
+#: field:magento.website,name:0
+msgid "Name"
+msgstr "Name"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_website
+#: field:magento.address,website_id:0
+#: field:magento.res.partner,website_id:0
+#: field:magento.store,website_id:0
+#: view:magento.website:0
+msgid "Magento Website"
+msgstr "Magento Webseite"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,enabled:0
+msgid "Enabled"
+msgstr "Aktiviert"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,backorders:0
+msgid "Manage Inventory Backorders"
+msgstr "Verwalte Inventarrücksendungen"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_product_product
+#: field:magento.product.product,openerp_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Synchronize Metadata"
+msgstr "Synchronisiere Metadaten"
+
+#. module: magentoerpconnect
+#: help:magento.website,pricelist_id:0
+msgid ""
+"The pricelist used to define the prices of the products in Magento for this "
+"website.\n"
+"Choose a pricelist only if the prices are different for this website.\n"
+"When empty, the default price will be used."
+msgstr ""
+"Die Preisliste, welche benutzt wird, um die Preise der Produkte der Webseite "
+"in Magento zu definieren.\n"
+"Wählen Sie eine Preisliste nur, wenn die Preis sich für diese Webseite "
+"unterscheiden. \n"
+"Wenn leer,  wird der Standartpreis benutzt."
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
+msgid "Carrier"
+msgstr "Frachtführer"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_website
+#: view:magento.backend:0
+#: field:magento.product.product,website_ids:0
+msgid "Websites"
+msgstr "Webseiten"
+
+#. module: magentoerpconnect
+#: view:magento.product.product:0
+msgid "Inventory Options"
+msgstr "Sortimentsoptionen"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "No Sell"
+msgstr "Kein Verkauf"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid ""
+"Once imported,\n"
+"                                    some types of records,\n"
+"                                    like the products or categories,\n"
+"                                    need a manual review.\n"
+"                                    You will find the list\n"
+"                                    of the new records to review\n"
+"                                    in the menu 'Connectors > Checkpoint'."
+msgstr ""
+"Einmal importiert,\n"
+"                                 einige Typen von Daten, \n"
+"                                 wie die Produkte oder Kategorien, \n"
+"                                 brauchen eine manuelle Überprüfung.\n"
+"                                 Sie finden die Liste der zu Überprüfenden "
+"Daten in dem \n"
+"                                 Menü 'Connectors > Checkpunkte'."
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_tracking_title:0
+msgid "Magento Tracking Title"
+msgstr "Magento Sendungsverfolgungstitel"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,manage_stock:0
+msgid "Manage Stock"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,updated_at:0
+#: field:magento.product.product,updated_at:0
+#: field:magento.res.partner,updated_at:0
+msgid "Updated At (on Magento)"
+msgstr ""
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Complete"
+msgstr "Vollständig"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_store
+#: view:magento.store:0
+msgid "Magento Store"
+msgstr "Magento Store"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_product_product
+#: view:magento.product.product:0
+msgid "Magento Product"
+msgstr "Magento Produkt"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order
+#: field:magento.account.invoice,magento_order_id:0
+#: field:magento.sale.order.line,magento_order_id:0
+#: field:magento.stock.picking.out,magento_order_id:0
+msgid "Magento Sale Order"
+msgstr "Magento VK-Auftrag"
+
+#. module: magentoerpconnect
+#: field:magento.website,import_partners_from_date:0
+msgid "Import partners from date"
+msgstr "Importiere Partner seit Datum"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.sale.order:0
+#: sql_constraint:magento.sale.order.line:0
+msgid "A sale order line with the same ID on Magento already exists."
+msgstr "Eine VK-Auftragszeile mit der ID existiert bereits in Magento."
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_order_line_ids:0
+msgid "Magento Order Lines"
+msgstr "Magento Auftragszeilen"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,newsletter:0
+msgid "Newsletter"
+msgstr "Newsletter"
+
+#. module: magentoerpconnect
+#: help:magento.backend,default_lang_id:0
+msgid ""
+"If a default language is selected, the records will be imported in the "
+"translation of this language.\n"
+"Note that a similar configuration exists for each storeview."
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.address:0
+msgid "A partner address with same ID on Magento already exists."
+msgstr ""

=== removed file 'magentoerpconnect/i18n/de.po'
--- magentoerpconnect/i18n/de.po	2014-01-13 12:22:35 +0000
+++ magentoerpconnect/i18n/de.po	1970-01-01 00:00:00 +0000
@@ -1,1058 +0,0 @@
-# German translation for openerp-connector-magento
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openerp-connector-magento package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openerp-connector-magento\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-05-01 12:45+0000\n"
-"PO-Revision-Date: 2014-01-09 09:13+0000\n"
-"Last-Translator: Jan-Philipp Fischer <jan-philipp.fischer@xxxxxxxxxxxxxx>\n"
-"Language-Team: German <de@xxxxxx>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-09 09:24+0000\n"
-"X-Generator: Launchpad (build 16884)\n"
-
-#. module: magentoerpconnect
-#: help:magento.backend,pricelist_id:0
-msgid "The price list used to define the prices of the products in Magento."
-msgstr ""
-"Die Preisliste wird benutzt, um die Preise der Produkte in Magento zu "
-"definieren."
-
-#. module: magentoerpconnect
-#: help:magento.store,send_invoice_paid_mail:0
-msgid ""
-"Does the invoice export/creation should send an email notification on "
-"Magento side?"
-msgstr ""
-"Soll der Rechnungsexport, die Rechnungserstelltung eine E-Mail auf "
-"Magentoseite verschicken?"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import sales orders from all store views"
-msgstr "Importiere VK-Aufträge von allen Store Views"
-
-#. module: magentoerpconnect
-#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
-msgid ""
-"The tax amount computed in OpenERP doesn't match with the tax amount in "
-"Magento.\n"
-"\n"
-"Cause:\n"
-"The taxes are probably different between OpenERP and Magento. A fiscal "
-"position could have changed the final price.\n"
-"\n"
-"Resolution:\n"
-"Check your taxes and fiscal positions configuration and correct them if "
-"necessary."
-msgstr ""
-"Die Steuersumme in OpenERP stimmt nicht mit der Steuersumme von Magento "
-"überein.\n"
-"\n"
-"Grund:\n"
-"Die Steuern sind eventuell verschieden zwischen OpenERP und Magento. Eine "
-"Finanzposition hat evtl. die Endsumme geändert.\n"
-"\n"
-"Lösung:\n"
-"Überprüfen Sie die Steuer und Finanzpositionen Konfigurationen und "
-"korrigieren Sie diese falls erforderlich."
-
-#. module: magentoerpconnect
-#: help:magento.backend,warehouse_id:0
-msgid "Warehouse used to compute the stock quantities."
-msgstr "Lager benutzt zum errechnen von Lagermengen."
-
-#. module: magentoerpconnect
-#: field:magento.account.invoice,sync_date:0
-#: field:magento.address,sync_date:0
-#: field:magento.binding,sync_date:0
-#: field:magento.product.category,sync_date:0
-#: field:magento.product.product,sync_date:0
-#: field:magento.res.partner,sync_date:0
-#: field:magento.res.partner.category,sync_date:0
-#: field:magento.sale.order,sync_date:0
-#: field:magento.sale.order.line,sync_date:0
-#: field:magento.stock.picking.out,sync_date:0
-#: field:magento.store,sync_date:0
-#: field:magento.storeview,sync_date:0
-#: field:magento.website,sync_date:0
-msgid "Last synchronization date"
-msgstr "Letztes Synchronisationsdatum"
-
-#. module: magentoerpconnect
-#: help:magento.backend,default_category_id:0
-msgid ""
-"If a default category is selected, products imported without a category will "
-"be linked to it."
-msgstr ""
-"Wenn eine voreingestellte Kategorie ausgewählt ist, werde Produkte ohne eine "
-"Kategoerie mit dieser verlinkt."
-
-#. module: magentoerpconnect
-#: help:magento.storeview,import_orders_from_date:0
-msgid ""
-"do not consider non-imported sale orders before this date. Leave empty to "
-"import all sale orders"
-msgstr ""
-"Beachte keine nicht importiereten VK-Aufträge bevor diesem Datum. Lasse leer "
-"um alle VK-Aufträge zu importieren."
-
-#. module: magentoerpconnect
-#: help:magento.store,send_picking_done_mail:0
-msgid ""
-"Does the picking export/creation should send an email notification on "
-"Magento side?"
-msgstr ""
-"Soll der Versandexport, die Versandanlage eine E-Mail auf Magento Seite "
-"schicken?"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,manage_stock:0
-msgid "Do Not Manage Stock"
-msgstr "Verwalte nicht das Lager"
-
-#. module: magentoerpconnect
-#: field:connector.config.settings,module_magentoerpconnect_catalog:0
-msgid "Handle the product's catalog (not implemented)"
-msgstr "Verwalre den Produktkatalog (nicht implementiert)"
-
-#. module: magentoerpconnect
-#: field:res.partner,company:0
-msgid "Company"
-msgstr "Unternehmen"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.website:0
-msgid "A website with the same ID on Magento already exists."
-msgstr "Eine Webseite mit der gleichen ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: field:magento.backend,import_categories_from_date:0
-msgid "Import categories from date"
-msgstr "Importiere Kategorien ab Datum"
-
-#. module: magentoerpconnect
-#: view:account.invoice:0
-#: field:account.invoice,magento_bind_ids:0
-#: view:product.category:0
-#: field:product.category,magento_bind_ids:0
-#: view:product.product:0
-#: field:product.product,magento_bind_ids:0
-#: view:res.partner:0
-#: field:res.partner,magento_bind_ids:0
-#: field:res.partner.category,magento_bind_ids:0
-#: field:sale.order,magento_bind_ids:0
-#: field:sale.order.line,magento_bind_ids:0
-#: field:sale.shop,magento_bind_ids:0
-#: field:stock.picking,magento_bind_ids:0
-#: view:stock.picking.out:0
-#: field:stock.picking.out,magento_bind_ids:0
-msgid "Magento Bindings"
-msgstr "Magento Verbindungen"
-
-#. module: magentoerpconnect
-#: help:connector.config.settings,module_magentoerpconnect_catalog:0
-msgid "This installs the module magentoerpconnect_catalog."
-msgstr "Dies installiert das Modul magentoerpconnect_catalog"
-
-#. module: magentoerpconnect
-#: field:magento.address,is_magento_order_address:0
-msgid "Address from a Magento Order"
-msgstr "Adresse von einer Magento Bestellung"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,magento_order_id:0
-msgid "Magento Order ID"
-msgstr "Magento Bestell ID"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
-msgid "magentoerpconnect.installed"
-msgstr ""
-
-#. module: magentoerpconnect
-#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
-msgid "This installs the module magentoerpconnect_export_partner."
-msgstr "Dies installiert das Modul magentoerpconnect_export_partner."
-
-#. module: magentoerpconnect
-#: field:magento.sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notizen"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,openerp_id:0
-msgid "Sale Order"
-msgstr "VK-Auftrag"
-
-#. module: magentoerpconnect
-#: field:magento.stock.picking.out,openerp_id:0
-msgid "Stock Picking"
-msgstr "Lagerpackauftrag"
-
-#. module: magentoerpconnect
-#: view:connector.config.settings:0
-msgid "Extensions"
-msgstr "Erweiterungen"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Advanced Configuration"
-msgstr "Erweiterte Einstellungen"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner,group_id:0
-msgid "Magento Group (Category)"
-msgstr "Magento Gruppe (Kategorie)"
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
-#: view:magento.website:0
-#: field:magento.website,store_ids:0
-msgid "Stores"
-msgstr "Stores"
-
-#. module: magentoerpconnect
-#: field:magento.backend,product_stock_field_id:0
-msgid "Stock Field"
-msgstr "Lagerfeld"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner.category,openerp_id:0
-msgid "Partner Category"
-msgstr "Partnerkategorie"
-
-#. module: magentoerpconnect
-#: help:magento.product.product,magento_qty:0
-msgid "Last computed quantity to send on Magento."
-msgstr "Zuletzt errechnete Anzahl die zu Magento geschickt wird."
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
-#: view:res.partner.category:0
-msgid "Magento"
-msgstr "Magento"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
-msgid "connector.config.settings"
-msgstr ""
-
-#. module: magentoerpconnect
-#: field:magento.backend,import_products_from_date:0
-msgid "Import products from date"
-msgstr "Importiere Produkte vom Datum"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_res_partner
-#: field:magento.address,openerp_id:0
-#: field:magento.res.partner,openerp_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_sale_order
-msgid "Sales Order"
-msgstr "VK-Auftrag"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
-msgid "Delivery Orders"
-msgstr "Auslieferungsaufträge"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_sale_order_line
-msgid "Sales Order Line"
-msgstr "Auftragsposition"
-
-#. module: magentoerpconnect
-#: field:connector.config.settings,module_magentoerpconnect_pricing:0
-msgid "Prices are managed in OpenERP with pricelists"
-msgstr "Preise sind in OpenERP mit Preislisten verwaltet"
-
-#. module: magentoerpconnect
-#: field:magento.address,is_default_shipping:0
-msgid "Default Shipping"
-msgstr "Vorgegebener Versand"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.stock.picking.out:0
-msgid "A stock picking with same ID on Magento already exists."
-msgstr "Ein Packauftrag mit der gleichen ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid ""
-"By clicking on the buttons,\n"
-"                                    you will initiate the synchronizations\n"
-"                                    with Magento.\n"
-"                                    Note that the import or exports\n"
-"                                    won't be done directly,\n"
-"                                    they will create 'Jobs'\n"
-"                                    executed as soon as possible."
-msgstr ""
-"Beim Klicken des Buttons,\n"
-"                                      weden Sie die Synchronisation mit "
-"Magento initialisieren.\n"
-"                                      Beachten Sie dass Im- und Exporte "
-"nicht direkt erldedigt werden. \n"
-"                                      Es werden 'Arbeitsschritte' erstellt, "
-"die dies so früh wie möglich erledigen."
-
-#. module: magentoerpconnect
-#: help:magento.backend,product_stock_field_id:0
-msgid ""
-"Choose the field of the product which will be used for stock inventory "
-"updates.\n"
-"If empty, Quantity Available is used."
-msgstr ""
-"Wählen Sie das Feld des Produktes, welches für Lagerinventar Updates benutzt "
-"wird. \n"
-"Wenn leer, wird die verfügbare Menge benutzt."
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.product.product:0
-msgid "A product with the same ID on Magento already exists"
-msgstr "Ein Produkt mit der gleichen ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
-msgid "Backends"
-msgstr "Backends"
-
-#. module: magentoerpconnect
-#: field:magento.backend,location:0
-msgid "Location"
-msgstr "Standort"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_stock_picking
-msgid "Picking List"
-msgstr "Entnahmeliste"
-
-#. module: magentoerpconnect
-#: field:magento.backend,warehouse_id:0
-msgid "Warehouse"
-msgstr "Lager"
-
-#. module: magentoerpconnect
-#: field:magento.backend,catalog_price_tax_included:0
-msgid "Prices include tax"
-msgstr "Preise inkl. Steuer"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import products categories since"
-msgstr "Importiere Produktkategorien seit"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order.line,openerp_id:0
-msgid "Sale Order Line"
-msgstr "Verkaufsauftragsposition"
-
-#. module: magentoerpconnect
-#: field:magento.backend,username:0
-msgid "Username"
-msgstr "Benutzername"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_product_category
-#: field:magento.product.category,openerp_id:0
-msgid "Product Category"
-msgstr "Produktkategorie"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner,guest_customer:0
-msgid "Guest Customer"
-msgstr "Gastkunde"
-
-#. module: magentoerpconnect
-#: help:connector.config.settings,module_magentoerpconnect_pricing:0
-msgid ""
-"Prices are set in OpenERP and exported to Magento.\n"
-"\n"
-"This installs the module magentoerpconnect_pricing."
-msgstr ""
-"Preise sind in OpenERP gesetzt und zu Magento exportiert.\n"
-"\n"
-"Dies installier das Modul magentoerpconnect_pricing."
-
-#. module: magentoerpconnect
-#: field:delivery.carrier,magento_carrier_code:0
-msgid "Magento Base Carrier Code"
-msgstr "Magento Basisspediteur Code"
-
-#. module: magentoerpconnect
-#: view:magento.website:0
-msgid "Import partners since"
-msgstr "Importiere Partner seit"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-#: view:magento.website:0
-msgid "Import in background"
-msgstr "Importiere im Hintergrund"
-
-#. module: magentoerpconnect
-#: field:magento.account.invoice,magento_id:0
-#: field:magento.address,magento_id:0
-#: field:magento.binding,magento_id:0
-#: field:magento.product.category,magento_id:0
-#: field:magento.product.product,magento_id:0
-#: field:magento.res.partner,magento_id:0
-#: field:magento.res.partner.category,magento_id:0
-#: field:magento.sale.order,magento_id:0
-#: field:magento.sale.order.line,magento_id:0
-#: field:magento.stock.picking.out,magento_id:0
-#: field:magento.store,magento_id:0
-#: field:magento.storeview,magento_id:0
-#: field:magento.website,magento_id:0
-msgid "ID on Magento"
-msgstr "ID in Magento"
-
-#. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
-msgid "Magento Stores"
-msgstr "Magento Stores"
-
-#. module: magentoerpconnect
-#: field:magento.backend,pricelist_id:0
-#: field:magento.website,pricelist_id:0
-msgid "Pricelist"
-msgstr "Preisliste"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,total_amount:0
-msgid "Total amount"
-msgstr "Gesamtbetrag"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_product_category
-#: view:magento.product.category:0
-msgid "Magento Product Category"
-msgstr "Magento Produktkategorie"
-
-#. module: magentoerpconnect
-#: view:magento.product.product:0
-msgid "(recompute)"
-msgstr "(neuberechnen)"
-
-#. module: magentoerpconnect
-#: field:magento.store,openerp_id:0
-msgid "Sale Shop"
-msgstr "Verkaufsshop"
-
-#. module: magentoerpconnect
-#: field:magento.product.product,manage_stock:0
-msgid "Manage Stock Level"
-msgstr "Verwalte Lager Level"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_backend
-#: field:magento.account.invoice,backend_id:0
-#: field:magento.address,backend_id:0
-#: view:magento.backend:0
-#: field:magento.binding,backend_id:0
-#: field:magento.product.category,backend_id:0
-#: field:magento.product.product,backend_id:0
-#: field:magento.res.partner,backend_id:0
-#: field:magento.res.partner.category,backend_id:0
-#: field:magento.sale.order,backend_id:0
-#: field:magento.sale.order.line,backend_id:0
-#: field:magento.stock.picking.out,backend_id:0
-#: field:magento.store,backend_id:0
-#: field:magento.storeview,backend_id:0
-#: field:magento.website,backend_id:0
-msgid "Magento Backend"
-msgstr "Magento Backend"
-
-#. module: magentoerpconnect
-#: view:magento.storeview:0
-msgid "Import Sale Orders"
-msgstr "Importiere VK-Aufträge"
-
-#. module: magentoerpconnect
-#: field:magento.stock.picking.out,picking_method:0
-msgid "Picking Method"
-msgstr "Packmethode"
-
-#. module: magentoerpconnect
-#: view:res.partner:0
-#: field:res.partner,magento_address_bind_ids:0
-msgid "Magento Address Bindings"
-msgstr ""
-
-#. module: magentoerpconnect
-#: field:magento.store,send_invoice_paid_mail:0
-msgid "Send email notification on invoice paid"
-msgstr "Sende E-Mail bei bezahlter Rechnung"
-
-#. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_storeview
-msgid "Magento Storeviews"
-msgstr "Magento Storeviews"
-
-#. module: magentoerpconnect
-#: view:magento.storeview:0
-msgid "Import Sale Orders since"
-msgstr "Importiere VK-Aufträge seit"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,backorders:0
-msgid "Sell Quantity < 0"
-msgstr "Verkaufmenge < 0"
-
-#. module: magentoerpconnect
-#: help:magento.sale.order,magento_order_id:0
-msgid "'order_id' field in Magento"
-msgstr "'order_id' Feld in Magento"
-
-#. module: magentoerpconnect
-#: field:magento.product.category,magento_parent_id:0
-msgid "Magento Parent Category"
-msgstr "Magento Überkategorie"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner,emailid:0
-msgid "E-mail address"
-msgstr "E-Mail Adresse"
-
-#. module: magentoerpconnect
-#: selection:magento.stock.picking.out,picking_method:0
-msgid "Partial"
-msgstr "Teilweise"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_sale_shop
-msgid "Sales Shop"
-msgstr "Verkaufsshop"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,total_amount_tax:0
-msgid "Total amount w. tax"
-msgstr "Gesamtbetrag inkl. Steuern"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_storeview
-#: view:magento.storeview:0
-msgid "Magento Storeview"
-msgstr "Magento Storeview"
-
-#. module: magentoerpconnect
-#: field:magento.backend,default_lang_id:0
-msgid "Default Language"
-msgstr "Standardsprache"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,magento_parent_id:0
-msgid "Parent Magento Order"
-msgstr "Übergeordneter Vk-Auftrag"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_address
-#: view:magento.address:0
-msgid "Magento Address"
-msgstr "Magento Adresse"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Update"
-msgstr "Update"
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_storeview
-#: view:magento.store:0
-#: field:magento.store,storeview_ids:0
-msgid "Storeviews"
-msgstr "Storeviews"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,backorders:0
-#: selection:magento.product.product,manage_stock:0
-msgid "Use Default Config"
-msgstr "Verwende Standartkonfiguration"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,store_id:0
-msgid "Store"
-msgstr "Store"
-
-#. module: magentoerpconnect
-#: field:magento.backend,website_ids:0
-msgid "Website"
-msgstr "Webseite"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Magento Configuration"
-msgstr "Magento Konfiguration"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Update all the products stock quantities"
-msgstr "Update alle Lagerstückzahlen"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import partners from all websites"
-msgstr "Importiere Partner von allen Webseiten"
-
-#. module: magentoerpconnect
-#: view:connector.config.settings:0
-msgid "Magentoerpconnect"
-msgstr "Magentoerpconnect"
-
-#. module: magentoerpconnect
-#: view:magento.store:0
-#: view:magento.storeview:0
-#: view:magento.website:0
-msgid "Options"
-msgstr "Optionen"
-
-#. module: magentoerpconnect
-#: field:res.partner,birthday:0
-msgid "Birthday"
-msgstr "Geburtstag"
-
-#. module: magentoerpconnect
-#: field:magento.backend,default_category_id:0
-msgid "Default Product Category"
-msgstr "Voreingestellte Produktkategorie"
-
-#. module: magentoerpconnect
-#: field:magento.product.product,magento_qty:0
-msgid "Computed Quantity"
-msgstr "Errechnete Menge"
-
-#. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_website
-msgid "Magento Websites"
-msgstr "Magento Webseiten"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_sale_order_line
-msgid "Magento Sale Order Line"
-msgstr "Magento Auftragszeile"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.product.category:0
-msgid "A product category with same ID on Magento already exists."
-msgstr ""
-"Eine Produktkategorie mit der gleichen ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: field:magento.product.product,product_type:0
-msgid "Magento Product Type"
-msgstr "Magento Produkttyp"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,lang_id:0
-msgid "Language"
-msgstr "Sprache"
-
-#. module: magentoerpconnect
-#: field:magento.address,created_at:0
-#: field:magento.product.product,created_at:0
-#: field:magento.res.partner,created_at:0
-msgid "Created At (on Magento)"
-msgstr "Erstellt am (in Magento)"
-
-#. module: magentoerpconnect
-#: field:delivery.carrier,magento_export_tracking:0
-msgid "Export tracking numbers"
-msgstr "Exportiere Sendungsverfolgungsnummern"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,sort_order:0
-#: field:magento.website,sort_order:0
-msgid "Sort Order"
-msgstr "Sortiere VK-Auftrag"
-
-#. module: magentoerpconnect
-#: field:magento.backend,product_binding_ids:0
-#: field:magento.website,product_binding_ids:0
-msgid "Magento Products"
-msgstr "Magento Produkte"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,import_orders_from_date:0
-msgid "Import sale orders from date"
-msgstr "Importiere VK-Aufträge vom Datum"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_res_partner_category
-msgid "Partner Categories"
-msgstr "Partnerkategorien"
-
-#. module: magentoerpconnect
-#: field:magento.address,is_default_billing:0
-msgid "Default Invoice"
-msgstr "Voreingestellte Rechnung"
-
-#. module: magentoerpconnect
-#: view:magento.store:0
-#: view:magento.storeview:0
-#: view:magento.website:0
-msgid "Informations"
-msgstr "Informationen"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,code:0
-#: field:magento.website,code:0
-msgid "Code"
-msgstr "Code"
-
-#. module: magentoerpconnect
-#: field:magento.sale.order.line,tax_rate:0
-msgid "Tax Rate"
-msgstr "Steuersatz"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-#: view:magento.storeview:0
-#: view:magento.website:0
-msgid "Imports"
-msgstr "Importe"
-
-#. module: magentoerpconnect
-#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_backend
-msgid "Magento Backends"
-msgstr "Magento Backends"
-
-#. module: magentoerpconnect
-#: field:magento.product.category,magento_child_ids:0
-msgid "Magento Child Categories"
-msgstr "Untergeordnete Magento Kategorien"
-
-#. module: magentoerpconnect
-#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
-msgid "Export Partners to Magento (experimental)"
-msgstr "Exportiere Partner zu Magento (experimentell)"
-
-#. module: magentoerpconnect
-#: field:magento.backend,version:0
-msgid "Version"
-msgstr "Version"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_account_invoice
-#: field:magento.account.invoice,openerp_id:0
-msgid "Invoice"
-msgstr "Rechnung"
-
-#. module: magentoerpconnect
-#: field:delivery.carrier,magento_code:0
-msgid "Magento Carrier Code"
-msgstr ""
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.res.partner.category:0
-msgid "A partner tag with same ID on Magento already exists."
-msgstr "Ein Partner Tag mit der gleichen ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: field:magento.res.partner,taxvat:0
-msgid "Magento VAT"
-msgstr "Magento VAT"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner.category,tax_class_id:0
-msgid "Tax Class ID"
-msgstr "Steuersatz ID"
-
-#. module: magentoerpconnect
-#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount
-msgid "Total Amount differs from Magento"
-msgstr "Gesamtwert unterscheidet sich zu Magento"
-
-#. module: magentoerpconnect
-#: field:magento.store,send_picking_done_mail:0
-msgid "Send email notification on picking done"
-msgstr "Sende Versandbestätigung per E-Mail"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_binding
-#: model:ir.model,name:magentoerpconnect.model_magento_res_partner_category
-msgid "Magento Binding (abstract)"
-msgstr ""
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_account_invoice
-msgid "Magento Account Invoice"
-msgstr ""
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.store:0
-msgid "A store with the same ID on Magento already exists."
-msgstr "Ein Store mit der ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_res_partner
-#: field:magento.address,magento_partner_id:0
-#: view:magento.res.partner:0
-msgid "Magento Partner"
-msgstr "Magento Partner"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.storeview:0
-msgid "A storeview with same ID on Magento already exists."
-msgstr "Ein Storeview mit der ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_stock_picking_out
-#: view:magento.stock.picking.out:0
-msgid "Magento Delivery Order"
-msgstr "Magento Versandauftrag"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import products since"
-msgstr "Importiere Produkte seit"
-
-#. module: magentoerpconnect
-#: field:magento.product.category,description:0
-msgid "Description"
-msgstr "Beschreibung"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,backorders:0
-msgid "Sell Quantity < 0 and Use Customer Notification"
-msgstr "Verkaufsmenge < 0 und benutzte Kundenbenachrichtigungen"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.account.invoice:0
-msgid "An invoice with the same ID on Magento already exists."
-msgstr "Eine Rechnung mit der ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.res.partner:0
-msgid "A partner with same ID on Magento already exists for this website."
-msgstr ""
-"Ein Partner mit der ID existiert in Magento bereits für diese Webseite."
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "e.g. http://my.magento.com";
-msgstr "e.g. http://my.magento.com";
-
-#. module: magentoerpconnect
-#: view:magento.account.invoice:0
-msgid "Magento Invoice"
-msgstr "Magento Rechnung"
-
-#. module: magentoerpconnect
-#: field:magento.backend,password:0
-msgid "Password"
-msgstr "Passwort"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Main Configuration"
-msgstr "Hauptkonfiguration"
-
-#. module: magentoerpconnect
-#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount
-msgid ""
-"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
-"\n"
-"Cause:\n"
-"The taxes are probably different between OpenERP and Magento. A fiscal "
-"position could have changed the final price.\n"
-"\n"
-"Resolution:\n"
-"Check your taxes and fiscal positions configuration and correct them if "
-"necessary."
-msgstr ""
-"Die in OpenERP errechnete Summe stimmt nicht mit der aus Magento überein.\n"
-"\n"
-"Grund:\n"
-"Die Steuern sind evtl. verschieden zwischen OpenERP und Magento. Eine "
-"Finanzposition hat die Endsumme evtl. verändert.\n"
-"\n"
-"Lösung:\n"
-"Überprüfen Sie Steuern und Finanzpositionen und korrigieren Sie diese, falls "
-"nötig."
-
-#. module: magentoerpconnect
-#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount_tax
-msgid "Total Tax Amount differs from Magento"
-msgstr "Steuersumme unterscheidet sich zu Magento"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Import all customer groups"
-msgstr "Importiere alle Kundengruppen"
-
-#. module: magentoerpconnect
-#: field:magento.backend,name:0
-#: field:magento.storeview,name:0
-#: field:magento.website,name:0
-msgid "Name"
-msgstr "Name"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_website
-#: field:magento.address,website_id:0
-#: field:magento.res.partner,website_id:0
-#: field:magento.store,website_id:0
-#: view:magento.website:0
-msgid "Magento Website"
-msgstr "Magento Webseite"
-
-#. module: magentoerpconnect
-#: field:magento.storeview,enabled:0
-msgid "Enabled"
-msgstr "Aktiviert"
-
-#. module: magentoerpconnect
-#: field:magento.product.product,backorders:0
-msgid "Manage Inventory Backorders"
-msgstr "Verwalte Inventarrücksendungen"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_product_product
-#: field:magento.product.product,openerp_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid "Synchronize Metadata"
-msgstr "Synchronisiere Metadaten"
-
-#. module: magentoerpconnect
-#: help:magento.website,pricelist_id:0
-msgid ""
-"The pricelist used to define the prices of the products in Magento for this "
-"website.\n"
-"Choose a pricelist only if the prices are different for this website.\n"
-"When empty, the default price will be used."
-msgstr ""
-"Die Preisliste, welche benutzt wird, um die Preise der Produkte der Webseite "
-"in Magento zu definieren.\n"
-"Wählen Sie eine Preisliste nur, wenn die Preis sich für diese Webseite "
-"unterscheiden. \n"
-"Wenn leer,  wird der Standartpreis benutzt."
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
-msgid "Carrier"
-msgstr "Frachtführer"
-
-#. module: magentoerpconnect
-#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_website
-#: view:magento.backend:0
-#: field:magento.product.product,website_ids:0
-msgid "Websites"
-msgstr "Webseiten"
-
-#. module: magentoerpconnect
-#: view:magento.product.product:0
-msgid "Inventory Options"
-msgstr "Sortimentsoptionen"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,backorders:0
-msgid "No Sell"
-msgstr "Kein Verkauf"
-
-#. module: magentoerpconnect
-#: view:magento.backend:0
-msgid ""
-"Once imported,\n"
-"                                    some types of records,\n"
-"                                    like the products or categories,\n"
-"                                    need a manual review.\n"
-"                                    You will find the list\n"
-"                                    of the new records to review\n"
-"                                    in the menu 'Connectors > Checkpoint'."
-msgstr ""
-"Einmal importiert,\n"
-"                                 einige Typen von Daten, \n"
-"                                 wie die Produkte oder Kategorien, \n"
-"                                 brauchen eine manuelle Überprüfung.\n"
-"                                 Sie finden die Liste der zu Überprüfenden "
-"Daten in dem \n"
-"                                 Menü 'Connectors > Checkpunkte'."
-
-#. module: magentoerpconnect
-#: field:delivery.carrier,magento_tracking_title:0
-msgid "Magento Tracking Title"
-msgstr "Magento Sendungsverfolgungstitel"
-
-#. module: magentoerpconnect
-#: selection:magento.product.product,manage_stock:0
-msgid "Manage Stock"
-msgstr ""
-
-#. module: magentoerpconnect
-#: field:magento.address,updated_at:0
-#: field:magento.product.product,updated_at:0
-#: field:magento.res.partner,updated_at:0
-msgid "Updated At (on Magento)"
-msgstr ""
-
-#. module: magentoerpconnect
-#: selection:magento.stock.picking.out,picking_method:0
-msgid "Complete"
-msgstr "Vollständig"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_store
-#: view:magento.store:0
-msgid "Magento Store"
-msgstr "Magento Store"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_product_product
-#: view:magento.product.product:0
-msgid "Magento Product"
-msgstr "Magento Produkt"
-
-#. module: magentoerpconnect
-#: model:ir.model,name:magentoerpconnect.model_magento_sale_order
-#: field:magento.account.invoice,magento_order_id:0
-#: field:magento.sale.order.line,magento_order_id:0
-#: field:magento.stock.picking.out,magento_order_id:0
-msgid "Magento Sale Order"
-msgstr "Magento VK-Auftrag"
-
-#. module: magentoerpconnect
-#: field:magento.website,import_partners_from_date:0
-msgid "Import partners from date"
-msgstr "Importiere Partner seit Datum"
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.sale.order:0
-#: sql_constraint:magento.sale.order.line:0
-msgid "A sale order line with the same ID on Magento already exists."
-msgstr "Eine VK-Auftragszeile mit der ID existiert bereits in Magento."
-
-#. module: magentoerpconnect
-#: field:magento.sale.order,magento_order_line_ids:0
-msgid "Magento Order Lines"
-msgstr "Magento Auftragszeilen"
-
-#. module: magentoerpconnect
-#: field:magento.res.partner,newsletter:0
-msgid "Newsletter"
-msgstr "Newsletter"
-
-#. module: magentoerpconnect
-#: help:magento.backend,default_lang_id:0
-msgid ""
-"If a default language is selected, the records will be imported in the "
-"translation of this language.\n"
-"Note that a similar configuration exists for each storeview."
-msgstr ""
-
-#. module: magentoerpconnect
-#: sql_constraint:magento.address:0
-msgid "A partner address with same ID on Magento already exists."
-msgstr ""

=== added file 'magentoerpconnect/i18n/es.po'
--- magentoerpconnect/i18n/es.po	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/i18n/es.po	2014-03-19 10:37:13 +0000
@@ -0,0 +1,1053 @@
+# Spanish translation for openerp-connector-magento
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openerp-connector-magento package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-connector-magento\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-01 12:45+0000\n"
+"PO-Revision-Date: 2014-02-28 14:21+0000\n"
+"Last-Translator: Alberto Garcia (Factor Libre) "
+"<alberto.garcia@xxxxxxxxxxxxxxx>\n"
+"Language-Team: Spanish <es@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-03-01 05:56+0000\n"
+"X-Generator: Launchpad (build 16948)\n"
+
+#. module: magentoerpconnect
+#: help:magento.backend,pricelist_id:0
+msgid "The price list used to define the prices of the products in Magento."
+msgstr "La tarifa usada para definir los precios de los productos en Magento"
+
+#. module: magentoerpconnect
+#: help:magento.store,send_invoice_paid_mail:0
+msgid ""
+"Does the invoice export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+"La creación/exportación de la factura debe enviar una notificación por email "
+"desde Magento?"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import sales orders from all store views"
+msgstr "Importar ordenes de ventas de todas las vistas de tienda"
+
+#. module: magentoerpconnect
+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
+msgid ""
+"The tax amount computed in OpenERP doesn't match with the tax amount in "
+"Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+msgstr ""
+"The tax amount computed in OpenERP doesn't match with the tax amount in "
+"Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+
+#. module: magentoerpconnect
+#: help:magento.backend,warehouse_id:0
+msgid "Warehouse used to compute the stock quantities."
+msgstr "Almacén utilizado para computar las cantidades de stock"
+
+#. module: magentoerpconnect
+#: field:magento.account.invoice,sync_date:0
+#: field:magento.address,sync_date:0
+#: field:magento.binding,sync_date:0
+#: field:magento.product.category,sync_date:0
+#: field:magento.product.product,sync_date:0
+#: field:magento.res.partner,sync_date:0
+#: field:magento.res.partner.category,sync_date:0
+#: field:magento.sale.order,sync_date:0
+#: field:magento.sale.order.line,sync_date:0
+#: field:magento.stock.picking.out,sync_date:0
+#: field:magento.store,sync_date:0
+#: field:magento.storeview,sync_date:0
+#: field:magento.website,sync_date:0
+msgid "Last synchronization date"
+msgstr "Fecha última sincronización"
+
+#. module: magentoerpconnect
+#: help:magento.backend,default_category_id:0
+msgid ""
+"If a default category is selected, products imported without a category will "
+"be linked to it."
+msgstr ""
+"If a default category is selected, products imported without a category will "
+"be linked to it."
+
+#. module: magentoerpconnect
+#: help:magento.storeview,import_orders_from_date:0
+msgid ""
+"do not consider non-imported sale orders before this date. Leave empty to "
+"import all sale orders"
+msgstr ""
+"do not consider non-imported sale orders before this date. Leave empty to "
+"import all sale orders"
+
+#. module: magentoerpconnect
+#: help:magento.store,send_picking_done_mail:0
+msgid ""
+"Does the picking export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+"Does the picking export/creation should send an email notification on "
+"Magento side?"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,manage_stock:0
+msgid "Do Not Manage Stock"
+msgstr "No se controla stock"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "Handle the product's catalog (not implemented)"
+msgstr "Handle the product's catalog (not implemented)"
+
+#. module: magentoerpconnect
+#: field:res.partner,company:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.website:0
+msgid "A website with the same ID on Magento already exists."
+msgstr "Una web con las misma ID existe en Magento"
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_categories_from_date:0
+msgid "Import categories from date"
+msgstr "Importar categorías desde fecha"
+
+#. module: magentoerpconnect
+#: view:account.invoice:0
+#: field:account.invoice,magento_bind_ids:0
+#: view:product.category:0
+#: field:product.category,magento_bind_ids:0
+#: view:product.product:0
+#: field:product.product,magento_bind_ids:0
+#: view:res.partner:0
+#: field:res.partner,magento_bind_ids:0
+#: field:res.partner.category,magento_bind_ids:0
+#: field:sale.order,magento_bind_ids:0
+#: field:sale.order.line,magento_bind_ids:0
+#: field:sale.shop,magento_bind_ids:0
+#: field:stock.picking,magento_bind_ids:0
+#: view:stock.picking.out:0
+#: field:stock.picking.out,magento_bind_ids:0
+msgid "Magento Bindings"
+msgstr "Magento Bindings"
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "This installs the module magentoerpconnect_catalog."
+msgstr "Esto instala el módulo magentoerpconnect_catalog."
+
+#. module: magentoerpconnect
+#: field:magento.address,is_magento_order_address:0
+msgid "Address from a Magento Order"
+msgstr "Dirección desde un Pedido Magento"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_order_id:0
+msgid "Magento Order ID"
+msgstr "Id Pedido Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
+msgid "magentoerpconnect.installed"
+msgstr "magentoerpconnect.installed"
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "This installs the module magentoerpconnect_export_partner."
+msgstr "This installs the module magentoerpconnect_export_partner."
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,openerp_id:0
+msgid "Sale Order"
+msgstr "Pedido de Venta"
+
+#. module: magentoerpconnect
+#: field:magento.stock.picking.out,openerp_id:0
+msgid "Stock Picking"
+msgstr "Albaran"
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Extensions"
+msgstr "Extensiones"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Advanced Configuration"
+msgstr "Configuración avanzada"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,group_id:0
+msgid "Magento Group (Category)"
+msgstr "Grupo Magento (Categoría)"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
+#: view:magento.website:0
+#: field:magento.website,store_ids:0
+msgid "Stores"
+msgstr "Tiendas"
+
+#. module: magentoerpconnect
+#: field:magento.backend,product_stock_field_id:0
+msgid "Stock Field"
+msgstr "Campo Stock"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner.category,openerp_id:0
+msgid "Partner Category"
+msgstr "Categoría de empresa"
+
+#. module: magentoerpconnect
+#: help:magento.product.product,magento_qty:0
+msgid "Last computed quantity to send on Magento."
+msgstr "Ultima cantidad computada enviada a Magento"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
+#: view:res.partner.category:0
+msgid "Magento"
+msgstr "Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
+msgid "connector.config.settings"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_products_from_date:0
+msgid "Import products from date"
+msgstr "Importar productos desde fecha"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_res_partner
+#: field:magento.address,openerp_id:0
+#: field:magento.res.partner,openerp_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_order
+msgid "Sales Order"
+msgstr "Pedidos de venta"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr "Albaranes"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Lineas Pedidos Venta"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_pricing:0
+msgid "Prices are managed in OpenERP with pricelists"
+msgstr "Precios son gestionados en OpenERP con Tarifas"
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_shipping:0
+msgid "Default Shipping"
+msgstr "Forma Envio Por Defecto"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.stock.picking.out:0
+msgid "A stock picking with same ID on Magento already exists."
+msgstr "A stock picking with same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid ""
+"By clicking on the buttons,\n"
+"                                    you will initiate the synchronizations\n"
+"                                    with Magento.\n"
+"                                    Note that the import or exports\n"
+"                                    won't be done directly,\n"
+"                                    they will create 'Jobs'\n"
+"                                    executed as soon as possible."
+msgstr ""
+"By clicking on the buttons,\n"
+"                                    you will initiate the synchronizations\n"
+"                                    with Magento.\n"
+"                                    Note that the import or exports\n"
+"                                    won't be done directly,\n"
+"                                    they will create 'Jobs'\n"
+"                                    executed as soon as possible."
+
+#. module: magentoerpconnect
+#: help:magento.backend,product_stock_field_id:0
+msgid ""
+"Choose the field of the product which will be used for stock inventory "
+"updates.\n"
+"If empty, Quantity Available is used."
+msgstr ""
+"Choose the field of the product which will be used for stock inventory "
+"updates.\n"
+"If empty, Quantity Available is used."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.product:0
+msgid "A product with the same ID on Magento already exists"
+msgstr "A product with the same ID on Magento already exists"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
+msgid "Backends"
+msgstr "Backends"
+
+#. module: magentoerpconnect
+#: field:magento.backend,location:0
+msgid "Location"
+msgstr "Localización"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: magentoerpconnect
+#: field:magento.backend,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacen"
+
+#. module: magentoerpconnect
+#: field:magento.backend,catalog_price_tax_included:0
+msgid "Prices include tax"
+msgstr "Precios incluyen impuestos"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products categories since"
+msgstr "Importar categorias productos desde"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,openerp_id:0
+msgid "Sale Order Line"
+msgstr "Línea Pedido Venta"
+
+#. module: magentoerpconnect
+#: field:magento.backend,username:0
+msgid "Username"
+msgstr "Usuario"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_product_category
+#: field:magento.product.category,openerp_id:0
+msgid "Product Category"
+msgstr "Categoría Producto"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,guest_customer:0
+msgid "Guest Customer"
+msgstr "Cliente Anónimo"
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_pricing:0
+msgid ""
+"Prices are set in OpenERP and exported to Magento.\n"
+"\n"
+"This installs the module magentoerpconnect_pricing."
+msgstr ""
+"Prices are set in OpenERP and exported to Magento.\n"
+"\n"
+"This installs the module magentoerpconnect_pricing."
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_carrier_code:0
+msgid "Magento Base Carrier Code"
+msgstr "Magento Base Carrier Code"
+
+#. module: magentoerpconnect
+#: view:magento.website:0
+msgid "Import partners since"
+msgstr "Importar empresas desde"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.website:0
+msgid "Import in background"
+msgstr "Importar en segundo plano"
+
+#. module: magentoerpconnect
+#: field:magento.account.invoice,magento_id:0
+#: field:magento.address,magento_id:0
+#: field:magento.binding,magento_id:0
+#: field:magento.product.category,magento_id:0
+#: field:magento.product.product,magento_id:0
+#: field:magento.res.partner,magento_id:0
+#: field:magento.res.partner.category,magento_id:0
+#: field:magento.sale.order,magento_id:0
+#: field:magento.sale.order.line,magento_id:0
+#: field:magento.stock.picking.out,magento_id:0
+#: field:magento.store,magento_id:0
+#: field:magento.storeview,magento_id:0
+#: field:magento.website,magento_id:0
+msgid "ID on Magento"
+msgstr "ID en Magento"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
+msgid "Magento Stores"
+msgstr "Tiendas Magento"
+
+#. module: magentoerpconnect
+#: field:magento.backend,pricelist_id:0
+#: field:magento.website,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,total_amount:0
+msgid "Total amount"
+msgstr "Cantidad Total"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_product_category
+#: view:magento.product.category:0
+msgid "Magento Product Category"
+msgstr "Categoría Producto Magento"
+
+#. module: magentoerpconnect
+#: view:magento.product.product:0
+msgid "(recompute)"
+msgstr "(recompitar)"
+
+#. module: magentoerpconnect
+#: field:magento.store,openerp_id:0
+msgid "Sale Shop"
+msgstr "Tienda Venta"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,manage_stock:0
+msgid "Manage Stock Level"
+msgstr "Gestión Nivel Stock"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_backend
+#: field:magento.account.invoice,backend_id:0
+#: field:magento.address,backend_id:0
+#: view:magento.backend:0
+#: field:magento.binding,backend_id:0
+#: field:magento.product.category,backend_id:0
+#: field:magento.product.product,backend_id:0
+#: field:magento.res.partner,backend_id:0
+#: field:magento.res.partner.category,backend_id:0
+#: field:magento.sale.order,backend_id:0
+#: field:magento.sale.order.line,backend_id:0
+#: field:magento.stock.picking.out,backend_id:0
+#: field:magento.store,backend_id:0
+#: field:magento.storeview,backend_id:0
+#: field:magento.website,backend_id:0
+msgid "Magento Backend"
+msgstr "Magento Backend"
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders"
+msgstr "Importar"
+
+#. module: magentoerpconnect
+#: field:magento.stock.picking.out,picking_method:0
+msgid "Picking Method"
+msgstr "Método Picking"
+
+#. module: magentoerpconnect
+#: view:res.partner:0
+#: field:res.partner,magento_address_bind_ids:0
+msgid "Magento Address Bindings"
+msgstr "Magento Address Bindings"
+
+#. module: magentoerpconnect
+#: field:magento.store,send_invoice_paid_mail:0
+msgid "Send email notification on invoice paid"
+msgstr "Enviar notificación email cuando se pague la factura"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_storeview
+msgid "Magento Storeviews"
+msgstr "Vista Tienda Magento"
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders since"
+msgstr "Importar Pedidos Venta desde"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "Sell Quantity < 0"
+msgstr "Vendes Cantidad < 0"
+
+#. module: magentoerpconnect
+#: help:magento.sale.order,magento_order_id:0
+msgid "'order_id' field in Magento"
+msgstr "'order_id' field in Magento"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,magento_parent_id:0
+msgid "Magento Parent Category"
+msgstr "Categoría Padre Magento"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,emailid:0
+msgid "E-mail address"
+msgstr "E-mail"
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Partial"
+msgstr "Parcial"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_shop
+msgid "Sales Shop"
+msgstr "Tienda Ventas"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,total_amount_tax:0
+msgid "Total amount w. tax"
+msgstr "Total w. impuesto"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_storeview
+#: view:magento.storeview:0
+msgid "Magento Storeview"
+msgstr "Vista Tienda Magento"
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_lang_id:0
+msgid "Default Language"
+msgstr "Idioma por defecto"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_parent_id:0
+msgid "Parent Magento Order"
+msgstr "Pedido Magento Padre"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_address
+#: view:magento.address:0
+msgid "Magento Address"
+msgstr "Dirección Magento"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Update"
+msgstr "Actualizar"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_storeview
+#: view:magento.store:0
+#: field:magento.store,storeview_ids:0
+msgid "Storeviews"
+msgstr "Vistas Tiendas"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+#: selection:magento.product.product,manage_stock:0
+msgid "Use Default Config"
+msgstr "Usar Configuración por defecto"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,store_id:0
+msgid "Store"
+msgstr "Tienda"
+
+#. module: magentoerpconnect
+#: field:magento.backend,website_ids:0
+msgid "Website"
+msgstr "Sitio Web"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Magento Configuration"
+msgstr "Magento Configuration"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Update all the products stock quantities"
+msgstr "Actualizar el stock de todos los productos"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import partners from all websites"
+msgstr "Importar empresas de todos los sitios web"
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Magentoerpconnect"
+msgstr "Magentoerpconnect"
+
+#. module: magentoerpconnect
+#: view:magento.store:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Options"
+msgstr "Opciones"
+
+#. module: magentoerpconnect
+#: field:res.partner,birthday:0
+msgid "Birthday"
+msgstr "Cumpleaños"
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_category_id:0
+msgid "Default Product Category"
+msgstr "Categoría Producto por Defecto"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,magento_qty:0
+msgid "Computed Quantity"
+msgstr "Computed Quantity"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_website
+msgid "Magento Websites"
+msgstr "Sitio Web Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order_line
+msgid "Magento Sale Order Line"
+msgstr "Línea Pedido Venta Magento"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.category:0
+msgid "A product category with same ID on Magento already exists."
+msgstr "A product category with same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: field:magento.product.product,product_type:0
+msgid "Magento Product Type"
+msgstr "Tipo Producto Magento"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,lang_id:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: magentoerpconnect
+#: field:magento.address,created_at:0
+#: field:magento.product.product,created_at:0
+#: field:magento.res.partner,created_at:0
+msgid "Created At (on Magento)"
+msgstr "Creado a las (en Magento)"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_export_tracking:0
+msgid "Export tracking numbers"
+msgstr "Exportar Números de Seguimiento"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,sort_order:0
+#: field:magento.website,sort_order:0
+msgid "Sort Order"
+msgstr "Orden de Clasificación"
+
+#. module: magentoerpconnect
+#: field:magento.backend,product_binding_ids:0
+#: field:magento.website,product_binding_ids:0
+msgid "Magento Products"
+msgstr "Productos Magento"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,import_orders_from_date:0
+msgid "Import sale orders from date"
+msgstr "Importar pedidos venta desde fecha"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_res_partner_category
+msgid "Partner Categories"
+msgstr "Categorías Empresas"
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_billing:0
+msgid "Default Invoice"
+msgstr "Factura por defecto"
+
+#. module: magentoerpconnect
+#: view:magento.store:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Informations"
+msgstr "Informaciones"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,code:0
+#: field:magento.website,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,tax_rate:0
+msgid "Tax Rate"
+msgstr "Impuesto"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Imports"
+msgstr "Importaciones"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_backend
+msgid "Magento Backends"
+msgstr "Magento Backends"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,magento_child_ids:0
+msgid "Magento Child Categories"
+msgstr "Subcategorias Magento"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "Export Partners to Magento (experimental)"
+msgstr "Exportar Empresas a Magento (experimental)"
+
+#. module: magentoerpconnect
+#: field:magento.backend,version:0
+msgid "Version"
+msgstr "Versión"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_account_invoice
+#: field:magento.account.invoice,openerp_id:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_code:0
+msgid "Magento Carrier Code"
+msgstr "Modo de Envio Magento"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner.category:0
+msgid "A partner tag with same ID on Magento already exists."
+msgstr "A partner tag with same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,taxvat:0
+msgid "Magento VAT"
+msgstr "Impuesto Magento"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner.category,tax_class_id:0
+msgid "Tax Class ID"
+msgstr "Tax Class ID"
+
+#. module: magentoerpconnect
+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount
+msgid "Total Amount differs from Magento"
+msgstr "Importe Total Difiere de Magento"
+
+#. module: magentoerpconnect
+#: field:magento.store,send_picking_done_mail:0
+msgid "Send email notification on picking done"
+msgstr "Enviar email de notificación cuando sea realizado el picking"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_binding
+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner_category
+msgid "Magento Binding (abstract)"
+msgstr "Magento Binding (abstract)"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_account_invoice
+msgid "Magento Account Invoice"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.store:0
+msgid "A store with the same ID on Magento already exists."
+msgstr "A store with the same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner
+#: field:magento.address,magento_partner_id:0
+#: view:magento.res.partner:0
+msgid "Magento Partner"
+msgstr "Empresa Magento"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.storeview:0
+msgid "A storeview with same ID on Magento already exists."
+msgstr "A storeview with same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_stock_picking_out
+#: view:magento.stock.picking.out:0
+msgid "Magento Delivery Order"
+msgstr "Albaran Magento"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products since"
+msgstr "Importar productos desde"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "Sell Quantity < 0 and Use Customer Notification"
+msgstr "Vender cantidad z 0 y Usar Notificación Cliente"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.account.invoice:0
+msgid "An invoice with the same ID on Magento already exists."
+msgstr "An invoice with the same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner:0
+msgid "A partner with same ID on Magento already exists for this website."
+msgstr "A partner with same ID on Magento already exists for this website."
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "e.g. http://my.magento.com";
+msgstr "e.g. http://my.magento.com";
+
+#. module: magentoerpconnect
+#: view:magento.account.invoice:0
+msgid "Magento Invoice"
+msgstr "Factura Magento"
+
+#. module: magentoerpconnect
+#: field:magento.backend,password:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Main Configuration"
+msgstr "Configuración Principal"
+
+#. module: magentoerpconnect
+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount
+msgid ""
+"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+msgstr ""
+"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+
+#. module: magentoerpconnect
+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount_tax
+msgid "Total Tax Amount differs from Magento"
+msgstr "Total Impuestos difiere de Magento"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import all customer groups"
+msgstr "Importar todos los grupos de clientes"
+
+#. module: magentoerpconnect
+#: field:magento.backend,name:0
+#: field:magento.storeview,name:0
+#: field:magento.website,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_website
+#: field:magento.address,website_id:0
+#: field:magento.res.partner,website_id:0
+#: field:magento.store,website_id:0
+#: view:magento.website:0
+msgid "Magento Website"
+msgstr "Sitio Web Magento"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,enabled:0
+msgid "Enabled"
+msgstr "Activado"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,backorders:0
+msgid "Manage Inventory Backorders"
+msgstr "Manage Inventory Backorders"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_product_product
+#: field:magento.product.product,openerp_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Synchronize Metadata"
+msgstr "Sincronizar Metadata"
+
+#. module: magentoerpconnect
+#: help:magento.website,pricelist_id:0
+msgid ""
+"The pricelist used to define the prices of the products in Magento for this "
+"website.\n"
+"Choose a pricelist only if the prices are different for this website.\n"
+"When empty, the default price will be used."
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
+msgid "Carrier"
+msgstr "Transportista"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_website
+#: view:magento.backend:0
+#: field:magento.product.product,website_ids:0
+msgid "Websites"
+msgstr "Sitios Web"
+
+#. module: magentoerpconnect
+#: view:magento.product.product:0
+msgid "Inventory Options"
+msgstr "Opciones Inventario"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "No Sell"
+msgstr "No Vender"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid ""
+"Once imported,\n"
+"                                    some types of records,\n"
+"                                    like the products or categories,\n"
+"                                    need a manual review.\n"
+"                                    You will find the list\n"
+"                                    of the new records to review\n"
+"                                    in the menu 'Connectors > Checkpoint'."
+msgstr ""
+"Once imported,\n"
+"                                    some types of records,\n"
+"                                    like the products or categories,\n"
+"                                    need a manual review.\n"
+"                                    You will find the list\n"
+"                                    of the new records to review\n"
+"                                    in the menu 'Connectors > Checkpoint'."
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_tracking_title:0
+msgid "Magento Tracking Title"
+msgstr "Magento Tracking Title"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,manage_stock:0
+msgid "Manage Stock"
+msgstr "Gestionar Stock"
+
+#. module: magentoerpconnect
+#: field:magento.address,updated_at:0
+#: field:magento.product.product,updated_at:0
+#: field:magento.res.partner,updated_at:0
+msgid "Updated At (on Magento)"
+msgstr "Updated At (on Magento)"
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Complete"
+msgstr "Completo"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_store
+#: view:magento.store:0
+msgid "Magento Store"
+msgstr "Tienda Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_product_product
+#: view:magento.product.product:0
+msgid "Magento Product"
+msgstr "Producto Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order
+#: field:magento.account.invoice,magento_order_id:0
+#: field:magento.sale.order.line,magento_order_id:0
+#: field:magento.stock.picking.out,magento_order_id:0
+msgid "Magento Sale Order"
+msgstr "Pedido Venta Magento"
+
+#. module: magentoerpconnect
+#: field:magento.website,import_partners_from_date:0
+msgid "Import partners from date"
+msgstr "Importar empresas desde fecha"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.sale.order:0
+#: sql_constraint:magento.sale.order.line:0
+msgid "A sale order line with the same ID on Magento already exists."
+msgstr "A sale order line with the same ID on Magento already exists."
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_order_line_ids:0
+msgid "Magento Order Lines"
+msgstr "Lineas Pedido Venta Magento"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,newsletter:0
+msgid "Newsletter"
+msgstr "Boletín"
+
+#. module: magentoerpconnect
+#: help:magento.backend,default_lang_id:0
+msgid ""
+"If a default language is selected, the records will be imported in the "
+"translation of this language.\n"
+"Note that a similar configuration exists for each storeview."
+msgstr ""
+"If a default language is selected, the records will be imported in the "
+"translation of this language.\n"
+"Note that a similar configuration exists for each storeview."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.address:0
+msgid "A partner address with same ID on Magento already exists."
+msgstr "A partner address with same ID on Magento already exists."

=== modified file 'magentoerpconnect/i18n/fr.po'
--- magentoerpconnect/i18n/fr.po	2014-01-07 05:34:21 +0000
+++ magentoerpconnect/i18n/fr.po	2014-03-19 10:37:13 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-07 05:34+0000\n"
-"X-Generator: Launchpad (build 16877)\n"
+"X-Launchpad-Export-Date: 2014-02-27 06:35+0000\n"
+"X-Generator: Launchpad (build 16935)\n"
 
 #. module: magentoerpconnect
 #: help:magento.backend,pricelist_id:0

=== added file 'magentoerpconnect/i18n/it.po'
--- magentoerpconnect/i18n/it.po	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/i18n/it.po	2014-03-19 10:37:13 +0000
@@ -0,0 +1,1004 @@
+# Italian translation for openerp-connector-magento
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openerp-connector-magento package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-connector-magento\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-01 12:45+0000\n"
+"PO-Revision-Date: 2014-02-13 13:32+0000\n"
+"Last-Translator: Davide Corio @ LS <davide.corio@xxxxxxxx>\n"
+"Language-Team: Italian <it@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-02-27 06:35+0000\n"
+"X-Generator: Launchpad (build 16935)\n"
+
+#. module: magentoerpconnect
+#: help:magento.backend,pricelist_id:0
+msgid "The price list used to define the prices of the products in Magento."
+msgstr "Listino prezzo usato per definire i prezzi dei prodotti in Magento."
+
+#. module: magentoerpconnect
+#: help:magento.store,send_invoice_paid_mail:0
+msgid ""
+"Does the invoice export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+"Si vuole che l'esportazione/creazione di fatture invii un email di notifica "
+"da Magento?"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import sales orders from all store views"
+msgstr "Importa ordini di vendita da tutte le viste negozio."
+
+#. module: magentoerpconnect
+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
+msgid ""
+"The tax amount computed in OpenERP doesn't match with the tax amount in "
+"Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,warehouse_id:0
+msgid "Warehouse used to compute the stock quantities."
+msgstr "Magazzino usato per la valorizzazione delle scorte."
+
+#. module: magentoerpconnect
+#: field:magento.account.invoice,sync_date:0
+#: field:magento.address,sync_date:0
+#: field:magento.binding,sync_date:0
+#: field:magento.product.category,sync_date:0
+#: field:magento.product.product,sync_date:0
+#: field:magento.res.partner,sync_date:0
+#: field:magento.res.partner.category,sync_date:0
+#: field:magento.sale.order,sync_date:0
+#: field:magento.sale.order.line,sync_date:0
+#: field:magento.stock.picking.out,sync_date:0
+#: field:magento.store,sync_date:0
+#: field:magento.storeview,sync_date:0
+#: field:magento.website,sync_date:0
+msgid "Last synchronization date"
+msgstr "Data ultima sincronizzazione"
+
+#. module: magentoerpconnect
+#: help:magento.backend,default_category_id:0
+msgid ""
+"If a default category is selected, products imported without a category will "
+"be linked to it."
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.storeview,import_orders_from_date:0
+msgid ""
+"do not consider non-imported sale orders before this date. Leave empty to "
+"import all sale orders"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.store,send_picking_done_mail:0
+msgid ""
+"Does the picking export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,manage_stock:0
+msgid "Do Not Manage Stock"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "Handle the product's catalog (not implemented)"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:res.partner,company:0
+msgid "Company"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.website:0
+msgid "A website with the same ID on Magento already exists."
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_categories_from_date:0
+msgid "Import categories from date"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:account.invoice:0
+#: field:account.invoice,magento_bind_ids:0
+#: view:product.category:0
+#: field:product.category,magento_bind_ids:0
+#: view:product.product:0
+#: field:product.product,magento_bind_ids:0
+#: view:res.partner:0
+#: field:res.partner,magento_bind_ids:0
+#: field:res.partner.category,magento_bind_ids:0
+#: field:sale.order,magento_bind_ids:0
+#: field:sale.order.line,magento_bind_ids:0
+#: field:sale.shop,magento_bind_ids:0
+#: field:stock.picking,magento_bind_ids:0
+#: view:stock.picking.out:0
+#: field:stock.picking.out,magento_bind_ids:0
+msgid "Magento Bindings"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "This installs the module magentoerpconnect_catalog."
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,is_magento_order_address:0
+msgid "Address from a Magento Order"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_order_id:0
+msgid "Magento Order ID"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
+msgid "magentoerpconnect.installed"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "This installs the module magentoerpconnect_export_partner."
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,openerp_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.stock.picking.out,openerp_id:0
+msgid "Stock Picking"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Extensions"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Advanced Configuration"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,group_id:0
+msgid "Magento Group (Category)"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
+#: view:magento.website:0
+#: field:magento.website,store_ids:0
+msgid "Stores"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,product_stock_field_id:0
+msgid "Stock Field"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.res.partner.category,openerp_id:0
+msgid "Partner Category"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.product.product,magento_qty:0
+msgid "Last computed quantity to send on Magento."
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
+#: view:res.partner.category:0
+msgid "Magento"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
+msgid "connector.config.settings"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_products_from_date:0
+msgid "Import products from date"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_res_partner
+#: field:magento.address,openerp_id:0
+#: field:magento.res.partner,openerp_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_pricing:0
+msgid "Prices are managed in OpenERP with pricelists"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_shipping:0
+msgid "Default Shipping"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.stock.picking.out:0
+msgid "A stock picking with same ID on Magento already exists."
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid ""
+"By clicking on the buttons,\n"
+"                                    you will initiate the synchronizations\n"
+"                                    with Magento.\n"
+"                                    Note that the import or exports\n"
+"                                    won't be done directly,\n"
+"                                    they will create 'Jobs'\n"
+"                                    executed as soon as possible."
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,product_stock_field_id:0
+msgid ""
+"Choose the field of the product which will be used for stock inventory "
+"updates.\n"
+"If empty, Quantity Available is used."
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.product:0
+msgid "A product with the same ID on Magento already exists"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
+msgid "Backends"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,location:0
+msgid "Location"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,catalog_price_tax_included:0
+msgid "Prices include tax"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products categories since"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,openerp_id:0
+msgid "Sale Order Line"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,username:0
+msgid "Username"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_product_category
+#: field:magento.product.category,openerp_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,guest_customer:0
+msgid "Guest Customer"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_pricing:0
+msgid ""
+"Prices are set in OpenERP and exported to Magento.\n"
+"\n"
+"This installs the module magentoerpconnect_pricing."
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_carrier_code:0
+msgid "Magento Base Carrier Code"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.website:0
+msgid "Import partners since"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.website:0
+msgid "Import in background"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.account.invoice,magento_id:0
+#: field:magento.address,magento_id:0
+#: field:magento.binding,magento_id:0
+#: field:magento.product.category,magento_id:0
+#: field:magento.product.product,magento_id:0
+#: field:magento.res.partner,magento_id:0
+#: field:magento.res.partner.category,magento_id:0
+#: field:magento.sale.order,magento_id:0
+#: field:magento.sale.order.line,magento_id:0
+#: field:magento.stock.picking.out,magento_id:0
+#: field:magento.store,magento_id:0
+#: field:magento.storeview,magento_id:0
+#: field:magento.website,magento_id:0
+msgid "ID on Magento"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
+msgid "Magento Stores"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,pricelist_id:0
+#: field:magento.website,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,total_amount:0
+msgid "Total amount"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_product_category
+#: view:magento.product.category:0
+msgid "Magento Product Category"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.product.product:0
+msgid "(recompute)"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.store,openerp_id:0
+msgid "Sale Shop"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.product.product,manage_stock:0
+msgid "Manage Stock Level"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_backend
+#: field:magento.account.invoice,backend_id:0
+#: field:magento.address,backend_id:0
+#: view:magento.backend:0
+#: field:magento.binding,backend_id:0
+#: field:magento.product.category,backend_id:0
+#: field:magento.product.product,backend_id:0
+#: field:magento.res.partner,backend_id:0
+#: field:magento.res.partner.category,backend_id:0
+#: field:magento.sale.order,backend_id:0
+#: field:magento.sale.order.line,backend_id:0
+#: field:magento.stock.picking.out,backend_id:0
+#: field:magento.store,backend_id:0
+#: field:magento.storeview,backend_id:0
+#: field:magento.website,backend_id:0
+msgid "Magento Backend"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.stock.picking.out,picking_method:0
+msgid "Picking Method"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:res.partner:0
+#: field:res.partner,magento_address_bind_ids:0
+msgid "Magento Address Bindings"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.store,send_invoice_paid_mail:0
+msgid "Send email notification on invoice paid"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_storeview
+msgid "Magento Storeviews"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders since"
+msgstr ""
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "Sell Quantity < 0"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.sale.order,magento_order_id:0
+msgid "'order_id' field in Magento"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.product.category,magento_parent_id:0
+msgid "Magento Parent Category"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,emailid:0
+msgid "E-mail address"
+msgstr ""
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Partial"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,total_amount_tax:0
+msgid "Total amount w. tax"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_storeview
+#: view:magento.storeview:0
+msgid "Magento Storeview"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_lang_id:0
+msgid "Default Language"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_parent_id:0
+msgid "Parent Magento Order"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_address
+#: view:magento.address:0
+msgid "Magento Address"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Update"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_storeview
+#: view:magento.store:0
+#: field:magento.store,storeview_ids:0
+msgid "Storeviews"
+msgstr ""
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+#: selection:magento.product.product,manage_stock:0
+msgid "Use Default Config"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.storeview,store_id:0
+msgid "Store"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,website_ids:0
+msgid "Website"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Magento Configuration"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Update all the products stock quantities"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import partners from all websites"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Magentoerpconnect"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.store:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Options"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:res.partner,birthday:0
+msgid "Birthday"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_category_id:0
+msgid "Default Product Category"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.product.product,magento_qty:0
+msgid "Computed Quantity"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_website
+msgid "Magento Websites"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order_line
+msgid "Magento Sale Order Line"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.category:0
+msgid "A product category with same ID on Magento already exists."
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.product.product,product_type:0
+msgid "Magento Product Type"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.storeview,lang_id:0
+msgid "Language"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,created_at:0
+#: field:magento.product.product,created_at:0
+#: field:magento.res.partner,created_at:0
+msgid "Created At (on Magento)"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_export_tracking:0
+msgid "Export tracking numbers"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.storeview,sort_order:0
+#: field:magento.website,sort_order:0
+msgid "Sort Order"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,product_binding_ids:0
+#: field:magento.website,product_binding_ids:0
+msgid "Magento Products"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.storeview,import_orders_from_date:0
+msgid "Import sale orders from date"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_res_partner_category
+msgid "Partner Categories"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_billing:0
+msgid "Default Invoice"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.store:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Informations"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.storeview,code:0
+#: field:magento.website,code:0
+msgid "Code"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,tax_rate:0
+msgid "Tax Rate"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Imports"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_backend
+msgid "Magento Backends"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.product.category,magento_child_ids:0
+msgid "Magento Child Categories"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "Export Partners to Magento (experimental)"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,version:0
+msgid "Version"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_account_invoice
+#: field:magento.account.invoice,openerp_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_code:0
+msgid "Magento Carrier Code"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner.category:0
+msgid "A partner tag with same ID on Magento already exists."
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,taxvat:0
+msgid "Magento VAT"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.res.partner.category,tax_class_id:0
+msgid "Tax Class ID"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount
+msgid "Total Amount differs from Magento"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.store,send_picking_done_mail:0
+msgid "Send email notification on picking done"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_binding
+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner_category
+msgid "Magento Binding (abstract)"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_account_invoice
+msgid "Magento Account Invoice"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.store:0
+msgid "A store with the same ID on Magento already exists."
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner
+#: field:magento.address,magento_partner_id:0
+#: view:magento.res.partner:0
+msgid "Magento Partner"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.storeview:0
+msgid "A storeview with same ID on Magento already exists."
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_stock_picking_out
+#: view:magento.stock.picking.out:0
+msgid "Magento Delivery Order"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products since"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.product.category,description:0
+msgid "Description"
+msgstr ""
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "Sell Quantity < 0 and Use Customer Notification"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.account.invoice:0
+msgid "An invoice with the same ID on Magento already exists."
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner:0
+msgid "A partner with same ID on Magento already exists for this website."
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "e.g. http://my.magento.com";
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.account.invoice:0
+msgid "Magento Invoice"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,password:0
+msgid "Password"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Main Configuration"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount
+msgid ""
+"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount_tax
+msgid "Total Tax Amount differs from Magento"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import all customer groups"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.backend,name:0
+#: field:magento.storeview,name:0
+#: field:magento.website,name:0
+msgid "Name"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_website
+#: field:magento.address,website_id:0
+#: field:magento.res.partner,website_id:0
+#: field:magento.store,website_id:0
+#: view:magento.website:0
+msgid "Magento Website"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.storeview,enabled:0
+msgid "Enabled"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.product.product,backorders:0
+msgid "Manage Inventory Backorders"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_product_product
+#: field:magento.product.product,openerp_id:0
+msgid "Product"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Synchronize Metadata"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.website,pricelist_id:0
+msgid ""
+"The pricelist used to define the prices of the products in Magento for this "
+"website.\n"
+"Choose a pricelist only if the prices are different for this website.\n"
+"When empty, the default price will be used."
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
+msgid "Carrier"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_website
+#: view:magento.backend:0
+#: field:magento.product.product,website_ids:0
+msgid "Websites"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.product.product:0
+msgid "Inventory Options"
+msgstr ""
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "No Sell"
+msgstr ""
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid ""
+"Once imported,\n"
+"                                    some types of records,\n"
+"                                    like the products or categories,\n"
+"                                    need a manual review.\n"
+"                                    You will find the list\n"
+"                                    of the new records to review\n"
+"                                    in the menu 'Connectors > Checkpoint'."
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_tracking_title:0
+msgid "Magento Tracking Title"
+msgstr ""
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,manage_stock:0
+msgid "Manage Stock"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.address,updated_at:0
+#: field:magento.product.product,updated_at:0
+#: field:magento.res.partner,updated_at:0
+msgid "Updated At (on Magento)"
+msgstr ""
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Complete"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_store
+#: view:magento.store:0
+msgid "Magento Store"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_product_product
+#: view:magento.product.product:0
+msgid "Magento Product"
+msgstr ""
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order
+#: field:magento.account.invoice,magento_order_id:0
+#: field:magento.sale.order.line,magento_order_id:0
+#: field:magento.stock.picking.out,magento_order_id:0
+msgid "Magento Sale Order"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.website,import_partners_from_date:0
+msgid "Import partners from date"
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.sale.order:0
+#: sql_constraint:magento.sale.order.line:0
+msgid "A sale order line with the same ID on Magento already exists."
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_order_line_ids:0
+msgid "Magento Order Lines"
+msgstr ""
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,newsletter:0
+msgid "Newsletter"
+msgstr ""
+
+#. module: magentoerpconnect
+#: help:magento.backend,default_lang_id:0
+msgid ""
+"If a default language is selected, the records will be imported in the "
+"translation of this language.\n"
+"Note that a similar configuration exists for each storeview."
+msgstr ""
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.address:0
+msgid "A partner address with same ID on Magento already exists."
+msgstr ""

=== added file 'magentoerpconnect/i18n/nl.po'
--- magentoerpconnect/i18n/nl.po	1970-01-01 00:00:00 +0000
+++ magentoerpconnect/i18n/nl.po	2014-03-19 10:37:13 +0000
@@ -0,0 +1,1062 @@
+# Dutch translation for openerp-connector-magento
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openerp-connector-magento package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-connector-magento\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-01 12:45+0000\n"
+"PO-Revision-Date: 2014-02-13 14:11+0000\n"
+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
+"Language-Team: Dutch <nl@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-02-27 06:35+0000\n"
+"X-Generator: Launchpad (build 16935)\n"
+
+#. module: magentoerpconnect
+#: help:magento.backend,pricelist_id:0
+msgid "The price list used to define the prices of the products in Magento."
+msgstr ""
+"De prijslijst welke wordt gebruikt voor het bepalen van de prijzen van de "
+"producten in  Magento."
+
+#. module: magentoerpconnect
+#: help:magento.store,send_invoice_paid_mail:0
+msgid ""
+"Does the invoice export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+"Moet het exporteren of aanmaken van een factuur een e-mail sturen vanaf de "
+"Magento zijde?"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import sales orders from all store views"
+msgstr "Improteer verkooporders van alle winkelweergaven"
+
+#. module: magentoerpconnect
+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
+msgid ""
+"The tax amount computed in OpenERP doesn't match with the tax amount in "
+"Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+msgstr ""
+"Het BTW bedrag berekend in OpenERP komt niet overeen met het BTW bedrag in "
+"Magento in Magento.\n"
+"\n"
+"Oorzaak:\n"
+"De BTW tarieven zijn mogelijk verschillend in OpenERP en Magento of een "
+"fiscale positie heeft de uiteindelijke prijs veranderd.\n"
+"\n"
+"Oplossing:\n"
+"Controleer de BTW tarieven en de fiscale posities en corrigeer deze indien "
+"nodig.."
+
+#. module: magentoerpconnect
+#: help:magento.backend,warehouse_id:0
+msgid "Warehouse used to compute the stock quantities."
+msgstr ""
+"Het magazijn dat wordt gebruikt om de hoeveelheid op voorraad te berekenen"
+
+#. module: magentoerpconnect
+#: field:magento.account.invoice,sync_date:0
+#: field:magento.address,sync_date:0
+#: field:magento.binding,sync_date:0
+#: field:magento.product.category,sync_date:0
+#: field:magento.product.product,sync_date:0
+#: field:magento.res.partner,sync_date:0
+#: field:magento.res.partner.category,sync_date:0
+#: field:magento.sale.order,sync_date:0
+#: field:magento.sale.order.line,sync_date:0
+#: field:magento.stock.picking.out,sync_date:0
+#: field:magento.store,sync_date:0
+#: field:magento.storeview,sync_date:0
+#: field:magento.website,sync_date:0
+msgid "Last synchronization date"
+msgstr "Laatste synchronisatie datum"
+
+#. module: magentoerpconnect
+#: help:magento.backend,default_category_id:0
+msgid ""
+"If a default category is selected, products imported without a category will "
+"be linked to it."
+msgstr ""
+"Indien de standaard categorie is geselecteerd, worden producten zonder een "
+"categorie aan deze standaard categorie gekoppeld."
+
+#. module: magentoerpconnect
+#: help:magento.storeview,import_orders_from_date:0
+msgid ""
+"do not consider non-imported sale orders before this date. Leave empty to "
+"import all sale orders"
+msgstr ""
+"Houdt geen rekening met de niet geïmporteerde verkooporders voor deze datum. "
+"Laat leeg om alle verkooporders importeren"
+
+#. module: magentoerpconnect
+#: help:magento.store,send_picking_done_mail:0
+msgid ""
+"Does the picking export/creation should send an email notification on "
+"Magento side?"
+msgstr ""
+"Moet het exporteren of aanmaken van een uitgaande levering een e-mail sturen "
+"vanaf de Magento zijde?"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,manage_stock:0
+msgid "Do Not Manage Stock"
+msgstr "Geen voorraad beheren"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "Handle the product's catalog (not implemented)"
+msgstr "Beheer de producten categolus (Niet geïmplementeerd)"
+
+#. module: magentoerpconnect
+#: field:res.partner,company:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.website:0
+msgid "A website with the same ID on Magento already exists."
+msgstr "Een website met dezelfde ID bestaat als in Magento."
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_categories_from_date:0
+msgid "Import categories from date"
+msgstr "Importeer productcategorien vanaf"
+
+#. module: magentoerpconnect
+#: view:account.invoice:0
+#: field:account.invoice,magento_bind_ids:0
+#: view:product.category:0
+#: field:product.category,magento_bind_ids:0
+#: view:product.product:0
+#: field:product.product,magento_bind_ids:0
+#: view:res.partner:0
+#: field:res.partner,magento_bind_ids:0
+#: field:res.partner.category,magento_bind_ids:0
+#: field:sale.order,magento_bind_ids:0
+#: field:sale.order.line,magento_bind_ids:0
+#: field:sale.shop,magento_bind_ids:0
+#: field:stock.picking,magento_bind_ids:0
+#: view:stock.picking.out:0
+#: field:stock.picking.out,magento_bind_ids:0
+msgid "Magento Bindings"
+msgstr "Magento koppelingen"
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_catalog:0
+msgid "This installs the module magentoerpconnect_catalog."
+msgstr "Dit installeert de module magentoerpconnect_catalog."
+
+#. module: magentoerpconnect
+#: field:magento.address,is_magento_order_address:0
+msgid "Address from a Magento Order"
+msgstr "Adres van een Magento order"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_order_id:0
+msgid "Magento Order ID"
+msgstr "Magento order ID"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
+msgid "magentoerpconnect.installed"
+msgstr "magentoerpconnect.installed"
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "This installs the module magentoerpconnect_export_partner."
+msgstr "Dit installeert de module magentoerpconnect_export_partner."
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,notes:0
+msgid "Notes"
+msgstr "Notities"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,openerp_id:0
+msgid "Sale Order"
+msgstr "Verkooporder"
+
+#. module: magentoerpconnect
+#: field:magento.stock.picking.out,openerp_id:0
+msgid "Stock Picking"
+msgstr "Uitgaande levering"
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Extensions"
+msgstr "Extensies"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Advanced Configuration"
+msgstr "Geavanceerde configuratie"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,group_id:0
+msgid "Magento Group (Category)"
+msgstr "Magento groep (Categorie)"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
+#: view:magento.website:0
+#: field:magento.website,store_ids:0
+msgid "Stores"
+msgstr "Winkels"
+
+#. module: magentoerpconnect
+#: field:magento.backend,product_stock_field_id:0
+msgid "Stock Field"
+msgstr "Voorraad veld"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner.category,openerp_id:0
+msgid "Partner Category"
+msgstr "Relatiecategorie"
+
+#. module: magentoerpconnect
+#: help:magento.product.product,magento_qty:0
+msgid "Last computed quantity to send on Magento."
+msgstr "Laatst berekende hoeveelheid om te versturen naar Magento"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
+#: view:res.partner.category:0
+msgid "Magento"
+msgstr "Magento"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
+msgid "connector.config.settings"
+msgstr "connector.config.settings"
+
+#. module: magentoerpconnect
+#: field:magento.backend,import_products_from_date:0
+msgid "Import products from date"
+msgstr "Importeer producten vanaf"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_res_partner
+#: field:magento.address,openerp_id:0
+#: field:magento.res.partner,openerp_id:0
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_order
+msgid "Sales Order"
+msgstr "Verkooporder"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
+msgid "Delivery Orders"
+msgstr "Uitgaande leveringen"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Verkooporderregel"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_pricing:0
+msgid "Prices are managed in OpenERP with pricelists"
+msgstr "Prijzen worden beheert in OpenERP door middel van prijslijsten"
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_shipping:0
+msgid "Default Shipping"
+msgstr "Standaard verzending"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.stock.picking.out:0
+msgid "A stock picking with same ID on Magento already exists."
+msgstr "Een uitgaande levering met hetzelfde ID bestaat al in Magento."
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid ""
+"By clicking on the buttons,\n"
+"                                    you will initiate the synchronizations\n"
+"                                    with Magento.\n"
+"                                    Note that the import or exports\n"
+"                                    won't be done directly,\n"
+"                                    they will create 'Jobs'\n"
+"                                    executed as soon as possible."
+msgstr ""
+"Door op de knoppen te drukken,\n"
+"                                    start u de synchronisatie\n"
+"                                    met Magento.\n"
+"                                    Houdt er rekening mee dat de \n"
+"                                    import of export niet direct start,\n"
+"                                    maar dat zij 'taken' genereren\n"
+"                                    welke z.s.m. worden uitgevoerd."
+
+#. module: magentoerpconnect
+#: help:magento.backend,product_stock_field_id:0
+msgid ""
+"Choose the field of the product which will be used for stock inventory "
+"updates.\n"
+"If empty, Quantity Available is used."
+msgstr ""
+"Kies het veld van het product welke wordt gebruikt voor het bijwerken van de "
+"voorraad.\n"
+"Indien leeg wordt de beschikbare voorraad gebruikt."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.product:0
+msgid "A product with the same ID on Magento already exists"
+msgstr "Een product met hetzelfde ID bestaat al in Magento."
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
+msgid "Backends"
+msgstr "Backends"
+
+#. module: magentoerpconnect
+#: field:magento.backend,location:0
+msgid "Location"
+msgstr "Locatie"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_stock_picking
+msgid "Picking List"
+msgstr "Verzamellijst"
+
+#. module: magentoerpconnect
+#: field:magento.backend,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazijn"
+
+#. module: magentoerpconnect
+#: field:magento.backend,catalog_price_tax_included:0
+msgid "Prices include tax"
+msgstr "Prijzen incl. BTW"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products categories since"
+msgstr "Importeer product categorieën vanaf"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,openerp_id:0
+msgid "Sale Order Line"
+msgstr "Verkooporderregel"
+
+#. module: magentoerpconnect
+#: field:magento.backend,username:0
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_product_category
+#: field:magento.product.category,openerp_id:0
+msgid "Product Category"
+msgstr "Productcategorie"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,guest_customer:0
+msgid "Guest Customer"
+msgstr "Gast klant"
+
+#. module: magentoerpconnect
+#: help:connector.config.settings,module_magentoerpconnect_pricing:0
+msgid ""
+"Prices are set in OpenERP and exported to Magento.\n"
+"\n"
+"This installs the module magentoerpconnect_pricing."
+msgstr ""
+"Prijzen worden ingesteld in OpenERP en geëxporteerd naar Magento.\n"
+"\n"
+"Dit installeert de module magentoerpconnect_pricing."
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_carrier_code:0
+msgid "Magento Base Carrier Code"
+msgstr "Magento standaard vervoerderscode"
+
+#. module: magentoerpconnect
+#: view:magento.website:0
+msgid "Import partners since"
+msgstr "Importeer relaties vanaf"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.website:0
+msgid "Import in background"
+msgstr "Importeer op de achtergrond"
+
+#. module: magentoerpconnect
+#: field:magento.account.invoice,magento_id:0
+#: field:magento.address,magento_id:0
+#: field:magento.binding,magento_id:0
+#: field:magento.product.category,magento_id:0
+#: field:magento.product.product,magento_id:0
+#: field:magento.res.partner,magento_id:0
+#: field:magento.res.partner.category,magento_id:0
+#: field:magento.sale.order,magento_id:0
+#: field:magento.sale.order.line,magento_id:0
+#: field:magento.stock.picking.out,magento_id:0
+#: field:magento.store,magento_id:0
+#: field:magento.storeview,magento_id:0
+#: field:magento.website,magento_id:0
+msgid "ID on Magento"
+msgstr "ID in Magento"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
+msgid "Magento Stores"
+msgstr "Magento winkels"
+
+#. module: magentoerpconnect
+#: field:magento.backend,pricelist_id:0
+#: field:magento.website,pricelist_id:0
+msgid "Pricelist"
+msgstr "Verzamellijst"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,total_amount:0
+msgid "Total amount"
+msgstr "Totaalbedrag"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_product_category
+#: view:magento.product.category:0
+msgid "Magento Product Category"
+msgstr "Magento product categorie"
+
+#. module: magentoerpconnect
+#: view:magento.product.product:0
+msgid "(recompute)"
+msgstr "(herbereken)"
+
+#. module: magentoerpconnect
+#: field:magento.store,openerp_id:0
+msgid "Sale Shop"
+msgstr "Verkooppunt"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,manage_stock:0
+msgid "Manage Stock Level"
+msgstr "Beheer vororaad"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_backend
+#: field:magento.account.invoice,backend_id:0
+#: field:magento.address,backend_id:0
+#: view:magento.backend:0
+#: field:magento.binding,backend_id:0
+#: field:magento.product.category,backend_id:0
+#: field:magento.product.product,backend_id:0
+#: field:magento.res.partner,backend_id:0
+#: field:magento.res.partner.category,backend_id:0
+#: field:magento.sale.order,backend_id:0
+#: field:magento.sale.order.line,backend_id:0
+#: field:magento.stock.picking.out,backend_id:0
+#: field:magento.store,backend_id:0
+#: field:magento.storeview,backend_id:0
+#: field:magento.website,backend_id:0
+msgid "Magento Backend"
+msgstr "Magento backend"
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders"
+msgstr "Importeer verkooporders"
+
+#. module: magentoerpconnect
+#: field:magento.stock.picking.out,picking_method:0
+msgid "Picking Method"
+msgstr "Verzamelmethode"
+
+#. module: magentoerpconnect
+#: view:res.partner:0
+#: field:res.partner,magento_address_bind_ids:0
+msgid "Magento Address Bindings"
+msgstr "Magento adres koppelingen"
+
+#. module: magentoerpconnect
+#: field:magento.store,send_invoice_paid_mail:0
+msgid "Send email notification on invoice paid"
+msgstr "Stuur e-mail bevestiging als de factuur betaald is"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_storeview
+msgid "Magento Storeviews"
+msgstr "Magento winkelweergaven"
+
+#. module: magentoerpconnect
+#: view:magento.storeview:0
+msgid "Import Sale Orders since"
+msgstr "Importeer verkooporders vanaf"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "Sell Quantity < 0"
+msgstr "Verkoop hoeveelheid< 0"
+
+#. module: magentoerpconnect
+#: help:magento.sale.order,magento_order_id:0
+msgid "'order_id' field in Magento"
+msgstr "'order_id' veld in Magento"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,magento_parent_id:0
+msgid "Magento Parent Category"
+msgstr "Magento bovenliggende categorie"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,emailid:0
+msgid "E-mail address"
+msgstr "E-mail adres"
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Partial"
+msgstr "Gedeeltelijk"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_sale_shop
+msgid "Sales Shop"
+msgstr "Verkooppunt"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,total_amount_tax:0
+msgid "Total amount w. tax"
+msgstr "Totaalbedrag excl. BTW"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_storeview
+#: view:magento.storeview:0
+msgid "Magento Storeview"
+msgstr "Magento winkelweergave"
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_lang_id:0
+msgid "Default Language"
+msgstr "Standaardtaal"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_parent_id:0
+msgid "Parent Magento Order"
+msgstr "Bovenliggende Mageto order"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_address
+#: view:magento.address:0
+msgid "Magento Address"
+msgstr "Magento adres"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Update"
+msgstr "Bijwerken"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_storeview
+#: view:magento.store:0
+#: field:magento.store,storeview_ids:0
+msgid "Storeviews"
+msgstr "Winkelweergaven"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+#: selection:magento.product.product,manage_stock:0
+msgid "Use Default Config"
+msgstr "Gebruik standaard configuratie"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,store_id:0
+msgid "Store"
+msgstr "Winkel"
+
+#. module: magentoerpconnect
+#: field:magento.backend,website_ids:0
+msgid "Website"
+msgstr "Website"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Magento Configuration"
+msgstr "Magento configuratie"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Update all the products stock quantities"
+msgstr "Bijwerken voorraad van alle producten"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import partners from all websites"
+msgstr "Importeer relatie van alle websites"
+
+#. module: magentoerpconnect
+#: view:connector.config.settings:0
+msgid "Magentoerpconnect"
+msgstr "Magentoerpconnect"
+
+#. module: magentoerpconnect
+#: view:magento.store:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Options"
+msgstr "Opties"
+
+#. module: magentoerpconnect
+#: field:res.partner,birthday:0
+msgid "Birthday"
+msgstr "Verjaardag"
+
+#. module: magentoerpconnect
+#: field:magento.backend,default_category_id:0
+msgid "Default Product Category"
+msgstr "Standaard productcategorie"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,magento_qty:0
+msgid "Computed Quantity"
+msgstr "Berekende hoeveelheid"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_website
+msgid "Magento Websites"
+msgstr "Magento websites"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order_line
+msgid "Magento Sale Order Line"
+msgstr "Magento verkooporderregel"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.product.category:0
+msgid "A product category with same ID on Magento already exists."
+msgstr "Een productcategorie met hetzelfde ID bestaat al in Magento."
+
+#. module: magentoerpconnect
+#: field:magento.product.product,product_type:0
+msgid "Magento Product Type"
+msgstr "Magento productsoort"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,lang_id:0
+msgid "Language"
+msgstr "Taal"
+
+#. module: magentoerpconnect
+#: field:magento.address,created_at:0
+#: field:magento.product.product,created_at:0
+#: field:magento.res.partner,created_at:0
+msgid "Created At (on Magento)"
+msgstr "Aangemaakt op (in Magento)"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_export_tracking:0
+msgid "Export tracking numbers"
+msgstr "Exporteer traceer nummers"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,sort_order:0
+#: field:magento.website,sort_order:0
+msgid "Sort Order"
+msgstr "Sorteervolgorde"
+
+#. module: magentoerpconnect
+#: field:magento.backend,product_binding_ids:0
+#: field:magento.website,product_binding_ids:0
+msgid "Magento Products"
+msgstr "Magento producten"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,import_orders_from_date:0
+msgid "Import sale orders from date"
+msgstr "Importeer verkooporders vanaf"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_res_partner_category
+msgid "Partner Categories"
+msgstr "Relatie categorieën"
+
+#. module: magentoerpconnect
+#: field:magento.address,is_default_billing:0
+msgid "Default Invoice"
+msgstr "Standaard factuur"
+
+#. module: magentoerpconnect
+#: view:magento.store:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Informations"
+msgstr "Informatie"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,code:0
+#: field:magento.website,code:0
+msgid "Code"
+msgstr "Code"
+
+#. module: magentoerpconnect
+#: field:magento.sale.order.line,tax_rate:0
+msgid "Tax Rate"
+msgstr "BTW tarief"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+#: view:magento.storeview:0
+#: view:magento.website:0
+msgid "Imports"
+msgstr "Imports"
+
+#. module: magentoerpconnect
+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_backend
+msgid "Magento Backends"
+msgstr "Magento backends"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,magento_child_ids:0
+msgid "Magento Child Categories"
+msgstr "Magento onderliggende categorien"
+
+#. module: magentoerpconnect
+#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
+msgid "Export Partners to Magento (experimental)"
+msgstr "Exporteer relaties naar Magento"
+
+#. module: magentoerpconnect
+#: field:magento.backend,version:0
+msgid "Version"
+msgstr "Versie"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_account_invoice
+#: field:magento.account.invoice,openerp_id:0
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_code:0
+msgid "Magento Carrier Code"
+msgstr "Magento vervoerdercode"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner.category:0
+msgid "A partner tag with same ID on Magento already exists."
+msgstr "Een relatie label met hetzelfde ID bestaat al in Magento."
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,taxvat:0
+msgid "Magento VAT"
+msgstr "Magento BTW"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner.category,tax_class_id:0
+msgid "Tax Class ID"
+msgstr "BTW Class ID"
+
+#. module: magentoerpconnect
+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount
+msgid "Total Amount differs from Magento"
+msgstr "Totalbedrag wijkt af van Magento"
+
+#. module: magentoerpconnect
+#: field:magento.store,send_picking_done_mail:0
+msgid "Send email notification on picking done"
+msgstr "Stuur e-mail bevestiging als de uitgaande levering gereed is"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_binding
+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner_category
+msgid "Magento Binding (abstract)"
+msgstr "Magento koppelingen (abstract)"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_account_invoice
+msgid "Magento Account Invoice"
+msgstr "Magento factuur"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.store:0
+msgid "A store with the same ID on Magento already exists."
+msgstr "Een winkel met hetzelfde ID bestaat al in Magento."
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner
+#: field:magento.address,magento_partner_id:0
+#: view:magento.res.partner:0
+msgid "Magento Partner"
+msgstr "Magento relatie"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.storeview:0
+msgid "A storeview with same ID on Magento already exists."
+msgstr "Een winkelweergave met hetzelfde ID bestaat al in Magento."
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_stock_picking_out
+#: view:magento.stock.picking.out:0
+msgid "Magento Delivery Order"
+msgstr "Magento uitgaande levering"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import products since"
+msgstr "Importeer producten vanaf"
+
+#. module: magentoerpconnect
+#: field:magento.product.category,description:0
+msgid "Description"
+msgstr "Beschrijving"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "Sell Quantity < 0 and Use Customer Notification"
+msgstr "Verkoop hoeveelheden < 0 en gebruik klant notificatie"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.account.invoice:0
+msgid "An invoice with the same ID on Magento already exists."
+msgstr "Een factuur met hetzelfde ID bestaat al in Magento."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.res.partner:0
+msgid "A partner with same ID on Magento already exists for this website."
+msgstr ""
+"Een relatie met hetzelfde ID bestaat al in Magento voor deze website."
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "e.g. http://my.magento.com";
+msgstr "Bijv. http://my.magento.com";
+
+#. module: magentoerpconnect
+#: view:magento.account.invoice:0
+msgid "Magento Invoice"
+msgstr "Magento factuur"
+
+#. module: magentoerpconnect
+#: field:magento.backend,password:0
+msgid "Password"
+msgstr "Wachtwoord"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Main Configuration"
+msgstr "Belangrijkste instellingen"
+
+#. module: magentoerpconnect
+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount
+msgid ""
+"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
+"\n"
+"Cause:\n"
+"The taxes are probably different between OpenERP and Magento. A fiscal "
+"position could have changed the final price.\n"
+"\n"
+"Resolution:\n"
+"Check your taxes and fiscal positions configuration and correct them if "
+"necessary."
+msgstr ""
+"Het bedrag berekend in OpenERP komt niet overeen met het  bedrag in Magento "
+"in Magento.\n"
+"\n"
+"Oorzaak:\n"
+"De BTW tarieven zijn mogelijk verschillend in OpenERP en Magento of een "
+"fiscale positie heeft de uiteindelijke prijs veranderd.\n"
+"\n"
+"Oplossing:\n"
+"Controleer de BTW tarieven en de fiscale posities en corrigeer deze indien "
+"nodig.."
+
+#. module: magentoerpconnect
+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount_tax
+msgid "Total Tax Amount differs from Magento"
+msgstr "Totaal BTW bedrag wijkt af van Magento"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Import all customer groups"
+msgstr "Importeer alle klant groepen"
+
+#. module: magentoerpconnect
+#: field:magento.backend,name:0
+#: field:magento.storeview,name:0
+#: field:magento.website,name:0
+msgid "Name"
+msgstr "Naam"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_website
+#: field:magento.address,website_id:0
+#: field:magento.res.partner,website_id:0
+#: field:magento.store,website_id:0
+#: view:magento.website:0
+msgid "Magento Website"
+msgstr "Magento website"
+
+#. module: magentoerpconnect
+#: field:magento.storeview,enabled:0
+msgid "Enabled"
+msgstr "Ingeschakeld"
+
+#. module: magentoerpconnect
+#: field:magento.product.product,backorders:0
+msgid "Manage Inventory Backorders"
+msgstr "Beheer voorraad backorders"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_product_product
+#: field:magento.product.product,openerp_id:0
+msgid "Product"
+msgstr "Product"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid "Synchronize Metadata"
+msgstr "Synchroniseer metadata"
+
+#. module: magentoerpconnect
+#: help:magento.website,pricelist_id:0
+msgid ""
+"The pricelist used to define the prices of the products in Magento for this "
+"website.\n"
+"Choose a pricelist only if the prices are different for this website.\n"
+"When empty, the default price will be used."
+msgstr ""
+"De prijslijst welke wordt gebruikt om de prijzen te bepalen in Magento voor "
+"deze website.\n"
+"Kies alleen ene prijslijst als de prijzen voor deze website anders zijn.\n"
+"Indien leeg wordt de standaard prijs gebruikt."
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
+msgid "Carrier"
+msgstr "Vervoerder"
+
+#. module: magentoerpconnect
+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_website
+#: view:magento.backend:0
+#: field:magento.product.product,website_ids:0
+msgid "Websites"
+msgstr "Websites"
+
+#. module: magentoerpconnect
+#: view:magento.product.product:0
+msgid "Inventory Options"
+msgstr "Voorraad opties"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,backorders:0
+msgid "No Sell"
+msgstr "Niet verkocht"
+
+#. module: magentoerpconnect
+#: view:magento.backend:0
+msgid ""
+"Once imported,\n"
+"                                    some types of records,\n"
+"                                    like the products or categories,\n"
+"                                    need a manual review.\n"
+"                                    You will find the list\n"
+"                                    of the new records to review\n"
+"                                    in the menu 'Connectors > Checkpoint'."
+msgstr ""
+"Wanneer geïmporteerd,\n"
+"                                    hebben sommige soorten regels,\n"
+"                                    zoals de producten of categorieën,\n"
+"                                    een handmatige controle nodig.\n"
+"                                    U vindt de lijst van nieuwe regels\n"
+"                                    welke dienen te worden gecontroleerd\n"
+"                                    in het menu 'Connectors > "
+"Controlepunten'."
+
+#. module: magentoerpconnect
+#: field:delivery.carrier,magento_tracking_title:0
+msgid "Magento Tracking Title"
+msgstr "Magento Tracking Title"
+
+#. module: magentoerpconnect
+#: selection:magento.product.product,manage_stock:0
+msgid "Manage Stock"
+msgstr "Beheer vororaad"
+
+#. module: magentoerpconnect
+#: field:magento.address,updated_at:0
+#: field:magento.product.product,updated_at:0
+#: field:magento.res.partner,updated_at:0
+msgid "Updated At (on Magento)"
+msgstr "Bijgewerkt op (in Magento)"
+
+#. module: magentoerpconnect
+#: selection:magento.stock.picking.out,picking_method:0
+msgid "Complete"
+msgstr "Compleet"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_store
+#: view:magento.store:0
+msgid "Magento Store"
+msgstr "Magento winkel"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_product_product
+#: view:magento.product.product:0
+msgid "Magento Product"
+msgstr "Magento product"
+
+#. module: magentoerpconnect
+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order
+#: field:magento.account.invoice,magento_order_id:0
+#: field:magento.sale.order.line,magento_order_id:0
+#: field:magento.stock.picking.out,magento_order_id:0
+msgid "Magento Sale Order"
+msgstr "Magento verkooporder"
+
+#. module: magentoerpconnect
+#: field:magento.website,import_partners_from_date:0
+msgid "Import partners from date"
+msgstr "Importeer relaties vanaf"
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.sale.order:0
+#: sql_constraint:magento.sale.order.line:0
+msgid "A sale order line with the same ID on Magento already exists."
+msgstr "Een verkooporderregel met hetzelfde ID bestaat al in Magento."
+
+#. module: magentoerpconnect
+#: field:magento.sale.order,magento_order_line_ids:0
+msgid "Magento Order Lines"
+msgstr "Magento orderregels"
+
+#. module: magentoerpconnect
+#: field:magento.res.partner,newsletter:0
+msgid "Newsletter"
+msgstr "Nieuwsbrief"
+
+#. module: magentoerpconnect
+#: help:magento.backend,default_lang_id:0
+msgid ""
+"If a default language is selected, the records will be imported in the "
+"translation of this language.\n"
+"Note that a similar configuration exists for each storeview."
+msgstr ""
+"Als een standaard taal is geselecteerd, worden de regels geïmporteerd in de "
+"vertaling van deze taal.\n"
+"Let op, deze instelling bestaat voor iedere winkelweergave."
+
+#. module: magentoerpconnect
+#: sql_constraint:magento.address:0
+msgid "A partner address with same ID on Magento already exists."
+msgstr "Een relatie adres met hetzelfde ID bestaat al in Magento."

=== modified file 'magentoerpconnect/invoice.py'
--- magentoerpconnect/invoice.py	2014-01-13 13:26:35 +0000
+++ magentoerpconnect/invoice.py	2014-03-19 10:37:13 +0000
@@ -222,13 +222,12 @@
                                   if store.backend_id.id == magento_sale.backend_id.id),
                                  None)
             assert magento_store
-			
-	    payment_method = sale.payment_method_id
-	    if payment_method and payment_method.create_invoice_on:
-            	create_invoice = payment_method.create_invoice_on
-	    else:
-		create_invoice = magento_store.create_invoice_on	    
 
+            payment_method = sale.payment_method_id
+            if payment_method and payment_method.create_invoice_on:
+                create_invoice = payment_method.create_invoice_on
+            else:
+                create_invoice = magento_store.create_invoice_on
 
             if create_invoice == invoice.state:
                 session.create('magento.account.invoice',
@@ -238,7 +237,7 @@
 
 
 @on_record_create(model_names='magento.account.invoice')
-def delay_export_account_invoice(session, model_name, record_id):
+def delay_export_account_invoice(session, model_name, record_id, vals):
     """
     Delay the job to export the magento invoice.
     """

=== modified file 'magentoerpconnect/magento_model.py'
--- magentoerpconnect/magento_model.py	2014-01-14 11:32:02 +0000
+++ magentoerpconnect/magento_model.py	2014-03-19 10:37:13 +0000
@@ -382,8 +382,10 @@
             'Create invoice on action',
             required=True,
             help="Should the invoice be created in Magento "
-                 "when it is validated or when it is paid in OpenERP?" 
-                  "This only takes effect if the SO-related Payment Method is not giving a Option for this by itself. (See Payment Methods)"),
+                 "when it is validated or when it is paid in OpenERP?\n"
+                  "This only takes effect if the sales order's related "
+                  "payment method is not giving an option for this by "
+                  "itself. (See Payment Methods)"),
     }
 
     _defaults = {

=== modified file 'magentoerpconnect/magento_model_view.xml'
--- magentoerpconnect/magento_model_view.xml	2013-08-15 08:01:46 +0000
+++ magentoerpconnect/magento_model_view.xml	2014-03-19 10:37:13 +0000
@@ -114,6 +114,14 @@
                                     <field name="sale_prefix" placeholder="mag-" />
                                     <field name="product_stock_field_id" widget="selection"
                                         domain="[('model', 'in', ['product.product', 'product.template']), ('ttype', '=', 'float')]"/>
+                                    <field name="catalog_price_tax_included"/>
+                                    <p attrs="{'invisible': [('catalog_price_tax_included', '=', False)]}">
+                                      This option should respect the same
+                                      configuration than Magento.  Pay
+                                      attention to the taxes on the products,
+                                      which should surely include prices when
+                                      this option is activated.
+                                    </p>
                                 </group>
                             </page>
 

=== modified file 'magentoerpconnect/partner.py'
--- magentoerpconnect/partner.py	2013-11-11 15:38:19 +0000
+++ magentoerpconnect/partner.py	2014-03-19 10:37:13 +0000
@@ -451,10 +451,10 @@
                     # and use the name of the company for the name
                     company_mapper = get_unit(CompanyImportMapper,
                                               'magento.res.partner')
-                    company_mapper.convert(magento_record)
+                    map_record = company_mapper.map_record(magento_record)
                     self.session.write('magento.res.partner',
                                        partner_binding_id,
-                                       company_mapper.data)
+                                       map_record.values())
                 else:
                     # for B2C individual customers, merge with the main
                     # partner

=== modified file 'magentoerpconnect/payment_invoice.py'
--- magentoerpconnect/payment_invoice.py	2014-01-14 11:32:02 +0000
+++ magentoerpconnect/payment_invoice.py	2014-03-19 10:37:13 +0000
@@ -1,13 +1,17 @@
-from osv import osv, fields
-
-class payment_invoice(osv.Model):
-	_inherit = "payment.method"
-	
-	_columns = {
-		'create_invoice_on': fields.selection(
+# -*- coding: utf-8 -*-
+from openerp.osv import orm, fields
+
+
+class payment_invoice(orm.Model):
+    _inherit = "payment.method"
+
+    _columns = {
+        'create_invoice_on': fields.selection(
             [('open', 'Validate'),
              ('paid', 'Paid')],
             'Create invoice on action',
             help="Should the invoice be created in Magento "
-                 "when it is validated or when it is paid in OpenERP? If nothing is set, Create invoice on action falls back to Store Options."),
-		}
\ No newline at end of file
+                 "when it is validated or when it is paid in OpenERP?\n"
+                 "If nothing is set, the option falls back to the same option "
+                 "on the Magento store related to the sales order."),
+    }

=== modified file 'magentoerpconnect/payment_invoice.xml'
--- magentoerpconnect/payment_invoice.xml	2014-01-13 13:26:35 +0000
+++ magentoerpconnect/payment_invoice.xml	2014-03-19 10:37:13 +0000
@@ -1,19 +1,21 @@
 <?xml version ="1.0" encoding="utf-8"?>
 
 <openerp>
-	<data>
-		
-		<record id="sale_payment_method_payment_method_view_form" model="ir.ui.view">
-			<field name="model">payment.method</field>
-			<field name="inherit_id" ref="sale_payment_method.payment_method_view_form"/>
-			<field name="arch" type="xml">
-			
-				<field name="company_id" position="after">
-					<field name="create_invoice_on" string="Create invoice on"/>
-				</field>
-				
-			</field>
-		</record>
-		
-	</data>
-</openerp>
\ No newline at end of file
+  <data>
+
+    <record id="payment_method_view_form" model="ir.ui.view">
+      <field name="model">payment.method</field>
+      <field name="inherit_id" ref="connector_ecommerce.payment_method_view_form"/>
+      <field name="arch" type="xml">
+
+        <group name="import_rule" position="after">
+          <group name="magento" string="Magento">
+            <field name="create_invoice_on" string="Create invoice on"/>
+          </group>
+        </group>
+
+      </field>
+    </record>
+
+  </data>
+</openerp>

=== modified file 'magentoerpconnect/product.py'
--- magentoerpconnect/product.py	2013-11-09 23:01:40 +0000
+++ magentoerpconnect/product.py	2014-03-19 10:37:13 +0000
@@ -28,7 +28,7 @@
 from openerp.osv import orm, fields
 from openerp.tools.translate import _
 from openerp.addons.connector.queue.job import job
-from openerp.addons.connector.event import on_record_create, on_record_write
+from openerp.addons.connector.event import on_record_write
 from openerp.addons.connector.unit.synchronizer import (ImportSynchronizer,
                                                         ExportSynchronizer
                                                         )
@@ -259,7 +259,7 @@
 
     def _sort_images(self, images):
         """ Returns a list of images sorted by their priority.
-        An image with the 'base' type is the the primary one.
+        An image with the 'image' type is the the primary one.
         The other images are sorted by their position.
 
         The returned list is reversed, the items at the end
@@ -267,11 +267,11 @@
         """
         if not images:
             return {}
-        # place the images where the type is 'base' first then
+        # place the images where the type is 'image' first then
         # sort them by the reverse priority (last item of the list has
         # the the higher priority)
         def priority(image):
-            primary = 'base' in image['types']
+            primary = 'image' in image['types']
             try:
                 position = int(image['position'])
             except ValueError:
@@ -510,10 +510,10 @@
 
 
 @on_record_write(model_names='magento.product.product')
-def magento_product_modified(session, model_name, record_id, fields=None):
+def magento_product_modified(session, model_name, record_id, vals):
     if session.context.get('connector_no_export'):
         return
-    inventory_fields = list(set(fields).intersection(INVENTORY_FIELDS))
+    inventory_fields = list(set(vals).intersection(INVENTORY_FIELDS))
     if inventory_fields:
         export_product_inventory.delay(session, model_name,
                                        record_id, fields=inventory_fields,

=== modified file 'magentoerpconnect/sale.py'
--- magentoerpconnect/sale.py	2013-11-18 15:10:50 +0000
+++ magentoerpconnect/sale.py	2014-03-19 10:37:13 +0000
@@ -33,7 +33,10 @@
                                                   ImportMapper
                                                   )
 from openerp.addons.connector_ecommerce.unit.sale_order_onchange import (
-        SaleOrderOnChange)
+    SaleOrderOnChange)
+from openerp.addons.connector_ecommerce.sale import (ShippingLineBuilder,
+                                                     CashOnDeliveryLineBuilder,
+                                                     GiftOrderLineBuilder)
 from .unit.backend_adapter import GenericAdapter
 from .unit.import_synchronizer import (DelayedBatchImport,
                                        MagentoImportSynchronizer
@@ -563,11 +566,11 @@
                 'website_id': record.get('website_id'),
             }
             mapper = self.get_connector_unit_for_model(PartnerImportMapper,
-                                                      'magento.res.partner')
-            mapper.convert(customer_record)
-            oe_record = mapper.data_for_create
-            oe_record['guest_customer'] = True
-            partner_bind_id = sess.create('magento.res.partner', oe_record)
+                                                       'magento.res.partner')
+            map_record = mapper.map_record(customer_record)
+            map_record.update(guest_customer=True)
+            partner_bind_id = sess.create('magento.res.partner',
+                                          map_record.values(for_create=True))
             partner_binder.bind(guest_customer_id,
                                 partner_bind_id)
         else:
@@ -608,10 +611,10 @@
                                                        'magento.address')
 
         def create_address(address_record):
-            addr_mapper.convert(address_record)
-            oe_address = addr_mapper.data_for_create
-            oe_address.update(addresses_defaults)
-            address_bind_id = sess.create('magento.address', oe_address)
+            map_record = addr_mapper.map_record(address_record)
+            map_record.update(addresses_defaults)
+            address_bind_id = sess.create('magento.address',
+                                          map_record.values(for_create=True))
             return sess.read('magento.address',
                              address_bind_id,
                              ['openerp_id'])['openerp_id'][0]
@@ -635,10 +638,20 @@
         data['partner_shipping_id'] = self.partner_shipping_id
         return data
 
+    def _create_data(self, map_record, **kwargs):
+        tax_include = self.backend_record.catalog_price_tax_included
+        return super(SaleOrderImport, self)._create_data(
+            map_record, tax_include=tax_include, **kwargs)
+
     def _create(self, data):
         data = self._update_special_fields(data)
         return super(SaleOrderImport, self)._create(data)
 
+    def _update_data(self, map_record, **kwargs):
+        tax_include = self.backend_record.catalog_price_tax_included
+        return super(SaleOrderImport, self)._update_data(
+            map_record, tax_include=tax_include, **kwargs)
+
     def _update(self, binding_id, data):
         data = self._update_special_fields(data)
         return super(SaleOrderImport, self)._update(binding_id, data)
@@ -671,32 +684,69 @@
     children = [('items', 'magento_order_line_ids', 'magento.sale.order.line'),
                 ]
 
-    def _after_mapping(self, result):
-        sess = self.session
-        # TODO: refactor: do no longer store the transient fields in the
-        # result, use a ConnectorUnit to create the lines
-        result = sess.pool['sale.order']._convert_special_fields(sess.cr,
-                                                                 sess.uid,
-                                                                 result,
-                                                                 result['magento_order_line_ids'],
-                                                                 sess.context)
-        # remove transient fields otherwise OpenERP will raise a warning
-        # or even fail to create the record because the fields do not
-        # exist
-        result.pop('shipping_amount_tax_excluded', None)
-        result.pop('shipping_amount_tax_included', None)
-        result.pop('shipping_tax_amount', None)
-        result.pop('gift_certificates_amount', None)
-        result.pop('gift_certificates_code', None)
+    def _add_shipping_line(self, map_record, values):
+        record = map_record.source
+        amount_incl = float(record.get('base_shipping_incl_tax') or 0.0)
+        amount_excl = float(record.get('shipping_amount') or 0.0)
+        if not (amount_incl or amount_excl):
+            return values
+        line_builder = self.get_connector_unit_for_model(MagentoShippingLineBuilder)
+        if self.options.tax_include:
+            discount = float(record.get('shipping_discount_amount') or 0.0)
+            line_builder.price_unit = (amount_incl - discount)
+        else:
+            line_builder.price_unit = amount_excl
+
+        if values.get('carrier_id'):
+            carrier = self.session.browse('delivery.carrier',
+                                          values['carrier_id'])
+            line_builder.product_id = carrier.product_id
+
+        line = (0, 0, line_builder.get_line())
+        values['order_line'].append(line)
+        return values
+
+    def _add_cash_on_delivery_line(self, map_record, values):
+        record = map_record.source
+        amount_excl = float(record.get('cod_fee') or 0.0)
+        amount_incl = float(record.get('cod_tax_amount') or 0.0)
+        if not (amount_excl or amount_incl):
+            return values
+        line_builder = self.get_connector_unit_for_model(MagentoCashOnDeliveryLineBuilder)
+        backend = self.backend_record
+        tax_include = self.options.tax_include
+        line_builder.price_unit = amount_incl if tax_include else amount_excl
+        line = (0, 0, line_builder.get_line())
+        values['order_line'].append(line)
+        return values
+
+    def _add_gift_certificate_line(self, map_record, values):
+        record = map_record.source
+        if 'gift_cert_amount' not in record:
+            return values
+        amount = float(record['gift_cert_amount'])
+        line_builder = self.get_connector_unit_for_model(MagentoGiftOrderLineBuilder)
+        line_builder.price_unit = amount
+        if 'gift_cert_code' in record:
+            line_builder.code = record['gift_cert_code']
+        line = (0, 0, line_builder.get_line())
+        values['order_line'].append(line)
+        return values
+
+    def finalize(self, map_record, values):
+        values.setdefault('order_line', [])
+        values = self._add_shipping_line(map_record, values)
+        values = self._add_cash_on_delivery_line(map_record, values)
+        values = self._add_gift_certificate_line(map_record, values)
         onchange = self.get_connector_unit_for_model(SaleOrderOnChange)
-        return onchange.play(result, result['magento_order_line_ids'])
+        return onchange.play(values, values['magento_order_line_ids'])
 
     @mapping
     def name(self, record):
         name = record['increment_id']
         prefix = self.backend_record.sale_prefix
         if prefix:
-          name = prefix + name
+            name = prefix + name
         return {'name': name}
 
     @mapping
@@ -728,33 +778,12 @@
         return {'payment_method_id': method_id}
 
     @mapping
-    def cod_fee(self, record): # cash on delivery
-        # TODO Map Me (sic)
-        pass
-
-    @mapping
-    def gift_cert_amount(self, record):
-        if 'gift_cert_amount' in record:
-            result = {'gift_certificates_amount': record['gift_cert_amount']}
-        else:
-            result = {}
-        return result
-
-    @mapping
-    def gift_cert_code(self, record):
-        if 'gift_cert_code' in record:
-            result = {'gift_certificates_code': record['gift_cert_code']}
-        else:
-            result = {}
-        return result
-
-    @mapping
     def shipping_method(self, record):
         session = self.session
         ifield = record.get('shipping_method')
         if not ifield:
             return
-        
+
         carrier_ids = session.search('delivery.carrier',
                                      [('magento_code', '=', ifield)])
         if carrier_ids:
@@ -774,24 +803,6 @@
             result = {'carrier_id': carrier_id}
         return result
 
-    @mapping
-    def base_shipping_incl_tax(self, record):
-        amount_tax_inc = float(record.get('base_shipping_incl_tax', 0.0))
-        discount = float(record.get('shipping_discount_amount', 0.0))
-        amount_tax_inc -=  discount
-        amount_tax_exc = float(record.get('shipping_amount', 0.0))
-
-        if amount_tax_exc and amount_tax_inc:
-            tax_rate = amount_tax_inc / amount_tax_exc -1
-        else:
-            tax_rate = 0
-
-        result = {'shipping_amount_tax_included': amount_tax_inc,
-                  'shipping_amount_tax_excluded': amount_tax_exc,
-                  'shipping_tax_rate': tax_rate,
-                  }
-        return result
-
     # partner_id, partner_invoice_id, partner_shipping_id
     # are done in the importer
 
@@ -866,13 +877,28 @@
         base_row_total = float(record['base_row_total'] or 0.)
         base_row_total_incl_tax = float(record['base_row_total_incl_tax'] or 0.)
         qty_ordered = float(record['qty_ordered'])
-        if backend.catalog_price_tax_included:
+        if self.options.tax_include:
             result['price_unit'] = base_row_total_incl_tax / qty_ordered
         else:
             result['price_unit'] = base_row_total / qty_ordered
         return result
 
 
+@magento
+class MagentoShippingLineBuilder(ShippingLineBuilder):
+    _model_name = 'magento.sale.order'
+
+
+@magento
+class MagentoCashOnDeliveryLineBuilder(CashOnDeliveryLineBuilder):
+    _model_name = 'magento.sale.order'
+
+
+@magento
+class MagentoGiftOrderLineBuilder(GiftOrderLineBuilder):
+    _model_name = 'magento.sale.order'
+
+
 @job
 def sale_order_import_batch(session, model_name, backend_id, filters=None):
     """ Prepare a batch import of records from Magento """

=== modified file 'magentoerpconnect/stock_picking.py'
--- magentoerpconnect/stock_picking.py	2013-11-21 18:26:50 +0000
+++ magentoerpconnect/stock_picking.py	2014-03-19 10:37:13 +0000
@@ -243,7 +243,7 @@
 
 
 @on_record_create(model_names='magento.stock.picking.out')
-def delay_export_picking_out(session, model_name, record_id):
+def delay_export_picking_out(session, model_name, record_id, vals):
     export_picking_done.delay(session, model_name, record_id)
 
 

=== modified file 'magentoerpconnect/tests/__init__.py'
--- magentoerpconnect/tests/__init__.py	2014-01-16 10:10:21 +0000
+++ magentoerpconnect/tests/__init__.py	2014-03-19 10:37:13 +0000
@@ -23,7 +23,6 @@
 import test_address_book
 import test_export_invoice
 import test_import_product_image
-import test_export_invoice_jan
 fast_suite = [
 ]
 

=== modified file 'magentoerpconnect/tests/test_data.py'
--- magentoerpconnect/tests/test_data.py	2013-10-30 13:16:37 +0000
+++ magentoerpconnect/tests/test_data.py	2014-03-19 10:37:13 +0000
@@ -25398,4 +25398,377 @@
                                           'updated_at': '2013-10-30 09:43:20',
                                           'weight': '2.0000',
                                           'x_forwarded_for': None},
+('sales_order.info', (900000695, None)): {'adjustment_negative': None,
+		                                        'adjustment_positive': None,
+		                                        'applied_rule_ids': None,
+		                                        'base_adjustment_negative': None,
+		                                        'base_adjustment_positive': None,
+		                                        'base_currency_code': 'EUR',
+		                                        'base_discount_amount': '0.0000',
+		                                        'base_discount_canceled': None,
+		                                        'base_discount_invoiced': '0.0000',
+		                                        'base_discount_refunded': None,
+		                                        'base_grand_total': '97.5000',
+		                                        'base_hidden_tax_amount': '0.0000',
+		                                        'base_hidden_tax_invoiced': '0.0000',
+		                                        'base_hidden_tax_refunded': None,
+		                                        'base_shipping_amount': '7.8700',
+		                                        'base_shipping_canceled': None,
+		                                        'base_shipping_discount_amount': '0.0000',
+		                                        'base_shipping_hidden_tax_amnt': '0.0000',
+		                                        'base_shipping_hidden_tax_amount': '0.0000',
+		                                        'base_shipping_incl_tax': '8.5000',
+		                                        'base_shipping_invoiced': '7.8700',
+		                                        'base_shipping_refunded': None,
+		                                        'base_shipping_tax_amount': '0.6300',
+		                                        'base_shipping_tax_refunded': None,
+		                                        'base_subtotal': '82.4100',
+		                                        'base_subtotal_canceled': None,
+		                                        'base_subtotal_incl_tax': '89.0000',
+		                                        'base_subtotal_invoiced': '82.4100',
+		                                        'base_subtotal_refunded': None,
+		                                        'base_tax_amount': '7.2200',
+		                                        'base_tax_canceled': None,
+		                                        'base_tax_invoiced': '7.2200',
+		                                        'base_tax_refunded': None,
+		                                        'base_to_global_rate': '1.0000',
+		                                        'base_to_order_rate': '1.0000',
+		                                        'base_total_canceled': None,
+		                                        'base_total_due': '0.0000',
+		                                        'base_total_invoiced': '97.5000',
+		                                        'base_total_invoiced_cost': '0.0000',
+		                                        'base_total_offline_refunded': None,
+		                                        'base_total_online_refunded': None,
+		                                        'base_total_paid': '97.5000',
+		                                        'base_total_qty_ordered': None,
+		                                        'base_total_refunded': None,
+		                                        'billing_address': {'address_id': '38468',
+		                                                            'address_type': 'billing',
+		                                                            'city': 'Lyon',
+		                                                            'company': None,
+		                                                            'country_id': 'FR',
+		                                                            'customer_address_id': '4999',
+		                                                            'customer_id': None,
+		                                                            'email': 'john@xxxxxx',
+		                                                            'fax': None,
+		                                                            'firstname': 'John',
+		                                                            'lastname': 'Doe',
+		                                                            'middlename': None,
+		                                                            'parent_id': '7360',
+		                                                            'postcode': '1006',
+		                                                            'prefix': None,
+		                                                            'quote_address_id': None,
+		                                                            'region': None,
+		                                                            'region_id': None,
+		                                                            'street': 'Victor Hugo',
+		                                                            'suffix': None,
+		                                                            'telephone': '31763163390',
+		                                                            'vat_id': None,
+		                                                            'vat_is_valid': None,
+		                                                            'vat_request_date': None,
+		                                                            'vat_request_id': None,
+		                                                            'vat_request_success': None},
+		                                        'billing_address_id': '38468',
+		                                        'can_ship_partially': None,
+		                                        'can_ship_partially_item': None,
+		                                        'coupon_code': None,
+		                                        'coupon_rule_name': None,
+		                                        'created_at': '2013-10-14 13:20:56',
+		                                        'customer_dob': None,
+		                                        'customer_email': 'john@xxxxxx',
+		                                        'customer_firstname': 'John',
+		                                        'customer_gender': None,
+		                                        'customer_group_id': '1',
+		                                        'customer_id': '1',
+		                                        'customer_is_guest': '0',
+		                                        'customer_lastname': 'Doe',
+		                                        'customer_middlename': None,
+		                                        'customer_note': None,
+		                                        'customer_note_notify': '1',
+		                                        'customer_prefix': None,
+		                                        'customer_suffix': None,
+		                                        'customer_taxvat': None,
+		                                        'discount_amount': '0.0000',
+		                                        'discount_canceled': None,
+		                                        'discount_description': None,
+		                                        'discount_invoiced': '0.0000',
+		                                        'discount_refunded': None,
+		                                        'edit_increment': None,
+		                                        'email_sent': '1',
+		                                        'employee_email': None,
+		                                        'employee_name': None,
+		                                        'employee_phone': None,
+		                                        'ext_customer_id': None,
+		                                        'ext_order_id': None,
+		                                        'forced_do_shipment_with_invoice': None,
+		                                        'forced_shipment_with_invoice': None,
+		                                        'gift_message_id': None,
+		                                        'global_currency_code': 'EUR',
+		                                        'grand_total': '97.5000',
+		                                        'hidden_tax_amount': '0.0000',
+		                                        'hidden_tax_invoiced': '0.0000',
+		                                        'hidden_tax_refunded': None,
+		                                        'hold_before_state': None,
+		                                        'hold_before_status': None,
+		                                        'imported': '0',
+		                                        'increment_id': '100005281',
+		                                        'is_virtual': '0',
+		                                        'items': [{'additional_data': None,
+		                                                   'amount_refunded': '0.0000',
+		                                                   'applied_rule_ids': None,
+		                                                   'base_amount_refunded': '0.0000',
+		                                                   'base_cost': None,
+		                                                   'base_discount_amount': '0.0000',
+		                                                   'base_discount_invoiced': '0.0000',
+		                                                   'base_discount_refunded': None,
+		                                                   'base_hidden_tax_amount': None,
+		                                                   'base_hidden_tax_invoiced': '0.0000',
+		                                                   'base_hidden_tax_refunded': None,
+		                                                   'base_original_price': '89.0000',
+		                                                   'base_price': '82.4100',
+		                                                   'base_price_incl_tax': '89.0000',
+		                                                   'base_row_invoiced': '82.4100',
+		                                                   'base_row_total': '82.4100',
+		                                                   'base_row_total_incl_tax': '89.0000',
+		                                                   'base_tax_amount': '6.5900',
+		                                                   'base_tax_before_discount': None,
+		                                                   'base_tax_invoiced': '6.5900',
+		                                                   'base_tax_refunded': None,
+		                                                   'base_weee_tax_applied_amount': '0.0000',
+		                                                   'base_weee_tax_applied_row_amnt': '0.0000',
+		                                                   'base_weee_tax_applied_row_amount': '0.0000',
+		                                                   'base_weee_tax_disposition': '0.0000',
+		                                                   'base_weee_tax_row_disposition': '0.0000',
+		                                                   'created_at': '2013-10-14 13:20:56',
+		                                                   'description': None,
+		                                                   'discount_amount': '0.0000',
+		                                                   'discount_invoiced': '0.0000',
+		                                                   'discount_percent': '0.0000',
+		                                                   'discount_refunded': None,
+		                                                   'earned_points_hash': None,
+		                                                   'ext_order_item_id': None,
+		                                                   'free_shipping': '0',
+		                                                   'gift_message_available': None,
+		                                                   'gift_message_id': None,
+		                                                   'hidden_tax_amount': None,
+		                                                   'hidden_tax_canceled': None,
+		                                                   'hidden_tax_invoiced': '0.0000',
+		                                                   'hidden_tax_refunded': None,
+		                                                   'is_nominal': '0',
+		                                                   'is_qty_decimal': '0',
+		                                                   'is_virtual': '0',
+		                                                   'item_id': '12751',
+		                                                   'locked_do_invoice': None,
+		                                                   'locked_do_ship': None,
+		                                                   'name': 'Dior Homme',
+		                                                   'no_discount': '0',
+		                                                   'order_id': '7360',
+		                                                   'original_price': '89.0000',
+		                                                   'parent_item_id': None,
+		                                                   'price': '82.4100',
+		                                                   'price_incl_tax': '89.0000',
+		                                                   'product_id': '157',
+		                                                   'product_options': 'a:1:{s:15:"info_buyRequest";a:6:{s:4:"uenc";s:176:"aHR0cDovL3d3dy4xMDAwcGFyZnVtcy5jaC9ib3V0aXF1ZTEuNy4wLjIvZnIvcGFyZnVtLWhvbW1lcy1ldC1mZW1tZXMtcGFzLWNoZXIvcGFyZnVtLWRpb3ItcGFzLWNoZXIvcGFyZnVtLWRpb3ItaG9tbWUtcGFzLWNoZXIuaHRtbA,,";s:7:"product";s:4:"4773";s:15:"related_product";s:0:"";s:3:"qty";s:1:"1";s:1:"x";s:2:"70";s:1:"y";s:2:"23";}}',
+		                                                   'product_type': 'simple',
+		                                                   'qty_backordered': None,
+		                                                   'qty_canceled': '0.0000',
+		                                                   'qty_invoiced': '1.0000',
+		                                                   'qty_ordered': '1.0000',
+		                                                   'qty_refunded': '0.0000',
+		                                                   'qty_shipped': '0.0000',
+		                                                   'quote_item_id': '46485',
+		                                                   'redeemed_points_hash': None,
+		                                                   'row_invoiced': '82.4100',
+		                                                   'row_total': '82.4100',
+		                                                   'row_total_after_redemptions': None,
+		                                                   'row_total_after_redemptions_incl_tax': None,
+		                                                   'row_total_before_redemptions': None,
+		                                                   'row_total_before_redemptions_incl_tax': None,
+		                                                   'row_total_incl_tax': '89.0000',
+		                                                   'row_weight': '0.0000',
+		                                                   'sku': '1625',
+		                                                   'store_id': '1',
+		                                                   'tax_amount': '6.5900',
+		                                                   'tax_before_discount': None,
+		                                                   'tax_canceled': None,
+		                                                   'tax_invoiced': '6.5900',
+		                                                   'tax_percent': '8.0000',
+		                                                   'tax_refunded': None,
+		                                                   'updated_at': '2013-10-14 13:22:00',
+		                                                   'weee_tax_applied': 'a:0:{}',
+		                                                   'weee_tax_applied_amount': '0.0000',
+		                                                   'weee_tax_applied_row_amount': '0.0000',
+		                                                   'weee_tax_disposition': '0.0000',
+		                                                   'weee_tax_row_disposition': '0.0000',
+		                                                   'weight': None}],
+		                                        'order_currency_code': 'EUR',
+		                                        'order_id': '7360',
+		                                        'original_increment_id': None,
+		                                        'payment': {'account_status': None,
+		                                                    'additional_data': None,
+		                                                    'address_status': None,
+		                                                    'amount_authorized': None,
+		                                                    'amount_canceled': None,
+		                                                    'amount_ordered': '97.5000',
+		                                                    'amount_paid': '97.5000',
+		                                                    'amount_refunded': None,
+		                                                    'anet_trans_method': None,
+		                                                    'base_amount_authorized': None,
+		                                                    'base_amount_canceled': None,
+		                                                    'base_amount_ordered': '97.5000',
+		                                                    'base_amount_paid': '97.5000',
+		                                                    'base_amount_paid_online': None,
+		                                                    'base_amount_refunded': None,
+		                                                    'base_amount_refunded_online': None,
+		                                                    'base_shipping_amount': '7.8700',
+		                                                    'base_shipping_captured': '7.8700',
+		                                                    'base_shipping_refunded': None,
+		                                                    'cc_approval': None,
+		                                                    'cc_avs_status': None,
+		                                                    'cc_cid_status': None,
+		                                                    'cc_debug_request_body': None,
+		                                                    'cc_debug_response_body': None,
+		                                                    'cc_debug_response_serialized': None,
+		                                                    'cc_exp_month': '0',
+		                                                    'cc_exp_year': '0',
+		                                                    'cc_last4': None,
+		                                                    'cc_number_enc': None,
+		                                                    'cc_owner': None,
+		                                                    'cc_secure_verify': None,
+		                                                    'cc_ss_issue': None,
+		                                                    'cc_ss_start_month': '0',
+		                                                    'cc_ss_start_year': '0',
+		                                                    'cc_status': None,
+		                                                    'cc_status_description': None,
+		                                                    'cc_trans_id': None,
+		                                                    'cc_type': None,
+		                                                    'cybersource_token': None,
+		                                                    'echeck_account_name': None,
+		                                                    'echeck_account_type': None,
+		                                                    'echeck_bank_name': None,
+		                                                    'echeck_routing_number': None,
+		                                                    'echeck_type': None,
+		                                                    'flo2cash_account_id': None,
+		                                                    'ideal_issuer_id': None,
+		                                                    'ideal_issuer_title': None,
+		                                                    'ideal_transaction_checked': None,
+		                                                    'last_trans_id': '1P06829259760661R',
+		                                                    'method': 'checkmo',
+		                                                    'parent_id': '7360',
+		                                                    'paybox_question_number': None,
+		                                                    'paybox_request_number': None,
+		                                                    'payment_id': '32844',
+		                                                    'po_number': None,
+		                                                    'protection_eligibility': None,
+		                                                    'quote_payment_id': None,
+		                                                    'shipping_amount': '7.8700',
+		                                                    'shipping_captured': '7.8700',
+		                                                    'shipping_refunded': None},
+		                                        'payment_auth_expiration': None,
+		                                        'payment_authorization_amount': None,
+		                                        'payment_authorization_expiration': None,
+		                                        'paypal_ipn_customer_notified': None,
+		                                        'protect_code': '49accf',
+		                                        'quote_address_id': None,
+		                                        'quote_id': '33794',
+		                                        'relation_child_id': None,
+		                                        'relation_child_real_id': None,
+		                                        'relation_parent_id': None,
+		                                        'relation_parent_real_id': None,
+		                                        'remote_ip': None,
+		                                        'rewards_base_discount_amount': None,
+		                                        'rewards_base_discount_tax_amount': None,
+		                                        'rewards_discount_amount': None,
+		                                        'rewards_discount_tax_amount': None,
+		                                        'shipping_address': {'address_id': '38469',
+		                                                             'address_type': 'shipping',
+		                                                             'city': 'Lyon',
+		                                                             'company': None,
+		                                                             'country_id': 'FR',
+		                                                             'customer_address_id': None,
+		                                                             'customer_id': None,
+		                                                             'email': 'john@xxxxxx',
+		                                                             'fax': None,
+		                                                             'firstname': 'John',
+		                                                             'lastname': 'Doe',
+		                                                             'middlename': None,
+		                                                             'parent_id': '7360',
+		                                                             'postcode': '1006',
+		                                                             'prefix': None,
+		                                                             'quote_address_id': None,
+		                                                             'region': None,
+		                                                             'region_id': None,
+		                                                             'street': 'Victor Hugo',
+		                                                             'suffix': None,
+		                                                             'telephone': '31763163390',
+		                                                             'vat_id': None,
+		                                                             'vat_is_valid': None,
+		                                                             'vat_request_date': None,
+		                                                             'vat_request_id': None,
+		                                                             'vat_request_success': None},
+		                                        'shipping_address_id': '38469',
+		                                        'shipping_amount': '7.8700',
+		                                        'shipping_canceled': None,
+		                                        'shipping_description': 'La Poste',
+		                                        'shipping_discount_amount': '0.0000',
+		                                        'shipping_hidden_tax_amount': '0.0000',
+		                                        'shipping_incl_tax': '8.5000',
+		                                        'shipping_invoiced': '7.8700',
+		                                        'shipping_method': 'flatrate_flatrate',
+		                                        'shipping_refunded': None,
+		                                        'shipping_tax_amount': '0.6300',
+		                                        'shipping_tax_refunded': None,
+		                                        'state': 'processing',
+		                                        'status': 'processing',
+		                                        'status_history': [{'comment': u'Notifier le client pour la facture n\xb0100003489.',
+		                                                            'created_at': '2013-10-14 13:22:02',
+		                                                            'entity_name': 'invoice',
+		                                                            'is_customer_notified': '1',
+		                                                            'is_visible_on_front': '0',
+		                                                            'parent_id': '7360',
+		                                                            'status': 'processing',
+		                                                            'store_id': '1'},
+		                                                           {'comment': u'IPN "Completed". Registered notification about captured amount of 97,50\xa0EUR. Transaction ID: "1P06829259760661R".',
+		                                                            'created_at': '2013-10-14 13:22:00',
+		                                                            'entity_name': 'invoice',
+		                                                            'is_customer_notified': '2',
+		                                                            'is_visible_on_front': '0',
+		                                                            'parent_id': '7360',
+		                                                            'status': 'processing',
+		                                                            'store_id': '1'},
+		                                                           {'comment': None,
+		                                                            'created_at': '2013-10-14 13:20:58',
+		                                                            'entity_name': 'order',
+		                                                            'is_customer_notified': '0',
+		                                                            'is_visible_on_front': '0',
+		                                                            'parent_id': '7360',
+		                                                            'status': 'pending_payment',
+		                                                            'store_id': '1'}],
+		                                        'store_currency_code': 'EUR',
+		                                        'store_id': '1',
+		                                        'store_name': u'France',
+		                                        'store_to_base_rate': '1.0000',
+		                                        'store_to_order_rate': '1.0000',
+		                                        'subtotal': '82.4100',
+		                                        'subtotal_canceled': None,
+		                                        'subtotal_incl_tax': '89.0000',
+		                                        'subtotal_invoiced': '82.4100',
+		                                        'subtotal_refunded': None,
+		                                        'tax_amount': '7.2200',
+		                                        'tax_canceled': None,
+		                                        'tax_invoiced': '7.2200',
+		                                        'tax_refunded': None,
+		                                        'total_canceled': None,
+		                                        'total_due': '0.0000',
+		                                        'total_invoiced': '97.5000',
+		                                        'total_item_count': '1',
+		                                        'total_offline_refunded': None,
+		                                        'total_online_refunded': None,
+		                                        'total_paid': '97.5000',
+		                                        'total_qty_ordered': '1.0000',
+		                                        'total_refunded': None,
+		                                        'updated_at': '2013-10-14 13:22:00',
+		                                        'website_id': u'1',
+		                                        'weight': '0.0000',
+		                                        'x_forwarded_for': None},
 }

=== modified file 'magentoerpconnect/tests/test_export_invoice.py'
--- magentoerpconnect/tests/test_export_invoice.py	2013-08-09 21:14:23 +0000
+++ magentoerpconnect/tests/test_export_invoice.py	2014-03-19 10:37:13 +0000
@@ -64,12 +64,13 @@
                                        'manual_validation')
         __, journal_id = self.get_ref('account',
                                       'check_journal')
-        self.registry('payment.method').create(
+        self.payment_method_id = self.registry('payment.method').create(
             cr, uid,
             {'name': 'checkmo',
-                'workflow_process_id': workflow_id,
-                'import_rule': 'always',
-                'journal_id': journal_id})
+             'create_invoice_on': False,
+             'workflow_process_id': workflow_id,
+             'import_rule': 'always',
+             'journal_id': journal_id})
         __, self.journal_id = self.get_ref('account', 'bank_journal')
         __, self.pay_account_id = self.get_ref('account', 'cash')
         __, self.period_id = self.get_ref('account', 'period_10')
@@ -149,6 +150,63 @@
                 mock.ANY, 'magento.account.invoice',
                 self.invoice.magento_bind_ids[0].id)
 
+    def test_export_invoice_on_payment_method_validate(self):
+        """ Exporting an invoice: when it is validated with payment method """
+        cr, uid = self.cr, self.uid
+        store_ids = [store.id for website in self.backend.website_ids
+                     for store in website.store_ids]
+        # we setup the stores so they export the invoices as soon
+        # as they are validated (open)
+        self.registry('payment.method').write(
+            cr, uid, self.payment_method_id, {'create_invoice_on': 'open'})
+        # ensure we use the option of the payment method, not store
+        self.registry('magento.store').write(
+           cr, uid, store_ids, {'create_invoice_on': 'paid'})
+        # this is the consumer called when a 'magento.account.invoice'
+        # is created, it delay a job to export the invoice
+        patched = 'openerp.addons.magentoerpconnect.invoice.export_invoice'
+        with mock.patch(patched) as export_invoice:  # prevent to create the job
+            self._invoice_open()
+
+            assert len(self.invoice.magento_bind_ids) == 1
+            export_invoice.delay.assert_called_with(mock.ANY,
+                                                    'magento.account.invoice',
+                                                    self.invoice.magento_bind_ids[0].id)
+
+        # pay and verify it is NOT called
+        with mock.patch(patched) as export_invoice:  # prevent to create the job
+            self._pay_and_reconcile()
+            self.assertEqual(self.invoice.state, 'paid')
+            assert not export_invoice.delay.called
+
+    def test_export_invoice_on_payment_method_paid(self):
+        """ Exporting an invoice: when it is paid on payment method """
+        cr, uid = self.cr, self.uid
+        store_ids = [store.id for website in self.backend.website_ids
+                     for store in website.store_ids]
+        # we setup the stores so they export the invoices as soon
+        # as they are validated (open)
+        self.registry('payment.method').write(
+            cr, uid, self.payment_method_id, {'create_invoice_on': 'paid'})
+        # ensure we use the option of the payment method, not store
+        self.registry('magento.store').write(
+            cr, uid, store_ids, {'create_invoice_on': 'open'})
+        # this is the consumer called when a 'magento.account.invoice'
+        # is created, it delay a job to export the invoice
+        patched = 'openerp.addons.magentoerpconnect.invoice.export_invoice'
+        with mock.patch(patched) as export_invoice:  # prevent to create the job
+            self._invoice_open()
+            assert not export_invoice.delay.called
+
+        # pay and verify it is NOT called
+        with mock.patch(patched) as export_invoice:  # prevent to create the job
+            self._pay_and_reconcile()
+            self.assertEqual(self.invoice.state, 'paid')
+            assert len(self.invoice.magento_bind_ids) == 1
+            export_invoice.delay.assert_called_with(
+                mock.ANY, 'magento.account.invoice',
+                self.invoice.magento_bind_ids[0].id)
+
     def _invoice_open(self):
         wf_service = netsvc.LocalService("workflow")
         wf_service.trg_validate(self.uid, 'account.invoice',

=== removed file 'magentoerpconnect/tests/test_export_invoice_jan.py'
--- magentoerpconnect/tests/test_export_invoice_jan.py	2014-01-16 10:10:21 +0000
+++ magentoerpconnect/tests/test_export_invoice_jan.py	1970-01-01 00:00:00 +0000
@@ -1,180 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Guewen Baconnier
-#    Copyright 2013 Camptocamp SA
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import unittest2
-import mock
-from functools import partial
-
-import openerp.tests.common as common
-from openerp import netsvc
-from openerp.addons.connector.session import ConnectorSession
-from openerp.addons.magentoerpconnect.unit.import_synchronizer import (
-    import_batch,
-    import_record)
-from openerp.addons.magentoerpconnect.invoice import (
-    delay_export_account_invoice)
-from .common import (mock_api,
-                     mock_urlopen_image)
-from .test_data import magento_base_responses
-
-
-class test_export_invoice(common.TransactionCase):
-    """ Test the export of an invoice to Magento with options in payment methods"""
-
-    def setUp(self):
-        super(test_export_invoice, self).setUp()
-        cr, uid = self.cr, self.uid
-        backend_model = self.registry('magento.backend')
-        self.mag_sale_model = self.registry('magento.sale.order')
-        self.session = ConnectorSession(cr, uid)
-        data_model = self.registry('ir.model.data')
-        self.get_ref = partial(data_model.get_object_reference,
-                               cr, uid)
-        __, warehouse_id = self.get_ref('stock', 'warehouse0')
-        backend_id = backend_model.create(
-            cr,
-            uid,
-            {'name': 'Test Magento',
-                'version': '1.7',
-                'location': 'http://anyurl',
-                'username': 'guewen',
-                'warehouse_id': warehouse_id,
-                'password': '42'})
-        self.backend = backend_model.browse(cr, uid, backend_id)
-        # payment method needed to import a sale order
-        __, workflow_id = self.get_ref('sale_automatic_workflow',
-                                       'manual_validation')
-        __, journal_id = self.get_ref('account',
-                                      'check_journal')
-        self.payment_method_id = self.registry('payment.method').create(
-            cr, uid,
-            {'name': 'checkmo',
-	#	'create_invoice_on': 'open',
-                'workflow_process_id': workflow_id,
-                'import_rule': 'always',
-                'journal_id': journal_id})
-        __, self.journal_id = self.get_ref('account', 'bank_journal')
-        __, self.pay_account_id = self.get_ref('account', 'cash')
-        __, self.period_id = self.get_ref('account', 'period_10')
-        # import the base informations
-        with mock_api(magento_base_responses):
-            import_batch(self.session, 'magento.website', backend_id)
-            import_batch(self.session, 'magento.store', backend_id)
-            import_batch(self.session, 'magento.storeview', backend_id)
-            with mock_urlopen_image():
-                import_record(self.session,
-                              'magento.sale.order',
-                              backend_id, 900000691)
-        sale_ids = self.mag_sale_model.search(
-            cr, uid,
-            [('backend_id', '=', backend_id),
-             ('magento_id', '=', '900000691')])
-        self.assertEqual(len(sale_ids), 1)
-        self.mag_sale = self.mag_sale_model.browse(cr, uid, sale_ids[0])
-        # ignore exceptions on the sale order
-        self.mag_sale.write({'ignore_exceptions': True})
-        self.mag_sale.openerp_id.action_button_confirm()
-        self.mag_sale.refresh()  # update to manual state
-        self.sale_id = self.mag_sale.openerp_id.id
-        sale_obj = self.registry('sale.order')
-        invoice_id = sale_obj.action_invoice_create(cr, uid, [self.sale_id])
-        assert invoice_id
-        self.invoice_model = self.registry('account.invoice')
-        self.invoice = self.invoice_model.browse(cr, uid, invoice_id)
-
-    def test_export_invoice_on_payment_method_validate(self):
-        """ Exporting an invoice: when it is validated with payment method """
-        cr, uid = self.cr, self.uid
-        store_ids = [store.id for website in self.backend.website_ids
-                     for store in website.store_ids]
-        # we setup the stores so they export the invoices as soon
-        # as they are validated (open)
-	self.registry('payment.method').write(
-            cr, uid, self.payment_method_id, {'create_invoice_on': 'open'})
-        # self.registry('magento.store').write(
-        #    cr, uid, store_ids, {'create_invoice_on': 'paid'})
-        # this is the consumer called when a 'magento.account.invoice'
-        # is created, it delay a job to export the invoice
-        patched = 'openerp.addons.magentoerpconnect.invoice.export_invoice'
-        with mock.patch(patched) as export_invoice:  # prevent to create the job
-            self._invoice_open()
-	  
-            assert len(self.invoice.magento_bind_ids) == 1
-            export_invoice.delay.assert_called_with(mock.ANY,
-                                        'magento.account.invoice',
-                                        self.invoice.magento_bind_ids[0].id)
-
-        # pay and verify it is NOT called
-        with mock.patch(patched) as export_invoice:  # prevent to create the job
-            self._pay_and_reconcile()
-            self.assertEqual(self.invoice.state, 'paid')
-            assert not export_invoice.delay.called
-			
-
-    def test_export_invoice_on_payment_method_paid(self):
-        """ Exporting an invoice: when it is paid on payment method """
-        cr, uid = self.cr, self.uid
-        store_ids = [store.id for website in self.backend.website_ids
-                     for store in website.store_ids]
-        # we setup the stores so they export the invoices as soon
-        # as they are validated (open)
-	self.registry('payment.method').write(
-	    cr, uid, self.payment_method_id, {'create_invoice_on': 'paid'})
-        #self.registry('magento.store').write(
-        #    cr, uid, store_ids, {'create_invoice_on': 'open'})
-        # this is the consumer called when a 'magento.account.invoice'
-        # is created, it delay a job to export the invoice
-        patched = 'openerp.addons.magentoerpconnect.invoice.export_invoice'
-        with mock.patch(patched) as export_invoice:  # prevent to create the job
-            self._invoice_open()
-            assert not export_invoice.delay.called
-
-        # pay and verify it is NOT called
-        with mock.patch(patched) as export_invoice:  # prevent to create the job
-            self._pay_and_reconcile()
-            self.assertEqual(self.invoice.state, 'paid')
-            assert len(self.invoice.magento_bind_ids) == 1
-            export_invoice.delay.assert_called_with(
-                mock.ANY, 'magento.account.invoice',
-                self.invoice.magento_bind_ids[0].id)
-
-    def _invoice_open(self):
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(self.uid, 'account.invoice',
-                                self.invoice.id, 'invoice_open', self.cr)
-        self.invoice.refresh()
-
-    def _pay_and_reconcile(self):
-        self.invoice_model.pay_and_reconcile(
-            self.cr, self.uid, [self.invoice.id],
-            pay_amount=self.invoice.amount_total,
-            pay_account_id=self.pay_account_id,
-            period_id=self.period_id,
-            pay_journal_id=self.journal_id,
-            writeoff_acc_id=self.pay_account_id,
-            writeoff_period_id=self.period_id,
-            writeoff_journal_id=self.journal_id,
-            name="Payment for tests of invoice's exports")
-        self.invoice.refresh()
-
-    @unittest2.skip("Needs to be implemented")
-    def test_export_invoice_api(self):
-        """ Exporting an invoice: call towards the Magento API """

=== modified file 'magentoerpconnect/tests/test_import_product_image.py'
--- magentoerpconnect/tests/test_import_product_image.py	2013-09-03 09:55:45 +0000
+++ magentoerpconnect/tests/test_import_product_image.py	2014-03-19 10:37:13 +0000
@@ -70,7 +70,7 @@
         """ Check if the images are sorted in the correct priority """
         env = mock.Mock()
         importer = CatalogImageImporter(env)
-        file1 = {'file': 'file1', 'types': ['base'], 'position': '10'}
+        file1 = {'file': 'file1', 'types': ['image'], 'position': '10'}
         file2 = {'file': 'file2', 'types': ['thumbnail'], 'position': '3'}
         file3 = {'file': 'file3', 'types': ['thumbnail'], 'position': '4'}
         file4 = {'file': 'file4', 'types': [], 'position': '10'}

=== modified file 'magentoerpconnect/tests/test_synchronization.py'
--- magentoerpconnect/tests/test_synchronization.py	2013-10-31 08:10:45 +0000
+++ magentoerpconnect/tests/test_synchronization.py	2014-03-19 10:37:13 +0000
@@ -76,6 +76,7 @@
                 {'name': 'checkmo',
                  'workflow_process_id': workflow_id,
                  'import_rule': 'always',
+                 'days_before_cancel': 0,
                  'journal_id': journal_id})
 
     def test_00_import_backend(self):
@@ -286,4 +287,34 @@
                                            self.uid,
                                            order_line_id[0],
                                            ['price_unit'])['price_unit']
-        self.assertEqual(price_unit, 41.0500)
\ No newline at end of file
+        self.assertEqual(price_unit, 41.0500)
+
+    def test_34_import_sale_order_with_taxes_included(self):
+        """ Import a sale order with taxes included """
+        backend_id = self.backend_id
+        self.backend_model.write(self.cr, self.uid, self.backend_id,
+                                 {'catalog_price_tax_included': True})
+        with mock_api(magento_base_responses):
+            with mock_urlopen_image():
+                import_record(self.session,
+                              'magento.sale.order',
+                              backend_id, 900000695)
+        mag_order_model = self.registry('magento.sale.order')
+        mag_order_ids = mag_order_model.search(self.cr,
+                                               self.uid,
+                                               [('backend_id', '=', backend_id),
+                                                ('magento_id', '=', '900000695')])
+        self.assertEqual(len(mag_order_ids), 1)
+        order_id = mag_order_model.read(self.cr,
+                                        self.uid,
+                                        mag_order_ids[0],
+                                        ['openerp_id'])['openerp_id']
+        order_model = self.registry('sale.order')
+        amount_total = order_model.read(self.cr,
+                                       self.uid,
+                                       order_id[0],
+                                       ['amount_total'])['amount_total']
+        #97.5 is the amount_total if connector takes correctly included tax prices.
+        self.assertEqual(amount_total, 97.5000)
+        self.backend_model.write(self.cr, self.uid, self.backend_id,
+                                 {'catalog_price_tax_included': False})

=== modified file 'magentoerpconnect/unit/export_synchronizer.py'
--- magentoerpconnect/unit/export_synchronizer.py	2013-05-01 12:12:58 +0000
+++ magentoerpconnect/unit/export_synchronizer.py	2014-03-19 10:37:13 +0000
@@ -139,9 +139,12 @@
         """ Export the dependencies for the record"""
         return
 
-    def _map_data(self, fields=None):
-        """ Convert the external record to OpenERP """
-        self.mapper.convert(self.binding_record, fields=fields)
+    def _map_data(self):
+        """ Returns an instance of
+        :py:class:`~openerp.addons.connector.unit.mapper.MapRecord`
+
+        """
+        return self.mapper.map_record(self.binding_record)
 
     def _validate_data(self, data):
         """ Check if the values to import are correct
@@ -153,13 +156,25 @@
         """
         return
 
+    def _create_data(self, map_record, fields=None, **kwargs):
+        """ Get the data to pass to :py:meth:`_create` """
+        return map_record.values(for_create=True, fields=fields, **kwargs)
+
     def _create(self, data):
         """ Create the Magento record """
+        # special check on data before export
+        self._validate_data(data)
         return self.backend_adapter.create(data)
 
+    def _update_data(self, map_record, fields=None, **kwargs):
+        """ Get the data to pass to :py:meth:`_update` """
+        return map_record.values(fields=fields, **kwargs)
+
     def _update(self, data):
         """ Update an Magento record """
         assert self.magento_id
+        # special check on data before export
+        self._validate_data(data)
         self.backend_adapter.write(self.magento_id, data)
 
     def _run(self, fields=None):
@@ -176,21 +191,17 @@
         # export the missing linked resources
         self._export_dependencies()
 
-        self._map_data(fields=fields)
+        map_record = self._map_data()
 
         if self.magento_id:
-            record = self.mapper.data
+            record = self._update_data(map_record, fields=fields)
             if not record:
                 return _('Nothing to export.')
-            # special check on data before export
-            self._validate_data(record)
             self._update(record)
         else:
-            record = self.mapper.data_for_create
+            record = self._create_data(map_record, fields=fields)
             if not record:
                 return _('Nothing to export.')
-            # special check on data before export
-            self._validate_data(record)
             self.magento_id = self._create(record)
         return _('Record exported with ID %s on Magento.') % self.magento_id
 

=== modified file 'magentoerpconnect/unit/import_synchronizer.py'
--- magentoerpconnect/unit/import_synchronizer.py	2013-10-31 08:53:35 +0000
+++ magentoerpconnect/unit/import_synchronizer.py	2014-03-19 10:37:13 +0000
@@ -92,9 +92,11 @@
         return
 
     def _map_data(self):
-        """ Call the convert on the Mapper so the converted record can
-        be obtained using mapper.data or mapper.data_for_create"""
-        self.mapper.convert(self.magento_record)
+        """ Returns an instance of
+        :py:class:`~openerp.addons.connector.unit.mapper.MapRecord`
+
+        """
+        return self.mapper.map_record(self.magento_record)
 
     def _validate_data(self, data):
         """ Check if the values to import are correct
@@ -124,21 +126,26 @@
         """Return the binding id from the magento id"""
         return self.binder.to_openerp(self.magento_id)
 
-    def _context(self):
-        context = self.session.context.copy()
-        context['connector_no_export'] = True
-        return context
+    def _create_data(self, map_record, **kwargs):
+        return map_record.values(for_create=True, **kwargs)
 
     def _create(self, data):
         """ Create the OpenERP record """
+        # special check on data before import
+        self._validate_data(data)
         with self.session.change_context({'connector_no_export': True}):
             binding_id = self.session.create(self.model._name, data)
         _logger.debug('%s %d created from magento %s',
                       self.model._name, binding_id, self.magento_id)
         return binding_id
 
+    def _update_data(self, map_record, **kwargs):
+        return map_record.values(**kwargs)
+
     def _update(self, binding_id, data):
         """ Update an OpenERP record """
+        # special check on data before import
+        self._validate_data(data)
         with self.session.change_context({'connector_no_export': True}):
             self.session.write(self.model._name, binding_id, data)
         _logger.debug('%s %d updated from magento %s',
@@ -173,17 +180,13 @@
         # import the missing linked resources
         self._import_dependencies()
 
-        self._map_data()
+        map_record = self._map_data()
 
         if binding_id:
-            record = self.mapper.data
-            # special check on data before import
-            self._validate_data(record)
+            record = self._update_data(map_record)
             self._update(binding_id, record)
         else:
-            record = self.mapper.data_for_create
-            # special check on data before import
-            self._validate_data(record)
+            record = self._create_data(map_record)
             binding_id = self._create(record)
 
         self.binder.bind(self.magento_id, binding_id)
@@ -282,8 +285,8 @@
 
         for storeview in lang_storeviews:
             lang_record = self._get_magento_data(storeview.magento_id)
-            self.mapper.convert(lang_record)
-            record = self.mapper.data
+            map_record = self.mapper.map_record(lang_record)
+            record = map_record.values()
 
             data = dict((field, value) for field, value in record.iteritems()
                         if field in translatable_fields)

=== modified file 'magentoerpconnect_export_partner/consumer.py'
--- magentoerpconnect_export_partner/consumer.py	2013-04-23 13:53:37 +0000
+++ magentoerpconnect_export_partner/consumer.py	2014-03-19 10:37:13 +0000
@@ -30,15 +30,15 @@
 
 @on_record_create(model_names='magento.res.partner')
 @on_record_write(model_names='magento.res.partner')
-def delay_export(session, model_name, record_id, fields=None):
+def delay_export(session, model_name, record_id, vals):
     magentoerpconnect.delay_export(session, model_name,
-                                   record_id, fields=fields)
+                                   record_id, vals)
 
 
 @on_record_write(model_names='res.partner')
-def delay_export_all_bindings(session, model_name, record_id, fields=None):
+def delay_export_all_bindings(session, model_name, record_id, vals):
     magentoerpconnect.delay_export_all_bindings(session, model_name,
-                                                record_id, fields=fields)
+                                                record_id, vals)
 
 
 @on_record_unlink(model_names='magento.res.partner')

=== added directory 'server_env_magentoerpconnect'
=== added file 'server_env_magentoerpconnect/__init__.py'
--- server_env_magentoerpconnect/__init__.py	1970-01-01 00:00:00 +0000
+++ server_env_magentoerpconnect/__init__.py	2014-03-19 10:37:13 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import magento_model

=== added file 'server_env_magentoerpconnect/__openerp__.py'
--- server_env_magentoerpconnect/__openerp__.py	1970-01-01 00:00:00 +0000
+++ server_env_magentoerpconnect/__openerp__.py	2014-03-19 10:37:13 +0000
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{'name': 'Server environment for Magento Connector',
+ 'version': '1.0',
+ 'author': 'Camptocamp',
+ 'maintainer': 'Camptocamp',
+ 'license': 'AGPL-3',
+ 'category': 'Tools',
+ 'complexity': 'expert',
+ 'depends' : ['base',
+              'server_environment',
+              'magentoerpconnect',
+              ],
+ 'description': """
+Server environment for Magento Connector
+========================================
+
+This module is based on the `server_environment` module to use files for
+configuration.  Thus we can have a different configutation for each
+environment (dev, test, staging, prod).  This module define the config
+variables for the `magentoerpconnect` module.
+
+In the configuration file, you can configure the url, login and
+password of the Magento Backends.
+
+Exemple of the section to put in the configuration file::
+
+    [magento_backend.name_of_the_backend]
+    location = http://localhost/magento/
+    username = my_api_login
+    password = my_api_password
+
+""",
+ 'website': 'http://www.camptocamp.com',
+ 'data': [],
+ 'test': [],
+ 'installable': True,
+ 'auto_install': False,
+}

=== added directory 'server_env_magentoerpconnect/i18n'
=== added file 'server_env_magentoerpconnect/magento_model.py'
--- server_env_magentoerpconnect/magento_model.py	1970-01-01 00:00:00 +0000
+++ server_env_magentoerpconnect/magento_model.py	2014-03-19 10:37:13 +0000
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import logging
+from openerp.osv import fields, orm
+try:
+    from server_environment import serv_config
+except ImportError:
+    logging.getLogger('openerp.module').warning('server_environment not available in addons path. '
+                                                'server_env_magentoerpconnect will not be usable')
+
+_logger = logging.getLogger(__name__)
+
+
+class magento_backend(orm.Model):
+    _inherit = 'magento.backend'
+
+    def _get_environment_config_by_name(self, cr, uid, ids, field_names,
+                                        arg, context=None):
+        values = {}
+        for backend in self.browse(cr, uid, ids, context=context):
+            values[backend.id] = {}
+            for field_name in field_names:
+                section_name = '.'.join((self._name.replace('.', '_'),
+                                         backend.name))
+                try:
+                    value = serv_config.get(section_name, field_name)
+                    values[backend.id][field_name] = value
+                except:
+                    _logger.exception('error trying to read field %s '
+                                      'in section %s', field_name,
+                                      section_name)
+                    values[backend.id][field_name] = False
+        return values
+
+    _columns = {
+        'location': fields.function(
+            _get_environment_config_by_name,
+            string='Location',
+            type='char',
+            multi='connection_config'),
+        'username': fields.function(
+            _get_environment_config_by_name,
+            string='Username',
+            type='char',
+            multi='connection_config'),
+        'password': fields.function(
+            _get_environment_config_by_name,
+            string='Password',
+            type='char',
+            multi='connection_config'),
+    }

=== added directory 'server_env_magentoerpconnect/security'