Merge branch 'master' into dev

ho-nl · Jun 9, 2016 · 33245c2 · 33245c2
2 parents 6c58ec7 + 96f56db
commit 33245c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1131,7 +1131,7 @@ We don't have actual benchmarks at the moment, but the time spend fieldmapping i
 If you need help with the module, create an issue in the [GitHub issue tracker](https://github.com/ho-nl/Ho_Import/issues).
 
 ## Author
-The module is written by Paul Hachmang (twitter: [@paales](https://twitter.com/paales), email: paul@h-o.nl) build for H&O (website: <http://www.h-o.nl/>, email: <info@h-o.nl>, twitter: [@ho_nl](https://twitter.com/ho_nl)).
+The module is written by Paul Hachmang (twitter: [@paales](https://twitter.com/paales), email: paul@h-o.nl) build for H&O, we make [Magento Webshops](https://www.h-o.nl/magento-webshops) (website: <http://www.h-o.nl/>, email: <info@h-o.nl>, twitter: [@ho_nl](https://twitter.com/ho_nl)).
 
 ## Why build it and open source it?
 After having build multiple product, category and customer imports I was never really satisfied with the available projects. After implementing a project with bare code we came to the conclusion that it was pretty difficult to create an import, make sure al the fields are correctly set for Magento to accept them, the development iteration was to slow, etc.

diff --git a/docs/imports/old_products.xml b/docs/imports/old_products.xml
@@ -67,7 +67,7 @@ Importing products from an old database with image downloading
                     </sku>
                     <!--<_store/> field is never required, store configuration is per field -->
                     <_attribute_set helper="ho_import/import::getFieldMap">
-                        <field>A_WA</field>
+                        <field field="A_WA"/>
                         <mapping>
                             <artikelen from="A" to="Default"/>
                             <bladmuziek from="B" to="Bladmuziek"/>
@@ -80,9 +80,9 @@ Importing products from an old database with image downloading
 
                 <!-- GENERAL PRODUCT INFORMATION -->
                     <name field="A_Titel"/>
-                    <short_description helper="ho_import/import::getFieldDefault"><field>A_Beschrijving</field><default><![CDATA[<!--empty-->]]></default></short_description>
+                    <short_description helper="ho_import/import::getFieldDefault"><field field="A_Beschrijving"/><default><![CDATA[<!--empty-->]]></default></short_description>
                     <description helper="ho_import/import::stripHtmlTags">
-                        <field>A_Xtratxt</field>
+                        <field field="A_Xtratxt"/>
                         <allowed><![CDATA[<p><a><br>]]></allowed>
                     </description>
                     <status value="1"/>
@@ -94,7 +94,7 @@ Importing products from an old database with image downloading
                     </url_key>
                     <!--<url_path /> not required-->
                     <visibility value="4"/>
-                    <weight helper="ho_import/import::getFieldDefault"><field>weight</field><default>0</default></weight>
+                    <weight helper="ho_import/import::getFieldDefault"><field field="weight"/><default>0</default></weight>
 
                     <!--<news_from_date />-->
                     <!--<news_to_date />-->
@@ -119,7 +119,7 @@ Importing products from an old database with image downloading
                     <!--<msrp_display_actual_price_type/>-->
                     <!--<msrp_enabled/>-->
                     <tax_class_id helper="ho_import/import::getFieldMap">
-                        <field>A_BTW</field>
+                        <field field="A_BTW"/>
                         <mapping>
                             <particulier from="H" to="2"/>
                             <zakelijk from="L" to="5"/>
@@ -148,7 +148,7 @@ Importing products from an old database with image downloading
                     <!--<use_config_min_sale_qty value="1"/>-->
                     <!--<max_sale_qty value="10000"/>-->
                     <!--<use_config_max_sale_qty value="1"/>-->
-                    <!--<is_in_stock helper="ho_import/import::getFieldBoolean"><field>stock</field></is_in_stock>-->
+                    <!--<is_in_stock helper="ho_import/import::getFieldBoolean"><field field="stock"/></is_in_stock>-->
                     <!--<notify_stock_qty value=""/>-->
                     <!--<use_config_notify_stock_qty value="1"/>-->
                     <!--<manage_stock value="1"/>-->