EBoekhouden_Export - Version 4.1.30

Version Notes

The price for bundled products was not calcualted correctly.

Download this release

Release Info

Developer Ronald Kas
Extension EBoekhouden_Export
Version 4.1.30
Comparing to
See all releases


Code changes from version 4.1.29 to 4.1.30

Files changed (6) hide show
  1. app/code/community/Eboekhouden/Export/Model/Export/Sales.php +16 -6
  2. app/code/community/Eboekhouden/Export/etc/config.xml +3 -3
  3. app/code/community/Eboekhouden/Export/sql/eboekhouden_setup/mysql4-install-4.1.28.php +0 -33
  4. app/code/community/Eboekhouden/Export/sql/eboekhouden_setup/mysql4-install-4.1.29.php +0 -33
  5. app/code/community/Eboekhouden/Export/sql/eboekhouden_setup/{mysql4-install-4.1.25.php → mysql4-install-4.1.30.php} +0 -0
  6. package.xml +5 -5
app/code/community/Eboekhouden/Export/Model/Export/Sales.php CHANGED
@@ -395,7 +395,7 @@ class Eboekhouden_Export_Model_Export_Sales
395
  $iStoreId));
396
  $sXml .= $this->_getItemXml($oContainer, $oShippingItem);
397
  }
398
-
399
  // Add adjustment in case it exists (for credit memos)
400
  if ((float)$oContainer->getAdjustment() !== 0) {
401
  $oAdjustmentItem = new Mage_Sales_Model_Order_Item();
@@ -404,7 +404,7 @@ class Eboekhouden_Export_Model_Export_Sales
404
  $oAdjustmentItem->setBaseRowTotal($oContainer->getAdjustment());
405
  $oAdjustmentItem->setBaseRowTotalInclTax($oContainer->getAdjustment());
406
  $oAdjustmentItem->setBaseTaxAmount(0);
407
-
408
  $sXml .= $this->_getItemXml($oContainer, $oAdjustmentItem);
409
  }
410
  $sXml .= '
@@ -609,10 +609,12 @@ class Eboekhouden_Export_Model_Export_Sales
609
  $fPriceIn = $oItem->getBaseRowTotalInclTax();
610
  if (empty($fPriceIn)) // Can be 0 and invalid in Magento 1.3.x
611
  {
612
- // Receiving TotalPriceInclTax failed, probably Magento 1.3.x or complicated one
613
- // Use fallback calculation method.
614
- $fPriceIn = $oItem->getBaseRowTotal() * $fVatFactor;
615
- $sComment .= ' ['.$fPriceIn.' = '.$oItem->getBaseRowTotal().' * '.$fVatFactor.'] ';
 
 
616
  }
617
 
618
  $fDiscountAmount = $oItem->getBaseDiscountAmount();
@@ -645,6 +647,14 @@ class Eboekhouden_Export_Model_Export_Sales
645
 
646
  $fPriceEx = $fPriceIn / $fVatFactor;
647
 
 
 
 
 
 
 
 
 
648
  $fTaxAmount = $fPriceIn - $fPriceEx;
649
  if (empty($fTaxAmount))
650
  {
395
  $iStoreId));
396
  $sXml .= $this->_getItemXml($oContainer, $oShippingItem);
397
  }
398
+
399
  // Add adjustment in case it exists (for credit memos)
400
  if ((float)$oContainer->getAdjustment() !== 0) {
401
  $oAdjustmentItem = new Mage_Sales_Model_Order_Item();
404
  $oAdjustmentItem->setBaseRowTotal($oContainer->getAdjustment());
405
  $oAdjustmentItem->setBaseRowTotalInclTax($oContainer->getAdjustment());
406
  $oAdjustmentItem->setBaseTaxAmount(0);
407
+
408
  $sXml .= $this->_getItemXml($oContainer, $oAdjustmentItem);
409
  }
410
  $sXml .= '
609
  $fPriceIn = $oItem->getBaseRowTotalInclTax();
610
  if (empty($fPriceIn)) // Can be 0 and invalid in Magento 1.3.x
611
  {
612
+ if ($oItem->getBaseRowTotal() !== null) {
613
+ // Receiving TotalPriceInclTax failed, probably Magento 1.3.x or complicated one
614
+ // Use fallback calculation method.
615
+ $fPriceIn = $oItem->getBaseRowTotal() * $fVatFactor;
616
+ $sComment .= ' ['.$fPriceIn.' = '.$oItem->getBaseRowTotal().' * '.$fVatFactor.'] ';
617
+ }
618
  }
619
 
620
  $fDiscountAmount = $oItem->getBaseDiscountAmount();
647
 
648
  $fPriceEx = $fPriceIn / $fVatFactor;
649
 
