OpenERP Connector - Magento

Merge lp:~akretion-team/openerp-connector-magento/openerp-connector-magento-rma into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0

  1. openerp-connector-magento-rma
  2. Merge into 7.0
Proposed by Chafique DELLI
Status: Work in progress
Proposed branch: lp:~akretion-team/openerp-connector-magento/openerp-connector-magento-rma
Merge into: lp:~openerp-connector-core-editors/openerp-connector-magento/7.0
Diff against target: 8679 lines (+7620/-120) (has conflicts)
58 files modified
magentoerpconnect/AUTHORS (+5/-1)
magentoerpconnect/CHANGES.rst (+16/-0)
magentoerpconnect/__init__.py (+1/-0)
magentoerpconnect/__openerp__.py (+1/-0)
magentoerpconnect/doc/guides/tutorial_customize.rst (+3/-7)
magentoerpconnect/doc/howto/configure_schedulers.rst (+2/-0)
magentoerpconnect/i18n/de.po (+5/-0)
magentoerpconnect/i18n/es.po (+1060/-0)
magentoerpconnect/i18n/fr.po (+5/-0)
magentoerpconnect/i18n/it.po (+1007/-0)
magentoerpconnect/i18n/nl.po (+1065/-0)
magentoerpconnect/invoice.py (+9/-1)
magentoerpconnect/magento_model.py (+52/-9)
magentoerpconnect/magento_model_view.xml (+21/-7)
magentoerpconnect/magentoerpconnect_data.xml (+13/-0)
magentoerpconnect/partner.py (+2/-7)
magentoerpconnect/payment_invoice.py (+17/-0)
magentoerpconnect/payment_invoice.xml (+21/-0)
magentoerpconnect/product.py (+47/-11)
magentoerpconnect/product_view.xml (+2/-1)
magentoerpconnect/sale.py (+60/-21)
magentoerpconnect/setting_view.xml (+0/-2)
magentoerpconnect/tests/__init__.py (+0/-1)
magentoerpconnect/tests/common.py (+10/-5)
magentoerpconnect/tests/test_data.py (+811/-18)
magentoerpconnect/tests/test_data_address_book.py (+11/-11)
magentoerpconnect/tests/test_export_invoice.py (+62/-4)
magentoerpconnect/tests/test_import_product_image.py (+1/-0)
magentoerpconnect/tests/test_synchronization.py (+58/-3)
magentoerpconnect/unit/backend_adapter.py (+49/-9)
magentoerpconnect/unit/export_synchronizer.py (+3/-1)
magentoerpconnect/unit/import_synchronizer.py (+35/-1)
magentoerpconnect/unit/mapper.py (+31/-0)
magentoerpconnect_options_active/__init__.py (+24/-0)
magentoerpconnect_options_active/__openerp__.py (+40/-0)
magentoerpconnect_options_active/connector.py (+25/-0)
magentoerpconnect_options_active/magento_model.py (+45/-0)
magentoerpconnect_options_active/magento_model_view.xml (+17/-0)
magentoerpconnect_options_active/product.py (+45/-0)
magentoerpconnect_order_comment/__init__.py (+5/-0)
magentoerpconnect_order_comment/__openerp__.py (+61/-0)
magentoerpconnect_order_comment/connector.py (+25/-0)
magentoerpconnect_order_comment/magento_model.py (+37/-0)
magentoerpconnect_order_comment/magento_model_view.xml (+17/-0)
magentoerpconnect_order_comment/sale.py (+300/-0)
magentoerpconnect_order_comment/tests/__init__.py (+29/-0)
magentoerpconnect_order_comment/tests/test_synchronization.py (+161/-0)
magentoerpconnect_rma/__init__.py (+5/-0)
magentoerpconnect_rma/__openerp__.py (+51/-0)
magentoerpconnect_rma/claim.py (+1014/-0)
magentoerpconnect_rma/claim_data.xml (+45/-0)
magentoerpconnect_rma/connector.py (+25/-0)
magentoerpconnect_rma/ir_attachment_view.xml (+17/-0)
magentoerpconnect_rma/magento_model.py (+39/-0)
magentoerpconnect_rma/magento_model_view.xml (+51/-0)
magentoerpconnect_rma/tests/__init__.py (+29/-0)
magentoerpconnect_rma/tests/test_data.py (+825/-0)
magentoerpconnect_rma/tests/test_synchronization.py (+203/-0)
Text conflict in magentoerpconnect/i18n/de.po
Text conflict in magentoerpconnect/i18n/es.po
Text conflict in magentoerpconnect/i18n/fr.po
Text conflict in magentoerpconnect/i18n/it.po
Text conflict in magentoerpconnect/i18n/nl.po
To merge this branch: bzr merge lp:~akretion-team/openerp-connector-magento/openerp-connector-magento-rma
Reviewer Review Type Date Requested Status
OpenERP Connector Core Editors Pending
Review via email: mp+214055@code.launchpad.net

Description of the change

Add module for importing and exporting RMA

To post a comment you must log in.
lp:~akretion-team/openerp-connector-magento/openerp-connector-magento-rma updated
970. By Chafique DELLI

[MERGE] merge with next release branch

971. By Chafique DELLI

[TEST]:fixed and enable test for synchronize RMA with Magento

Unmerged revisions

971. By Chafique DELLI

[TEST]:fixed and enable test for synchronize RMA with Magento

970. By Chafique DELLI

[MERGE] merge with next release branch

969. By Chafique DELLI

[FIX]:fix method to export comments and attachments

968. By Chafique DELLI

[IMP]: simplification of the code for mapping field 'ref' for Crm Claim

967. By Chafique DELLI

[IMP]: add import dependencies(rma, sale order)

966. By Chafique DELLI

[IMP]: add synchronisation (import/export) claim comments and claim attachments

965. By Chafique DELLI

