EBoekhouden_Export - Version 4.1.37

Version Notes

Small bugfixes

Download this release

Release Info

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


Code changes from version 4.1.36 to 4.1.37

Files changed (5) hide show
  1. app/code/community/Eboekhouden/Export/Model/Export/Sales.php +34 -42
  2. app/code/community/Eboekhouden/Export/etc/config.xml +1 -1
  3. app/code/community/Eboekhouden/Export/sql/eboekhouden_setup/{mysql4-install-4.1.36.php → mysql4-install-4.1.37.php} +0 -0
  4. app/etc/modules/Eboekhouden_Export.xml +2 -2
  5. package.xml +5 -5
app/code/community/Eboekhouden/Export/Model/Export/Sales.php CHANGED
@@ -298,20 +298,20 @@ class Eboekhouden_Export_Model_Export_Sales
298
 
299
  $aOrderItems = $oContainer->getItemsCollection();
300
  $fDiscountLeft = $oContainer->getBaseDiscountAmount();
301
-
302
  $totalBaseAmountItems = 0;
303
  $totalBaseAmountInclTaxItems = 0;
304
  $totalBaseTaxItems = 0;
305
-
306
  foreach ($aOrderItems as $oItem)
307
  /* @var $oItem Mage_Sales_Model_Order_Invoice_Item */
308
  {
309
  $fDbProductTaxAmount = $oItem->getBaseTaxAmount();
310
- //add to order totals
311
  $totalBaseTaxItems += $fDbProductTaxAmount;
312
  $totalBaseAmountItems += $oItem->getBaseRowTotal();
313
  $totalBaseAmountInclTaxItems += $oItem->getBaseRowTotalInclTax();
314
-
315
  $aWeeItems = $this->_oWeeeHelper->getApplied( $oItem );
316
  foreach ( $aWeeItems as $aWeeData )
317
  {
@@ -383,11 +383,11 @@ class Eboekhouden_Export_Model_Export_Sales
383
  $fShipFactor = $oContainer->getBaseShippingAmount() / $fBaseShippingAmount;
384
  }
385
  }
386
- //add to order totals
387
  $totalBaseTaxItems += $fShipFactor * $oContainer->getBaseShippingTaxAmount();
388
  $totalBaseAmountItems += $fShipFactor * $oContainer->getBaseShippingAmount();
389
  $totalBaseAmountInclTaxItems += $fShipFactor * $oContainer->getBaseShippingInclTax();
390
-
391
  // Shipping & Handling cost, create a virtual order_item
392
  $oShippingItem = new Mage_Sales_Model_Order_Item();
393
  $oShippingItem->setStoreId($iStoreId);
@@ -420,43 +420,33 @@ class Eboekhouden_Export_Model_Export_Sales
420
 
421
  $sXml .= $this->_getItemXml($oContainer, $oAdjustmentItem);
422
  }
423
-
424
- if ($oContainer instanceof Mage_Sales_Model_Order_Invoice) {
425
- //add additional fee price (in case invoice price is higher then itemprice + shipping)
426
- $orderGrandTotal = round(floatval($oOrder->getGrandTotal()), 4) - $oOrder->getDiscountInvoiced();
427
-
428
-
429
-
430
- if (0.0001 < abs($orderGrandTotal - round($totalBaseAmountInclTaxItems, 4))) {
431
-
432
-
433
- $orderSubtotal = round(floatval($oOrder->getSubtotal()) + floatval($oOrder->getBaseShippingAmount()), 4);
434
- $orderTaxAmount = round(floatval($oOrder->getTaxAmount()), 4);
435
-
436
-
437
- $feeRowTotal = round($totalBaseAmountItems, 4) - $orderSubtotal;
438
- $feeRowTotalInclTax = $orderGrandTotal - round($totalBaseAmountInclTaxItems, 4) ;
439
- $feeTaxAmount = round($totalBaseTaxItems, 4) - $orderTaxAmount;
440
-
441
-
442
- $feeItem = new Mage_Sales_Model_Order_Item();
443
- $feeItem->setStoreId($iStoreId);
444
- $feeItem->setProductId('payment_fee');
445
- $feeItem->setBaseRowTotal($feeRowTotal);
446
- $feeItem->setBaseRowTotalInclTax($feeRowTotalInclTax);
447
- $feeItem->setBaseTaxAmount($feeTaxAmount);
448
- $feeItem->setBaseDiscountAmount(0);
449
-
450
-
451
- $sXml .= $this->_getItemXml($oContainer, $feeItem);
452
- }
453
- }
454
-
455
  $sXml .= '
456
  </MUTATIEREGELS>
457
  </MUTATIE>';
458
 
459
-
460
  $sPostAction = (!empty($iExistingMutatieNr)) ? 'ALTER_MUTATIE' : 'ADD_MUTATIE';
461
  list($sThisMutatieNr, $iThisExist, $sThisErrorMsg, $sThisInfoMsg) = $this->_postMutatieXml($sXml,
462
  $aSettings,
@@ -581,9 +571,11 @@ class Eboekhouden_Export_Model_Export_Sales
581
  {
582
  $iOrdersExist++;
583
  }
584
-
585
- $sErrorMsg .= Mage::helper('Eboekhouden_Export')->__('Fout %s: %s', $oData->ERROR->CODE,
586
- $oData->ERROR->DESCRIPTION) . "\n";
 
 
587
  }
588
  elseif ('OK' == strval($oData->RESULT))