650
+ // When the base_row_total is null, use base prices
651
+ // This occurs when bundled products are used
652
+ if (empty($fPriceIn) && $oItem->getBaseRowTotal() === null) {
653
+ $sComment .= ' ['.$fPriceIn.' = Base price: '.$oItem->getBasePriceInclTax().'] ';
654
+ $fPriceIn = $oItem->getBasePriceInclTax();
655
+ $fPriceEx = $oItem->getBasePrice();
656
+ }
657
+
658
  $fTaxAmount = $fPriceIn - $fPriceEx;
659
  if (empty($fTaxAmount))
660
  {
app/code/community/Eboekhouden/Export/etc/config.xml CHANGED
@@ -13,10 +13,10 @@
13
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14
  * copies of the Software, and to permit persons to whom the Software is
15
  * furnished to do so, subject to the following conditions:
16
- *
17
  * The above copyright notice and this permission notice shall be included in
18
  * all copies or substantial portions of the Software.
19
- *
20
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -35,7 +35,7 @@
35
  <modules>
36
  <Eboekhouden_Export>
37
  <!-- When changing version: Don't forget to rename the mysql4-install script in sql/eboekhouden_setup -->
38
- <version>4.1.29</version>
39
  </Eboekhouden_Export>
40
  </modules>
41
 
13
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14
  * copies of the Software, and to permit persons to whom the Software is
15
  * furnished to do so, subject to the following conditions:
16
+ *
17
  * The above copyright notice and this permission notice shall be included in
18
  * all copies or substantial portions of the Software.
19
+ *
20
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
35
  <modules>
36
  <Eboekhouden_Export>
37
  <!-- When changing version: Don't forget to rename the mysql4-install script in sql/eboekhouden_setup -->
38
+ <version>4.1.30</version>
39
  </Eboekhouden_Export>
40
  </modules>
41
 
app/code/community/Eboekhouden/Export/sql/eboekhouden_setup/mysql4-install-4.1.28.php DELETED
@@ -1,33 +0,0 @@
1
- <?php
2
- /**
3
- * NOTICE OF LICENSE
4
- *
5
- * The MIT License
6
- *
7
- * Copyright (c) 2010 e-Boekhouden.nl
8
- *
9
- * Permission is hereby granted, free of charge, to any person obtaining a copy
10
- * of this software and associated documentation files (the "Software"), to deal
11
- * in the Software without restriction, including without limitation the rights
12
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13
- * copies of the Software, and to permit persons to whom the Software is
14
- * furnished to do so, subject to the following conditions:
15
- *
16
- * The above copyright notice and this permission notice shall be included in
17
- * all copies or substantial portions of the Software.
18
- *
19
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25
- * THE SOFTWARE.
26
- *
27
- * @package Eboekhouden_Export
28
- * @copyright Copyright (c) 2010 e-Boekhouden.nl
29
- * @license http://opensource.org/licenses/mit-license.php The MIT License
30
- * @author e-Boekhouden.nl
31
- */
32
-
33
- require_once dirname(__FILE__) . '/includes/install-current.php';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Eboekhouden/Export/sql/eboekhouden_setup/mysql4-install-4.1.29.php DELETED
@@ -1,33 +0,0 @@
1
- <?php
2
- /**
3
- * NOTICE OF LICENSE
4
- *
5
- * The MIT License
6
- *
7
- * Copyright (c) 2010 e-Boekhouden.nl
8
- *
9
- * Permission is hereby granted, free of charge, to any person obtaining a copy
10
- * of this software and associated documentation files (the "Software"), to deal
11
- * in the Software without restriction, including without limitation the rights
12
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
13
- * copies of the Software, and to permit persons to whom the Software is
14
- * furnished to do so, subject to the following conditions:
15
- *
16
- * The above copyright notice and this permission notice shall be included in
17
- * all copies or substantial portions of the Software.
18
- *
19
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
25
- * THE SOFTWARE.
26
- *
27
- * @package Eboekhouden_Export
28
- * @copyright Copyright (c) 2010 e-Boekhouden.nl
29
- * @license http://opensource.org/licenses/mit-license.php The MIT License
30
- * @author e-Boekhouden.nl
31
- */
32
-
33
- require_once dirname(__FILE__) . '/includes/install-current.php';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Eboekhouden/Export/sql/eboekhouden_setup/{mysql4-install-4.1.25.php → mysql4-install-4.1.30.php} RENAMED
File without changes
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>EBoekhouden_Export</name>
4
- <version>4.1.29</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/mit-license.php">MIT</license>
7
  <channel>community</channel>
@@ -31,11 +31,11 @@ Meer informatie over deze koppeling met Magento kunt u terugvinden als u ingelog
31
  -----------------------------------------------------&#xD;
32
  Info about uninstalling can be found in &#xD;
33
  app/code/community/Eboekhouden/Export/sql/HOWTO_UnInstall.sql</description>
34
- <notes>When using the adjustment fees during refund they will now also be exported properly.</notes>
35
  <authors><author><name>Ronald Kas</name><user>eboekhoudennl</user><email>info@e-boekhouden.nl</email></author></authors>
36
- <date>2014-04-11</date>
37
- <time>15:44:50</time>
38
- <contents><target name="magecommunity"><dir name="Eboekhouden"><dir name="Export"><dir name="Block"><dir name="Config"><dir name="Info"><file name="Version.php" hash="e8957685d4f906457d1eb45853702e1f"/></dir></dir><dir name="Sales"><dir name="Creditmemo"><file name="Grid.php" hash="5d323b6842ac429c346fc1a00d8b38ee"/></dir><dir name="Invoice"><file name="Grid.php" hash="264f95548e6d5dd501a4c613fb38b3a8"/></dir><dir name="Order"><file name="Grid.php" hash="a1a9fe52f445f7f40e553b4c7f6dce99"/></dir></dir><dir name="Tax"><dir name="Rate"><file name="Form.php" hash="ea36d8fde2272e24f5187c0bfd9deb76"/><dir name="Grid"><dir name="Renderer"><file name="Ebvatcode.php" hash="d34d2edd9593e4d2c23a20c8e0864c95"/></dir></dir><file name="Grid.php" hash="ca50f669ccd75b1365d5937d0390fe3e"/></dir></dir></dir><dir name="Helper"><file name="AccountNumber.php" hash="599c8af6b93e2206c631aa79e9ba5dd4"/><file name="Data.php" hash="9ffb5971e67503fcc07756a74aadb744"/></dir><dir name="Model"><dir name="Config"><file name="Costcenter.php" hash="7f280ef51e003de0bf80f0ab2b9685f0"/><file name="Ledgeraccount.php" hash="318e87f5932d4bd898d1552d27c50bc7"/><file name="Taxcalculationrate.php" hash="9871b70f56e8fee7cd3364bc8b3de2c5"/></dir><dir name="Export"><file name="Sales.php" hash="26843e9a0f254feb5c97f1fd2734f29f"/></dir><dir name="Import"><file name="Costcenter.php" hash="593b1a269583073098f5c1f52002058f"/><file name="Ebcode.php" hash="4127f3460ccb06e800f88baf86a58008"/><file name="Gbcodes.php" hash="d513db427803e3c079f6577b7b240219"/></dir><file name="Info.php" hash="c8dbbbaeead14393cb36c0eec5706882"/><dir name="Product"><dir name="Attribute"><file name="Costcenter.php" hash="3b1e02791a8ff9782d18f14afdc90221"/><file name="Ledgeraccount.php" hash="132f16b2407b579605cb24de6ea5b6ab"/></dir></dir><dir name="Tax"><dir name="Attribute"><file name="Ebtaxcode.php" hash="0b34f8d566896c3fbab02ddaabf55536"/></dir></dir></dir><dir name="controllers"><dir name="Catalog"><file name="ProductController.php" hash="b19ff72404a75fcb1d89da436d3c68e9"/></dir><dir name="Export"><file name="SaleController.php" hash="c4f64b12685ad9558dff62f26ac7e6f2"/></dir><file name="MutatieController.php" hash="1634fcb7298ef44b369f9ac9fbdf87b4"/></dir><dir name="etc"><file name="config.xml" hash="3def55f66bcf6d24fd81df39ecba53f0"/><file name="system.xml" hash="a4cb1ca9aab1dd453c6c9d79282bff9b"/></dir><dir name="sql"><file name="HOWTO_UnInstall.sql" hash="691131453816d890630a6d3a21b6c7bf"/><dir name="eboekhouden_setup"><dir name="includes"><file name="install-current.php" hash="ddb3ff7895f4ec22fc6b4866207c9575"/></dir><file name="mysql4-install-4.1.25.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-install-4.1.28.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-install-4.1.29.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.0.2-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.0.7-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.1.5-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.2.0-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.2.2-4.0.php" hash="e0ce8dbd2e1de28479e90505abbc6297"/><file name="mysql4-upgrade-1.2.6-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.3-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.4-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.5-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.6-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-2.0-4.0.php" hash="b1b333b3815368af7d599e5126eca26e"/><file name="mysql4-upgrade-3.0-4.0.php" hash="b1b333b3815368af7d599e5126eca26e"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Eboekhouden_Export.xml" hash="9ced450b54f7225a83049f6bff3adbae"/></dir></target></contents>
39
  <compatible/>
40
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
41
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>EBoekhouden_Export</name>
4
+ <version>4.1.30</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/mit-license.php">MIT</license>
7
  <channel>community</channel>
31
  -----------------------------------------------------&#xD;
32
  Info about uninstalling can be found in &#xD;
33
  app/code/community/Eboekhouden/Export/sql/HOWTO_UnInstall.sql</description>
34
+ <notes>The price for bundled products was not calcualted correctly.</notes>
35
  <authors><author><name>Ronald Kas</name><user>eboekhoudennl</user><email>info@e-boekhouden.nl</email></author></authors>
36
+ <date>2014-08-01</date>
37
+ <time>11:56:44</time>
38
+ <contents><target name="magecommunity"><dir name="Eboekhouden"><dir name="Export"><dir name="Block"><dir name="Config"><dir name="Info"><file name="Version.php" hash="e8957685d4f906457d1eb45853702e1f"/></dir></dir><dir name="Sales"><dir name="Creditmemo"><file name="Grid.php" hash="5d323b6842ac429c346fc1a00d8b38ee"/></dir><dir name="Invoice"><file name="Grid.php" hash="264f95548e6d5dd501a4c613fb38b3a8"/></dir><dir name="Order"><file name="Grid.php" hash="a1a9fe52f445f7f40e553b4c7f6dce99"/></dir></dir><dir name="Tax"><dir name="Rate"><file name="Form.php" hash="ea36d8fde2272e24f5187c0bfd9deb76"/><dir name="Grid"><dir name="Renderer"><file name="Ebvatcode.php" hash="d34d2edd9593e4d2c23a20c8e0864c95"/></dir></dir><file name="Grid.php" hash="ca50f669ccd75b1365d5937d0390fe3e"/></dir></dir></dir><dir name="Helper"><file name="AccountNumber.php" hash="599c8af6b93e2206c631aa79e9ba5dd4"/><file name="Data.php" hash="9ffb5971e67503fcc07756a74aadb744"/></dir><dir name="Model"><dir name="Config"><file name="Costcenter.php" hash="7f280ef51e003de0bf80f0ab2b9685f0"/><file name="Ledgeraccount.php" hash="318e87f5932d4bd898d1552d27c50bc7"/><file name="Taxcalculationrate.php" hash="9871b70f56e8fee7cd3364bc8b3de2c5"/></dir><dir name="Export"><file name="Sales.php" hash="5db01429fd531a938a44f45aa93f3a05"/></dir><dir name="Import"><file name="Costcenter.php" hash="593b1a269583073098f5c1f52002058f"/><file name="Ebcode.php" hash="4127f3460ccb06e800f88baf86a58008"/><file name="Gbcodes.php" hash="d513db427803e3c079f6577b7b240219"/></dir><file name="Info.php" hash="c8dbbbaeead14393cb36c0eec5706882"/><dir name="Product"><dir name="Attribute"><file name="Costcenter.php" hash="3b1e02791a8ff9782d18f14afdc90221"/><file name="Ledgeraccount.php" hash="132f16b2407b579605cb24de6ea5b6ab"/></dir></dir><dir name="Tax"><dir name="Attribute"><file name="Ebtaxcode.php" hash="0b34f8d566896c3fbab02ddaabf55536"/></dir></dir></dir><dir name="controllers"><dir name="Catalog"><file name="ProductController.php" hash="b19ff72404a75fcb1d89da436d3c68e9"/></dir><dir name="Export"><file name="SaleController.php" hash="c4f64b12685ad9558dff62f26ac7e6f2"/></dir><file name="MutatieController.php" hash="1634fcb7298ef44b369f9ac9fbdf87b4"/></dir><dir name="etc"><file name="config.xml" hash="c7f659bd3c60f645c6fde58a4db5b7ad"/><file name="system.xml" hash="a4cb1ca9aab1dd453c6c9d79282bff9b"/></dir><dir name="sql"><file name="HOWTO_UnInstall.sql" hash="691131453816d890630a6d3a21b6c7bf"/><dir name="eboekhouden_setup"><dir name="includes"><file name="install-current.php" hash="ddb3ff7895f4ec22fc6b4866207c9575"/></dir><file name="mysql4-install-4.1.30.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.0.2-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.0.7-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.1.5-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.2.0-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.2.2-4.0.php" hash="e0ce8dbd2e1de28479e90505abbc6297"/><file name="mysql4-upgrade-1.2.6-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.3-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.4-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.5-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-1.6-4.0.php" hash="8febe17420f3a5a2e99eb86605ab3dd3"/><file name="mysql4-upgrade-2.0-4.0.php" hash="b1b333b3815368af7d599e5126eca26e"/><file name="mysql4-upgrade-3.0-4.0.php" hash="b1b333b3815368af7d599e5126eca26e"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Eboekhouden_Export.xml" hash="9ced450b54f7225a83049f6bff3adbae"/></dir></target></contents>
39
  <compatible/>
40
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
41
  </package>