[ADD]: module ...rma

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'magentoerpconnect/AUTHORS'
2--- magentoerpconnect/AUTHORS 2014-01-14 14:18:48 +0000
3+++ magentoerpconnect/AUTHORS 2014-05-23 12:57:06 +0000
4@@ -1,4 +1,4 @@
5-Last update: Tue Jan 14 15:17:34 CET 2014
6+Last update: Tue May 6 17:45:23 CEST 2014
7
8 * Guewen Baconnier at Camptocamp
9 * Alexandre Fayolle at Camptocamp
10@@ -13,3 +13,7 @@
11 * Alexis de Lattre at Akretion (tiny change)
12 * Olivier Distexhe at Akilon (tiny change)
13 * Romain Deheele at Camptocamp
14+* Jan-Philipp Fischer at Greencoding
15+* Thomas Rehn at initOS
16+* Katja Matthes at initOS
17+* Markus Schneider at initOS
18
19=== modified file 'magentoerpconnect/CHANGES.rst'
20--- magentoerpconnect/CHANGES.rst 2014-01-23 08:14:03 +0000
21+++ magentoerpconnect/CHANGES.rst 2014-05-23 12:57:06 +0000
22@@ -1,6 +1,22 @@
23 Changelog
24 ---------
25
26+2.3.1.dev0 (unreleased)
27+~~~~~~~~~~~~~~~~~~~~~~~
28+
29+* New helper in importer to import dependencies
30+* allow to customize the available versions without overriding the 'version' field
31+* New option 'Create Invoice On' on payment methods with options 'on paid', 'on validate'
32+* Using Magento on PHP 5.4 without using the compatibility patch would
33+ break syncs'. Correct solution is to install the patch on Magento
34+ though! http://magento.com/blog/magento-news/magento-now-supports-php-54
35+* Allow to use HTTP Auth Basic to connect to the Magento API
36+* Retry jobs when they hit a 502, 503 or 504 error
37+* Added missing scheduler for import of products
38+* Fix: calculate correctly the discount ratio on sales order lines (lp:1201590)
39+* Possibility to exclude products from stock synchronizations
40+* Products disabled on Magento are imported disabled on OpenERP. An additional module allows more options.
41+
42
43 2.3.1 (2014-01-23)
44 ~~~~~~~~~~~~~~~~~~
45
46=== modified file 'magentoerpconnect/__init__.py'
47--- magentoerpconnect/__init__.py 2013-05-02 12:30:40 +0000
48+++ magentoerpconnect/__init__.py 2014-05-23 12:57:06 +0000
49@@ -13,5 +13,6 @@
50 import delivery
51 import stock_picking
52 import stock_tracking
53+import payment_invoice
54
55 import consumer
56
57=== modified file 'magentoerpconnect/__openerp__.py'
58--- magentoerpconnect/__openerp__.py 2014-05-19 11:20:35 +0000
59+++ magentoerpconnect/__openerp__.py 2014-05-23 12:57:06 +0000
60@@ -132,6 +132,7 @@
61 'delivery_view.xml',
62 'stock_view.xml',
63 'security/ir.model.access.csv',
64+ 'payment_invoice.xml',
65 ],
66 'installable': True,
67 'application': True,
68
69=== modified file 'magentoerpconnect/doc/guides/tutorial_customize.rst'
70--- magentoerpconnect/doc/guides/tutorial_customize.rst 2014-01-14 13:47:28 +0000
71+++ magentoerpconnect/doc/guides/tutorial_customize.rst 2014-05-23 12:57:06 +0000
72@@ -130,19 +130,15 @@
73 class magento_backend(orm.Model):
74 _inherit = 'magento.backend'
75
76- def _select_versions(self, cr, uid, context=None):
77- """ Available versions
78+ def select_versions(self, cr, uid, context=None):
79+ """ Available versions in the backend.
80
81 Can be inherited to add custom versions.
82 """
83- versions = super(magento_backend, self)._select_versions(cr, uid, context=context)
84+ versions = super(magento_backend, self).select_versions(cr, uid, context=context)
85 versions.append(('1.7-myversion', '1.7 - My Version'))
86 return versions
87
88- _columns = {
89- 'version': fields.selection(_select_versions, string='Version', required=True),
90- }
91-
92 Things to note:
93
94 * The ``parent`` argument of my version is the 1.7 version. You have to
95
96=== modified file 'magentoerpconnect/doc/howto/configure_schedulers.rst'
97--- magentoerpconnect/doc/howto/configure_schedulers.rst 2013-04-11 12:28:48 +0000
98+++ magentoerpconnect/doc/howto/configure_schedulers.rst 2014-05-23 12:57:06 +0000
99@@ -18,6 +18,8 @@
100
101 * Magento - Import Product Categories
102
103+* Magento - Import Products
104+
105 * Magento - Import Sales Orders
106
107 * Magento - Update Stock Quantities
108
109=== modified file 'magentoerpconnect/i18n/de.po'
110--- magentoerpconnect/i18n/de.po 2014-05-22 06:50:36 +0000
111+++ magentoerpconnect/i18n/de.po 2014-05-23 12:57:06 +0000
112@@ -15,8 +15,13 @@
113 "MIME-Version: 1.0\n"
114 "Content-Type: text/plain; charset=UTF-8\n"
115 "Content-Transfer-Encoding: 8bit\n"
116+<<<<<<< TREE
117 "X-Launchpad-Export-Date: 2014-05-22 06:50+0000\n"
118 "X-Generator: Launchpad (build 17017)\n"
119+=======
120+"X-Launchpad-Export-Date: 2014-04-12 10:07+0000\n"
121+"X-Generator: Launchpad (build 16976)\n"
122+>>>>>>> MERGE-SOURCE
123
124 #. module: magentoerpconnect
125 #: help:magento.backend,pricelist_id:0
126
127=== modified file 'magentoerpconnect/i18n/es.po'
128--- magentoerpconnect/i18n/es.po 2014-05-22 06:50:36 +0000
129+++ magentoerpconnect/i18n/es.po 2014-05-23 12:57:06 +0000
130@@ -1,3 +1,4 @@
131+<<<<<<< TREE
132 # Spanish translation for openerp-connector-magento
133 # Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
134 # This file is distributed under the same license as the openerp-connector-magento package.
135@@ -1055,3 +1056,1062 @@
136 #: sql_constraint:magento.address:0
137 msgid "A partner address with same ID on Magento already exists."
138 msgstr "A partner address with same ID on Magento already exists."
139+=======
140+# Spanish translation for openerp-connector-magento
141+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
142+# This file is distributed under the same license as the openerp-connector-magento package.
143+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
144+#
145+msgid ""
146+msgstr ""
147+"Project-Id-Version: openerp-connector-magento\n"
148+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
149+"POT-Creation-Date: 2013-05-01 12:45+0000\n"
150+"PO-Revision-Date: 2014-03-25 16:58+0000\n"
151+"Last-Translator: Alberto Garcia (Factor Libre) "
152+"<alberto.garcia@factorlibre.com>\n"
153+"Language-Team: Spanish <es@li.org>\n"
154+"MIME-Version: 1.0\n"
155+"Content-Type: text/plain; charset=UTF-8\n"
156+"Content-Transfer-Encoding: 8bit\n"
157+"X-Launchpad-Export-Date: 2014-04-12 10:07+0000\n"
158+"X-Generator: Launchpad (build 16976)\n"
159+
160+#. module: magentoerpconnect
161+#: help:magento.backend,pricelist_id:0
162+msgid "The price list used to define the prices of the products in Magento."
163+msgstr "La tarifa usada para definir los precios de los productos en Magento"
164+
165+#. module: magentoerpconnect
166+#: help:magento.store,send_invoice_paid_mail:0
167+msgid ""
168+"Does the invoice export/creation should send an email notification on "
169+"Magento side?"
170+msgstr ""
171+"La creación/exportación de la factura debe enviar una notificación por email "
172+"desde Magento?"
173+
174+#. module: magentoerpconnect
175+#: view:magento.backend:0
176+msgid "Import sales orders from all store views"
177+msgstr "Importar ordenes de ventas de todas las vistas de tienda"
178+
179+#. module: magentoerpconnect
180+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
181+msgid ""
182+"The tax amount computed in OpenERP doesn't match with the tax amount in "
183+"Magento.\n"
184+"\n"
185+"Cause:\n"
186+"The taxes are probably different between OpenERP and Magento. A fiscal "
187+"position could have changed the final price.\n"
188+"\n"
189+"Resolution:\n"
190+"Check your taxes and fiscal positions configuration and correct them if "
191+"necessary."
192+msgstr ""
193+"The tax amount computed in OpenERP doesn't match with the tax amount in "
194+"Magento.\n"
195+"\n"
196+"Cause:\n"
197+"The taxes are probably different between OpenERP and Magento. A fiscal "
198+"position could have changed the final price.\n"
199+"\n"
200+"Resolution:\n"
201+"Check your taxes and fiscal positions configuration and correct them if "
202+"necessary."
203+
204+#. module: magentoerpconnect
205+#: help:magento.backend,warehouse_id:0
206+msgid "Warehouse used to compute the stock quantities."
207+msgstr "Almacén utilizado para computar las cantidades de stock"
208+
209+#. module: magentoerpconnect
210+#: field:magento.account.invoice,sync_date:0
211+#: field:magento.address,sync_date:0
212+#: field:magento.binding,sync_date:0
213+#: field:magento.product.category,sync_date:0
214+#: field:magento.product.product,sync_date:0
215+#: field:magento.res.partner,sync_date:0
216+#: field:magento.res.partner.category,sync_date:0
217+#: field:magento.sale.order,sync_date:0
218+#: field:magento.sale.order.line,sync_date:0
219+#: field:magento.stock.picking.out,sync_date:0
220+#: field:magento.store,sync_date:0
221+#: field:magento.storeview,sync_date:0
222+#: field:magento.website,sync_date:0
223+msgid "Last synchronization date"
224+msgstr "Fecha última sincronización"
225+
226+#. module: magentoerpconnect
227+#: help:magento.backend,default_category_id:0
228+msgid ""
229+"If a default category is selected, products imported without a category will "
230+"be linked to it."
231+msgstr ""
232+"If a default category is selected, products imported without a category will "
233+"be linked to it."
234+
235+#. module: magentoerpconnect
236+#: help:magento.storeview,import_orders_from_date:0
237+msgid ""
238+"do not consider non-imported sale orders before this date. Leave empty to "
239+"import all sale orders"
240+msgstr ""
241+"do not consider non-imported sale orders before this date. Leave empty to "
242+"import all sale orders"
243+
244+#. module: magentoerpconnect
245+#: help:magento.store,send_picking_done_mail:0
246+msgid ""
247+"Does the picking export/creation should send an email notification on "
248+"Magento side?"
249+msgstr ""
250+"Does the picking export/creation should send an email notification on "
251+"Magento side?"
252+
253+#. module: magentoerpconnect
254+#: selection:magento.product.product,manage_stock:0
255+msgid "Do Not Manage Stock"
256+msgstr "No se controla stock"
257+
258+#. module: magentoerpconnect
259+#: field:connector.config.settings,module_magentoerpconnect_catalog:0
260+msgid "Handle the product's catalog (not implemented)"
261+msgstr "Handle the product's catalog (not implemented)"
262+
263+#. module: magentoerpconnect
264+#: field:res.partner,company:0
265+msgid "Company"
266+msgstr "Compañía"
267+
268+#. module: magentoerpconnect
269+#: sql_constraint:magento.website:0
270+msgid "A website with the same ID on Magento already exists."
271+msgstr "Una web con las misma ID existe en Magento"
272+
273+#. module: magentoerpconnect
274+#: field:magento.backend,import_categories_from_date:0
275+msgid "Import categories from date"
276+msgstr "Importar categorías desde fecha"
277+
278+#. module: magentoerpconnect
279+#: view:account.invoice:0
280+#: field:account.invoice,magento_bind_ids:0
281+#: view:product.category:0
282+#: field:product.category,magento_bind_ids:0
283+#: view:product.product:0
284+#: field:product.product,magento_bind_ids:0
285+#: view:res.partner:0
286+#: field:res.partner,magento_bind_ids:0
287+#: field:res.partner.category,magento_bind_ids:0
288+#: field:sale.order,magento_bind_ids:0
289+#: field:sale.order.line,magento_bind_ids:0
290+#: field:sale.shop,magento_bind_ids:0
291+#: field:stock.picking,magento_bind_ids:0
292+#: view:stock.picking.out:0
293+#: field:stock.picking.out,magento_bind_ids:0
294+msgid "Magento Bindings"
295+msgstr "Magento Bindings"
296+
297+#. module: magentoerpconnect
298+#: help:connector.config.settings,module_magentoerpconnect_catalog:0
299+msgid "This installs the module magentoerpconnect_catalog."
300+msgstr "Esto instala el módulo magentoerpconnect_catalog."
301+
302+#. module: magentoerpconnect
303+#: field:magento.address,is_magento_order_address:0
304+msgid "Address from a Magento Order"
305+msgstr "Dirección desde un Pedido Magento"
306+
307+#. module: magentoerpconnect
308+#: field:magento.sale.order,magento_order_id:0
309+msgid "Magento Order ID"
310+msgstr "Id Pedido Magento"
311+
312+#. module: magentoerpconnect
313+#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
314+msgid "magentoerpconnect.installed"
315+msgstr "magentoerpconnect.installed"
316+
317+#. module: magentoerpconnect
318+#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
319+msgid "This installs the module magentoerpconnect_export_partner."
320+msgstr "This installs the module magentoerpconnect_export_partner."
321+
322+#. module: magentoerpconnect
323+#: field:magento.sale.order.line,notes:0
324+msgid "Notes"
325+msgstr "Notas"
326+
327+#. module: magentoerpconnect
328+#: field:magento.sale.order,openerp_id:0
329+msgid "Sale Order"
330+msgstr "Pedido de Venta"
331+
332+#. module: magentoerpconnect
333+#: field:magento.stock.picking.out,openerp_id:0
334+msgid "Stock Picking"
335+msgstr "Albaran"
336+
337+#. module: magentoerpconnect
338+#: view:connector.config.settings:0
339+msgid "Extensions"
340+msgstr "Extensiones"
341+
342+#. module: magentoerpconnect
343+#: view:magento.backend:0
344+msgid "Advanced Configuration"
345+msgstr "Configuración avanzada"
346+
347+#. module: magentoerpconnect
348+#: field:magento.res.partner,group_id:0
349+msgid "Magento Group (Category)"
350+msgstr "Grupo Magento (Categoría)"
351+
352+#. module: magentoerpconnect
353+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
354+#: view:magento.website:0
355+#: field:magento.website,store_ids:0
356+msgid "Stores"
357+msgstr "Tiendas"
358+
359+#. module: magentoerpconnect
360+#: field:magento.backend,product_stock_field_id:0
361+msgid "Stock Field"
362+msgstr "Campo Stock"
363+
364+#. module: magentoerpconnect
365+#: field:magento.res.partner.category,openerp_id:0
366+msgid "Partner Category"
367+msgstr "Categoría de empresa"
368+
369+#. module: magentoerpconnect
370+#: help:magento.product.product,magento_qty:0
371+msgid "Last computed quantity to send on Magento."
372+msgstr "Ultima cantidad computada enviada a Magento"
373+
374+#. module: magentoerpconnect
375+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
376+#: view:res.partner.category:0
377+msgid "Magento"
378+msgstr "Magento"
379+
380+#. module: magentoerpconnect
381+#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
382+msgid "connector.config.settings"
383+msgstr "connector.config.settings"
384+
385+#. module: magentoerpconnect
386+#: field:magento.backend,import_products_from_date:0
387+msgid "Import products from date"
388+msgstr "Importar productos desde fecha"
389+
390+#. module: magentoerpconnect
391+#: model:ir.model,name:magentoerpconnect.model_res_partner
392+#: field:magento.address,openerp_id:0
393+#: field:magento.res.partner,openerp_id:0
394+msgid "Partner"
395+msgstr "Empresa"
396+
397+#. module: magentoerpconnect
398+#: model:ir.model,name:magentoerpconnect.model_sale_order
399+msgid "Sales Order"
400+msgstr "Pedidos de venta"
401+
402+#. module: magentoerpconnect
403+#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
404+msgid "Delivery Orders"
405+msgstr "Albaranes"
406+
407+#. module: magentoerpconnect
408+#: model:ir.model,name:magentoerpconnect.model_sale_order_line
409+msgid "Sales Order Line"
410+msgstr "Lineas Pedidos Venta"
411+
412+#. module: magentoerpconnect
413+#: field:connector.config.settings,module_magentoerpconnect_pricing:0
414+msgid "Prices are managed in OpenERP with pricelists"
415+msgstr "Precios son gestionados en OpenERP con Tarifas"
416+
417+#. module: magentoerpconnect
418+#: field:magento.address,is_default_shipping:0
419+msgid "Default Shipping"
420+msgstr "Forma Envio Por Defecto"
421+
422+#. module: magentoerpconnect
423+#: sql_constraint:magento.stock.picking.out:0
424+msgid "A stock picking with same ID on Magento already exists."
425+msgstr "A stock picking with same ID on Magento already exists."
426+
427+#. module: magentoerpconnect
428+#: view:magento.backend:0
429+msgid ""
430+"By clicking on the buttons,\n"
431+" you will initiate the synchronizations\n"
432+" with Magento.\n"
433+" Note that the import or exports\n"
434+" won't be done directly,\n"
435+" they will create 'Jobs'\n"
436+" executed as soon as possible."
437+msgstr ""
438+"By clicking on the buttons,\n"
439+" you will initiate the synchronizations\n"
440+" with Magento.\n"
441+" Note that the import or exports\n"
442+" won't be done directly,\n"
443+" they will create 'Jobs'\n"
444+" executed as soon as possible."
445+
446+#. module: magentoerpconnect
447+#: help:magento.backend,product_stock_field_id:0
448+msgid ""
449+"Choose the field of the product which will be used for stock inventory "
450+"updates.\n"
451+"If empty, Quantity Available is used."
452+msgstr ""
453+"Choose the field of the product which will be used for stock inventory "
454+"updates.\n"
455+"If empty, Quantity Available is used."
456+
457+#. module: magentoerpconnect
458+#: sql_constraint:magento.product.product:0
459+msgid "A product with the same ID on Magento already exists"
460+msgstr "A product with the same ID on Magento already exists"
461+
462+#. module: magentoerpconnect
463+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
464+msgid "Backends"
465+msgstr "Backends"
466+
467+#. module: magentoerpconnect
468+#: field:magento.backend,location:0
469+msgid "Location"
470+msgstr "Localización"
471+
472+#. module: magentoerpconnect
473+#: model:ir.model,name:magentoerpconnect.model_stock_picking
474+msgid "Picking List"
475+msgstr "Albarán"
476+
477+#. module: magentoerpconnect
478+#: field:magento.backend,warehouse_id:0
479+msgid "Warehouse"
480+msgstr "Almacen"
481+
482+#. module: magentoerpconnect
483+#: field:magento.backend,catalog_price_tax_included:0
484+msgid "Prices include tax"
485+msgstr "Precios incluyen impuestos"
486+
487+#. module: magentoerpconnect
488+#: view:magento.backend:0
489+msgid "Import products categories since"
490+msgstr "Importar categorias productos desde"
491+
492+#. module: magentoerpconnect
493+#: field:magento.sale.order.line,openerp_id:0
494+msgid "Sale Order Line"
495+msgstr "Línea Pedido Venta"
496+
497+#. module: magentoerpconnect
498+#: field:magento.backend,username:0
499+msgid "Username"
500+msgstr "Usuario"
501+
502+#. module: magentoerpconnect
503+#: model:ir.model,name:magentoerpconnect.model_product_category
504+#: field:magento.product.category,openerp_id:0
505+msgid "Product Category"
506+msgstr "Categoría Producto"
507+
508+#. module: magentoerpconnect
509+#: field:magento.res.partner,guest_customer:0
510+msgid "Guest Customer"
511+msgstr "Cliente Anónimo"
512+
513+#. module: magentoerpconnect
514+#: help:connector.config.settings,module_magentoerpconnect_pricing:0
515+msgid ""
516+"Prices are set in OpenERP and exported to Magento.\n"
517+"\n"
518+"This installs the module magentoerpconnect_pricing."
519+msgstr ""
520+"Prices are set in OpenERP and exported to Magento.\n"
521+"\n"
522+"This installs the module magentoerpconnect_pricing."
523+
524+#. module: magentoerpconnect
525+#: field:delivery.carrier,magento_carrier_code:0
526+msgid "Magento Base Carrier Code"
527+msgstr "Magento Base Carrier Code"
528+
529+#. module: magentoerpconnect
530+#: view:magento.website:0
531+msgid "Import partners since"
532+msgstr "Importar empresas desde"
533+
534+#. module: magentoerpconnect
535+#: view:magento.backend:0
536+#: view:magento.website:0
537+msgid "Import in background"
538+msgstr "Importar en segundo plano"
539+
540+#. module: magentoerpconnect
541+#: field:magento.account.invoice,magento_id:0
542+#: field:magento.address,magento_id:0
543+#: field:magento.binding,magento_id:0
544+#: field:magento.product.category,magento_id:0
545+#: field:magento.product.product,magento_id:0
546+#: field:magento.res.partner,magento_id:0
547+#: field:magento.res.partner.category,magento_id:0
548+#: field:magento.sale.order,magento_id:0
549+#: field:magento.sale.order.line,magento_id:0
550+#: field:magento.stock.picking.out,magento_id:0
551+#: field:magento.store,magento_id:0
552+#: field:magento.storeview,magento_id:0
553+#: field:magento.website,magento_id:0
554+msgid "ID on Magento"
555+msgstr "ID en Magento"
556+
557+#. module: magentoerpconnect
558+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
559+msgid "Magento Stores"
560+msgstr "Tiendas Magento"
561+
562+#. module: magentoerpconnect
563+#: field:magento.backend,pricelist_id:0
564+#: field:magento.website,pricelist_id:0
565+msgid "Pricelist"
566+msgstr "Tarifa"
567+
568+#. module: magentoerpconnect
569+#: field:magento.sale.order,total_amount:0
570+msgid "Total amount"
571+msgstr "Cantidad Total"
572+
573+#. module: magentoerpconnect
574+#: model:ir.model,name:magentoerpconnect.model_magento_product_category
575+#: view:magento.product.category:0
576+msgid "Magento Product Category"
577+msgstr "Categoría Producto Magento"
578+
579+#. module: magentoerpconnect
580+#: view:magento.product.product:0
581+msgid "(recompute)"
582+msgstr "(recompitar)"
583+
584+#. module: magentoerpconnect
585+#: field:magento.store,openerp_id:0
586+msgid "Sale Shop"
587+msgstr "Tienda Venta"
588+
589+#. module: magentoerpconnect
590+#: field:magento.product.product,manage_stock:0
591+msgid "Manage Stock Level"
592+msgstr "Gestión Nivel Stock"
593+
594+#. module: magentoerpconnect
595+#: model:ir.model,name:magentoerpconnect.model_magento_backend
596+#: field:magento.account.invoice,backend_id:0
597+#: field:magento.address,backend_id:0
598+#: view:magento.backend:0
599+#: field:magento.binding,backend_id:0
600+#: field:magento.product.category,backend_id:0
601+#: field:magento.product.product,backend_id:0
602+#: field:magento.res.partner,backend_id:0
603+#: field:magento.res.partner.category,backend_id:0
604+#: field:magento.sale.order,backend_id:0
605+#: field:magento.sale.order.line,backend_id:0
606+#: field:magento.stock.picking.out,backend_id:0
607+#: field:magento.store,backend_id:0
608+#: field:magento.storeview,backend_id:0
609+#: field:magento.website,backend_id:0
610+msgid "Magento Backend"
611+msgstr "Magento Backend"
612+
613+#. module: magentoerpconnect
614+#: view:magento.storeview:0
615+msgid "Import Sale Orders"
616+msgstr "Importar"
617+
618+#. module: magentoerpconnect
619+#: field:magento.stock.picking.out,picking_method:0
620+msgid "Picking Method"
621+msgstr "Método Picking"
622+
623+#. module: magentoerpconnect
624+#: view:res.partner:0
625+#: field:res.partner,magento_address_bind_ids:0
626+msgid "Magento Address Bindings"
627+msgstr "Magento Address Bindings"
628+
629+#. module: magentoerpconnect
630+#: field:magento.store,send_invoice_paid_mail:0
631+msgid "Send email notification on invoice paid"
632+msgstr "Enviar notificación email cuando se pague la factura"
633+
634+#. module: magentoerpconnect
635+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_storeview
636+msgid "Magento Storeviews"
637+msgstr "Vista Tienda Magento"
638+
639+#. module: magentoerpconnect
640+#: view:magento.storeview:0
641+msgid "Import Sale Orders since"
642+msgstr "Importar Pedidos Venta desde"
643+
644+#. module: magentoerpconnect
645+#: selection:magento.product.product,backorders:0
646+msgid "Sell Quantity < 0"
647+msgstr "Vendes Cantidad < 0"
648+
649+#. module: magentoerpconnect
650+#: help:magento.sale.order,magento_order_id:0
651+msgid "'order_id' field in Magento"
652+msgstr "'order_id' field in Magento"
653+
654+#. module: magentoerpconnect
655+#: field:magento.product.category,magento_parent_id:0
656+msgid "Magento Parent Category"
657+msgstr "Categoría Padre Magento"
658+
659+#. module: magentoerpconnect
660+#: field:magento.res.partner,emailid:0
661+msgid "E-mail address"
662+msgstr "E-mail"
663+
664+#. module: magentoerpconnect
665+#: selection:magento.stock.picking.out,picking_method:0
666+msgid "Partial"
667+msgstr "Parcial"
668+
669+#. module: magentoerpconnect
670+#: model:ir.model,name:magentoerpconnect.model_sale_shop
671+msgid "Sales Shop"
672+msgstr "Tienda Ventas"
673+
674+#. module: magentoerpconnect
675+#: field:magento.sale.order,total_amount_tax:0
676+msgid "Total amount w. tax"
677+msgstr "Total w. impuesto"
678+
679+#. module: magentoerpconnect
680+#: model:ir.model,name:magentoerpconnect.model_magento_storeview
681+#: view:magento.storeview:0
682+msgid "Magento Storeview"
683+msgstr "Vista Tienda Magento"
684+
685+#. module: magentoerpconnect
686+#: field:magento.backend,default_lang_id:0
687+msgid "Default Language"
688+msgstr "Idioma por defecto"
689+
690+#. module: magentoerpconnect
691+#: field:magento.sale.order,magento_parent_id:0
692+msgid "Parent Magento Order"
693+msgstr "Pedido Magento Padre"
694+
695+#. module: magentoerpconnect
696+#: model:ir.model,name:magentoerpconnect.model_magento_address
697+#: view:magento.address:0
698+msgid "Magento Address"
699+msgstr "Dirección Magento"
700+
701+#. module: magentoerpconnect
702+#: view:magento.backend:0
703+msgid "Update"
704+msgstr "Actualizar"
705+
706+#. module: magentoerpconnect
707+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_storeview
708+#: view:magento.store:0
709+#: field:magento.store,storeview_ids:0
710+msgid "Storeviews"
711+msgstr "Vistas Tiendas"
712+
713+#. module: magentoerpconnect
714+#: selection:magento.product.product,backorders:0
715+#: selection:magento.product.product,manage_stock:0
716+msgid "Use Default Config"
717+msgstr "Usar Configuración por defecto"
718+
719+#. module: magentoerpconnect
720+#: field:magento.storeview,store_id:0
721+msgid "Store"
722+msgstr "Tienda"
723+
724+#. module: magentoerpconnect
725+#: field:magento.backend,website_ids:0
726+msgid "Website"
727+msgstr "Sitio Web"
728+
729+#. module: magentoerpconnect
730+#: view:magento.backend:0
731+msgid "Magento Configuration"
732+msgstr "Magento Configuration"
733+
734+#. module: magentoerpconnect
735+#: view:magento.backend:0
736+msgid "Update all the products stock quantities"
737+msgstr "Actualizar el stock de todos los productos"
738+
739+#. module: magentoerpconnect
740+#: view:magento.backend:0
741+msgid "Import partners from all websites"
742+msgstr "Importar empresas de todos los sitios web"
743+
744+#. module: magentoerpconnect
745+#: view:connector.config.settings:0
746+msgid "Magentoerpconnect"
747+msgstr "Magentoerpconnect"
748+
749+#. module: magentoerpconnect
750+#: view:magento.store:0
751+#: view:magento.storeview:0
752+#: view:magento.website:0
753+msgid "Options"
754+msgstr "Opciones"
755+
756+#. module: magentoerpconnect
757+#: field:res.partner,birthday:0
758+msgid "Birthday"
759+msgstr "Cumpleaños"
760+
761+#. module: magentoerpconnect
762+#: field:magento.backend,default_category_id:0
763+msgid "Default Product Category"
764+msgstr "Categoría Producto por Defecto"
765+
766+#. module: magentoerpconnect
767+#: field:magento.product.product,magento_qty:0
768+msgid "Computed Quantity"
769+msgstr "Computed Quantity"
770+
771+#. module: magentoerpconnect
772+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_website
773+msgid "Magento Websites"
774+msgstr "Sitio Web Magento"
775+
776+#. module: magentoerpconnect
777+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order_line
778+msgid "Magento Sale Order Line"
779+msgstr "Línea Pedido Venta Magento"
780+
781+#. module: magentoerpconnect
782+#: sql_constraint:magento.product.category:0
783+msgid "A product category with same ID on Magento already exists."
784+msgstr "A product category with same ID on Magento already exists."
785+
786+#. module: magentoerpconnect
787+#: field:magento.product.product,product_type:0
788+msgid "Magento Product Type"
789+msgstr "Tipo Producto Magento"
790+
791+#. module: magentoerpconnect
792+#: field:magento.storeview,lang_id:0
793+msgid "Language"
794+msgstr "Idioma"
795+
796+#. module: magentoerpconnect
797+#: field:magento.address,created_at:0
798+#: field:magento.product.product,created_at:0
799+#: field:magento.res.partner,created_at:0
800+msgid "Created At (on Magento)"
801+msgstr "Creado a las (en Magento)"
802+
803+#. module: magentoerpconnect
804+#: field:delivery.carrier,magento_export_tracking:0
805+msgid "Export tracking numbers"
806+msgstr "Exportar Números de Seguimiento"
807+
808+#. module: magentoerpconnect
809+#: field:magento.storeview,sort_order:0
810+#: field:magento.website,sort_order:0
811+msgid "Sort Order"
812+msgstr "Orden de Clasificación"
813+
814+#. module: magentoerpconnect
815+#: field:magento.backend,product_binding_ids:0
816+#: field:magento.website,product_binding_ids:0
817+msgid "Magento Products"
818+msgstr "Productos Magento"
819+
820+#. module: magentoerpconnect
821+#: field:magento.storeview,import_orders_from_date:0
822+msgid "Import sale orders from date"
823+msgstr "Importar pedidos venta desde fecha"
824+
825+#. module: magentoerpconnect
826+#: model:ir.model,name:magentoerpconnect.model_res_partner_category
827+msgid "Partner Categories"
828+msgstr "Categorías Empresas"
829+
830+#. module: magentoerpconnect
831+#: field:magento.address,is_default_billing:0
832+msgid "Default Invoice"
833+msgstr "Factura por defecto"
834+
835+#. module: magentoerpconnect
836+#: view:magento.store:0
837+#: view:magento.storeview:0
838+#: view:magento.website:0
839+msgid "Informations"
840+msgstr "Informaciones"
841+
842+#. module: magentoerpconnect
843+#: field:magento.storeview,code:0
844+#: field:magento.website,code:0
845+msgid "Code"
846+msgstr "Código"
847+
848+#. module: magentoerpconnect
849+#: field:magento.sale.order.line,tax_rate:0
850+msgid "Tax Rate"
851+msgstr "Impuesto"
852+
853+#. module: magentoerpconnect
854+#: view:magento.backend:0
855+#: view:magento.storeview:0
856+#: view:magento.website:0
857+msgid "Imports"
858+msgstr "Importaciones"
859+
860+#. module: magentoerpconnect
861+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_backend
862+msgid "Magento Backends"
863+msgstr "Magento Backends"
864+
865+#. module: magentoerpconnect
866+#: field:magento.product.category,magento_child_ids:0
867+msgid "Magento Child Categories"
868+msgstr "Subcategorias Magento"
869+
870+#. module: magentoerpconnect
871+#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
872+msgid "Export Partners to Magento (experimental)"
873+msgstr "Exportar Empresas a Magento (experimental)"
874+
875+#. module: magentoerpconnect
876+#: field:magento.backend,version:0
877+msgid "Version"
878+msgstr "Versión"
879+
880+#. module: magentoerpconnect
881+#: model:ir.model,name:magentoerpconnect.model_account_invoice
882+#: field:magento.account.invoice,openerp_id:0
883+msgid "Invoice"
884+msgstr "Factura"
885+
886+#. module: magentoerpconnect
887+#: field:delivery.carrier,magento_code:0
888+msgid "Magento Carrier Code"
889+msgstr "Modo de Envio Magento"
890+
891+#. module: magentoerpconnect
892+#: sql_constraint:magento.res.partner.category:0
893+msgid "A partner tag with same ID on Magento already exists."
894+msgstr "A partner tag with same ID on Magento already exists."
895+
896+#. module: magentoerpconnect
897+#: field:magento.res.partner,taxvat:0
898+msgid "Magento VAT"
899+msgstr "Impuesto Magento"
900+
901+#. module: magentoerpconnect
902+#: field:magento.res.partner.category,tax_class_id:0
903+msgid "Tax Class ID"
904+msgstr "Tax Class ID"
905+
906+#. module: magentoerpconnect
907+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount
908+msgid "Total Amount differs from Magento"
909+msgstr "Importe Total Difiere de Magento"
910+
911+#. module: magentoerpconnect
912+#: field:magento.store,send_picking_done_mail:0
913+msgid "Send email notification on picking done"
914+msgstr "Enviar email de notificación cuando sea realizado el picking"
915+
916+#. module: magentoerpconnect
917+#: model:ir.model,name:magentoerpconnect.model_magento_binding
918+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner_category
919+msgid "Magento Binding (abstract)"
920+msgstr "Magento Binding (abstract)"
921+
922+#. module: magentoerpconnect
923+#: model:ir.model,name:magentoerpconnect.model_magento_account_invoice
924+msgid "Magento Account Invoice"
925+msgstr "Factura Magento"
926+
927+#. module: magentoerpconnect
928+#: sql_constraint:magento.store:0
929+msgid "A store with the same ID on Magento already exists."
930+msgstr "A store with the same ID on Magento already exists."
931+
932+#. module: magentoerpconnect
933+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner
934+#: field:magento.address,magento_partner_id:0
935+#: view:magento.res.partner:0
936+msgid "Magento Partner"
937+msgstr "Empresa Magento"
938+
939+#. module: magentoerpconnect
940+#: sql_constraint:magento.storeview:0
941+msgid "A storeview with same ID on Magento already exists."
942+msgstr "A storeview with same ID on Magento already exists."
943+
944+#. module: magentoerpconnect
945+#: model:ir.model,name:magentoerpconnect.model_magento_stock_picking_out
946+#: view:magento.stock.picking.out:0
947+msgid "Magento Delivery Order"
948+msgstr "Albaran Magento"
949+
950+#. module: magentoerpconnect
951+#: view:magento.backend:0
952+msgid "Import products since"
953+msgstr "Importar productos desde"
954+
955+#. module: magentoerpconnect
956+#: field:magento.product.category,description:0
957+msgid "Description"
958+msgstr "Descripción"
959+
960+#. module: magentoerpconnect
961+#: selection:magento.product.product,backorders:0
962+msgid "Sell Quantity < 0 and Use Customer Notification"
963+msgstr "Vender cantidad z 0 y Usar Notificación Cliente"
964+
965+#. module: magentoerpconnect
966+#: sql_constraint:magento.account.invoice:0
967+msgid "An invoice with the same ID on Magento already exists."
968+msgstr "An invoice with the same ID on Magento already exists."
969+
970+#. module: magentoerpconnect
971+#: sql_constraint:magento.res.partner:0
972+msgid "A partner with same ID on Magento already exists for this website."
973+msgstr "A partner with same ID on Magento already exists for this website."
974+
975+#. module: magentoerpconnect
976+#: view:magento.backend:0
977+msgid "e.g. http://my.magento.com"
978+msgstr "e.g. http://my.magento.com"
979+
980+#. module: magentoerpconnect
981+#: view:magento.account.invoice:0
982+msgid "Magento Invoice"
983+msgstr "Factura Magento"
984+
985+#. module: magentoerpconnect
986+#: field:magento.backend,password:0
987+msgid "Password"
988+msgstr "Contraseña"
989+
990+#. module: magentoerpconnect
991+#: view:magento.backend:0
992+msgid "Main Configuration"
993+msgstr "Configuración Principal"
994+
995+#. module: magentoerpconnect
996+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount
997+msgid ""
998+"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
999+"\n"
1000+"Cause:\n"
1001+"The taxes are probably different between OpenERP and Magento. A fiscal "
1002+"position could have changed the final price.\n"
1003+"\n"
1004+"Resolution:\n"
1005+"Check your taxes and fiscal positions configuration and correct them if "
1006+"necessary."
1007+msgstr ""
1008+"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
1009+"\n"
1010+"Cause:\n"
1011+"The taxes are probably different between OpenERP and Magento. A fiscal "
1012+"position could have changed the final price.\n"
1013+"\n"
1014+"Resolution:\n"
1015+"Check your taxes and fiscal positions configuration and correct them if "
1016+"necessary."
1017+
1018+#. module: magentoerpconnect
1019+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount_tax
1020+msgid "Total Tax Amount differs from Magento"
1021+msgstr "Total Impuestos difiere de Magento"
1022+
1023+#. module: magentoerpconnect
1024+#: view:magento.backend:0
1025+msgid "Import all customer groups"
1026+msgstr "Importar todos los grupos de clientes"
1027+
1028+#. module: magentoerpconnect
1029+#: field:magento.backend,name:0
1030+#: field:magento.storeview,name:0
1031+#: field:magento.website,name:0
1032+msgid "Name"
1033+msgstr "Nombre"
1034+
1035+#. module: magentoerpconnect
1036+#: model:ir.model,name:magentoerpconnect.model_magento_website
1037+#: field:magento.address,website_id:0
1038+#: field:magento.res.partner,website_id:0
1039+#: field:magento.store,website_id:0
1040+#: view:magento.website:0
1041+msgid "Magento Website"
1042+msgstr "Sitio Web Magento"
1043+
1044+#. module: magentoerpconnect
1045+#: field:magento.storeview,enabled:0
1046+msgid "Enabled"
1047+msgstr "Activado"
1048+
1049+#. module: magentoerpconnect
1050+#: field:magento.product.product,backorders:0
1051+msgid "Manage Inventory Backorders"
1052+msgstr "Manage Inventory Backorders"
1053+
1054+#. module: magentoerpconnect
1055+#: model:ir.model,name:magentoerpconnect.model_product_product
1056+#: field:magento.product.product,openerp_id:0
1057+msgid "Product"
1058+msgstr "Producto"
1059+
1060+#. module: magentoerpconnect
1061+#: view:magento.backend:0
1062+msgid "Synchronize Metadata"
1063+msgstr "Sincronizar Metadata"
1064+
1065+#. module: magentoerpconnect
1066+#: help:magento.website,pricelist_id:0
1067+msgid ""
1068+"The pricelist used to define the prices of the products in Magento for this "
1069+"website.\n"
1070+"Choose a pricelist only if the prices are different for this website.\n"
1071+"When empty, the default price will be used."
1072+msgstr ""
1073+"Lista de precios usada para definir los precios de los productos en Magento "
1074+"para esta web.\n"
1075+"Elige una lista solo si los precios son diferentes para esta web.\n"
1076+"Si no seleccionas ninguna, los precios serán por defecto."
1077+
1078+#. module: magentoerpconnect
1079+#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
1080+msgid "Carrier"
1081+msgstr "Transportista"
1082+
1083+#. module: magentoerpconnect
1084+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_website
1085+#: view:magento.backend:0
1086+#: field:magento.product.product,website_ids:0
1087+msgid "Websites"
1088+msgstr "Sitios Web"
1089+
1090+#. module: magentoerpconnect
1091+#: view:magento.product.product:0
1092+msgid "Inventory Options"
1093+msgstr "Opciones Inventario"
1094+
1095+#. module: magentoerpconnect
1096+#: selection:magento.product.product,backorders:0
1097+msgid "No Sell"
1098+msgstr "No Vender"
1099+
1100+#. module: magentoerpconnect
1101+#: view:magento.backend:0
1102+msgid ""
1103+"Once imported,\n"
1104+" some types of records,\n"
1105+" like the products or categories,\n"
1106+" need a manual review.\n"
1107+" You will find the list\n"
1108+" of the new records to review\n"
1109+" in the menu 'Connectors > Checkpoint'."
1110+msgstr ""
1111+"Once imported,\n"
1112+" some types of records,\n"
1113+" like the products or categories,\n"
1114+" need a manual review.\n"
1115+" You will find the list\n"
1116+" of the new records to review\n"
1117+" in the menu 'Connectors > Checkpoint'."
1118+
1119+#. module: magentoerpconnect
1120+#: field:delivery.carrier,magento_tracking_title:0
1121+msgid "Magento Tracking Title"
1122+msgstr "Magento Tracking Title"
1123+
1124+#. module: magentoerpconnect
1125+#: selection:magento.product.product,manage_stock:0
1126+msgid "Manage Stock"
1127+msgstr "Gestionar Stock"
1128+
1129+#. module: magentoerpconnect
1130+#: field:magento.address,updated_at:0
1131+#: field:magento.product.product,updated_at:0
1132+#: field:magento.res.partner,updated_at:0
1133+msgid "Updated At (on Magento)"
1134+msgstr "Updated At (on Magento)"
1135+
1136+#. module: magentoerpconnect
1137+#: selection:magento.stock.picking.out,picking_method:0
1138+msgid "Complete"
1139+msgstr "Completo"
1140+
1141+#. module: magentoerpconnect
1142+#: model:ir.model,name:magentoerpconnect.model_magento_store
1143+#: view:magento.store:0
1144+msgid "Magento Store"
1145+msgstr "Tienda Magento"
1146+
1147+#. module: magentoerpconnect
1148+#: model:ir.model,name:magentoerpconnect.model_magento_product_product
1149+#: view:magento.product.product:0
1150+msgid "Magento Product"
1151+msgstr "Producto Magento"
1152+
1153+#. module: magentoerpconnect
1154+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order
1155+#: field:magento.account.invoice,magento_order_id:0
1156+#: field:magento.sale.order.line,magento_order_id:0
1157+#: field:magento.stock.picking.out,magento_order_id:0
1158+msgid "Magento Sale Order"
1159+msgstr "Pedido Venta Magento"
1160+
1161+#. module: magentoerpconnect
1162+#: field:magento.website,import_partners_from_date:0
1163+msgid "Import partners from date"
1164+msgstr "Importar empresas desde fecha"
1165+
1166+#. module: magentoerpconnect
1167+#: sql_constraint:magento.sale.order:0
1168+#: sql_constraint:magento.sale.order.line:0
1169+msgid "A sale order line with the same ID on Magento already exists."
1170+msgstr "A sale order line with the same ID on Magento already exists."
1171+
1172+#. module: magentoerpconnect
1173+#: field:magento.sale.order,magento_order_line_ids:0
1174+msgid "Magento Order Lines"
1175+msgstr "Lineas Pedido Venta Magento"
1176+
1177+#. module: magentoerpconnect
1178+#: field:magento.res.partner,newsletter:0
1179+msgid "Newsletter"
1180+msgstr "Boletín"
1181+
1182+#. module: magentoerpconnect
1183+#: help:magento.backend,default_lang_id:0
1184+msgid ""
1185+"If a default language is selected, the records will be imported in the "
1186+"translation of this language.\n"
1187+"Note that a similar configuration exists for each storeview."
1188+msgstr ""
1189+"If a default language is selected, the records will be imported in the "
1190+"translation of this language.\n"
1191+"Note that a similar configuration exists for each storeview."
1192+
1193+#. module: magentoerpconnect
1194+#: sql_constraint:magento.address:0
1195+msgid "A partner address with same ID on Magento already exists."
1196+msgstr "A partner address with same ID on Magento already exists."
1197+>>>>>>> MERGE-SOURCE
1198
1199=== modified file 'magentoerpconnect/i18n/fr.po'
1200--- magentoerpconnect/i18n/fr.po 2014-05-22 06:50:36 +0000
1201+++ magentoerpconnect/i18n/fr.po 2014-05-23 12:57:06 +0000
1202@@ -13,8 +13,13 @@
1203 "MIME-Version: 1.0\n"
1204 "Content-Type: text/plain; charset=UTF-8\n"
1205 "Content-Transfer-Encoding: 8bit\n"
1206+<<<<<<< TREE
1207 "X-Launchpad-Export-Date: 2014-05-22 06:50+0000\n"
1208 "X-Generator: Launchpad (build 17017)\n"
1209+=======
1210+"X-Launchpad-Export-Date: 2014-04-12 10:07+0000\n"
1211+"X-Generator: Launchpad (build 16976)\n"
1212+>>>>>>> MERGE-SOURCE
1213
1214 #. module: magentoerpconnect
1215 #: help:magento.backend,pricelist_id:0
1216
1217=== modified file 'magentoerpconnect/i18n/it.po'
1218--- magentoerpconnect/i18n/it.po 2014-05-22 06:50:36 +0000
1219+++ magentoerpconnect/i18n/it.po 2014-05-23 12:57:06 +0000
1220@@ -1,3 +1,4 @@
1221+<<<<<<< TREE
1222 # Italian translation for openerp-connector-magento
1223 # Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
1224 # This file is distributed under the same license as the openerp-connector-magento package.
1225@@ -1002,3 +1003,1009 @@
1226 #: sql_constraint:magento.address:0
1227 msgid "A partner address with same ID on Magento already exists."
1228 msgstr ""
1229+=======
1230+# Italian translation for openerp-connector-magento
1231+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
1232+# This file is distributed under the same license as the openerp-connector-magento package.
1233+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
1234+#
1235+msgid ""
1236+msgstr ""
1237+"Project-Id-Version: openerp-connector-magento\n"
1238+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1239+"POT-Creation-Date: 2013-05-01 12:45+0000\n"
1240+"PO-Revision-Date: 2014-02-13 13:32+0000\n"
1241+"Last-Translator: Davide Corio @ LS <davide.corio@lsweb.it>\n"
1242+"Language-Team: Italian <it@li.org>\n"
1243+"MIME-Version: 1.0\n"
1244+"Content-Type: text/plain; charset=UTF-8\n"
1245+"Content-Transfer-Encoding: 8bit\n"
1246+"X-Launchpad-Export-Date: 2014-04-12 10:07+0000\n"
1247+"X-Generator: Launchpad (build 16976)\n"
1248+
1249+#. module: magentoerpconnect
1250+#: help:magento.backend,pricelist_id:0
1251+msgid "The price list used to define the prices of the products in Magento."
1252+msgstr "Listino prezzo usato per definire i prezzi dei prodotti in Magento."
1253+
1254+#. module: magentoerpconnect
1255+#: help:magento.store,send_invoice_paid_mail:0
1256+msgid ""
1257+"Does the invoice export/creation should send an email notification on "
1258+"Magento side?"
1259+msgstr ""
1260+"Si vuole che l'esportazione/creazione di fatture invii un email di notifica "
1261+"da Magento?"
1262+
1263+#. module: magentoerpconnect
1264+#: view:magento.backend:0
1265+msgid "Import sales orders from all store views"
1266+msgstr "Importa ordini di vendita da tutte le viste negozio."
1267+
1268+#. module: magentoerpconnect
1269+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
1270+msgid ""
1271+"The tax amount computed in OpenERP doesn't match with the tax amount in "
1272+"Magento.\n"
1273+"\n"
1274+"Cause:\n"
1275+"The taxes are probably different between OpenERP and Magento. A fiscal "
1276+"position could have changed the final price.\n"
1277+"\n"
1278+"Resolution:\n"
1279+"Check your taxes and fiscal positions configuration and correct them if "
1280+"necessary."
1281+msgstr ""
1282+
1283+#. module: magentoerpconnect
1284+#: help:magento.backend,warehouse_id:0
1285+msgid "Warehouse used to compute the stock quantities."
1286+msgstr "Magazzino usato per la valorizzazione delle scorte."
1287+
1288+#. module: magentoerpconnect
1289+#: field:magento.account.invoice,sync_date:0
1290+#: field:magento.address,sync_date:0
1291+#: field:magento.binding,sync_date:0
1292+#: field:magento.product.category,sync_date:0
1293+#: field:magento.product.product,sync_date:0
1294+#: field:magento.res.partner,sync_date:0
1295+#: field:magento.res.partner.category,sync_date:0
1296+#: field:magento.sale.order,sync_date:0
1297+#: field:magento.sale.order.line,sync_date:0
1298+#: field:magento.stock.picking.out,sync_date:0
1299+#: field:magento.store,sync_date:0
1300+#: field:magento.storeview,sync_date:0
1301+#: field:magento.website,sync_date:0
1302+msgid "Last synchronization date"
1303+msgstr "Data ultima sincronizzazione"
1304+
1305+#. module: magentoerpconnect
1306+#: help:magento.backend,default_category_id:0
1307+msgid ""
1308+"If a default category is selected, products imported without a category will "
1309+"be linked to it."
1310+msgstr ""
1311+
1312+#. module: magentoerpconnect
1313+#: help:magento.storeview,import_orders_from_date:0
1314+msgid ""
1315+"do not consider non-imported sale orders before this date. Leave empty to "
1316+"import all sale orders"
1317+msgstr ""
1318+
1319+#. module: magentoerpconnect
1320+#: help:magento.store,send_picking_done_mail:0
1321+msgid ""
1322+"Does the picking export/creation should send an email notification on "
1323+"Magento side?"
1324+msgstr ""
1325+
1326+#. module: magentoerpconnect
1327+#: selection:magento.product.product,manage_stock:0
1328+msgid "Do Not Manage Stock"
1329+msgstr ""
1330+
1331+#. module: magentoerpconnect
1332+#: field:connector.config.settings,module_magentoerpconnect_catalog:0
1333+msgid "Handle the product's catalog (not implemented)"
1334+msgstr ""
1335+
1336+#. module: magentoerpconnect
1337+#: field:res.partner,company:0
1338+msgid "Company"
1339+msgstr ""
1340+
1341+#. module: magentoerpconnect
1342+#: sql_constraint:magento.website:0
1343+msgid "A website with the same ID on Magento already exists."
1344+msgstr ""
1345+
1346+#. module: magentoerpconnect
1347+#: field:magento.backend,import_categories_from_date:0
1348+msgid "Import categories from date"
1349+msgstr ""
1350+
1351+#. module: magentoerpconnect
1352+#: view:account.invoice:0
1353+#: field:account.invoice,magento_bind_ids:0
1354+#: view:product.category:0
1355+#: field:product.category,magento_bind_ids:0
1356+#: view:product.product:0
1357+#: field:product.product,magento_bind_ids:0
1358+#: view:res.partner:0
1359+#: field:res.partner,magento_bind_ids:0
1360+#: field:res.partner.category,magento_bind_ids:0
1361+#: field:sale.order,magento_bind_ids:0
1362+#: field:sale.order.line,magento_bind_ids:0
1363+#: field:sale.shop,magento_bind_ids:0
1364+#: field:stock.picking,magento_bind_ids:0
1365+#: view:stock.picking.out:0
1366+#: field:stock.picking.out,magento_bind_ids:0
1367+msgid "Magento Bindings"
1368+msgstr ""
1369+
1370+#. module: magentoerpconnect
1371+#: help:connector.config.settings,module_magentoerpconnect_catalog:0
1372+msgid "This installs the module magentoerpconnect_catalog."
1373+msgstr ""
1374+
1375+#. module: magentoerpconnect
1376+#: field:magento.address,is_magento_order_address:0
1377+msgid "Address from a Magento Order"
1378+msgstr ""
1379+
1380+#. module: magentoerpconnect
1381+#: field:magento.sale.order,magento_order_id:0
1382+msgid "Magento Order ID"
1383+msgstr ""
1384+
1385+#. module: magentoerpconnect
1386+#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
1387+msgid "magentoerpconnect.installed"
1388+msgstr ""
1389+
1390+#. module: magentoerpconnect
1391+#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
1392+msgid "This installs the module magentoerpconnect_export_partner."
1393+msgstr ""
1394+
1395+#. module: magentoerpconnect
1396+#: field:magento.sale.order.line,notes:0
1397+msgid "Notes"
1398+msgstr ""
1399+
1400+#. module: magentoerpconnect
1401+#: field:magento.sale.order,openerp_id:0
1402+msgid "Sale Order"
1403+msgstr ""
1404+
1405+#. module: magentoerpconnect
1406+#: field:magento.stock.picking.out,openerp_id:0
1407+msgid "Stock Picking"
1408+msgstr ""
1409+
1410+#. module: magentoerpconnect
1411+#: view:connector.config.settings:0
1412+msgid "Extensions"
1413+msgstr ""
1414+
1415+#. module: magentoerpconnect
1416+#: view:magento.backend:0
1417+msgid "Advanced Configuration"
1418+msgstr ""
1419+
1420+#. module: magentoerpconnect
1421+#: field:magento.res.partner,group_id:0
1422+msgid "Magento Group (Category)"
1423+msgstr ""
1424+
1425+#. module: magentoerpconnect
1426+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
1427+#: view:magento.website:0
1428+#: field:magento.website,store_ids:0
1429+msgid "Stores"
1430+msgstr ""
1431+
1432+#. module: magentoerpconnect
1433+#: field:magento.backend,product_stock_field_id:0
1434+msgid "Stock Field"
1435+msgstr ""
1436+
1437+#. module: magentoerpconnect
1438+#: field:magento.res.partner.category,openerp_id:0
1439+msgid "Partner Category"
1440+msgstr ""
1441+
1442+#. module: magentoerpconnect
1443+#: help:magento.product.product,magento_qty:0
1444+msgid "Last computed quantity to send on Magento."
1445+msgstr ""
1446+
1447+#. module: magentoerpconnect
1448+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
1449+#: view:res.partner.category:0
1450+msgid "Magento"
1451+msgstr ""
1452+
1453+#. module: magentoerpconnect
1454+#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
1455+msgid "connector.config.settings"
1456+msgstr ""
1457+
1458+#. module: magentoerpconnect
1459+#: field:magento.backend,import_products_from_date:0
1460+msgid "Import products from date"
1461+msgstr ""
1462+
1463+#. module: magentoerpconnect
1464+#: model:ir.model,name:magentoerpconnect.model_res_partner
1465+#: field:magento.address,openerp_id:0
1466+#: field:magento.res.partner,openerp_id:0
1467+msgid "Partner"
1468+msgstr ""
1469+
1470+#. module: magentoerpconnect
1471+#: model:ir.model,name:magentoerpconnect.model_sale_order
1472+msgid "Sales Order"
1473+msgstr ""
1474+
1475+#. module: magentoerpconnect
1476+#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
1477+msgid "Delivery Orders"
1478+msgstr ""
1479+
1480+#. module: magentoerpconnect
1481+#: model:ir.model,name:magentoerpconnect.model_sale_order_line
1482+msgid "Sales Order Line"
1483+msgstr ""
1484+
1485+#. module: magentoerpconnect
1486+#: field:connector.config.settings,module_magentoerpconnect_pricing:0
1487+msgid "Prices are managed in OpenERP with pricelists"
1488+msgstr ""
1489+
1490+#. module: magentoerpconnect
1491+#: field:magento.address,is_default_shipping:0
1492+msgid "Default Shipping"
1493+msgstr ""
1494+
1495+#. module: magentoerpconnect
1496+#: sql_constraint:magento.stock.picking.out:0
1497+msgid "A stock picking with same ID on Magento already exists."
1498+msgstr ""
1499+
1500+#. module: magentoerpconnect
1501+#: view:magento.backend:0
1502+msgid ""
1503+"By clicking on the buttons,\n"
1504+" you will initiate the synchronizations\n"
1505+" with Magento.\n"
1506+" Note that the import or exports\n"
1507+" won't be done directly,\n"
1508+" they will create 'Jobs'\n"
1509+" executed as soon as possible."
1510+msgstr ""
1511+
1512+#. module: magentoerpconnect
1513+#: help:magento.backend,product_stock_field_id:0
1514+msgid ""
1515+"Choose the field of the product which will be used for stock inventory "
1516+"updates.\n"
1517+"If empty, Quantity Available is used."
1518+msgstr ""
1519+
1520+#. module: magentoerpconnect
1521+#: sql_constraint:magento.product.product:0
1522+msgid "A product with the same ID on Magento already exists"
1523+msgstr ""
1524+
1525+#. module: magentoerpconnect
1526+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
1527+msgid "Backends"
1528+msgstr ""
1529+
1530+#. module: magentoerpconnect
1531+#: field:magento.backend,location:0
1532+msgid "Location"
1533+msgstr ""
1534+
1535+#. module: magentoerpconnect
1536+#: model:ir.model,name:magentoerpconnect.model_stock_picking
1537+msgid "Picking List"
1538+msgstr ""
1539+
1540+#. module: magentoerpconnect
1541+#: field:magento.backend,warehouse_id:0
1542+msgid "Warehouse"
1543+msgstr ""
1544+
1545+#. module: magentoerpconnect
1546+#: field:magento.backend,catalog_price_tax_included:0
1547+msgid "Prices include tax"
1548+msgstr ""
1549+
1550+#. module: magentoerpconnect
1551+#: view:magento.backend:0
1552+msgid "Import products categories since"
1553+msgstr ""
1554+
1555+#. module: magentoerpconnect
1556+#: field:magento.sale.order.line,openerp_id:0
1557+msgid "Sale Order Line"
1558+msgstr ""
1559+
1560+#. module: magentoerpconnect
1561+#: field:magento.backend,username:0
1562+msgid "Username"
1563+msgstr ""
1564+
1565+#. module: magentoerpconnect
1566+#: model:ir.model,name:magentoerpconnect.model_product_category
1567+#: field:magento.product.category,openerp_id:0
1568+msgid "Product Category"
1569+msgstr ""
1570+
1571+#. module: magentoerpconnect
1572+#: field:magento.res.partner,guest_customer:0
1573+msgid "Guest Customer"
1574+msgstr ""
1575+
1576+#. module: magentoerpconnect
1577+#: help:connector.config.settings,module_magentoerpconnect_pricing:0
1578+msgid ""
1579+"Prices are set in OpenERP and exported to Magento.\n"
1580+"\n"
1581+"This installs the module magentoerpconnect_pricing."
1582+msgstr ""
1583+
1584+#. module: magentoerpconnect
1585+#: field:delivery.carrier,magento_carrier_code:0
1586+msgid "Magento Base Carrier Code"
1587+msgstr ""
1588+
1589+#. module: magentoerpconnect
1590+#: view:magento.website:0
1591+msgid "Import partners since"
1592+msgstr ""
1593+
1594+#. module: magentoerpconnect
1595+#: view:magento.backend:0
1596+#: view:magento.website:0
1597+msgid "Import in background"
1598+msgstr ""
1599+
1600+#. module: magentoerpconnect
1601+#: field:magento.account.invoice,magento_id:0
1602+#: field:magento.address,magento_id:0
1603+#: field:magento.binding,magento_id:0
1604+#: field:magento.product.category,magento_id:0
1605+#: field:magento.product.product,magento_id:0
1606+#: field:magento.res.partner,magento_id:0
1607+#: field:magento.res.partner.category,magento_id:0
1608+#: field:magento.sale.order,magento_id:0
1609+#: field:magento.sale.order.line,magento_id:0
1610+#: field:magento.stock.picking.out,magento_id:0
1611+#: field:magento.store,magento_id:0
1612+#: field:magento.storeview,magento_id:0
1613+#: field:magento.website,magento_id:0
1614+msgid "ID on Magento"
1615+msgstr ""
1616+
1617+#. module: magentoerpconnect
1618+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
1619+msgid "Magento Stores"
1620+msgstr ""
1621+
1622+#. module: magentoerpconnect
1623+#: field:magento.backend,pricelist_id:0
1624+#: field:magento.website,pricelist_id:0
1625+msgid "Pricelist"
1626+msgstr ""
1627+
1628+#. module: magentoerpconnect
1629+#: field:magento.sale.order,total_amount:0
1630+msgid "Total amount"
1631+msgstr ""
1632+
1633+#. module: magentoerpconnect
1634+#: model:ir.model,name:magentoerpconnect.model_magento_product_category
1635+#: view:magento.product.category:0
1636+msgid "Magento Product Category"
1637+msgstr ""
1638+
1639+#. module: magentoerpconnect
1640+#: view:magento.product.product:0
1641+msgid "(recompute)"
1642+msgstr ""
1643+
1644+#. module: magentoerpconnect
1645+#: field:magento.store,openerp_id:0
1646+msgid "Sale Shop"
1647+msgstr ""
1648+
1649+#. module: magentoerpconnect
1650+#: field:magento.product.product,manage_stock:0
1651+msgid "Manage Stock Level"
1652+msgstr ""
1653+
1654+#. module: magentoerpconnect
1655+#: model:ir.model,name:magentoerpconnect.model_magento_backend
1656+#: field:magento.account.invoice,backend_id:0
1657+#: field:magento.address,backend_id:0
1658+#: view:magento.backend:0
1659+#: field:magento.binding,backend_id:0
1660+#: field:magento.product.category,backend_id:0
1661+#: field:magento.product.product,backend_id:0
1662+#: field:magento.res.partner,backend_id:0
1663+#: field:magento.res.partner.category,backend_id:0
1664+#: field:magento.sale.order,backend_id:0
1665+#: field:magento.sale.order.line,backend_id:0
1666+#: field:magento.stock.picking.out,backend_id:0
1667+#: field:magento.store,backend_id:0
1668+#: field:magento.storeview,backend_id:0
1669+#: field:magento.website,backend_id:0
1670+msgid "Magento Backend"
1671+msgstr ""
1672+
1673+#. module: magentoerpconnect
1674+#: view:magento.storeview:0
1675+msgid "Import Sale Orders"
1676+msgstr ""
1677+
1678+#. module: magentoerpconnect
1679+#: field:magento.stock.picking.out,picking_method:0
1680+msgid "Picking Method"
1681+msgstr ""
1682+
1683+#. module: magentoerpconnect
1684+#: view:res.partner:0
1685+#: field:res.partner,magento_address_bind_ids:0
1686+msgid "Magento Address Bindings"
1687+msgstr ""
1688+
1689+#. module: magentoerpconnect
1690+#: field:magento.store,send_invoice_paid_mail:0
1691+msgid "Send email notification on invoice paid"
1692+msgstr ""
1693+
1694+#. module: magentoerpconnect
1695+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_storeview
1696+msgid "Magento Storeviews"
1697+msgstr ""
1698+
1699+#. module: magentoerpconnect
1700+#: view:magento.storeview:0
1701+msgid "Import Sale Orders since"
1702+msgstr ""
1703+
1704+#. module: magentoerpconnect
1705+#: selection:magento.product.product,backorders:0
1706+msgid "Sell Quantity < 0"
1707+msgstr ""
1708+
1709+#. module: magentoerpconnect
1710+#: help:magento.sale.order,magento_order_id:0
1711+msgid "'order_id' field in Magento"
1712+msgstr ""
1713+
1714+#. module: magentoerpconnect
1715+#: field:magento.product.category,magento_parent_id:0
1716+msgid "Magento Parent Category"
1717+msgstr ""
1718+
1719+#. module: magentoerpconnect
1720+#: field:magento.res.partner,emailid:0
1721+msgid "E-mail address"
1722+msgstr ""
1723+
1724+#. module: magentoerpconnect
1725+#: selection:magento.stock.picking.out,picking_method:0
1726+msgid "Partial"
1727+msgstr ""
1728+
1729+#. module: magentoerpconnect
1730+#: model:ir.model,name:magentoerpconnect.model_sale_shop
1731+msgid "Sales Shop"
1732+msgstr ""
1733+
1734+#. module: magentoerpconnect
1735+#: field:magento.sale.order,total_amount_tax:0
1736+msgid "Total amount w. tax"
1737+msgstr ""
1738+
1739+#. module: magentoerpconnect
1740+#: model:ir.model,name:magentoerpconnect.model_magento_storeview
1741+#: view:magento.storeview:0
1742+msgid "Magento Storeview"
1743+msgstr ""
1744+
1745+#. module: magentoerpconnect
1746+#: field:magento.backend,default_lang_id:0
1747+msgid "Default Language"
1748+msgstr ""
1749+
1750+#. module: magentoerpconnect
1751+#: field:magento.sale.order,magento_parent_id:0
1752+msgid "Parent Magento Order"
1753+msgstr ""
1754+
1755+#. module: magentoerpconnect
1756+#: model:ir.model,name:magentoerpconnect.model_magento_address
1757+#: view:magento.address:0
1758+msgid "Magento Address"
1759+msgstr ""
1760+
1761+#. module: magentoerpconnect
1762+#: view:magento.backend:0
1763+msgid "Update"
1764+msgstr ""
1765+
1766+#. module: magentoerpconnect
1767+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_storeview
1768+#: view:magento.store:0
1769+#: field:magento.store,storeview_ids:0
1770+msgid "Storeviews"
1771+msgstr ""
1772+
1773+#. module: magentoerpconnect
1774+#: selection:magento.product.product,backorders:0
1775+#: selection:magento.product.product,manage_stock:0
1776+msgid "Use Default Config"
1777+msgstr ""
1778+
1779+#. module: magentoerpconnect
1780+#: field:magento.storeview,store_id:0
1781+msgid "Store"
1782+msgstr ""
1783+
1784+#. module: magentoerpconnect
1785+#: field:magento.backend,website_ids:0
1786+msgid "Website"
1787+msgstr ""
1788+
1789+#. module: magentoerpconnect
1790+#: view:magento.backend:0
1791+msgid "Magento Configuration"
1792+msgstr ""
1793+
1794+#. module: magentoerpconnect
1795+#: view:magento.backend:0
1796+msgid "Update all the products stock quantities"
1797+msgstr ""
1798+
1799+#. module: magentoerpconnect
1800+#: view:magento.backend:0
1801+msgid "Import partners from all websites"
1802+msgstr ""
1803+
1804+#. module: magentoerpconnect
1805+#: view:connector.config.settings:0
1806+msgid "Magentoerpconnect"
1807+msgstr ""
1808+
1809+#. module: magentoerpconnect
1810+#: view:magento.store:0
1811+#: view:magento.storeview:0
1812+#: view:magento.website:0
1813+msgid "Options"
1814+msgstr ""
1815+
1816+#. module: magentoerpconnect
1817+#: field:res.partner,birthday:0
1818+msgid "Birthday"
1819+msgstr ""
1820+
1821+#. module: magentoerpconnect
1822+#: field:magento.backend,default_category_id:0
1823+msgid "Default Product Category"
1824+msgstr ""
1825+
1826+#. module: magentoerpconnect
1827+#: field:magento.product.product,magento_qty:0
1828+msgid "Computed Quantity"
1829+msgstr ""
1830+
1831+#. module: magentoerpconnect
1832+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_website
1833+msgid "Magento Websites"
1834+msgstr ""
1835+
1836+#. module: magentoerpconnect
1837+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order_line
1838+msgid "Magento Sale Order Line"
1839+msgstr ""
1840+
1841+#. module: magentoerpconnect
1842+#: sql_constraint:magento.product.category:0
1843+msgid "A product category with same ID on Magento already exists."
1844+msgstr ""
1845+
1846+#. module: magentoerpconnect
1847+#: field:magento.product.product,product_type:0
1848+msgid "Magento Product Type"
1849+msgstr ""
1850+
1851+#. module: magentoerpconnect
1852+#: field:magento.storeview,lang_id:0
1853+msgid "Language"
1854+msgstr ""
1855+
1856+#. module: magentoerpconnect
1857+#: field:magento.address,created_at:0
1858+#: field:magento.product.product,created_at:0
1859+#: field:magento.res.partner,created_at:0
1860+msgid "Created At (on Magento)"
1861+msgstr ""
1862+
1863+#. module: magentoerpconnect
1864+#: field:delivery.carrier,magento_export_tracking:0
1865+msgid "Export tracking numbers"
1866+msgstr ""
1867+
1868+#. module: magentoerpconnect
1869+#: field:magento.storeview,sort_order:0
1870+#: field:magento.website,sort_order:0
1871+msgid "Sort Order"
1872+msgstr ""
1873+
1874+#. module: magentoerpconnect
1875+#: field:magento.backend,product_binding_ids:0
1876+#: field:magento.website,product_binding_ids:0
1877+msgid "Magento Products"
1878+msgstr ""
1879+
1880+#. module: magentoerpconnect
1881+#: field:magento.storeview,import_orders_from_date:0
1882+msgid "Import sale orders from date"
1883+msgstr ""
1884+
1885+#. module: magentoerpconnect
1886+#: model:ir.model,name:magentoerpconnect.model_res_partner_category
1887+msgid "Partner Categories"
1888+msgstr ""
1889+
1890+#. module: magentoerpconnect
1891+#: field:magento.address,is_default_billing:0
1892+msgid "Default Invoice"
1893+msgstr ""
1894+
1895+#. module: magentoerpconnect
1896+#: view:magento.store:0
1897+#: view:magento.storeview:0
1898+#: view:magento.website:0
1899+msgid "Informations"
1900+msgstr ""
1901+
1902+#. module: magentoerpconnect
1903+#: field:magento.storeview,code:0
1904+#: field:magento.website,code:0
1905+msgid "Code"
1906+msgstr ""
1907+
1908+#. module: magentoerpconnect
1909+#: field:magento.sale.order.line,tax_rate:0
1910+msgid "Tax Rate"
1911+msgstr ""
1912+
1913+#. module: magentoerpconnect
1914+#: view:magento.backend:0
1915+#: view:magento.storeview:0
1916+#: view:magento.website:0
1917+msgid "Imports"
1918+msgstr ""
1919+
1920+#. module: magentoerpconnect
1921+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_backend
1922+msgid "Magento Backends"
1923+msgstr ""
1924+
1925+#. module: magentoerpconnect
1926+#: field:magento.product.category,magento_child_ids:0
1927+msgid "Magento Child Categories"
1928+msgstr ""
1929+
1930+#. module: magentoerpconnect
1931+#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
1932+msgid "Export Partners to Magento (experimental)"
1933+msgstr ""
1934+
1935+#. module: magentoerpconnect
1936+#: field:magento.backend,version:0
1937+msgid "Version"
1938+msgstr ""
1939+
1940+#. module: magentoerpconnect
1941+#: model:ir.model,name:magentoerpconnect.model_account_invoice
1942+#: field:magento.account.invoice,openerp_id:0
1943+msgid "Invoice"
1944+msgstr ""
1945+
1946+#. module: magentoerpconnect
1947+#: field:delivery.carrier,magento_code:0
1948+msgid "Magento Carrier Code"
1949+msgstr ""
1950+
1951+#. module: magentoerpconnect
1952+#: sql_constraint:magento.res.partner.category:0
1953+msgid "A partner tag with same ID on Magento already exists."
1954+msgstr ""
1955+
1956+#. module: magentoerpconnect
1957+#: field:magento.res.partner,taxvat:0
1958+msgid "Magento VAT"
1959+msgstr ""
1960+
1961+#. module: magentoerpconnect
1962+#: field:magento.res.partner.category,tax_class_id:0
1963+msgid "Tax Class ID"
1964+msgstr ""
1965+
1966+#. module: magentoerpconnect
1967+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount
1968+msgid "Total Amount differs from Magento"
1969+msgstr ""
1970+
1971+#. module: magentoerpconnect
1972+#: field:magento.store,send_picking_done_mail:0
1973+msgid "Send email notification on picking done"
1974+msgstr ""
1975+
1976+#. module: magentoerpconnect
1977+#: model:ir.model,name:magentoerpconnect.model_magento_binding
1978+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner_category
1979+msgid "Magento Binding (abstract)"
1980+msgstr ""
1981+
1982+#. module: magentoerpconnect
1983+#: model:ir.model,name:magentoerpconnect.model_magento_account_invoice
1984+msgid "Magento Account Invoice"
1985+msgstr ""
1986+
1987+#. module: magentoerpconnect
1988+#: sql_constraint:magento.store:0
1989+msgid "A store with the same ID on Magento already exists."
1990+msgstr ""
1991+
1992+#. module: magentoerpconnect
1993+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner
1994+#: field:magento.address,magento_partner_id:0
1995+#: view:magento.res.partner:0
1996+msgid "Magento Partner"
1997+msgstr ""
1998+
1999+#. module: magentoerpconnect
2000+#: sql_constraint:magento.storeview:0
2001+msgid "A storeview with same ID on Magento already exists."
2002+msgstr ""
2003+
2004+#. module: magentoerpconnect
2005+#: model:ir.model,name:magentoerpconnect.model_magento_stock_picking_out
2006+#: view:magento.stock.picking.out:0
2007+msgid "Magento Delivery Order"
2008+msgstr ""
2009+
2010+#. module: magentoerpconnect
2011+#: view:magento.backend:0
2012+msgid "Import products since"
2013+msgstr ""
2014+
2015+#. module: magentoerpconnect
2016+#: field:magento.product.category,description:0
2017+msgid "Description"
2018+msgstr ""
2019+
2020+#. module: magentoerpconnect
2021+#: selection:magento.product.product,backorders:0
2022+msgid "Sell Quantity < 0 and Use Customer Notification"
2023+msgstr ""
2024+
2025+#. module: magentoerpconnect
2026+#: sql_constraint:magento.account.invoice:0
2027+msgid "An invoice with the same ID on Magento already exists."
2028+msgstr ""
2029+
2030+#. module: magentoerpconnect
2031+#: sql_constraint:magento.res.partner:0
2032+msgid "A partner with same ID on Magento already exists for this website."
2033+msgstr ""
2034+
2035+#. module: magentoerpconnect
2036+#: view:magento.backend:0
2037+msgid "e.g. http://my.magento.com"
2038+msgstr ""
2039+
2040+#. module: magentoerpconnect
2041+#: view:magento.account.invoice:0
2042+msgid "Magento Invoice"
2043+msgstr ""
2044+
2045+#. module: magentoerpconnect
2046+#: field:magento.backend,password:0
2047+msgid "Password"
2048+msgstr ""
2049+
2050+#. module: magentoerpconnect
2051+#: view:magento.backend:0
2052+msgid "Main Configuration"
2053+msgstr ""
2054+
2055+#. module: magentoerpconnect
2056+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount
2057+msgid ""
2058+"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
2059+"\n"
2060+"Cause:\n"
2061+"The taxes are probably different between OpenERP and Magento. A fiscal "
2062+"position could have changed the final price.\n"
2063+"\n"
2064+"Resolution:\n"
2065+"Check your taxes and fiscal positions configuration and correct them if "
2066+"necessary."
2067+msgstr ""
2068+
2069+#. module: magentoerpconnect
2070+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount_tax
2071+msgid "Total Tax Amount differs from Magento"
2072+msgstr ""
2073+
2074+#. module: magentoerpconnect
2075+#: view:magento.backend:0
2076+msgid "Import all customer groups"
2077+msgstr ""
2078+
2079+#. module: magentoerpconnect
2080+#: field:magento.backend,name:0
2081+#: field:magento.storeview,name:0
2082+#: field:magento.website,name:0
2083+msgid "Name"
2084+msgstr ""
2085+
2086+#. module: magentoerpconnect
2087+#: model:ir.model,name:magentoerpconnect.model_magento_website
2088+#: field:magento.address,website_id:0
2089+#: field:magento.res.partner,website_id:0
2090+#: field:magento.store,website_id:0
2091+#: view:magento.website:0
2092+msgid "Magento Website"
2093+msgstr ""
2094+
2095+#. module: magentoerpconnect
2096+#: field:magento.storeview,enabled:0
2097+msgid "Enabled"
2098+msgstr ""
2099+
2100+#. module: magentoerpconnect
2101+#: field:magento.product.product,backorders:0
2102+msgid "Manage Inventory Backorders"
2103+msgstr ""
2104+
2105+#. module: magentoerpconnect
2106+#: model:ir.model,name:magentoerpconnect.model_product_product
2107+#: field:magento.product.product,openerp_id:0
2108+msgid "Product"
2109+msgstr ""
2110+
2111+#. module: magentoerpconnect
2112+#: view:magento.backend:0
2113+msgid "Synchronize Metadata"
2114+msgstr ""
2115+
2116+#. module: magentoerpconnect
2117+#: help:magento.website,pricelist_id:0
2118+msgid ""
2119+"The pricelist used to define the prices of the products in Magento for this "
2120+"website.\n"
2121+"Choose a pricelist only if the prices are different for this website.\n"
2122+"When empty, the default price will be used."
2123+msgstr ""
2124+
2125+#. module: magentoerpconnect
2126+#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
2127+msgid "Carrier"
2128+msgstr ""
2129+
2130+#. module: magentoerpconnect
2131+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_website
2132+#: view:magento.backend:0
2133+#: field:magento.product.product,website_ids:0
2134+msgid "Websites"
2135+msgstr ""
2136+
2137+#. module: magentoerpconnect
2138+#: view:magento.product.product:0
2139+msgid "Inventory Options"
2140+msgstr ""
2141+
2142+#. module: magentoerpconnect
2143+#: selection:magento.product.product,backorders:0
2144+msgid "No Sell"
2145+msgstr ""
2146+
2147+#. module: magentoerpconnect
2148+#: view:magento.backend:0
2149+msgid ""
2150+"Once imported,\n"
2151+" some types of records,\n"
2152+" like the products or categories,\n"
2153+" need a manual review.\n"
2154+" You will find the list\n"
2155+" of the new records to review\n"
2156+" in the menu 'Connectors > Checkpoint'."
2157+msgstr ""
2158+
2159+#. module: magentoerpconnect
2160+#: field:delivery.carrier,magento_tracking_title:0
2161+msgid "Magento Tracking Title"
2162+msgstr ""
2163+
2164+#. module: magentoerpconnect
2165+#: selection:magento.product.product,manage_stock:0
2166+msgid "Manage Stock"
2167+msgstr ""
2168+
2169+#. module: magentoerpconnect
2170+#: field:magento.address,updated_at:0
2171+#: field:magento.product.product,updated_at:0
2172+#: field:magento.res.partner,updated_at:0
2173+msgid "Updated At (on Magento)"
2174+msgstr ""
2175+
2176+#. module: magentoerpconnect
2177+#: selection:magento.stock.picking.out,picking_method:0
2178+msgid "Complete"
2179+msgstr ""
2180+
2181+#. module: magentoerpconnect
2182+#: model:ir.model,name:magentoerpconnect.model_magento_store
2183+#: view:magento.store:0
2184+msgid "Magento Store"
2185+msgstr ""
2186+
2187+#. module: magentoerpconnect
2188+#: model:ir.model,name:magentoerpconnect.model_magento_product_product
2189+#: view:magento.product.product:0
2190+msgid "Magento Product"
2191+msgstr ""
2192+
2193+#. module: magentoerpconnect
2194+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order
2195+#: field:magento.account.invoice,magento_order_id:0
2196+#: field:magento.sale.order.line,magento_order_id:0
2197+#: field:magento.stock.picking.out,magento_order_id:0
2198+msgid "Magento Sale Order"
2199+msgstr ""
2200+
2201+#. module: magentoerpconnect
2202+#: field:magento.website,import_partners_from_date:0
2203+msgid "Import partners from date"
2204+msgstr ""
2205+
2206+#. module: magentoerpconnect
2207+#: sql_constraint:magento.sale.order:0
2208+#: sql_constraint:magento.sale.order.line:0
2209+msgid "A sale order line with the same ID on Magento already exists."
2210+msgstr ""
2211+
2212+#. module: magentoerpconnect
2213+#: field:magento.sale.order,magento_order_line_ids:0
2214+msgid "Magento Order Lines"
2215+msgstr ""
2216+
2217+#. module: magentoerpconnect
2218+#: field:magento.res.partner,newsletter:0
2219+msgid "Newsletter"
2220+msgstr ""
2221+
2222+#. module: magentoerpconnect
2223+#: help:magento.backend,default_lang_id:0
2224+msgid ""
2225+"If a default language is selected, the records will be imported in the "
2226+"translation of this language.\n"
2227+"Note that a similar configuration exists for each storeview."
2228+msgstr ""
2229+
2230+#. module: magentoerpconnect
2231+#: sql_constraint:magento.address:0
2232+msgid "A partner address with same ID on Magento already exists."
2233+msgstr ""
2234+>>>>>>> MERGE-SOURCE
2235
2236=== modified file 'magentoerpconnect/i18n/nl.po'
2237--- magentoerpconnect/i18n/nl.po 2014-05-22 06:50:36 +0000
2238+++ magentoerpconnect/i18n/nl.po 2014-05-23 12:57:06 +0000
2239@@ -1,3 +1,4 @@
2240+<<<<<<< TREE
2241 # Dutch translation for openerp-connector-magento
2242 # Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
2243 # This file is distributed under the same license as the openerp-connector-magento package.
2244@@ -1060,3 +1061,1067 @@
2245 #: sql_constraint:magento.address:0
2246 msgid "A partner address with same ID on Magento already exists."
2247 msgstr "Een relatie adres met hetzelfde ID bestaat al in Magento."
2248+=======
2249+# Dutch translation for openerp-connector-magento
2250+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
2251+# This file is distributed under the same license as the openerp-connector-magento package.
2252+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
2253+#
2254+msgid ""
2255+msgstr ""
2256+"Project-Id-Version: openerp-connector-magento\n"
2257+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2258+"POT-Creation-Date: 2013-05-01 12:45+0000\n"
2259+"PO-Revision-Date: 2014-02-13 14:11+0000\n"
2260+"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
2261+"Language-Team: Dutch <nl@li.org>\n"
2262+"MIME-Version: 1.0\n"
2263+"Content-Type: text/plain; charset=UTF-8\n"
2264+"Content-Transfer-Encoding: 8bit\n"
2265+"X-Launchpad-Export-Date: 2014-04-12 10:07+0000\n"
2266+"X-Generator: Launchpad (build 16976)\n"
2267+
2268+#. module: magentoerpconnect
2269+#: help:magento.backend,pricelist_id:0
2270+msgid "The price list used to define the prices of the products in Magento."
2271+msgstr ""
2272+"De prijslijst welke wordt gebruikt voor het bepalen van de prijzen van de "
2273+"producten in Magento."
2274+
2275+#. module: magentoerpconnect
2276+#: help:magento.store,send_invoice_paid_mail:0
2277+msgid ""
2278+"Does the invoice export/creation should send an email notification on "
2279+"Magento side?"
2280+msgstr ""
2281+"Moet het exporteren of aanmaken van een factuur een e-mail sturen vanaf de "
2282+"Magento zijde?"
2283+
2284+#. module: magentoerpconnect
2285+#: view:magento.backend:0
2286+msgid "Import sales orders from all store views"
2287+msgstr "Improteer verkooporders van alle winkelweergaven"
2288+
2289+#. module: magentoerpconnect
2290+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount_tax
2291+msgid ""
2292+"The tax amount computed in OpenERP doesn't match with the tax amount in "
2293+"Magento.\n"
2294+"\n"
2295+"Cause:\n"
2296+"The taxes are probably different between OpenERP and Magento. A fiscal "
2297+"position could have changed the final price.\n"
2298+"\n"
2299+"Resolution:\n"
2300+"Check your taxes and fiscal positions configuration and correct them if "
2301+"necessary."
2302+msgstr ""
2303+"Het BTW bedrag berekend in OpenERP komt niet overeen met het BTW bedrag in "
2304+"Magento in Magento.\n"
2305+"\n"
2306+"Oorzaak:\n"
2307+"De BTW tarieven zijn mogelijk verschillend in OpenERP en Magento of een "
2308+"fiscale positie heeft de uiteindelijke prijs veranderd.\n"
2309+"\n"
2310+"Oplossing:\n"
2311+"Controleer de BTW tarieven en de fiscale posities en corrigeer deze indien "
2312+"nodig.."
2313+
2314+#. module: magentoerpconnect
2315+#: help:magento.backend,warehouse_id:0
2316+msgid "Warehouse used to compute the stock quantities."
2317+msgstr ""
2318+"Het magazijn dat wordt gebruikt om de hoeveelheid op voorraad te berekenen"
2319+
2320+#. module: magentoerpconnect
2321+#: field:magento.account.invoice,sync_date:0
2322+#: field:magento.address,sync_date:0
2323+#: field:magento.binding,sync_date:0
2324+#: field:magento.product.category,sync_date:0
2325+#: field:magento.product.product,sync_date:0
2326+#: field:magento.res.partner,sync_date:0
2327+#: field:magento.res.partner.category,sync_date:0
2328+#: field:magento.sale.order,sync_date:0
2329+#: field:magento.sale.order.line,sync_date:0
2330+#: field:magento.stock.picking.out,sync_date:0
2331+#: field:magento.store,sync_date:0
2332+#: field:magento.storeview,sync_date:0
2333+#: field:magento.website,sync_date:0
2334+msgid "Last synchronization date"
2335+msgstr "Laatste synchronisatie datum"
2336+
2337+#. module: magentoerpconnect
2338+#: help:magento.backend,default_category_id:0
2339+msgid ""
2340+"If a default category is selected, products imported without a category will "
2341+"be linked to it."
2342+msgstr ""
2343+"Indien de standaard categorie is geselecteerd, worden producten zonder een "
2344+"categorie aan deze standaard categorie gekoppeld."
2345+
2346+#. module: magentoerpconnect
2347+#: help:magento.storeview,import_orders_from_date:0
2348+msgid ""
2349+"do not consider non-imported sale orders before this date. Leave empty to "
2350+"import all sale orders"
2351+msgstr ""
2352+"Houdt geen rekening met de niet geïmporteerde verkooporders voor deze datum. "
2353+"Laat leeg om alle verkooporders importeren"
2354+
2355+#. module: magentoerpconnect
2356+#: help:magento.store,send_picking_done_mail:0
2357+msgid ""
2358+"Does the picking export/creation should send an email notification on "
2359+"Magento side?"
2360+msgstr ""
2361+"Moet het exporteren of aanmaken van een uitgaande levering een e-mail sturen "
2362+"vanaf de Magento zijde?"
2363+
2364+#. module: magentoerpconnect
2365+#: selection:magento.product.product,manage_stock:0
2366+msgid "Do Not Manage Stock"
2367+msgstr "Geen voorraad beheren"
2368+
2369+#. module: magentoerpconnect
2370+#: field:connector.config.settings,module_magentoerpconnect_catalog:0
2371+msgid "Handle the product's catalog (not implemented)"
2372+msgstr "Beheer de producten categolus (Niet geïmplementeerd)"
2373+
2374+#. module: magentoerpconnect
2375+#: field:res.partner,company:0
2376+msgid "Company"
2377+msgstr "Bedrijf"
2378+
2379+#. module: magentoerpconnect
2380+#: sql_constraint:magento.website:0
2381+msgid "A website with the same ID on Magento already exists."
2382+msgstr "Een website met dezelfde ID bestaat als in Magento."
2383+
2384+#. module: magentoerpconnect
2385+#: field:magento.backend,import_categories_from_date:0
2386+msgid "Import categories from date"
2387+msgstr "Importeer productcategorien vanaf"
2388+
2389+#. module: magentoerpconnect
2390+#: view:account.invoice:0
2391+#: field:account.invoice,magento_bind_ids:0
2392+#: view:product.category:0
2393+#: field:product.category,magento_bind_ids:0
2394+#: view:product.product:0
2395+#: field:product.product,magento_bind_ids:0
2396+#: view:res.partner:0
2397+#: field:res.partner,magento_bind_ids:0
2398+#: field:res.partner.category,magento_bind_ids:0
2399+#: field:sale.order,magento_bind_ids:0
2400+#: field:sale.order.line,magento_bind_ids:0
2401+#: field:sale.shop,magento_bind_ids:0
2402+#: field:stock.picking,magento_bind_ids:0
2403+#: view:stock.picking.out:0
2404+#: field:stock.picking.out,magento_bind_ids:0
2405+msgid "Magento Bindings"
2406+msgstr "Magento koppelingen"
2407+
2408+#. module: magentoerpconnect
2409+#: help:connector.config.settings,module_magentoerpconnect_catalog:0
2410+msgid "This installs the module magentoerpconnect_catalog."
2411+msgstr "Dit installeert de module magentoerpconnect_catalog."
2412+
2413+#. module: magentoerpconnect
2414+#: field:magento.address,is_magento_order_address:0
2415+msgid "Address from a Magento Order"
2416+msgstr "Adres van een Magento order"
2417+
2418+#. module: magentoerpconnect
2419+#: field:magento.sale.order,magento_order_id:0
2420+msgid "Magento Order ID"
2421+msgstr "Magento order ID"
2422+
2423+#. module: magentoerpconnect
2424+#: model:ir.model,name:magentoerpconnect.model_magentoerpconnect_installed
2425+msgid "magentoerpconnect.installed"
2426+msgstr "magentoerpconnect.installed"
2427+
2428+#. module: magentoerpconnect
2429+#: help:connector.config.settings,module_magentoerpconnect_export_partner:0
2430+msgid "This installs the module magentoerpconnect_export_partner."
2431+msgstr "Dit installeert de module magentoerpconnect_export_partner."
2432+
2433+#. module: magentoerpconnect
2434+#: field:magento.sale.order.line,notes:0
2435+msgid "Notes"
2436+msgstr "Notities"
2437+
2438+#. module: magentoerpconnect
2439+#: field:magento.sale.order,openerp_id:0
2440+msgid "Sale Order"
2441+msgstr "Verkooporder"
2442+
2443+#. module: magentoerpconnect
2444+#: field:magento.stock.picking.out,openerp_id:0
2445+msgid "Stock Picking"
2446+msgstr "Uitgaande levering"
2447+
2448+#. module: magentoerpconnect
2449+#: view:connector.config.settings:0
2450+msgid "Extensions"
2451+msgstr "Extensies"
2452+
2453+#. module: magentoerpconnect
2454+#: view:magento.backend:0
2455+msgid "Advanced Configuration"
2456+msgstr "Geavanceerde configuratie"
2457+
2458+#. module: magentoerpconnect
2459+#: field:magento.res.partner,group_id:0
2460+msgid "Magento Group (Category)"
2461+msgstr "Magento groep (Categorie)"
2462+
2463+#. module: magentoerpconnect
2464+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_store
2465+#: view:magento.website:0
2466+#: field:magento.website,store_ids:0
2467+msgid "Stores"
2468+msgstr "Winkels"
2469+
2470+#. module: magentoerpconnect
2471+#: field:magento.backend,product_stock_field_id:0
2472+msgid "Stock Field"
2473+msgstr "Voorraad veld"
2474+
2475+#. module: magentoerpconnect
2476+#: field:magento.res.partner.category,openerp_id:0
2477+msgid "Partner Category"
2478+msgstr "Relatiecategorie"
2479+
2480+#. module: magentoerpconnect
2481+#: help:magento.product.product,magento_qty:0
2482+msgid "Last computed quantity to send on Magento."
2483+msgstr "Laatst berekende hoeveelheid om te versturen naar Magento"
2484+
2485+#. module: magentoerpconnect
2486+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_root
2487+#: view:res.partner.category:0
2488+msgid "Magento"
2489+msgstr "Magento"
2490+
2491+#. module: magentoerpconnect
2492+#: model:ir.model,name:magentoerpconnect.model_connector_config_settings
2493+msgid "connector.config.settings"
2494+msgstr "connector.config.settings"
2495+
2496+#. module: magentoerpconnect
2497+#: field:magento.backend,import_products_from_date:0
2498+msgid "Import products from date"
2499+msgstr "Importeer producten vanaf"
2500+
2501+#. module: magentoerpconnect
2502+#: model:ir.model,name:magentoerpconnect.model_res_partner
2503+#: field:magento.address,openerp_id:0
2504+#: field:magento.res.partner,openerp_id:0
2505+msgid "Partner"
2506+msgstr "Relatie"
2507+
2508+#. module: magentoerpconnect
2509+#: model:ir.model,name:magentoerpconnect.model_sale_order
2510+msgid "Sales Order"
2511+msgstr "Verkooporder"
2512+
2513+#. module: magentoerpconnect
2514+#: model:ir.model,name:magentoerpconnect.model_stock_picking_out
2515+msgid "Delivery Orders"
2516+msgstr "Uitgaande leveringen"
2517+
2518+#. module: magentoerpconnect
2519+#: model:ir.model,name:magentoerpconnect.model_sale_order_line
2520+msgid "Sales Order Line"
2521+msgstr "Verkooporderregel"
2522+
2523+#. module: magentoerpconnect
2524+#: field:connector.config.settings,module_magentoerpconnect_pricing:0
2525+msgid "Prices are managed in OpenERP with pricelists"
2526+msgstr "Prijzen worden beheert in OpenERP door middel van prijslijsten"
2527+
2528+#. module: magentoerpconnect
2529+#: field:magento.address,is_default_shipping:0
2530+msgid "Default Shipping"
2531+msgstr "Standaard verzending"
2532+
2533+#. module: magentoerpconnect
2534+#: sql_constraint:magento.stock.picking.out:0
2535+msgid "A stock picking with same ID on Magento already exists."
2536+msgstr "Een uitgaande levering met hetzelfde ID bestaat al in Magento."
2537+
2538+#. module: magentoerpconnect
2539+#: view:magento.backend:0
2540+msgid ""
2541+"By clicking on the buttons,\n"
2542+" you will initiate the synchronizations\n"
2543+" with Magento.\n"
2544+" Note that the import or exports\n"
2545+" won't be done directly,\n"
2546+" they will create 'Jobs'\n"
2547+" executed as soon as possible."
2548+msgstr ""
2549+"Door op de knoppen te drukken,\n"
2550+" start u de synchronisatie\n"
2551+" met Magento.\n"
2552+" Houdt er rekening mee dat de \n"
2553+" import of export niet direct start,\n"
2554+" maar dat zij 'taken' genereren\n"
2555+" welke z.s.m. worden uitgevoerd."
2556+
2557+#. module: magentoerpconnect
2558+#: help:magento.backend,product_stock_field_id:0
2559+msgid ""
2560+"Choose the field of the product which will be used for stock inventory "
2561+"updates.\n"
2562+"If empty, Quantity Available is used."
2563+msgstr ""
2564+"Kies het veld van het product welke wordt gebruikt voor het bijwerken van de "
2565+"voorraad.\n"
2566+"Indien leeg wordt de beschikbare voorraad gebruikt."
2567+
2568+#. module: magentoerpconnect
2569+#: sql_constraint:magento.product.product:0
2570+msgid "A product with the same ID on Magento already exists"
2571+msgstr "Een product met hetzelfde ID bestaat al in Magento."
2572+
2573+#. module: magentoerpconnect
2574+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_backend
2575+msgid "Backends"
2576+msgstr "Backends"
2577+
2578+#. module: magentoerpconnect
2579+#: field:magento.backend,location:0
2580+msgid "Location"
2581+msgstr "Locatie"
2582+
2583+#. module: magentoerpconnect
2584+#: model:ir.model,name:magentoerpconnect.model_stock_picking
2585+msgid "Picking List"
2586+msgstr "Verzamellijst"
2587+
2588+#. module: magentoerpconnect
2589+#: field:magento.backend,warehouse_id:0
2590+msgid "Warehouse"
2591+msgstr "Magazijn"
2592+
2593+#. module: magentoerpconnect
2594+#: field:magento.backend,catalog_price_tax_included:0
2595+msgid "Prices include tax"
2596+msgstr "Prijzen incl. BTW"
2597+
2598+#. module: magentoerpconnect
2599+#: view:magento.backend:0
2600+msgid "Import products categories since"
2601+msgstr "Importeer product categorieën vanaf"
2602+
2603+#. module: magentoerpconnect
2604+#: field:magento.sale.order.line,openerp_id:0
2605+msgid "Sale Order Line"
2606+msgstr "Verkooporderregel"
2607+
2608+#. module: magentoerpconnect
2609+#: field:magento.backend,username:0
2610+msgid "Username"
2611+msgstr "Gebruikersnaam"
2612+
2613+#. module: magentoerpconnect
2614+#: model:ir.model,name:magentoerpconnect.model_product_category
2615+#: field:magento.product.category,openerp_id:0
2616+msgid "Product Category"
2617+msgstr "Productcategorie"
2618+
2619+#. module: magentoerpconnect
2620+#: field:magento.res.partner,guest_customer:0
2621+msgid "Guest Customer"
2622+msgstr "Gast klant"
2623+
2624+#. module: magentoerpconnect
2625+#: help:connector.config.settings,module_magentoerpconnect_pricing:0
2626+msgid ""
2627+"Prices are set in OpenERP and exported to Magento.\n"
2628+"\n"
2629+"This installs the module magentoerpconnect_pricing."
2630+msgstr ""
2631+"Prijzen worden ingesteld in OpenERP en geëxporteerd naar Magento.\n"
2632+"\n"
2633+"Dit installeert de module magentoerpconnect_pricing."
2634+
2635+#. module: magentoerpconnect
2636+#: field:delivery.carrier,magento_carrier_code:0
2637+msgid "Magento Base Carrier Code"
2638+msgstr "Magento standaard vervoerderscode"
2639+
2640+#. module: magentoerpconnect
2641+#: view:magento.website:0
2642+msgid "Import partners since"
2643+msgstr "Importeer relaties vanaf"
2644+
2645+#. module: magentoerpconnect
2646+#: view:magento.backend:0
2647+#: view:magento.website:0
2648+msgid "Import in background"
2649+msgstr "Importeer op de achtergrond"
2650+
2651+#. module: magentoerpconnect
2652+#: field:magento.account.invoice,magento_id:0
2653+#: field:magento.address,magento_id:0
2654+#: field:magento.binding,magento_id:0
2655+#: field:magento.product.category,magento_id:0
2656+#: field:magento.product.product,magento_id:0
2657+#: field:magento.res.partner,magento_id:0
2658+#: field:magento.res.partner.category,magento_id:0
2659+#: field:magento.sale.order,magento_id:0
2660+#: field:magento.sale.order.line,magento_id:0
2661+#: field:magento.stock.picking.out,magento_id:0
2662+#: field:magento.store,magento_id:0
2663+#: field:magento.storeview,magento_id:0
2664+#: field:magento.website,magento_id:0
2665+msgid "ID on Magento"
2666+msgstr "ID in Magento"
2667+
2668+#. module: magentoerpconnect
2669+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_store
2670+msgid "Magento Stores"
2671+msgstr "Magento winkels"
2672+
2673+#. module: magentoerpconnect
2674+#: field:magento.backend,pricelist_id:0
2675+#: field:magento.website,pricelist_id:0
2676+msgid "Pricelist"
2677+msgstr "Verzamellijst"
2678+
2679+#. module: magentoerpconnect
2680+#: field:magento.sale.order,total_amount:0
2681+msgid "Total amount"
2682+msgstr "Totaalbedrag"
2683+
2684+#. module: magentoerpconnect
2685+#: model:ir.model,name:magentoerpconnect.model_magento_product_category
2686+#: view:magento.product.category:0
2687+msgid "Magento Product Category"
2688+msgstr "Magento product categorie"
2689+
2690+#. module: magentoerpconnect
2691+#: view:magento.product.product:0
2692+msgid "(recompute)"
2693+msgstr "(herbereken)"
2694+
2695+#. module: magentoerpconnect
2696+#: field:magento.store,openerp_id:0
2697+msgid "Sale Shop"
2698+msgstr "Verkooppunt"
2699+
2700+#. module: magentoerpconnect
2701+#: field:magento.product.product,manage_stock:0
2702+msgid "Manage Stock Level"
2703+msgstr "Beheer vororaad"
2704+
2705+#. module: magentoerpconnect
2706+#: model:ir.model,name:magentoerpconnect.model_magento_backend
2707+#: field:magento.account.invoice,backend_id:0
2708+#: field:magento.address,backend_id:0
2709+#: view:magento.backend:0
2710+#: field:magento.binding,backend_id:0
2711+#: field:magento.product.category,backend_id:0
2712+#: field:magento.product.product,backend_id:0
2713+#: field:magento.res.partner,backend_id:0
2714+#: field:magento.res.partner.category,backend_id:0
2715+#: field:magento.sale.order,backend_id:0
2716+#: field:magento.sale.order.line,backend_id:0
2717+#: field:magento.stock.picking.out,backend_id:0
2718+#: field:magento.store,backend_id:0
2719+#: field:magento.storeview,backend_id:0
2720+#: field:magento.website,backend_id:0
2721+msgid "Magento Backend"
2722+msgstr "Magento backend"
2723+
2724+#. module: magentoerpconnect
2725+#: view:magento.storeview:0
2726+msgid "Import Sale Orders"
2727+msgstr "Importeer verkooporders"
2728+
2729+#. module: magentoerpconnect
2730+#: field:magento.stock.picking.out,picking_method:0
2731+msgid "Picking Method"
2732+msgstr "Verzamelmethode"
2733+
2734+#. module: magentoerpconnect
2735+#: view:res.partner:0
2736+#: field:res.partner,magento_address_bind_ids:0
2737+msgid "Magento Address Bindings"
2738+msgstr "Magento adres koppelingen"
2739+
2740+#. module: magentoerpconnect
2741+#: field:magento.store,send_invoice_paid_mail:0
2742+msgid "Send email notification on invoice paid"
2743+msgstr "Stuur e-mail bevestiging als de factuur betaald is"
2744+
2745+#. module: magentoerpconnect
2746+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_storeview
2747+msgid "Magento Storeviews"
2748+msgstr "Magento winkelweergaven"
2749+
2750+#. module: magentoerpconnect
2751+#: view:magento.storeview:0
2752+msgid "Import Sale Orders since"
2753+msgstr "Importeer verkooporders vanaf"
2754+
2755+#. module: magentoerpconnect
2756+#: selection:magento.product.product,backorders:0
2757+msgid "Sell Quantity < 0"
2758+msgstr "Verkoop hoeveelheid< 0"
2759+
2760+#. module: magentoerpconnect
2761+#: help:magento.sale.order,magento_order_id:0
2762+msgid "'order_id' field in Magento"
2763+msgstr "'order_id' veld in Magento"
2764+
2765+#. module: magentoerpconnect
2766+#: field:magento.product.category,magento_parent_id:0
2767+msgid "Magento Parent Category"
2768+msgstr "Magento bovenliggende categorie"
2769+
2770+#. module: magentoerpconnect
2771+#: field:magento.res.partner,emailid:0
2772+msgid "E-mail address"
2773+msgstr "E-mail adres"
2774+
2775+#. module: magentoerpconnect
2776+#: selection:magento.stock.picking.out,picking_method:0
2777+msgid "Partial"
2778+msgstr "Gedeeltelijk"
2779+
2780+#. module: magentoerpconnect
2781+#: model:ir.model,name:magentoerpconnect.model_sale_shop
2782+msgid "Sales Shop"
2783+msgstr "Verkooppunt"
2784+
2785+#. module: magentoerpconnect
2786+#: field:magento.sale.order,total_amount_tax:0
2787+msgid "Total amount w. tax"
2788+msgstr "Totaalbedrag excl. BTW"
2789+
2790+#. module: magentoerpconnect
2791+#: model:ir.model,name:magentoerpconnect.model_magento_storeview
2792+#: view:magento.storeview:0
2793+msgid "Magento Storeview"
2794+msgstr "Magento winkelweergave"
2795+
2796+#. module: magentoerpconnect
2797+#: field:magento.backend,default_lang_id:0
2798+msgid "Default Language"
2799+msgstr "Standaardtaal"
2800+
2801+#. module: magentoerpconnect
2802+#: field:magento.sale.order,magento_parent_id:0
2803+msgid "Parent Magento Order"
2804+msgstr "Bovenliggende Mageto order"
2805+
2806+#. module: magentoerpconnect
2807+#: model:ir.model,name:magentoerpconnect.model_magento_address
2808+#: view:magento.address:0
2809+msgid "Magento Address"
2810+msgstr "Magento adres"
2811+
2812+#. module: magentoerpconnect
2813+#: view:magento.backend:0
2814+msgid "Update"
2815+msgstr "Bijwerken"
2816+
2817+#. module: magentoerpconnect
2818+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_storeview
2819+#: view:magento.store:0
2820+#: field:magento.store,storeview_ids:0
2821+msgid "Storeviews"
2822+msgstr "Winkelweergaven"
2823+
2824+#. module: magentoerpconnect
2825+#: selection:magento.product.product,backorders:0
2826+#: selection:magento.product.product,manage_stock:0
2827+msgid "Use Default Config"
2828+msgstr "Gebruik standaard configuratie"
2829+
2830+#. module: magentoerpconnect
2831+#: field:magento.storeview,store_id:0
2832+msgid "Store"
2833+msgstr "Winkel"
2834+
2835+#. module: magentoerpconnect
2836+#: field:magento.backend,website_ids:0
2837+msgid "Website"
2838+msgstr "Website"
2839+
2840+#. module: magentoerpconnect
2841+#: view:magento.backend:0
2842+msgid "Magento Configuration"
2843+msgstr "Magento configuratie"
2844+
2845+#. module: magentoerpconnect
2846+#: view:magento.backend:0
2847+msgid "Update all the products stock quantities"
2848+msgstr "Bijwerken voorraad van alle producten"
2849+
2850+#. module: magentoerpconnect
2851+#: view:magento.backend:0
2852+msgid "Import partners from all websites"
2853+msgstr "Importeer relatie van alle websites"
2854+
2855+#. module: magentoerpconnect
2856+#: view:connector.config.settings:0
2857+msgid "Magentoerpconnect"
2858+msgstr "Magentoerpconnect"
2859+
2860+#. module: magentoerpconnect
2861+#: view:magento.store:0
2862+#: view:magento.storeview:0
2863+#: view:magento.website:0
2864+msgid "Options"
2865+msgstr "Opties"
2866+
2867+#. module: magentoerpconnect
2868+#: field:res.partner,birthday:0
2869+msgid "Birthday"
2870+msgstr "Verjaardag"
2871+
2872+#. module: magentoerpconnect
2873+#: field:magento.backend,default_category_id:0
2874+msgid "Default Product Category"
2875+msgstr "Standaard productcategorie"
2876+
2877+#. module: magentoerpconnect
2878+#: field:magento.product.product,magento_qty:0
2879+msgid "Computed Quantity"
2880+msgstr "Berekende hoeveelheid"
2881+
2882+#. module: magentoerpconnect
2883+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_website
2884+msgid "Magento Websites"
2885+msgstr "Magento websites"
2886+
2887+#. module: magentoerpconnect
2888+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order_line
2889+msgid "Magento Sale Order Line"
2890+msgstr "Magento verkooporderregel"
2891+
2892+#. module: magentoerpconnect
2893+#: sql_constraint:magento.product.category:0
2894+msgid "A product category with same ID on Magento already exists."
2895+msgstr "Een productcategorie met hetzelfde ID bestaat al in Magento."
2896+
2897+#. module: magentoerpconnect
2898+#: field:magento.product.product,product_type:0
2899+msgid "Magento Product Type"
2900+msgstr "Magento productsoort"
2901+
2902+#. module: magentoerpconnect
2903+#: field:magento.storeview,lang_id:0
2904+msgid "Language"
2905+msgstr "Taal"
2906+
2907+#. module: magentoerpconnect
2908+#: field:magento.address,created_at:0
2909+#: field:magento.product.product,created_at:0
2910+#: field:magento.res.partner,created_at:0
2911+msgid "Created At (on Magento)"
2912+msgstr "Aangemaakt op (in Magento)"
2913+
2914+#. module: magentoerpconnect
2915+#: field:delivery.carrier,magento_export_tracking:0
2916+msgid "Export tracking numbers"
2917+msgstr "Exporteer traceer nummers"
2918+
2919+#. module: magentoerpconnect
2920+#: field:magento.storeview,sort_order:0
2921+#: field:magento.website,sort_order:0
2922+msgid "Sort Order"
2923+msgstr "Sorteervolgorde"
2924+
2925+#. module: magentoerpconnect
2926+#: field:magento.backend,product_binding_ids:0
2927+#: field:magento.website,product_binding_ids:0
2928+msgid "Magento Products"
2929+msgstr "Magento producten"
2930+
2931+#. module: magentoerpconnect
2932+#: field:magento.storeview,import_orders_from_date:0
2933+msgid "Import sale orders from date"
2934+msgstr "Importeer verkooporders vanaf"
2935+
2936+#. module: magentoerpconnect
2937+#: model:ir.model,name:magentoerpconnect.model_res_partner_category
2938+msgid "Partner Categories"
2939+msgstr "Relatie categorieën"
2940+
2941+#. module: magentoerpconnect
2942+#: field:magento.address,is_default_billing:0
2943+msgid "Default Invoice"
2944+msgstr "Standaard factuur"
2945+
2946+#. module: magentoerpconnect
2947+#: view:magento.store:0
2948+#: view:magento.storeview:0
2949+#: view:magento.website:0
2950+msgid "Informations"
2951+msgstr "Informatie"
2952+
2953+#. module: magentoerpconnect
2954+#: field:magento.storeview,code:0
2955+#: field:magento.website,code:0
2956+msgid "Code"
2957+msgstr "Code"
2958+
2959+#. module: magentoerpconnect
2960+#: field:magento.sale.order.line,tax_rate:0
2961+msgid "Tax Rate"
2962+msgstr "BTW tarief"
2963+
2964+#. module: magentoerpconnect
2965+#: view:magento.backend:0
2966+#: view:magento.storeview:0
2967+#: view:magento.website:0
2968+msgid "Imports"
2969+msgstr "Imports"
2970+
2971+#. module: magentoerpconnect
2972+#: model:ir.actions.act_window,name:magentoerpconnect.action_magento_backend
2973+msgid "Magento Backends"
2974+msgstr "Magento backends"
2975+
2976+#. module: magentoerpconnect
2977+#: field:magento.product.category,magento_child_ids:0
2978+msgid "Magento Child Categories"
2979+msgstr "Magento onderliggende categorien"
2980+
2981+#. module: magentoerpconnect
2982+#: field:connector.config.settings,module_magentoerpconnect_export_partner:0
2983+msgid "Export Partners to Magento (experimental)"
2984+msgstr "Exporteer relaties naar Magento"
2985+
2986+#. module: magentoerpconnect
2987+#: field:magento.backend,version:0
2988+msgid "Version"
2989+msgstr "Versie"
2990+
2991+#. module: magentoerpconnect
2992+#: model:ir.model,name:magentoerpconnect.model_account_invoice
2993+#: field:magento.account.invoice,openerp_id:0
2994+msgid "Invoice"
2995+msgstr "Factuur"
2996+
2997+#. module: magentoerpconnect
2998+#: field:delivery.carrier,magento_code:0
2999+msgid "Magento Carrier Code"
3000+msgstr "Magento vervoerdercode"
3001+
3002+#. module: magentoerpconnect
3003+#: sql_constraint:magento.res.partner.category:0
3004+msgid "A partner tag with same ID on Magento already exists."
3005+msgstr "Een relatie label met hetzelfde ID bestaat al in Magento."
3006+
3007+#. module: magentoerpconnect
3008+#: field:magento.res.partner,taxvat:0
3009+msgid "Magento VAT"
3010+msgstr "Magento BTW"
3011+
3012+#. module: magentoerpconnect
3013+#: field:magento.res.partner.category,tax_class_id:0
3014+msgid "Tax Class ID"
3015+msgstr "BTW Class ID"
3016+
3017+#. module: magentoerpconnect
3018+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount
3019+msgid "Total Amount differs from Magento"
3020+msgstr "Totalbedrag wijkt af van Magento"
3021+
3022+#. module: magentoerpconnect
3023+#: field:magento.store,send_picking_done_mail:0
3024+msgid "Send email notification on picking done"
3025+msgstr "Stuur e-mail bevestiging als de uitgaande levering gereed is"
3026+
3027+#. module: magentoerpconnect
3028+#: model:ir.model,name:magentoerpconnect.model_magento_binding
3029+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner_category
3030+msgid "Magento Binding (abstract)"
3031+msgstr "Magento koppelingen (abstract)"
3032+
3033+#. module: magentoerpconnect
3034+#: model:ir.model,name:magentoerpconnect.model_magento_account_invoice
3035+msgid "Magento Account Invoice"
3036+msgstr "Magento factuur"
3037+
3038+#. module: magentoerpconnect
3039+#: sql_constraint:magento.store:0
3040+msgid "A store with the same ID on Magento already exists."
3041+msgstr "Een winkel met hetzelfde ID bestaat al in Magento."
3042+
3043+#. module: magentoerpconnect
3044+#: model:ir.model,name:magentoerpconnect.model_magento_res_partner
3045+#: field:magento.address,magento_partner_id:0
3046+#: view:magento.res.partner:0
3047+msgid "Magento Partner"
3048+msgstr "Magento relatie"
3049+
3050+#. module: magentoerpconnect
3051+#: sql_constraint:magento.storeview:0
3052+msgid "A storeview with same ID on Magento already exists."
3053+msgstr "Een winkelweergave met hetzelfde ID bestaat al in Magento."
3054+
3055+#. module: magentoerpconnect
3056+#: model:ir.model,name:magentoerpconnect.model_magento_stock_picking_out
3057+#: view:magento.stock.picking.out:0
3058+msgid "Magento Delivery Order"
3059+msgstr "Magento uitgaande levering"
3060+
3061+#. module: magentoerpconnect
3062+#: view:magento.backend:0
3063+msgid "Import products since"
3064+msgstr "Importeer producten vanaf"
3065+
3066+#. module: magentoerpconnect
3067+#: field:magento.product.category,description:0
3068+msgid "Description"
3069+msgstr "Beschrijving"
3070+
3071+#. module: magentoerpconnect
3072+#: selection:magento.product.product,backorders:0
3073+msgid "Sell Quantity < 0 and Use Customer Notification"
3074+msgstr "Verkoop hoeveelheden < 0 en gebruik klant notificatie"
3075+
3076+#. module: magentoerpconnect
3077+#: sql_constraint:magento.account.invoice:0
3078+msgid "An invoice with the same ID on Magento already exists."
3079+msgstr "Een factuur met hetzelfde ID bestaat al in Magento."
3080+
3081+#. module: magentoerpconnect
3082+#: sql_constraint:magento.res.partner:0
3083+msgid "A partner with same ID on Magento already exists for this website."
3084+msgstr ""
3085+"Een relatie met hetzelfde ID bestaat al in Magento voor deze website."
3086+
3087+#. module: magentoerpconnect
3088+#: view:magento.backend:0
3089+msgid "e.g. http://my.magento.com"
3090+msgstr "Bijv. http://my.magento.com"
3091+
3092+#. module: magentoerpconnect
3093+#: view:magento.account.invoice:0
3094+msgid "Magento Invoice"
3095+msgstr "Magento factuur"
3096+
3097+#. module: magentoerpconnect
3098+#: field:magento.backend,password:0
3099+msgid "Password"
3100+msgstr "Wachtwoord"
3101+
3102+#. module: magentoerpconnect
3103+#: view:magento.backend:0
3104+msgid "Main Configuration"
3105+msgstr "Belangrijkste instellingen"
3106+
3107+#. module: magentoerpconnect
3108+#: model:sale.exception,description:magentoerpconnect.excep_wrong_total_amount
3109+msgid ""
3110+"The amount computed in OpenERP doesn't match with the amount in Magento.\n"
3111+"\n"
3112+"Cause:\n"
3113+"The taxes are probably different between OpenERP and Magento. A fiscal "
3114+"position could have changed the final price.\n"
3115+"\n"
3116+"Resolution:\n"
3117+"Check your taxes and fiscal positions configuration and correct them if "
3118+"necessary."
3119+msgstr ""
3120+"Het bedrag berekend in OpenERP komt niet overeen met het bedrag in Magento "
3121+"in Magento.\n"
3122+"\n"
3123+"Oorzaak:\n"
3124+"De BTW tarieven zijn mogelijk verschillend in OpenERP en Magento of een "
3125+"fiscale positie heeft de uiteindelijke prijs veranderd.\n"
3126+"\n"
3127+"Oplossing:\n"
3128+"Controleer de BTW tarieven en de fiscale posities en corrigeer deze indien "
3129+"nodig.."
3130+
3131+#. module: magentoerpconnect
3132+#: model:sale.exception,name:magentoerpconnect.excep_wrong_total_amount_tax
3133+msgid "Total Tax Amount differs from Magento"
3134+msgstr "Totaal BTW bedrag wijkt af van Magento"
3135+
3136+#. module: magentoerpconnect
3137+#: view:magento.backend:0
3138+msgid "Import all customer groups"
3139+msgstr "Importeer alle klant groepen"
3140+
3141+#. module: magentoerpconnect
3142+#: field:magento.backend,name:0
3143+#: field:magento.storeview,name:0
3144+#: field:magento.website,name:0
3145+msgid "Name"
3146+msgstr "Naam"
3147+
3148+#. module: magentoerpconnect
3149+#: model:ir.model,name:magentoerpconnect.model_magento_website
3150+#: field:magento.address,website_id:0
3151+#: field:magento.res.partner,website_id:0
3152+#: field:magento.store,website_id:0
3153+#: view:magento.website:0
3154+msgid "Magento Website"
3155+msgstr "Magento website"
3156+
3157+#. module: magentoerpconnect
3158+#: field:magento.storeview,enabled:0
3159+msgid "Enabled"
3160+msgstr "Ingeschakeld"
3161+
3162+#. module: magentoerpconnect
3163+#: field:magento.product.product,backorders:0
3164+msgid "Manage Inventory Backorders"
3165+msgstr "Beheer voorraad backorders"
3166+
3167+#. module: magentoerpconnect
3168+#: model:ir.model,name:magentoerpconnect.model_product_product
3169+#: field:magento.product.product,openerp_id:0
3170+msgid "Product"
3171+msgstr "Product"
3172+
3173+#. module: magentoerpconnect
3174+#: view:magento.backend:0
3175+msgid "Synchronize Metadata"
3176+msgstr "Synchroniseer metadata"
3177+
3178+#. module: magentoerpconnect
3179+#: help:magento.website,pricelist_id:0
3180+msgid ""
3181+"The pricelist used to define the prices of the products in Magento for this "
3182+"website.\n"
3183+"Choose a pricelist only if the prices are different for this website.\n"
3184+"When empty, the default price will be used."
3185+msgstr ""
3186+"De prijslijst welke wordt gebruikt om de prijzen te bepalen in Magento voor "
3187+"deze website.\n"
3188+"Kies alleen ene prijslijst als de prijzen voor deze website anders zijn.\n"
3189+"Indien leeg wordt de standaard prijs gebruikt."
3190+
3191+#. module: magentoerpconnect
3192+#: model:ir.model,name:magentoerpconnect.model_delivery_carrier
3193+msgid "Carrier"
3194+msgstr "Vervoerder"
3195+
3196+#. module: magentoerpconnect
3197+#: model:ir.ui.menu,name:magentoerpconnect.menu_magento_website
3198+#: view:magento.backend:0
3199+#: field:magento.product.product,website_ids:0
3200+msgid "Websites"
3201+msgstr "Websites"
3202+
3203+#. module: magentoerpconnect
3204+#: view:magento.product.product:0
3205+msgid "Inventory Options"
3206+msgstr "Voorraad opties"
3207+
3208+#. module: magentoerpconnect
3209+#: selection:magento.product.product,backorders:0
3210+msgid "No Sell"
3211+msgstr "Niet verkocht"
3212+
3213+#. module: magentoerpconnect
3214+#: view:magento.backend:0
3215+msgid ""
3216+"Once imported,\n"
3217+" some types of records,\n"
3218+" like the products or categories,\n"
3219+" need a manual review.\n"
3220+" You will find the list\n"
3221+" of the new records to review\n"
3222+" in the menu 'Connectors > Checkpoint'."
3223+msgstr ""
3224+"Wanneer geïmporteerd,\n"
3225+" hebben sommige soorten regels,\n"
3226+" zoals de producten of categorieën,\n"
3227+" een handmatige controle nodig.\n"
3228+" U vindt de lijst van nieuwe regels\n"
3229+" welke dienen te worden gecontroleerd\n"
3230+" in het menu 'Connectors > "
3231+"Controlepunten'."
3232+
3233+#. module: magentoerpconnect
3234+#: field:delivery.carrier,magento_tracking_title:0
3235+msgid "Magento Tracking Title"
3236+msgstr "Magento Tracking Title"
3237+
3238+#. module: magentoerpconnect
3239+#: selection:magento.product.product,manage_stock:0
3240+msgid "Manage Stock"
3241+msgstr "Beheer vororaad"
3242+
3243+#. module: magentoerpconnect
3244+#: field:magento.address,updated_at:0
3245+#: field:magento.product.product,updated_at:0
3246+#: field:magento.res.partner,updated_at:0
3247+msgid "Updated At (on Magento)"
3248+msgstr "Bijgewerkt op (in Magento)"
3249+
3250+#. module: magentoerpconnect
3251+#: selection:magento.stock.picking.out,picking_method:0
3252+msgid "Complete"
3253+msgstr "Compleet"
3254+
3255+#. module: magentoerpconnect
3256+#: model:ir.model,name:magentoerpconnect.model_magento_store
3257+#: view:magento.store:0
3258+msgid "Magento Store"
3259+msgstr "Magento winkel"
3260+
3261+#. module: magentoerpconnect
3262+#: model:ir.model,name:magentoerpconnect.model_magento_product_product
3263+#: view:magento.product.product:0
3264+msgid "Magento Product"
3265+msgstr "Magento product"
3266+
3267+#. module: magentoerpconnect
3268+#: model:ir.model,name:magentoerpconnect.model_magento_sale_order
3269+#: field:magento.account.invoice,magento_order_id:0
3270+#: field:magento.sale.order.line,magento_order_id:0
3271+#: field:magento.stock.picking.out,magento_order_id:0
3272+msgid "Magento Sale Order"
3273+msgstr "Magento verkooporder"
3274+
3275+#. module: magentoerpconnect
3276+#: field:magento.website,import_partners_from_date:0
3277+msgid "Import partners from date"
3278+msgstr "Importeer relaties vanaf"
3279+
3280+#. module: magentoerpconnect
3281+#: sql_constraint:magento.sale.order:0
3282+#: sql_constraint:magento.sale.order.line:0
3283+msgid "A sale order line with the same ID on Magento already exists."
3284+msgstr "Een verkooporderregel met hetzelfde ID bestaat al in Magento."
3285+
3286+#. module: magentoerpconnect
3287+#: field:magento.sale.order,magento_order_line_ids:0
3288+msgid "Magento Order Lines"
3289+msgstr "Magento orderregels"
3290+
3291+#. module: magentoerpconnect
3292+#: field:magento.res.partner,newsletter:0
3293+msgid "Newsletter"
3294+msgstr "Nieuwsbrief"
3295+
3296+#. module: magentoerpconnect
3297+#: help:magento.backend,default_lang_id:0
3298+msgid ""
3299+"If a default language is selected, the records will be imported in the "
3300+"translation of this language.\n"
3301+"Note that a similar configuration exists for each storeview."
3302+msgstr ""
3303+"Als een standaard taal is geselecteerd, worden de regels geïmporteerd in de "
3304+"vertaling van deze taal.\n"
3305+"Let op, deze instelling bestaat voor iedere winkelweergave."
3306+
3307+#. module: magentoerpconnect
3308+#: sql_constraint:magento.address:0
3309+msgid "A partner address with same ID on Magento already exists."
3310+msgstr "Een relatie adres met hetzelfde ID bestaat al in Magento."
3311+>>>>>>> MERGE-SOURCE
3312
3313=== modified file 'magentoerpconnect/invoice.py'
3314--- magentoerpconnect/invoice.py 2013-10-09 19:41:58 +0000
3315+++ magentoerpconnect/invoice.py 2014-05-23 12:57:06 +0000
3316@@ -215,6 +215,9 @@
3317 # we use the shop as many sale orders can be related to an invoice
3318 for sale in invoice.sale_ids:
3319 for magento_sale in sale.magento_bind_ids:
3320+ for mag_inv in invoice.magento_bind_ids:
3321+ if mag_inv.backend_id.id == magento_sale.backend_id.id:
3322+ continue
3323 # Check if invoice state matches configuration setting
3324 # for when to export an invoice
3325 magento_stores = magento_sale.shop_id.magento_bind_ids
3326@@ -222,7 +225,12 @@
3327 if store.backend_id.id == magento_sale.backend_id.id),
3328 None)
3329 assert magento_store
3330- create_invoice = magento_store.create_invoice_on
3331+
3332+ payment_method = sale.payment_method_id
3333+ if payment_method and payment_method.create_invoice_on:
3334+ create_invoice = payment_method.create_invoice_on
3335+ else:
3336+ create_invoice = magento_store.create_invoice_on
3337
3338 if create_invoice == invoice.state:
3339 session.create('magento.account.invoice',
3340
3341=== modified file 'magentoerpconnect/magento_model.py'
3342--- magentoerpconnect/magento_model.py 2013-08-15 08:01:46 +0000
3343+++ magentoerpconnect/magento_model.py 2014-05-23 12:57:06 +0000
3344@@ -52,15 +52,24 @@
3345
3346 _backend_type = 'magento'
3347
3348+ def select_versions(self, cr, uid, context=None):
3349+ """ Available versions in the backend.
3350+
3351+ Can be inherited to add custom versions. Using this method
3352+ to add a version from an ``_inherit`` does not constrain
3353+ to redefine the ``version`` field in the ``_inherit`` model.
3354+ """
3355+ return [('1.7', '1.7')]
3356+
3357 def _select_versions(self, cr, uid, context=None):
3358- """ Available versions
3359+ """ Available versions in the backend.
3360
3361- Can be inherited to add custom versions.
3362+ If you want to add a version, do not override this
3363+ method, but ``select_version``.
3364 """
3365- return [('1.7', '1.7')]
3366+ return self.select_versions(cr, uid, context=context)
3367
3368 def _get_stock_field_id(self, cr, uid, context=None):
3369- stock_field = 'virtual_available'
3370 field_ids = self.pool.get('ir.model.fields').search(
3371 cr, uid,
3372 [('model', '=', 'product.product'),
3373@@ -73,9 +82,33 @@
3374 _select_versions,
3375 string='Version',
3376 required=True),
3377- 'location': fields.char('Location', required=True),
3378- 'username': fields.char('Username'),
3379- 'password': fields.char('Password'),
3380+ 'location': fields.char(
3381+ 'Location',
3382+ required=True,
3383+ help="Url to magento application"),
3384+ 'use_custom_api_path': fields.boolean(
3385+ 'Custom Api Path',
3386+ help="The default API path is '/index.php/api/xmlrpc'. "
3387+ "Check this box if you use a custom API path, in that case, "
3388+ "the location has to be completed with the custom API path "),
3389+ 'username': fields.char(
3390+ 'Username',
3391+ help="Webservice user"),
3392+ 'password': fields.char(
3393+ 'Password',
3394+ help="Webservice password"),
3395+ 'use_auth_basic': fields.boolean(
3396+ 'Use HTTP Auth Basic',
3397+ help="Use a Basic Access Authentication for the API. "
3398+ "The Magento server could be configured to restrict access "
3399+ "using a HTTP authentication based on a username and "
3400+ "a password."),
3401+ 'auth_basic_username': fields.char(
3402+ 'Basic Auth. Username',
3403+ help="Basic access authentication web server side username"),
3404+ 'auth_basic_password': fields.char(
3405+ 'Basic Auth. Password',
3406+ help="Basic access authentication web server side password"),
3407 'sale_prefix': fields.char(
3408 'Sale Prefix',
3409 help="A prefix put before the name of imported sales orders.\n"
3410@@ -122,6 +155,8 @@
3411
3412 _defaults = {
3413 'product_stock_field_id': _get_stock_field_id,
3414+ 'use_custom_api_path': False,
3415+ 'use_auth_basic': False,
3416 }
3417
3418 _sql_constraints = [
3419@@ -223,7 +258,8 @@
3420 ids = [ids]
3421 mag_product_obj = self.pool.get('magento.product.product')
3422 product_ids = mag_product_obj.search(cr, uid,
3423- [('backend_id', 'in', ids)],
3424+ [('backend_id', 'in', ids),
3425+ ('no_stock_sync', '=', False)],
3426 context=context)
3427 mag_product_obj.recompute_magento_qty(cr, uid, product_ids,
3428 context=context)
3429@@ -251,6 +287,10 @@
3430 def _scheduler_import_product_categories(self, cr, uid, domain=None, context=None):
3431 self._magento_backend(cr, uid, self.import_product_categories,
3432 domain=domain, context=context)
3433+
3434+ def _scheduler_import_product_product(self, cr, uid, domain=None, context=None):
3435+ self._magento_backend(cr, uid, self.import_product_product,
3436+ domain=domain, context=context)
3437
3438 def _scheduler_update_product_stock_qty(self, cr, uid, domain=None, context=None):
3439 self._magento_backend(cr, uid, self.update_product_stock_qty,
3440@@ -382,7 +422,10 @@
3441 'Create invoice on action',
3442 required=True,
3443 help="Should the invoice be created in Magento "
3444- "when it is validated or when it is paid in OpenERP?"),
3445+ "when it is validated or when it is paid in OpenERP?\n"
3446+ "This only takes effect if the sales order's related "
3447+ "payment method is not giving an option for this by "
3448+ "itself. (See Payment Methods)"),
3449 }
3450
3451 _defaults = {
3452
3453=== modified file 'magentoerpconnect/magento_model_view.xml'
3454--- magentoerpconnect/magento_model_view.xml 2014-02-07 11:39:12 +0000
3455+++ magentoerpconnect/magento_model_view.xml 2014-05-23 12:57:06 +0000
3456@@ -19,13 +19,27 @@
3457 <field name="name" class="oe_inline" />
3458 </h1>
3459 <group name="magento" string="Magento Configuration">
3460- <group colspan="4" col="4">
3461- <field name="version" colspan="4"/>
3462- <field name="location" placeholder="e.g. http://my.magento.com"
3463- colspan="4"/>
3464- <field name="username" colspan="2"/>
3465- <field name="password" colspan="2"/>
3466- </group>
3467+ <notebook>
3468+ <page string="API" name="api">
3469+ <group colspan="4" col="4">
3470+ <field name="version" colspan="4"/>
3471+ <field name="location" placeholder="e.g. http://my.magento.com"
3472+ colspan="2"/>
3473+ <field name="use_custom_api_path" colspan="2"/>
3474+ <field name="username" colspan="2"/>
3475+ <field name="password" colspan="2"/>
3476+ </group>
3477+ </page>
3478+ <page string="HTTP Authentication" name="auth" colspan="4" col="4">
3479+ <group colspan="4" col="4">
3480+ <field name="use_auth_basic" colspan="4"/>
3481+ <field name="auth_basic_username" colspan="2"
3482+ attrs="{'invisible': [('use_auth_basic', '=', False)], 'required': [('use_auth_basic', '=', True)]}"/>
3483+ <field name="auth_basic_password" colspan="2"
3484+ attrs="{'invisible': [('use_auth_basic', '=', False)], 'required': [('use_auth_basic', '=', True)]}"/>
3485+ </group>
3486+ </page>
3487+ </notebook>
3488 </group>
3489 <group name="main_configuration" string="Main Configuration">
3490 <field name="warehouse_id"/>
3491
3492=== modified file 'magentoerpconnect/magentoerpconnect_data.xml'
3493--- magentoerpconnect/magentoerpconnect_data.xml 2013-04-03 14:19:58 +0000
3494+++ magentoerpconnect/magentoerpconnect_data.xml 2014-05-23 12:57:06 +0000
3495@@ -56,6 +56,19 @@
3496 <field eval="'_scheduler_import_product_categories'" name="function"/>
3497 <field eval="'()'" name="args"/>
3498 </record>
3499+
3500+ <record forcecreate="True" id="ir_cron_import_product_product" model="ir.cron">
3501+ <field name="name">Magento - Import Products</field>
3502+ <field eval="False" name="active"/>
3503+ <field name="user_id" ref="base.user_root"/>
3504+ <field name="interval_number">1</field>
3505+ <field name="interval_type">days</field>
3506+ <field name="numbercall">-1</field>
3507+ <field eval="False" name="doall"/>
3508+ <field eval="'magento.backend'" name="model"/>
3509+ <field eval="'_scheduler_import_product_product'" name="function"/>
3510+ <field eval="'()'" name="args"/>
3511+ </record>
3512
3513 <record forcecreate="True" id="ir_cron_update_product_stock_qty" model="ir.cron">
3514 <field name="name">Magento - Update Stock Quantities</field>
3515
3516=== modified file 'magentoerpconnect/partner.py'
3517--- magentoerpconnect/partner.py 2014-04-17 08:13:59 +0000
3518+++ magentoerpconnect/partner.py 2014-05-23 12:57:06 +0000
3519@@ -266,13 +266,8 @@
3520 def _import_dependencies(self):
3521 """ Import the dependencies for the record"""
3522 record = self.magento_record
3523-
3524- # import customer groups
3525- binder = self.get_binder_for_model('magento.res.partner.category')
3526- if binder.to_openerp(record['group_id']) is None:
3527- importer = self.get_connector_unit_for_model(MagentoImportSynchronizer,
3528- 'magento.res.partner.category')
3529- importer.run(record['group_id'])
3530+ self._import_dependency(record['group_id'],
3531+ 'magento.res.partner.category')
3532
3533 @property
3534 def mapper(self):
3535
3536=== added file 'magentoerpconnect/payment_invoice.py'
3537--- magentoerpconnect/payment_invoice.py 1970-01-01 00:00:00 +0000
3538+++ magentoerpconnect/payment_invoice.py 2014-05-23 12:57:06 +0000
3539@@ -0,0 +1,17 @@
3540+# -*- coding: utf-8 -*-
3541+from openerp.osv import orm, fields
3542+
3543+
3544+class payment_invoice(orm.Model):
3545+ _inherit = "payment.method"
3546+
3547+ _columns = {
3548+ 'create_invoice_on': fields.selection(
3549+ [('open', 'Validate'),
3550+ ('paid', 'Paid')],
3551+ 'Create invoice on action',
3552+ help="Should the invoice be created in Magento "
3553+ "when it is validated or when it is paid in OpenERP?\n"
3554+ "If nothing is set, the option falls back to the same option "
3555+ "on the Magento store related to the sales order."),
3556+ }
3557
3558=== added file 'magentoerpconnect/payment_invoice.xml'
3559--- magentoerpconnect/payment_invoice.xml 1970-01-01 00:00:00 +0000
3560+++ magentoerpconnect/payment_invoice.xml 2014-05-23 12:57:06 +0000
3561@@ -0,0 +1,21 @@
3562+<?xml version ="1.0" encoding="utf-8"?>
3563+
3564+<openerp>
3565+ <data>
3566+
3567+ <record id="payment_method_view_form" model="ir.ui.view">
3568+ <field name="model">payment.method</field>
3569+ <field name="inherit_id" ref="connector_ecommerce.payment_method_view_form"/>
3570+ <field name="arch" type="xml">
3571+
3572+ <group name="import_rule" position="after">
3573+ <group name="magento" string="Magento">
3574+ <field name="create_invoice_on" string="Create invoice on"/>
3575+ </group>
3576+ </group>
3577+
3578+ </field>
3579+ </record>
3580+
3581+ </data>
3582+</openerp>
3583
3584=== modified file 'magentoerpconnect/product.py'
3585--- magentoerpconnect/product.py 2014-01-14 10:41:05 +0000
3586+++ magentoerpconnect/product.py 2014-05-23 12:57:06 +0000
3587@@ -41,6 +41,7 @@
3588 ImportMapper,
3589 )
3590 from .unit.backend_adapter import GenericAdapter
3591+from .unit.mapper import normalize_datetime
3592 from .unit.import_synchronizer import (DelayedBatchImport,
3593 MagentoImportSynchronizer,
3594 TranslationImporter,
3595@@ -102,12 +103,18 @@
3596 'magento_qty': fields.float('Computed Quantity',
3597 help="Last computed quantity to send "
3598 "on Magento."),
3599+ 'no_stock_sync': fields.boolean(
3600+ 'No Stock Synchronization',
3601+ required=False,
3602+ help="Check this to exclude the product "
3603+ "from stock synchronizations."),
3604 }
3605
3606 _defaults = {
3607 'product_type': 'simple',
3608 'manage_stock': 'use_default',
3609 'backorders': 'use_default',
3610+ 'no_stock_sync': False,
3611 }
3612
3613 _sql_constraints = [
3614@@ -280,9 +287,16 @@
3615 return sorted(images, key=priority)
3616
3617 def _get_binary_image(self, image_data):
3618- url = image_data['url']
3619+ url = image_data['url'].encode('utf8')
3620 try:
3621- binary = urllib2.urlopen(url)
3622+ request = urllib2.Request(url)
3623+ if self.backend_record.auth_basic_username \
3624+ and self.backend_record.auth_basic_password:
3625+ base64string = base64.encodestring(
3626+ '%s:%s' % (self.backend_record.auth_basic_username,
3627+ self.backend_record.auth_basic_password))
3628+ request.add_header("Authorization", "Basic %s" % base64string)
3629+ binary = urllib2.urlopen(request)
3630 except urllib2.HTTPError as err:
3631 if err.code == 404:
3632 # the image is just missing, we skip it
3633@@ -314,17 +328,20 @@
3634 class ProductImport(MagentoImportSynchronizer):
3635 _model_name = ['magento.product.product']
3636
3637+ @property
3638+ def mapper(self):
3639+ if self._mapper is None:
3640+ self._mapper = self.get_connector_unit_for_model(
3641+ ProductImportMapper)
3642+ return self._mapper
3643+
3644 def _import_dependencies(self):
3645 """ Import the dependencies for the record"""
3646 record = self.magento_record
3647 # import related categories
3648- binder = self.get_binder_for_model('magento.product.category')
3649 for mag_category_id in record['categories']:
3650- if binder.to_openerp(mag_category_id) is None:
3651- importer = self.get_connector_unit_for_model(
3652- MagentoImportSynchronizer,
3653- model='magento.product.category')
3654- importer.run(mag_category_id)
3655+ self._import_dependency(mag_category_id,
3656+ 'magento.product.category')
3657
3658 def _validate_product_type(self, data):
3659 """ Check if the product type is in the selection (so we can
3660@@ -385,9 +402,21 @@
3661
3662
3663 @magento
3664+class IsActiveProductImportMapper(ImportMapper):
3665+ _model_name = 'magento.product.product'
3666+
3667+ @mapping
3668+ def is_active(self, record):
3669+ """Check if the product is active in Magento
3670+ and set active flag in OpenERP
3671+ status == 1 in Magento means active"""
3672+ return {'active': (record.get('status') == '1')}
3673+
3674+
3675+@magento
3676 class ProductImportMapper(ImportMapper):
3677 _model_name = 'magento.product.product'
3678- #TODO : categ, special_price => minimal_price
3679+ # TODO : categ, special_price => minimal_price
3680 direct = [('name', 'name'),
3681 ('description', 'description'),
3682 ('weight', 'weight'),
3683@@ -395,11 +424,16 @@
3684 ('short_description', 'description_sale'),
3685 ('sku', 'default_code'),
3686 ('type_id', 'product_type'),
3687- ('created_at', 'created_at'),
3688- ('updated_at', 'updated_at'),
3689+ (normalize_datetime('created_at'), 'created_at'),
3690+ (normalize_datetime('updated_at'), 'updated_at'),
3691 ]
3692
3693 @mapping
3694+ def is_active(self, record):
3695+ mapper = self.get_connector_unit_for_model(IsActiveProductImportMapper)
3696+ return mapper.map_record(record).values()
3697+
3698+ @mapping
3699 def price(self, record):
3700 """ The price is imported at the creation of
3701 the product, then it is only modified and exported
3702@@ -513,6 +547,8 @@
3703 def magento_product_modified(session, model_name, record_id, vals):
3704 if session.context.get('connector_no_export'):
3705 return
3706+ if session.browse(model_name, record_id).no_stock_sync:
3707+ return
3708 inventory_fields = list(set(vals).intersection(INVENTORY_FIELDS))
3709 if inventory_fields:
3710 export_product_inventory.delay(session, model_name,
3711
3712=== modified file 'magentoerpconnect/product_view.xml'
3713--- magentoerpconnect/product_view.xml 2013-10-14 09:29:39 +0000
3714+++ magentoerpconnect/product_view.xml 2014-05-23 12:57:06 +0000
3715@@ -49,7 +49,7 @@
3716 <record id="product_normal_form_view" model="ir.ui.view">
3717 <field name="name">product.product.form</field>
3718 <field name="model">product.product</field>
3719- <field name="inherit_id" ref="connector_ecommerce.product_normal_form_view"/>
3720+ <field name="inherit_id" ref="connector_base_product.product_normal_form_view"/>
3721 <field name="arch" type="xml">
3722 <page name="connector" position="attributes">
3723 <attribute name="invisible">0</attribute>
3724@@ -80,6 +80,7 @@
3725 <field name="product_type" readonly="1"/>
3726 </group>
3727 <group string="Inventory Options">
3728+ <field name="no_stock_sync"/>
3729 <field name="manage_stock"/>
3730 <field name="backorders"/>
3731 <div class="oe_inline">
3732
3733=== modified file 'magentoerpconnect/sale.py'
3734--- magentoerpconnect/sale.py 2014-04-17 08:38:34 +0000
3735+++ magentoerpconnect/sale.py 2014-05-23 12:57:06 +0000
3736@@ -83,6 +83,8 @@
3737 # the parent order and link the new one to the canceled parent
3738 'magento_parent_id': fields.many2one('magento.sale.order',
3739 string='Parent Magento Order'),
3740+ 'storeview_id': fields.many2one('magento.storeview',
3741+ string='Magento Storeview'),
3742 }
3743
3744 _sql_constraints = [
3745@@ -325,7 +327,6 @@
3746 'because it has not been paid since %d '
3747 'days' % (order_id, max_days))
3748
3749-
3750 def check(self, record):
3751 """ Check whether the current sale order should be imported
3752 or not. It will actually use the payment method configuration
3753@@ -354,9 +355,23 @@
3754
3755
3756 @magento
3757+class SaleOrderMoveComment(ConnectorUnit):
3758+ _model_name = ['magento.sale.order']
3759+
3760+ def move(self, binding):
3761+ pass
3762+
3763+
3764+@magento
3765 class SaleOrderImport(MagentoImportSynchronizer):
3766 _model_name = ['magento.sale.order']
3767
3768+ @property
3769+ def mapper(self):
3770+ if self._mapper is None:
3771+ self._mapper = self.environment.get_connector_unit(SaleOrderImportMapper)
3772+ return self._mapper
3773+
3774 def _clean_magento_items(self, resource):
3775 """
3776 Method that clean the sale order line given by magento before importing it
3777@@ -482,6 +497,10 @@
3778 def _after_import(self, binding_id):
3779 self._link_parent_orders(binding_id)
3780 self._create_payment(binding_id)
3781+ binding = self.session.browse(self.model._name, binding_id)
3782+ if binding.magento_parent_id:
3783+ move_comment = self.environment.get_connector_unit(SaleOrderMoveComment)
3784+ move_comment.move(binding)
3785
3786 def _get_magento_data(self):
3787 """ Return the raw Magento data for ``self.magento_id`` """
3788@@ -547,7 +566,6 @@
3789 customer_group = record.get('customer_group_id')
3790 if customer_group:
3791 self._import_customer_group(customer_group)
3792-
3793 customer_record = {
3794 'firstname': address['firstname'],
3795 'middlename': address['middlename'],
3796@@ -661,13 +679,17 @@
3797
3798 self._import_addresses()
3799
3800- prod_binder = self.get_binder_for_model('magento.product.product')
3801- prod_importer = self.get_connector_unit_for_model(MagentoImportSynchronizer,
3802- 'magento.product.product')
3803 for line in record.get('items', []):
3804- _logger.info('line: %s', line)
3805- if 'product_id' in line and prod_binder.to_openerp(line['product_id']) is None:
3806- prod_importer.run(line['product_id'])
3807+ _logger.debug('line: %s', line)
3808+ if 'product_id' in line:
3809+ self._import_dependency(line['product_id'],
3810+ 'magento.product.product')
3811+
3812+
3813+@magento
3814+class SaleOrderCommentImportMapper(ImportMapper):
3815+ " Mapper for importing comments of sales orders. Does nothing in the base addons. "
3816+ _model_name = 'magento.sale.order'
3817
3818
3819 @magento
3820@@ -679,6 +701,7 @@
3821 ('grand_total', 'total_amount'),
3822 ('tax_amount', 'total_amount_tax'),
3823 ('created_at', 'date_order'),
3824+ ('store_id', 'storeview_id'),
3825 ]
3826
3827 children = [('items', 'magento_order_line_ids', 'magento.sale.order.line'),
3828@@ -816,6 +839,12 @@
3829 for the salespersons (access rules)"""
3830 return {'user_id': False}
3831
3832+ @mapping
3833+ def sale_order_comment(self, record):
3834+ comment_mapper = self.environment.get_connector_unit(SaleOrderCommentImportMapper)
3835+ map_record = comment_mapper.map_record(record)
3836+ return map_record.values()
3837+
3838
3839 @magento
3840 class MagentoSaleOrderOnChange(SaleOrderOnChange):
3841@@ -833,6 +862,19 @@
3842 ]
3843
3844 @mapping
3845+ def discount_amount(self, record):
3846+ discount_value = float(record.get('discount_amount', 0))
3847+ if self.backend_record.catalog_price_tax_included:
3848+ row_total = float(record.get('row_total_incl_tax', 0))
3849+ else:
3850+ row_total = float(record.get('row_total', 0))
3851+ discount = 0
3852+ if discount_value > 0 and row_total > 0:
3853+ discount = 100 * discount_value / row_total
3854+ result = {'discount': discount}
3855+ return result
3856+
3857+ @mapping
3858 def product_id(self, record):
3859 binder = self.get_binder_for_model('magento.product.product')
3860 product_id = binder.to_openerp(record['product_id'], unwrap=True)
3861@@ -840,19 +882,7 @@
3862 ("product_id %s should have been imported in "
3863 "SaleOrderImport._import_dependencies" % record['product_id'])
3864 return {'product_id': product_id}
3865-
3866- @mapping
3867- def discount_amount(self, record):
3868- ifield = record.get('discount_amount')
3869- discount = 0
3870- if ifield:
3871- price = float(record['price'])
3872- qty_ordered = float(record['qty_ordered'])
3873- if price and qty_ordered:
3874- discount = 100 * float(ifield) / price * qty_ordered
3875- result = {'discount': discount}
3876- return result
3877-
3878+
3879 @mapping
3880 def product_options(self, record):
3881 result = {}
3882@@ -908,3 +938,12 @@
3883 env = get_environment(session, model_name, backend_id)
3884 importer = env.get_connector_unit(SaleOrderBatchImport)
3885 importer.run(filters)
3886+
3887+
3888+@magento
3889+class SaleCommentAdapter(GenericAdapter):
3890+ _model_name = 'magento.sale.comment'
3891+
3892+ def create(self, order_increment, status, comment=None, notify=False):
3893+ return self._call('sales_order.addComment',
3894+ [order_increment, status, comment, notify])
3895
3896=== modified file 'magentoerpconnect/setting_view.xml'
3897--- magentoerpconnect/setting_view.xml 2013-04-15 10:15:24 +0000
3898+++ magentoerpconnect/setting_view.xml 2014-05-23 12:57:06 +0000
3899@@ -38,5 +38,3 @@
3900
3901 </data>
3902 </openerp>
3903-
3904-
3905
3906=== modified file 'magentoerpconnect/tests/__init__.py'
3907--- magentoerpconnect/tests/__init__.py 2013-09-03 09:55:45 +0000
3908+++ magentoerpconnect/tests/__init__.py 2014-05-23 12:57:06 +0000
3909@@ -23,7 +23,6 @@
3910 import test_address_book
3911 import test_export_invoice
3912 import test_import_product_image
3913-
3914 fast_suite = [
3915 ]
3916
3917
3918=== modified file 'magentoerpconnect/tests/common.py'
3919--- magentoerpconnect/tests/common.py 2013-06-28 13:58:01 +0000
3920+++ magentoerpconnect/tests/common.py 2014-05-23 12:57:06 +0000
3921@@ -35,7 +35,7 @@
3922 response.
3923 """
3924
3925- def __init__(self, responses):
3926+ def __init__(self, responses, key_func=None):
3927 """
3928 The responses are stored in dict instances.
3929 The keys are normalized using the ``call_to_key``
3930@@ -43,30 +43,35 @@
3931 hashable form.
3932
3933 :param responses: responses returned by Magento
3934+ :param call_to_key: function to build the key
3935+ from the method and arguments
3936 :type responses: dict
3937 """
3938 self._responses = responses
3939+ self._calls = []
3940+ self.call_to_key = key_func or call_to_key
3941
3942 def __call__(self, method, arguments):
3943- key = call_to_key(method, arguments)
3944+ self._calls.append((method, arguments))
3945+ key = self.call_to_key(method, arguments)
3946 assert key in self._responses, (
3947 "%s not found in magento responses" % str(key))
3948 return self._responses[key]
3949
3950
3951 @contextmanager
3952-def mock_api(responses):
3953+def mock_api(responses, key_func=None):
3954 """
3955 :param responses: responses returned by Magento
3956 :type responses: dict
3957 """
3958- get_magento_response = TestResponder(responses)
3959+ get_magento_response = TestResponder(responses, key_func=key_func)
3960 with mock.patch('magento.API') as API:
3961 api_mock = mock.MagicMock(name='magento.api')
3962 API.return_value = api_mock
3963 api_mock.__enter__.return_value = api_mock
3964 api_mock.call.side_effect = get_magento_response
3965- yield
3966+ yield get_magento_response._calls
3967
3968
3969 class MockResponseImage(object):
3970
3971=== modified file 'magentoerpconnect/tests/test_data.py'
3972--- magentoerpconnect/tests/test_data.py 2013-11-05 13:50:49 +0000
3973+++ magentoerpconnect/tests/test_data.py 2014-05-23 12:57:06 +0000
3974@@ -22134,7 +22134,7 @@
3975 'sku': 'HTC Touch Diamond',
3976 'type': 'simple',
3977 'website_ids': ['1']}],
3978- ('customer.info', (1, None)): {'confirmation': None,
3979+ ('customer.info', (1,)): {'confirmation': None,
3980 'created_at': '2007-08-30 23:23:13',
3981 'created_in': None,
3982 'customer_id': '1',
3983@@ -22161,19 +22161,19 @@
3984 ('customer_address.list', (frozenset([('customer_id', frozenset([('eq', '1')]))]),)): [],
3985 ('ol_customer.search', (frozenset([('website_id', frozenset([('in', (u'0',))]))]),)): [],
3986 ('ol_customer.search', (frozenset([('website_id', frozenset([('in', (u'1',))]))]),)): ['1'],
3987- ('ol_customer_groups.info', (0, None)): {'customer_group_code': 'NOT LOGGED IN',
3988+ ('ol_customer_groups.info', (0,)): {'customer_group_code': 'NOT LOGGED IN',
3989 'customer_group_id': '0',
3990 'tax_class_id': '3'},
3991- ('ol_customer_groups.info', (1, None)): {'customer_group_code': 'General',
3992+ ('ol_customer_groups.info', (1,)): {'customer_group_code': 'General',
3993 'customer_group_id': '1',
3994 'tax_class_id': '3'},
3995- ('ol_customer_groups.info', (2, None)): {'customer_group_code': 'Wholesale',
3996+ ('ol_customer_groups.info', (2,)): {'customer_group_code': 'Wholesale',
3997 'customer_group_id': '2',
3998 'tax_class_id': '3'},
3999- ('ol_customer_groups.info', (3, None)): {'customer_group_code': 'Retailer',
4000+ ('ol_customer_groups.info', (3,)): {'customer_group_code': 'Retailer',
4001 'customer_group_id': '3',
4002 'tax_class_id': '3'},
4003- ('ol_customer_groups.info', (4, None)): {'customer_group_code': 'QAAAA',
4004+ ('ol_customer_groups.info', (4,)): {'customer_group_code': 'QAAAA',
4005 'customer_group_id': '4',
4006 'tax_class_id': '3'},
4007 ('ol_customer_groups.list', (frozenset([]),)): [{'customer_group_code': 'NOT LOGGED IN',
4008@@ -22191,39 +22191,39 @@
4009 {'customer_group_code': 'QAAAA',
4010 'customer_group_id': '4',
4011 'tax_class_id': '3'}],
4012- ('ol_groups.info', (0, None)): {'default_store_id': '0',
4013+ ('ol_groups.info', (0,)): {'default_store_id': '0',
4014 'group_id': '0',
4015 'name': 'Default',
4016 'root_category_id': '0',
4017 'website_id': '0'},
4018- ('ol_groups.info', (1, None)): {'default_store_id': '1',
4019+ ('ol_groups.info', (1,)): {'default_store_id': '1',
4020 'group_id': '1',
4021 'name': 'Main Store',
4022 'root_category_id': '3',
4023 'website_id': '1'},
4024 ('ol_groups.search', (frozenset([]),)): ['0', '1'],
4025- ('ol_storeviews.info', (0, None)): {'code': 'admin',
4026+ ('ol_storeviews.info', (0,)): {'code': 'admin',
4027 'group_id': '0',
4028 'is_active': '1',
4029 'name': 'Admin',
4030 'sort_order': '0',
4031 'store_id': '0',
4032 'website_id': '0'},
4033- ('ol_storeviews.info', (1, None)): {'code': 'default',
4034+ ('ol_storeviews.info', (1,)): {'code': 'default',
4035 'group_id': '1',
4036 'is_active': '1',
4037 'name': 'English',
4038 'sort_order': '0',
4039 'store_id': '1',
4040 'website_id': '1'},
4041- ('ol_storeviews.info', (2, None)): {'code': 'german',
4042+ ('ol_storeviews.info', (2,)): {'code': 'german',
4043 'group_id': '1',
4044 'is_active': '1',
4045 'name': 'German',
4046 'sort_order': '0',
4047 'store_id': '2',
4048 'website_id': '1'},
4049- ('ol_storeviews.info', (3, None)): {'code': 'french',
4050+ ('ol_storeviews.info', (3,)): {'code': 'french',
4051 'group_id': '1',
4052 'is_active': '1',
4053 'name': 'French',
4054@@ -22231,13 +22231,13 @@
4055 'store_id': '3',
4056 'website_id': '1'},
4057 ('ol_storeviews.search', (frozenset([]),)): ['0', '1', '2', '3'],
4058- ('ol_websites.info', (0, None)): {'code': 'admin',
4059+ ('ol_websites.info', (0,)): {'code': 'admin',
4060 'default_group_id': '0',
4061 'is_default': '0',
4062 'name': 'Admin',
4063 'sort_order': '0',
4064 'website_id': '0'},
4065- ('ol_websites.info', (1, None)): {'code': 'base',
4066+ ('ol_websites.info', (1,)): {'code': 'base',
4067 'default_group_id': '1',
4068 'is_default': '1',
4069 'name': 'Main Website',
4070@@ -24027,7 +24027,7 @@
4071 'shipping_tax_refunded': None,
4072 'state': 'new',
4073 'status': 'pending',
4074- 'status_history': [{'comment': None,
4075+ 'status_history': [{'comment': 'I am a sale order, I am a sale order ;)',
4076 'created_at': '2013-04-23 07:38:55',
4077 'entity_name': 'order',
4078 'is_customer_notified': '0',
4079@@ -25473,6 +25473,798 @@
4080 'can_ship_partially_item': None,
4081 'coupon_code': None,
4082 'coupon_rule_name': None,
4083+ 'created_at': time.strftime(FMT),
4084+ 'customer_dob': None,
4085+ 'customer_email': 'john@doe.fr',
4086+ 'customer_firstname': 'John',
4087+ 'customer_gender': None,
4088+ 'customer_group_id': '1',
4089+ 'customer_id': '1',
4090+ 'customer_is_guest': '0',
4091+ 'customer_lastname': 'Doe',
4092+ 'customer_middlename': None,
4093+ 'customer_note': None,
4094+ 'customer_note_notify': '1',
4095+ 'customer_prefix': None,
4096+ 'customer_suffix': None,
4097+ 'customer_taxvat': None,
4098+ 'discount_amount': '0.0000',
4099+ 'discount_canceled': None,
4100+ 'discount_description': None,
4101+ 'discount_invoiced': '0.0000',
4102+ 'discount_refunded': None,
4103+ 'edit_increment': None,
4104+ 'email_sent': '1',
4105+ 'employee_email': None,
4106+ 'employee_name': None,
4107+ 'employee_phone': None,
4108+ 'ext_customer_id': None,
4109+ 'ext_order_id': None,
4110+ 'forced_do_shipment_with_invoice': None,
4111+ 'forced_shipment_with_invoice': None,
4112+ 'gift_message_id': None,
4113+ 'global_currency_code': 'EUR',
4114+ 'grand_total': '97.5000',
4115+ 'hidden_tax_amount': '0.0000',
4116+ 'hidden_tax_invoiced': '0.0000',
4117+ 'hidden_tax_refunded': None,
4118+ 'hold_before_state': None,
4119+ 'hold_before_status': None,
4120+ 'imported': '0',
4121+ 'increment_id': '900000695',
4122+ 'is_virtual': '0',
4123+ 'items': [{'additional_data': None,
4124+ 'amount_refunded': '0.0000',
4125+ 'applied_rule_ids': None,
4126+ 'base_amount_refunded': '0.0000',
4127+ 'base_cost': None,
4128+ 'base_discount_amount': '0.0000',
4129+ 'base_discount_invoiced': '0.0000',
4130+ 'base_discount_refunded': None,
4131+ 'base_hidden_tax_amount': None,
4132+ 'base_hidden_tax_invoiced': '0.0000',
4133+ 'base_hidden_tax_refunded': None,
4134+ 'base_original_price': '89.0000',
4135+ 'base_price': '82.4100',
4136+ 'base_price_incl_tax': '89.0000',
4137+ 'base_row_invoiced': '82.4100',
4138+ 'base_row_total': '82.4100',
4139+ 'base_row_total_incl_tax': '89.0000',
4140+ 'base_tax_amount': '6.5900',
4141+ 'base_tax_before_discount': None,
4142+ 'base_tax_invoiced': '6.5900',
4143+ 'base_tax_refunded': None,
4144+ 'base_weee_tax_applied_amount': '0.0000',
4145+ 'base_weee_tax_applied_row_amnt': '0.0000',
4146+ 'base_weee_tax_applied_row_amount': '0.0000',
4147+ 'base_weee_tax_disposition': '0.0000',
4148+ 'base_weee_tax_row_disposition': '0.0000',
4149+ 'created_at': time.strftime(FMT),
4150+ 'description': None,
4151+ 'discount_amount': '0.0000',
4152+ 'discount_invoiced': '0.0000',
4153+ 'discount_percent': '0.0000',
4154+ 'discount_refunded': None,
4155+ 'earned_points_hash': None,
4156+ 'ext_order_item_id': None,
4157+ 'free_shipping': '0',
4158+ 'gift_message_available': None,
4159+ 'gift_message_id': None,
4160+ 'hidden_tax_amount': None,
4161+ 'hidden_tax_canceled': None,
4162+ 'hidden_tax_invoiced': '0.0000',
4163+ 'hidden_tax_refunded': None,
4164+ 'is_nominal': '0',
4165+ 'is_qty_decimal': '0',
4166+ 'is_virtual': '0',
4167+ 'item_id': '12751',
4168+ 'locked_do_invoice': None,
4169+ 'locked_do_ship': None,
4170+ 'name': 'Dior Homme',
4171+ 'no_discount': '0',
4172+ 'order_id': '7360',
4173+ 'original_price': '89.0000',
4174+ 'parent_item_id': None,
4175+ 'price': '82.4100',
4176+ 'price_incl_tax': '89.0000',
4177+ 'product_id': '157',
4178+ '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";}}',
4179+ 'product_type': 'simple',
4180+ 'qty_backordered': None,
4181+ 'qty_canceled': '0.0000',
4182+ 'qty_invoiced': '1.0000',
4183+ 'qty_ordered': '1.0000',
4184+ 'qty_refunded': '0.0000',
4185+ 'qty_shipped': '0.0000',
4186+ 'quote_item_id': '46485',
4187+ 'redeemed_points_hash': None,
4188+ 'row_invoiced': '82.4100',
4189+ 'row_total': '82.4100',
4190+ 'row_total_after_redemptions': None,
4191+ 'row_total_after_redemptions_incl_tax': None,
4192+ 'row_total_before_redemptions': None,
4193+ 'row_total_before_redemptions_incl_tax': None,
4194+ 'row_total_incl_tax': '89.0000',
4195+ 'row_weight': '0.0000',
4196+ 'sku': '1625',
4197+ 'store_id': '1',
4198+ 'tax_amount': '6.5900',
4199+ 'tax_before_discount': None,
4200+ 'tax_canceled': None,
4201+ 'tax_invoiced': '6.5900',
4202+ 'tax_percent': '8.0000',
4203+ 'tax_refunded': None,
4204+ 'updated_at': time.strftime(FMT),
4205+ 'weee_tax_applied': 'a:0:{}',
4206+ 'weee_tax_applied_amount': '0.0000',
4207+ 'weee_tax_applied_row_amount': '0.0000',
4208+ 'weee_tax_disposition': '0.0000',
4209+ 'weee_tax_row_disposition': '0.0000',
4210+ 'weight': None}],
4211+ 'order_currency_code': 'EUR',
4212+ 'order_id': '7360',
4213+ 'original_increment_id': None,
4214+ 'payment': {'account_status': None,
4215+ 'additional_data': None,
4216+ 'address_status': None,
4217+ 'amount_authorized': None,
4218+ 'amount_canceled': None,
4219+ 'amount_ordered': '97.5000',
4220+ 'amount_paid': '97.5000',
4221+ 'amount_refunded': None,
4222+ 'anet_trans_method': None,
4223+ 'base_amount_authorized': None,
4224+ 'base_amount_canceled': None,
4225+ 'base_amount_ordered': '97.5000',
4226+ 'base_amount_paid': '97.5000',
4227+ 'base_amount_paid_online': None,
4228+ 'base_amount_refunded': None,
4229+ 'base_amount_refunded_online': None,
4230+ 'base_shipping_amount': '7.8700',
4231+ 'base_shipping_captured': '7.8700',
4232+ 'base_shipping_refunded': None,
4233+ 'cc_approval': None,
4234+ 'cc_avs_status': None,
4235+ 'cc_cid_status': None,
4236+ 'cc_debug_request_body': None,
4237+ 'cc_debug_response_body': None,
4238+ 'cc_debug_response_serialized': None,
4239+ 'cc_exp_month': '0',
4240+ 'cc_exp_year': '0',
4241+ 'cc_last4': None,
4242+ 'cc_number_enc': None,
4243+ 'cc_owner': None,
4244+ 'cc_secure_verify': None,
4245+ 'cc_ss_issue': None,
4246+ 'cc_ss_start_month': '0',
4247+ 'cc_ss_start_year': '0',
4248+ 'cc_status': None,
4249+ 'cc_status_description': None,
4250+ 'cc_trans_id': None,
4251+ 'cc_type': None,
4252+ 'cybersource_token': None,
4253+ 'echeck_account_name': None,
4254+ 'echeck_account_type': None,
4255+ 'echeck_bank_name': None,
4256+ 'echeck_routing_number': None,
4257+ 'echeck_type': None,
4258+ 'flo2cash_account_id': None,
4259+ 'ideal_issuer_id': None,
4260+ 'ideal_issuer_title': None,
4261+ 'ideal_transaction_checked': None,
4262+ 'last_trans_id': '1P06829259760661R',
4263+ 'method': 'checkmo',
4264+ 'parent_id': '7360',
4265+ 'paybox_question_number': None,
4266+ 'paybox_request_number': None,
4267+ 'payment_id': '32844',
4268+ 'po_number': None,
4269+ 'protection_eligibility': None,
4270+ 'quote_payment_id': None,
4271+ 'shipping_amount': '7.8700',
4272+ 'shipping_captured': '7.8700',
4273+ 'shipping_refunded': None},
4274+ 'payment_auth_expiration': None,
4275+ 'payment_authorization_amount': None,
4276+ 'payment_authorization_expiration': None,
4277+ 'paypal_ipn_customer_notified': None,
4278+ 'protect_code': '49accf',
4279+ 'quote_address_id': None,
4280+ 'quote_id': '33794',
4281+ 'relation_child_id': None,
4282+ 'relation_child_real_id': None,
4283+ 'relation_parent_id': None,
4284+ 'relation_parent_real_id': None,
4285+ 'remote_ip': None,
4286+ 'rewards_base_discount_amount': None,
4287+ 'rewards_base_discount_tax_amount': None,
4288+ 'rewards_discount_amount': None,
4289+ 'rewards_discount_tax_amount': None,
4290+ 'shipping_address': {'address_id': '38469',
4291+ 'address_type': 'shipping',
4292+ 'city': 'Lyon',
4293+ 'company': None,
4294+ 'country_id': 'FR',
4295+ 'customer_address_id': None,
4296+ 'customer_id': None,
4297+ 'email': 'john@doe.fr',
4298+ 'fax': None,
4299+ 'firstname': 'John',
4300+ 'lastname': 'Doe',
4301+ 'middlename': None,
4302+ 'parent_id': '7360',
4303+ 'postcode': '1006',
4304+ 'prefix': None,
4305+ 'quote_address_id': None,
4306+ 'region': None,
4307+ 'region_id': None,
4308+ 'street': 'Victor Hugo',
4309+ 'suffix': None,
4310+ 'telephone': '31763163390',
4311+ 'vat_id': None,
4312+ 'vat_is_valid': None,
4313+ 'vat_request_date': None,
4314+ 'vat_request_id': None,
4315+ 'vat_request_success': None},
4316+ 'shipping_address_id': '38469',
4317+ 'shipping_amount': '7.8700',
4318+ 'shipping_canceled': None,
4319+ 'shipping_description': 'La Poste',
4320+ 'shipping_discount_amount': '0.0000',
4321+ 'shipping_hidden_tax_amount': '0.0000',
4322+ 'shipping_incl_tax': '8.5000',
4323+ 'shipping_invoiced': '7.8700',
4324+ 'shipping_method': 'flatrate_flatrate',
4325+ 'shipping_refunded': None,
4326+ 'shipping_tax_amount': '0.6300',
4327+ 'shipping_tax_refunded': None,
4328+ 'state': 'processing',
4329+ 'status': 'processing',
4330+ 'status_history': [{'comment': u'Notifier le client pour la facture n\xb0100003489.',
4331+ 'created_at': '2013-10-14 13:22:02',
4332+ 'entity_name': 'invoice',
4333+ 'is_customer_notified': '1',
4334+ 'is_visible_on_front': '0',
4335+ 'parent_id': '7360',
4336+ 'status': 'processing',
4337+ 'store_id': '1'},
4338+ {'comment': u'IPN "Completed". Registered notification about captured amount of 97,50\xa0EUR. Transaction ID: "1P06829259760661R".',
4339+ 'created_at': '2013-10-14 13:22:00',
4340+ 'entity_name': 'invoice',
4341+ 'is_customer_notified': '2',
4342+ 'is_visible_on_front': '0',
4343+ 'parent_id': '7360',
4344+ 'status': 'processing',
4345+ 'store_id': '1'},
4346+ {'comment': None,
4347+ 'created_at': '2013-10-14 13:20:58',
4348+ 'entity_name': 'order',
4349+ 'is_customer_notified': '0',
4350+ 'is_visible_on_front': '0',
4351+ 'parent_id': '7360',
4352+ 'status': 'pending_payment',
4353+ 'store_id': '1'}],
4354+ 'store_currency_code': 'EUR',
4355+ 'store_id': '1',
4356+ 'store_name': u'France',
4357+ 'store_to_base_rate': '1.0000',
4358+ 'store_to_order_rate': '1.0000',
4359+ 'subtotal': '82.4100',
4360+ 'subtotal_canceled': None,
4361+ 'subtotal_incl_tax': '89.0000',
4362+ 'subtotal_invoiced': '82.4100',
4363+ 'subtotal_refunded': None,
4364+ 'tax_amount': '7.2200',
4365+ 'tax_canceled': None,
4366+ 'tax_invoiced': '7.2200',
4367+ 'tax_refunded': None,
4368+ 'total_canceled': None,
4369+ 'total_due': '0.0000',
4370+ 'total_invoiced': '97.5000',
4371+ 'total_item_count': '1',
4372+ 'total_offline_refunded': None,
4373+ 'total_online_refunded': None,
4374+ 'total_paid': '97.5000',
4375+ 'total_qty_ordered': '1.0000',
4376+ 'total_refunded': None,
4377+ 'updated_at': time.strftime(FMT),
4378+ 'website_id': u'1',
4379+ 'weight': '0.0000',
4380+ 'x_forwarded_for': None},
4381+('sales_order.info', (900000696, None)): { 'adjustment_negative': None,
4382+ 'adjustment_positive': None,
4383+ 'applied_rule_ids': '192',
4384+ 'base_adjustment_negative': None,
4385+ 'base_adjustment_positive': None,
4386+ 'base_currency_code': 'EUR',
4387+ 'base_custbalance_amount': None,
4388+ 'base_discount_amount': '-5.0000',
4389+ 'base_discount_canceled': None,
4390+ 'base_discount_invoiced': '5.0000',
4391+ 'base_discount_refunded': None,
4392+ 'base_grand_total': '36.9500',
4393+ 'base_hidden_tax_amount': '0.0000',
4394+ 'base_hidden_tax_invoiced': '0.0000',
4395+ 'base_hidden_tax_refunded': None,
4396+ 'base_shipping_amount': '0.0000',
4397+ 'base_shipping_canceled': None,
4398+ 'base_shipping_discount_amount': '0.0000',
4399+ 'base_shipping_hidden_tax_amount': '0.0000',
4400+ 'base_shipping_incl_tax': '0.0000',
4401+ 'base_shipping_invoiced': '0.0000',
4402+ 'base_shipping_refunded': None,
4403+ 'base_shipping_tax_amount': '0.0000',
4404+ 'base_shipping_tax_refunded': None,
4405+ 'base_subtotal': '39.2100',
4406+ 'base_subtotal_canceled': None,
4407+ 'base_subtotal_incl_tax': '41.9500',
4408+ 'base_subtotal_invoiced': '39.2100',
4409+ 'base_subtotal_refunded': None,
4410+ 'base_tax_amount': '2.7400',
4411+ 'base_tax_canceled': None,
4412+ 'base_tax_invoiced': '2.7400',
4413+ 'base_tax_refunded': None,
4414+ 'base_to_global_rate': '1.0000',
4415+ 'base_to_order_rate': '1.0000',
4416+ 'base_total_canceled': None,
4417+ 'base_total_due': '0.0000',
4418+ 'base_total_invoiced': '36.9500',
4419+ 'base_total_invoiced_cost': '0.0000',
4420+ 'base_total_offline_refunded': None,
4421+ 'base_total_online_refunded': None,
4422+ 'base_total_paid': '36.9500',
4423+ 'base_total_qty_ordered': None,
4424+ 'base_total_refunded': None,
4425+ 'billing_address': {'address_id': '38468',
4426+ 'address_type': 'billing',
4427+ 'city': 'Lyon',
4428+ 'company': None,
4429+ 'country_id': 'FR',
4430+ 'customer_address_id': '4999',
4431+ 'customer_id': None,
4432+ 'email': 'john@doe.fr',
4433+ 'fax': None,
4434+ 'firstname': 'John',
4435+ 'lastname': 'Doe',
4436+ 'middlename': None,
4437+ 'parent_id': '7360',
4438+ 'postcode': '1006',
4439+ 'prefix': None,
4440+ 'quote_address_id': None,
4441+ 'region': None,
4442+ 'region_id': None,
4443+ 'street': 'Victor Hugo',
4444+ 'suffix': None,
4445+ 'telephone': '31763163390',
4446+ 'vat_id': None,
4447+ 'vat_is_valid': None,
4448+ 'vat_request_date': None,
4449+ 'vat_request_id': None,
4450+ 'vat_request_success': None},
4451+ 'can_ship_partially': None,
4452+ 'can_ship_partially_item': None,
4453+ 'coupon_code': 'COUPON',
4454+ 'created_at': time.strftime(FMT),
4455+ 'currency_base_id': None,
4456+ 'currency_code': None,
4457+ 'currency_rate': None,
4458+ 'custbalance_amount': None,
4459+ 'customer_dob': None,
4460+ 'customer_email': 'john@doe.fr',
4461+ 'customer_firstname': 'John',
4462+ 'customer_gender': None,
4463+ 'customer_group_id': '1',
4464+ 'customer_id': '1',
4465+ 'customer_is_guest': '0',
4466+ 'customer_lastname': 'Doe',
4467+ 'customer_middlename': None,
4468+ 'customer_note': None,
4469+ 'customer_note_notify': '1',
4470+ 'customer_prefix': None,
4471+ 'customer_suffix': None,
4472+ 'customer_taxvat': None,
4473+ 'discount_amount': '-5.0000',
4474+ 'discount_canceled': None,
4475+ 'discount_description': '5 EURO Coupon',
4476+ 'discount_invoiced': '5.0000',
4477+ 'discount_refunded': None,
4478+ 'edit_increment': None,
4479+ 'email_sent': 1,
4480+ 'entity_id': '4242',
4481+ 'ext_customer_id': None,
4482+ 'ext_order_id': None,
4483+ 'forced_do_shipment_with_invoice': None,
4484+ 'gift_message_id': None,
4485+ 'global_currency_code': 'EUR',
4486+ 'grand_total': '36.9500',
4487+ 'hidden_tax_amount': '0.0000',
4488+ 'hidden_tax_invoiced': '0.0000',
4489+ 'hidden_tax_refunded': None,
4490+ 'hold_before_state': None,
4491+ 'hold_before_status': None,
4492+ 'increment_id': '900000696',
4493+ 'is_hold': None,
4494+ 'is_multi_payment': None,
4495+ 'is_virtual': 0,
4496+ 'items': [ { 'additional_data': None,
4497+ 'amount_refunded': '0.0000',
4498+ 'applied_rule_ids': '192',
4499+ 'base_amount_refunded': '0.0000',
4500+ 'base_cost': '0.0000',
4501+ 'base_discount_amount': '3.5700',
4502+ 'base_discount_invoiced': '3.5700',
4503+ 'base_hidden_tax_amount': '0.0000',
4504+ 'base_hidden_tax_invoiced': '0.0000',
4505+ 'base_hidden_tax_refunded': None,
4506+ 'base_original_price': '29.9900',
4507+ 'base_price': '28.0300',
4508+ 'base_price_incl_tax': '29.9900',
4509+ 'base_row_invoiced': '28.0300',
4510+ 'base_row_total': '28.0300',
4511+ 'base_row_total_incl_tax': '29.9900',
4512+ 'base_tax_amount': '1.9600',
4513+ 'base_tax_before_discount': None,
4514+ 'base_tax_invoiced': '1.9600',
4515+ 'base_weee_tax_applied_amount': '0.0000',
4516+ 'base_weee_tax_applied_row_amount': '0.0000',
4517+ 'base_weee_tax_disposition': '0.0000',
4518+ 'base_weee_tax_row_disposition': '0.0000',
4519+ 'created_at': '2013-10-14 13:20:56',
4520+ 'description': None,
4521+ 'discount_amount': '3.5700',
4522+ 'discount_invoiced': '3.5700',
4523+ 'discount_percent': '0.0000',
4524+ 'ext_order_item_id': None,
4525+ 'free_shipping': 0,
4526+ 'gift_message_available': 2L,
4527+ 'gift_message_id': None,
4528+ 'hidden_tax_amount': '0.0000',
4529+ 'hidden_tax_canceled': None,
4530+ 'hidden_tax_invoiced': '0.0000',
4531+ 'hidden_tax_refunded': None,
4532+ 'is_nominal': 0L,
4533+ 'is_qty_decimal': 0,
4534+ 'is_virtual': 0,
4535+ 'item_id': 354520L,
4536+ 'locked_do_invoice': None,
4537+ 'locked_do_ship': None,
4538+ 'name': 'Item 1',
4539+ 'no_discount': 0,
4540+ 'order_id': '4242',
4541+ 'original_price': '29.9900',
4542+ 'parent_item_id': None,
4543+ 'price': '28.0300',
4544+ 'price_incl_tax': '29.9900',
4545+ 'product_id': '153',
4546+ 'product_options': None,
4547+ 'product_type': 'grouped',
4548+ 'qty_backordered': None,
4549+ 'qty_canceled': '0.0000',
4550+ 'qty_invoiced': '1.0000',
4551+ 'qty_ordered': '1.0000',
4552+ 'qty_refunded': '0.0000',
4553+ 'qty_shipped': '0.0000',
4554+ 'quote_item_id': 579492L,
4555+ 'row_invoiced': '28.0300',
4556+ 'row_total': '28.0300',
4557+ 'row_total_incl_tax': '29.9900',
4558+ 'row_weight': '0.0000',
4559+ 'sku': 'skui1',
4560+ 'store_id': 2,
4561+ 'tax_amount': '1.9600',
4562+ 'tax_before_discount': None,
4563+ 'tax_canceled': None,
4564+ 'tax_invoiced': '1.9600',
4565+ 'tax_percent': '7.0000',
4566+ 'tax_refunded': None,
4567+ 'updated_at': '2013-10-14 13:20:56',
4568+ 'weee_tax_applied': 'a:0:{}',
4569+ 'weee_tax_applied_amount': '0.0000',
4570+ 'weee_tax_applied_row_amount': '0.0000',
4571+ 'weee_tax_disposition': '0.0000',
4572+ 'weee_tax_row_disposition': '0.0000',
4573+ 'weight': None},
4574+ { 'additional_data': None,
4575+ 'amount_refunded': '0.0000',
4576+ 'applied_rule_ids': '192',
4577+ 'base_amount_refunded': '0.0000',
4578+ 'base_cost': '0.0000',
4579+ 'base_discount_amount': '1.4300',
4580+ 'base_discount_invoiced': '1.4300',
4581+ 'base_hidden_tax_amount': '0.0000',
4582+ 'base_hidden_tax_invoiced': '0.0000',
4583+ 'base_hidden_tax_refunded': None,
4584+ 'base_original_price': '11.9600',
4585+ 'base_price': '11.1800',
4586+ 'base_price_incl_tax': '11.9600',
4587+ 'base_row_invoiced': '11.1800',
4588+ 'base_row_total': '11.1800',
4589+ 'base_row_total_incl_tax': '11.9600',
4590+ 'base_tax_amount': '0.7800',
4591+ 'base_tax_before_discount': None,
4592+ 'base_tax_invoiced': '0.7800',
4593+ 'base_weee_tax_applied_amount': '0.0000',
4594+ 'base_weee_tax_applied_row_amount': '0.0000',
4595+ 'base_weee_tax_disposition': '0.0000',
4596+ 'base_weee_tax_row_disposition': '0.0000',
4597+ 'created_at': '2013-10-14 13:20:56',
4598+ 'description': None,
4599+ 'discount_amount': '1.4300',
4600+ 'discount_invoiced': '1.4300',
4601+ 'discount_percent': '0.0000',
4602+ 'ext_order_item_id': None,
4603+ 'free_shipping': 0,
4604+ 'gift_message_available': 2L,
4605+ 'gift_message_id': None,
4606+ 'hidden_tax_amount': '0.0000',
4607+ 'hidden_tax_canceled': None,
4608+ 'hidden_tax_invoiced': '0.0000',
4609+ 'hidden_tax_refunded': None,
4610+ 'is_nominal': 0L,
4611+ 'is_qty_decimal': 0,
4612+ 'is_virtual': 0,
4613+ 'item_id': 354521L,
4614+ 'locked_do_invoice': None,
4615+ 'locked_do_ship': None,
4616+ 'name': 'Item 2',
4617+ 'no_discount': 0,
4618+ 'order_id': '4242',
4619+ 'original_price': '11.9600',
4620+ 'parent_item_id': None,
4621+ 'price': '11.1800',
4622+ 'price_incl_tax': '11.9600',
4623+ 'product_id': '156',
4624+ 'product_options': None,
4625+ 'product_type': 'grouped',
4626+ 'qty_backordered': None,
4627+ 'qty_canceled': '0.0000',
4628+ 'qty_invoiced': '1.0000',
4629+ 'qty_ordered': '1.0000',
4630+ 'qty_refunded': '0.0000',
4631+ 'qty_shipped': '0.0000',
4632+ 'quote_item_id': 579493L,
4633+ 'row_invoiced': '11.1800',
4634+ 'row_total': '11.1800',
4635+ 'row_total_incl_tax': '11.9600',
4636+ 'row_weight': '0.0000',
4637+ 'sku': 'skui2',
4638+ 'store_id': 2,
4639+ 'tax_amount': '0.7800',
4640+ 'tax_before_discount': None,
4641+ 'tax_canceled': None,
4642+ 'tax_invoiced': '0.7800',
4643+ 'tax_percent': '7.0000',
4644+ 'tax_refunded': None,
4645+ 'updated_at': '2013-10-14 13:20:56',
4646+ 'weee_tax_applied': 'a:0:{}',
4647+ 'weee_tax_applied_amount': '0.0000',
4648+ 'weee_tax_applied_row_amount': '0.0000',
4649+ 'weee_tax_disposition': '0.0000',
4650+ 'weee_tax_row_disposition': '0.0000',
4651+ 'weight': None}],
4652+ 'order_currency_code': 'EUR',
4653+ 'original_increment_id': None,
4654+ 'payment': { 'account_status': None,
4655+ 'additional_data': None,
4656+ 'additional_information': None,
4657+ 'address_status': None,
4658+ 'amount': None,
4659+ 'amount_authorized': None,
4660+ 'amount_canceled': None,
4661+ 'amount_ordered': '36.9500',
4662+ 'amount_paid': '36.9500',
4663+ 'amount_refunded': None,
4664+ 'anet_trans_method': None,
4665+ 'base_amount_authorized': None,
4666+ 'base_amount_canceled': None,
4667+ 'base_amount_ordered': '36.9500',
4668+ 'base_amount_paid': '36.9500',
4669+ 'base_amount_paid_online': None,
4670+ 'base_amount_refunded': None,
4671+ 'base_amount_refunded_online': None,
4672+ 'base_shipping_amount': '0.0000',
4673+ 'base_shipping_captured': '0.0000',
4674+ 'base_shipping_refunded': None,
4675+ 'cc_approval': None,
4676+ 'cc_avs_status': None,
4677+ 'cc_cid_status': None,
4678+ 'cc_debug_request_body': None,
4679+ 'cc_debug_response_body': None,
4680+ 'cc_debug_response_serialized': None,
4681+ 'cc_exp_month': '0',
4682+ 'cc_exp_year': '0',
4683+ 'cc_last4': '',
4684+ 'cc_number_enc': '',
4685+ 'cc_owner': 'John Doe',
4686+ 'cc_raw_request': None,
4687+ 'cc_raw_response': None,
4688+ 'cc_secure_verify': None,
4689+ 'cc_ss_issue': None,
4690+ 'cc_ss_start_month': '0',
4691+ 'cc_ss_start_year': '0',
4692+ 'cc_status': None,
4693+ 'cc_status_description': None,
4694+ 'cc_trans_id': None,
4695+ 'cc_type': '',
4696+ 'customer_payment_id': None,
4697+ 'cybersource_token': None,
4698+ 'echeck_account_name': None,
4699+ 'echeck_account_type': None,
4700+ 'echeck_bank_name': None,
4701+ 'echeck_routing_number': None,
4702+ 'echeck_type': None,
4703+ 'entity_id': '4242',
4704+ 'flo2cash_account_id': None,
4705+ 'ideal_issuer_id': None,
4706+ 'ideal_issuer_title': None,
4707+ 'ideal_transaction_checked': None,
4708+ 'last_trans_id': None,
4709+ 'method': 'checkmo',
4710+ 'parent_id': '4242',
4711+ 'paybox_question_number': None,
4712+ 'paybox_request_number': None,
4713+ 'pn_su_transaction_id': None,
4714+ 'po_number': '',
4715+ 'protection_eligibility': None,
4716+ 'quote_payment_id': None,
4717+ 'sequence_number': None,
4718+ 'shipping_amount': '0.0000',
4719+ 'shipping_captured': '0.0000',
4720+ 'shipping_refunded': None},
4721+ 'payment_authorization_amount': None,
4722+ 'payment_authorization_expiration': None,
4723+ 'paypal_ipn_customer_notified': None,
4724+ 'protect_code': '3fde3f',
4725+ 'quote_address_id': None,
4726+ 'quote_id': 460362L,
4727+ 'real_order_id': None,
4728+ 'relation_child_id': None,
4729+ 'relation_child_real_id': None,
4730+ 'relation_parent_id': None,
4731+ 'relation_parent_real_id': None,
4732+ 'remote_ip': '127.0.0.1',
4733+ 'shipping_address': {'address_id': '38469',
4734+ 'address_type': 'shipping',
4735+ 'city': 'Lyon',
4736+ 'company': None,
4737+ 'country_id': 'FR',
4738+ 'customer_address_id': None,
4739+ 'customer_id': None,
4740+ 'email': 'john@doe.fr',
4741+ 'fax': None,
4742+ 'firstname': 'John',
4743+ 'lastname': 'Doe',
4744+ 'middlename': None,
4745+ 'parent_id': '7360',
4746+ 'postcode': '1006',
4747+ 'prefix': None,
4748+ 'quote_address_id': None,
4749+ 'region': None,
4750+ 'region_id': None,
4751+ 'street': 'Victor Hugo',
4752+ 'suffix': None,
4753+ 'telephone': '31763163390',
4754+ 'vat_id': None,
4755+ 'vat_is_valid': None,
4756+ 'vat_request_date': None,
4757+ 'vat_request_id': None,
4758+ 'vat_request_success': None},
4759+ 'shipping_amount': '0.0000',
4760+ 'shipping_canceled': None,
4761+ 'shipping_description': 'free',
4762+ 'shipping_discount_amount': '0.0000',
4763+ 'shipping_hidden_tax_amount': '0.0000',
4764+ 'shipping_incl_tax': '0.0000',
4765+ 'shipping_invoiced': '0.0000',
4766+ 'shipping_method': 'freeshipping',
4767+ 'shipping_refunded': None,
4768+ 'shipping_tax_amount': '0.0000',
4769+ 'shipping_tax_refunded': None,
4770+ 'state': 'new',
4771+ 'status': 'complete',
4772+ 'store_currency_code': 'EUR',
4773+ 'store_id': 2,
4774+ 'store_name': 'Main',
4775+ 'store_to_base_rate': '1.0000',
4776+ 'store_to_order_rate': '1.0000',
4777+ 'subtotal': '39.2100',
4778+ 'subtotal_canceled': None,
4779+ 'subtotal_incl_tax': '41.9500',
4780+ 'subtotal_invoiced': '39.2100',
4781+ 'subtotal_refunded': None,
4782+ 'tax_amount': '2.7400',
4783+ 'tax_canceled': None,
4784+ 'tax_invoiced': '2.7400',
4785+ 'tax_percent': None,
4786+ 'tax_refunded': None,
4787+ 'total_canceled': None,
4788+ 'total_due': '0.0000',
4789+ 'total_invoiced': '36.9500',
4790+ 'total_item_count': 2,
4791+ 'total_offline_refunded': None,
4792+ 'total_online_refunded': None,
4793+ 'total_paid': '36.9500',
4794+ 'total_qty_ordered': '2.0000',
4795+ 'total_refunded': None,
4796+ 'tracking_numbers': None,
4797+ 'updated_at': '2013-10-14 13:20:56',
4798+ 'weight': '0.0000',
4799+ 'x_forwarded_for': None},
4800+('sales_order.info', ('900000691-1', None)): {'adjustment_negative': None,
4801+ 'adjustment_positive': None,
4802+ 'applied_rule_ids': None,
4803+ 'base_adjustment_negative': None,
4804+ 'base_adjustment_positive': None,
4805+ 'base_currency_code': 'EUR',
4806+ 'base_discount_amount': '0.0000',
4807+ 'base_discount_canceled': None,
4808+ 'base_discount_invoiced': '0.0000',
4809+ 'base_discount_refunded': None,
4810+ 'base_grand_total': '97.5000',
4811+ 'base_hidden_tax_amount': '0.0000',
4812+ 'base_hidden_tax_invoiced': '0.0000',
4813+ 'base_hidden_tax_refunded': None,
4814+ 'base_shipping_amount': '7.8700',
4815+ 'base_shipping_canceled': None,
4816+ 'base_shipping_discount_amount': '0.0000',
4817+ 'base_shipping_hidden_tax_amnt': '0.0000',
4818+ 'base_shipping_hidden_tax_amount': '0.0000',
4819+ 'base_shipping_incl_tax': '8.5000',
4820+ 'base_shipping_invoiced': '7.8700',
4821+ 'base_shipping_refunded': None,
4822+ 'base_shipping_tax_amount': '0.6300',
4823+ 'base_shipping_tax_refunded': None,
4824+ 'base_subtotal': '82.4100',
4825+ 'base_subtotal_canceled': None,
4826+ 'base_subtotal_incl_tax': '89.0000',
4827+ 'base_subtotal_invoiced': '82.4100',
4828+ 'base_subtotal_refunded': None,
4829+ 'base_tax_amount': '7.2200',
4830+ 'base_tax_canceled': None,
4831+ 'base_tax_invoiced': '7.2200',
4832+ 'base_tax_refunded': None,
4833+ 'base_to_global_rate': '1.0000',
4834+ 'base_to_order_rate': '1.0000',
4835+ 'base_total_canceled': None,
4836+ 'base_total_due': '0.0000',
4837+ 'base_total_invoiced': '97.5000',
4838+ 'base_total_invoiced_cost': '0.0000',
4839+ 'base_total_offline_refunded': None,
4840+ 'base_total_online_refunded': None,
4841+ 'base_total_paid': '97.5000',
4842+ 'base_total_qty_ordered': None,
4843+ 'base_total_refunded': None,
4844+ 'billing_address': {'address_id': '38468',
4845+ 'address_type': 'billing',
4846+ 'city': 'Lyon',
4847+ 'company': None,
4848+ 'country_id': 'FR',
4849+ 'customer_address_id': '4999',
4850+ 'customer_id': None,
4851+ 'email': 'john@doe.fr',
4852+ 'fax': None,
4853+ 'firstname': 'John',
4854+ 'lastname': 'Doe',
4855+ 'middlename': None,
4856+ 'parent_id': '7360',
4857+ 'postcode': '1006',
4858+ 'prefix': None,
4859+ 'quote_address_id': None,
4860+ 'region': None,
4861+ 'region_id': None,
4862+ 'street': 'Victor Hugo',
4863+ 'suffix': None,
4864+ 'telephone': '31763163390',
4865+ 'vat_id': None,
4866+ 'vat_is_valid': None,
4867+ 'vat_request_date': None,
4868+ 'vat_request_id': None,
4869+ 'vat_request_success': None},
4870+ 'billing_address_id': '38468',
4871+ 'can_ship_partially': None,
4872+ 'can_ship_partially_item': None,
4873+ 'coupon_code': None,
4874+ 'coupon_rule_name': None,
4875 'created_at': '2013-10-14 13:20:56',
4876 'customer_dob': None,
4877 'customer_email': 'john@doe.fr',
4878@@ -25511,7 +26303,7 @@
4879 'hold_before_state': None,
4880 'hold_before_status': None,
4881 'imported': '0',
4882- 'increment_id': '100005281',
4883+ 'increment_id': '900000691-1',
4884 'is_virtual': '0',
4885 'items': [{'additional_data': None,
4886 'amount_refunded': '0.0000',
4887@@ -25603,7 +26395,7 @@
4888 'weight': None}],
4889 'order_currency_code': 'EUR',
4890 'order_id': '7360',
4891- 'original_increment_id': None,
4892+ 'original_increment_id': '900000691',
4893 'payment': {'account_status': None,
4894 'additional_data': None,
4895 'address_status': None,
4896@@ -25674,7 +26466,7 @@
4897 'relation_child_id': None,
4898 'relation_child_real_id': None,
4899 'relation_parent_id': None,
4900- 'relation_parent_real_id': None,
4901+ 'relation_parent_real_id': 900000691,
4902 'remote_ip': None,
4903 'rewards_base_discount_amount': None,
4904 'rewards_base_discount_tax_amount': None,
4905@@ -25771,4 +26563,5 @@
4906 'website_id': u'1',
4907 'weight': '0.0000',
4908 'x_forwarded_for': None},
4909+('sales_order.get_parent', (900000691,)): False,
4910 }
4911
4912=== modified file 'magentoerpconnect/tests/test_data_address_book.py'
4913--- magentoerpconnect/tests/test_data_address_book.py 2013-06-28 15:27:26 +0000
4914+++ magentoerpconnect/tests/test_data_address_book.py 2014-05-23 12:57:06 +0000
4915@@ -34,7 +34,7 @@
4916
4917 # customer without address
4918 no_address = {
4919- ('customer.info', (9999253, None)): {'confirmation': None,
4920+ ('customer.info', (9999253,)): {'confirmation': None,
4921 'created_at': '2013-06-28 12:35:33',
4922 'created_in': 'English',
4923 'customer_id': '9999253',
4924@@ -64,7 +64,7 @@
4925
4926 # individual customer with 1 address
4927 individual_1_address = \
4928-{ ('customer.info', (9999254, None)): {'confirmation': None,
4929+{ ('customer.info', (9999254,)): {'confirmation': None,
4930 'created_at': '2013-06-28 12:43:49',
4931 'created_in': 'English',
4932 'customer_id': '9999254',
4933@@ -88,7 +88,7 @@
4934 'taxvat': None,
4935 'updated_at': '2013-06-28 12:43:49',
4936 'website_id': '1'},
4937- ('customer_address.info', (9999253, None)): {'city': u'Boutin-la-Forêt',
4938+ ('customer_address.info', (9999253,)): {'city': u'Boutin-la-Forêt',
4939 'company': None,
4940 'country_id': 'FR',
4941 'created_at': '2013-06-28 12:43:49',
4942@@ -134,7 +134,7 @@
4943
4944 # individual customer with 2 addresses
4945 individual_2_addresses = \
4946-{('customer.info', (9999255, None)): {'confirmation': None,
4947+{('customer.info', (9999255,)): {'confirmation': None,
4948 'created_at': '2013-06-28 12:56:40',
4949 'created_in': 'English',
4950 'customer_id': '9999255',
4951@@ -158,7 +158,7 @@
4952 'taxvat': None,
4953 'updated_at': '2013-06-28 13:00:23',
4954 'website_id': '1'},
4955- ('customer_address.info', (9999254, None)): {'city': 'Perez',
4956+ ('customer_address.info', (9999254,)): {'city': 'Perez',
4957 'company': None,
4958 'country_id': 'FR',
4959 'created_at': '2013-06-28 12:56:43',
4960@@ -183,7 +183,7 @@
4961 'vat_request_date': None,
4962 'vat_request_id': None,
4963 'vat_request_success': None},
4964- ('customer_address.info', (9999255, None)): {'city': 'Bugarach',
4965+ ('customer_address.info', (9999255,)): {'city': 'Bugarach',
4966 'company': None,
4967 'country_id': 'FR',
4968 'created_at': '2013-06-28 13:00:23',
4969@@ -243,7 +243,7 @@
4970
4971 # company with 1 address
4972 company_1_address = \
4973-{('customer.info', (9999256, None)): {'confirmation': None,
4974+{('customer.info', (9999256,)): {'confirmation': None,
4975 'created_at': '2013-06-28 13:10:21',
4976 'created_in': 'English',
4977 'customer_id': '9999256',
4978@@ -267,7 +267,7 @@
4979 'taxvat': None,
4980 'updated_at': '2013-06-28 13:10:22',
4981 'website_id': '1'},
4982- ('customer_address.info', (9999256, None)): {'city': 'Launaynec',
4983+ ('customer_address.info', (9999256,)): {'city': 'Launaynec',
4984 'company': 'Marechal',
4985 'country_id': 'FR',
4986 'created_at': '2013-06-28 13:10:22',
4987@@ -313,7 +313,7 @@
4988
4989 # company with 2 addresses
4990 company_2_addresses = \
4991-{('customer.info', (9999257, None)): {'confirmation': None,
4992+{('customer.info', (9999257,)): {'confirmation': None,
4993 'created_at': '2013-06-28 13:23:01',
4994 'created_in': 'English',
4995 'customer_id': '9999257',
4996@@ -337,7 +337,7 @@
4997 'taxvat': None,
4998 'updated_at': '2013-06-28 13:25:28',
4999 'website_id': '1'},
5000- ('customer_address.info', (9999257, None)): {'city': 'Raynauddan',
The diff has been truncated for viewing.