589
  {
298
 
299
  $aOrderItems = $oContainer->getItemsCollection();
300
  $fDiscountLeft = $oContainer->getBaseDiscountAmount();
301
+
302
  $totalBaseAmountItems = 0;
303
  $totalBaseAmountInclTaxItems = 0;
304
  $totalBaseTaxItems = 0;
305
+
306
  foreach ($aOrderItems as $oItem)
307
  /* @var $oItem Mage_Sales_Model_Order_Invoice_Item */
308
  {
309
  $fDbProductTaxAmount = $oItem->getBaseTaxAmount();
310
+ //add to order totals
311
  $totalBaseTaxItems += $fDbProductTaxAmount;
312
  $totalBaseAmountItems += $oItem->getBaseRowTotal();
313
  $totalBaseAmountInclTaxItems += $oItem->getBaseRowTotalInclTax();
314
+
315
  $aWeeItems = $this->_oWeeeHelper->getApplied( $oItem );
316
  foreach ( $aWeeItems as $aWeeData )
317
  {
383
  $fShipFactor = $oContainer->getBaseShippingAmount() / $fBaseShippingAmount;
384
  }
385
  }
386
+ //add to order totals
387
  $totalBaseTaxItems += $fShipFactor * $oContainer->getBaseShippingTaxAmount();
388
  $totalBaseAmountItems += $fShipFactor * $oContainer->getBaseShippingAmount();
389
  $totalBaseAmountInclTaxItems += $fShipFactor * $oContainer->getBaseShippingInclTax();
390
+
391
  // Shipping & Handling cost, create a virtual order_item
392
  $oShippingItem = new Mage_Sales_Model_Order_Item();
393
  $oShippingItem->setStoreId($iStoreId);
420
 
421
  $sXml .= $this->_getItemXml($oContainer, $oAdjustmentItem);
422
  }
423
+
424
+ //add additional fee price (in case invoice price is higher then itemprice + shipping)
425
+ $orderGrandTotal = round(floatval($oOrder->getGrandTotal()), 4);
426
+ if (0.0001 < abs($orderGrandTotal - round($totalBaseAmountInclTaxItems, 4))) {
427
+
428
+ $orderSubtotal = round(floatval($oOrder->getSubtotal()) + floatval($oOrder->getBaseShippingAmount()), 4);
429
+ $orderTaxAmount = round(floatval($oOrder->getTaxAmount()), 4);
430
+
431
+ $feeRowTotal = $orderSubtotal - round($totalBaseAmountItems, 4);
432
+ $feeRowTotalInclTax = $orderGrandTotal - round($totalBaseAmountInclTaxItems, 4);
433
+ $feeTaxAmount = $orderTaxAmount - round($totalBaseTaxItems, 4);
434
+
435
+ $feeItem = new Mage_Sales_Model_Order_Item();
436
+ $feeItem->setStoreId($iStoreId);
437
+ $feeItem->setProductId('payment_fee');
438
+ $feeItem->setBaseRowTotal($feeRowTotal);
439
+ $feeItem->setBaseRowTotalInclTax($feeRowTotalInclTax);
440
+ $feeItem->setBaseTaxAmount($feeTaxAmount);
441
+ $feeItem->setBaseDiscountAmount(0);
442
+
443
+ $sXml .= $this->_getItemXml($oContainer, $feeItem);
444
+ }
445
+
 
 
 
 
 
 
 
 
 
446
  $sXml .= '
447
  </MUTATIEREGELS>
448
  </MUTATIE>';
449
 
 
450
  $sPostAction = (!empty($iExistingMutatieNr)) ? 'ALTER_MUTATIE' : 'ADD_MUTATIE';
451
  list($sThisMutatieNr, $iThisExist, $sThisErrorMsg, $sThisInfoMsg) = $this->_postMutatieXml($sXml,
452
  $aSettings,
571
  {
572
  $iOrdersExist++;
573
  }
574
+ else
575
+ {
576
+ $sErrorMsg .= Mage::helper('Eboekhouden_Export')->__('Fout %s: %s', $oData->ERROR->CODE,
577
+ $oData->ERROR->DESCRIPTION) . "\n";
578
+ }
579
  }
580
  elseif ('OK' == strval($oData->RESULT))
581
  {
app/code/community/Eboekhouden/Export/etc/config.xml CHANGED
@@ -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.36</version>
39
  </Eboekhouden_Export>
40
  </modules>
41
 
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.37</version>
39
  </Eboekhouden_Export>
40
  </modules>
41
 
app/code/community/Eboekhouden/Export/sql/eboekhouden_setup/{mysql4-install-4.1.36.php → mysql4-install-4.1.37.php} RENAMED
File without changes
app/etc/modules/Eboekhouden_Export.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
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
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>EBoekhouden_Export</name>
4
- <version>4.1.36</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>Fixed issue with discounts being added to payment fee totals</notes>
35
  <authors><author><name>Ronald Kas</name><user>eboekhoudennl</user><email>info@e-boekhouden.nl</email></author></authors>
36
- <date>2015-08-20</date>
37
- <time>10:38:25</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="74a043943649eeab7f204f333e50219f"/></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="3dd7a85445ebe461f222025631dda601"/></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="a11dddafc1472f4a37e334328a466480"/><file name="system.xml" hash="aed3ba1bbe341d0cbed0d2b8b848339d"/></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.36.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="bebe760d3a9a3a6e09833b8ffa91c8d3"/></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.37</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>Small bugfixes</notes>
35
  <authors><author><name>Ronald Kas</name><user>eboekhoudennl</user><email>info@e-boekhouden.nl</email></author></authors>
36
+ <date>2015-10-01</date>
37
+ <time>12:08:34</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="74a043943649eeab7f204f333e50219f"/></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="210249d32ed22057b87d9912b823a20c"/></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="70aa4525c771ba12eb495f4ba5b9e665"/><file name="system.xml" hash="aed3ba1bbe341d0cbed0d2b8b848339d"/></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.37.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>