Version Notes
- Reworked shipping calculation on creditmemo
Download this release
Release Info
| Developer | Ronald Kas |
| Extension | EBoekhouden_Export |
| Version | 4.1.43 |
| Comparing to | |
| See all releases | |
Code changes from version 4.1.42 to 4.1.43
app/code/community/Eboekhouden/Export/Model/Export/Sales.php
CHANGED
|
@@ -392,6 +392,7 @@ class Eboekhouden_Export_Model_Export_Sales
|
|
| 392 |
$fShipFactor = 1;
|
| 393 |
if ($oContainer instanceof Mage_Sales_Model_Order_Creditmemo)
|
| 394 |
{
|
|
|
|
| 395 |
// We need to find out which part of the shippingcost is refunded.
|
| 396 |
// Magento only updates the BaseShippingAmount for a CreditMemo.
|
| 397 |
$fBaseShippingAmount = $oOrder->getBaseShippingAmount();
|
|
@@ -402,6 +403,7 @@ class Eboekhouden_Export_Model_Export_Sales
|
|
| 402 |
{
|
| 403 |
$fShipFactor = $oContainer->getBaseShippingAmount() / $fBaseShippingAmount;
|
| 404 |
}
|
|
|
|
| 405 |
}
|
| 406 |
//add to order totals
|
| 407 |
$totalBaseTaxItems += $fShipFactor * $oContainer->getBaseShippingTaxAmount();
|
| 392 |
$fShipFactor = 1;
|
| 393 |
if ($oContainer instanceof Mage_Sales_Model_Order_Creditmemo)
|
| 394 |
{
|
| 395 |
+
/*
|
| 396 |
// We need to find out which part of the shippingcost is refunded.
|
| 397 |
// Magento only updates the BaseShippingAmount for a CreditMemo.
|
| 398 |
$fBaseShippingAmount = $oOrder->getBaseShippingAmount();
|
| 403 |
{
|
| 404 |
$fShipFactor = $oContainer->getBaseShippingAmount() / $fBaseShippingAmount;
|
| 405 |
}
|
| 406 |
+
*/
|
| 407 |
}
|
| 408 |
//add to order totals
|
| 409 |
$totalBaseTaxItems += $fShipFactor * $oContainer->getBaseShippingTaxAmount();
|
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.
|
| 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.43</version>
|
| 39 |
</Eboekhouden_Export>
|
| 40 |
</modules>
|
| 41 |
|
app/code/community/Eboekhouden/Export/sql/eboekhouden_setup/{mysql4-install-4.1.42.php → mysql4-install-4.1.43.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.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/mit-license.php">MIT</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -10,7 +10,7 @@
|
|
| 10 |
<description>Directe export van bestellingen naar www.e-Boekhouden.nl
|
| 11 |

|
| 12 |
Heeft u een webshop van Magento? Dan kunt u voortaan met 1 klik op de knop alle bestellingen van uw webshop direct verwerken in uw boekhouding. Speciaal hiervoor heeft e-Boekhouden.nl een plugin voor Magento ontwikkeld waarvan u geheel gratis gebruik kunt maken.
|
| 13 |
-
|
| 14 |
== Direct aan de slag! ==
|
| 15 |
De nieuwe extensie is zeer eenvoudig te installeren. U installeert 'm gewoon via uw Magento-webshop. Bij installatie wordt uw Magento-webshop gekoppeld aan uw administratie in e-Boekhouden.nl. U kunt vervolgens direct online orders exporteren naar uw boekhouding. U hoeft dus nooit meer handmatig orders in te voeren.
|
| 16 |

|
|
@@ -31,11 +31,11 @@ Meer informatie over deze koppeling met Magento kunt u terugvinden als u ingelog
|
|
| 31 |
-----------------------------------------------------
|
| 32 |
Info about uninstalling can be found in 
|
| 33 |
app/code/community/Eboekhouden/Export/sql/HOWTO_UnInstall.sql</description>
|
| 34 |
-
<notes>-
|
| 35 |
<authors><author><name>Ronald Kas</name><user>eboekhoudennl</user><email>info@e-boekhouden.nl</email></author></authors>
|
| 36 |
-
<date>
|
| 37 |
-
<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="6d777d678ae6f496497acc35e5b88a7d"/></dir><dir name="Invoice"><file name="Grid.php" hash="25a464357b8a9f0f54d69c4847f40faa"/></dir><dir name="Order"><file name="Grid.php" hash="7f19644546932debc14bf7a77ee0c40a"/></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"/><file name="Export.php" hash="6158668d554b363d4df3f7869e1ce780"/></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="
|
| 39 |
<compatible/>
|
| 40 |
-
<dependencies><required><php><min>5.2.0</min><max>
|
| 41 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>EBoekhouden_Export</name>
|
| 4 |
+
<version>4.1.43</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/mit-license.php">MIT</license>
|
| 7 |
<channel>community</channel>
|
| 10 |
<description>Directe export van bestellingen naar www.e-Boekhouden.nl
|
| 11 |

|
| 12 |
Heeft u een webshop van Magento? Dan kunt u voortaan met 1 klik op de knop alle bestellingen van uw webshop direct verwerken in uw boekhouding. Speciaal hiervoor heeft e-Boekhouden.nl een plugin voor Magento ontwikkeld waarvan u geheel gratis gebruik kunt maken.
|
| 13 |
+

|
| 14 |
== Direct aan de slag! ==
|
| 15 |
De nieuwe extensie is zeer eenvoudig te installeren. U installeert 'm gewoon via uw Magento-webshop. Bij installatie wordt uw Magento-webshop gekoppeld aan uw administratie in e-Boekhouden.nl. U kunt vervolgens direct online orders exporteren naar uw boekhouding. U hoeft dus nooit meer handmatig orders in te voeren.
|
| 16 |

|
| 31 |
-----------------------------------------------------
|
| 32 |
Info about uninstalling can be found in 
|
| 33 |
app/code/community/Eboekhouden/Export/sql/HOWTO_UnInstall.sql</description>
|
| 34 |
+
<notes>- Reworked shipping calculation on creditmemo</notes>
|
| 35 |
<authors><author><name>Ronald Kas</name><user>eboekhoudennl</user><email>info@e-boekhouden.nl</email></author></authors>
|
| 36 |
+
<date>2017-03-01</date>
|
| 37 |
+
<time>10:09:33</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="6d777d678ae6f496497acc35e5b88a7d"/></dir><dir name="Invoice"><file name="Grid.php" hash="25a464357b8a9f0f54d69c4847f40faa"/></dir><dir name="Order"><file name="Grid.php" hash="7f19644546932debc14bf7a77ee0c40a"/></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"/><file name="Export.php" hash="6158668d554b363d4df3f7869e1ce780"/></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="310f10ffb0b6411763e7f4149ec5104d"/></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="Adminhtml"><dir name="Eboekhouden"><dir name="Catalog"><file name="ProductController.php" hash="20e6690c7553a4f71691195862f9fabe"/></dir><dir name="Export"><file name="SaleController.php" hash="8fedb06d7d656fb3f39380cfb7390e3d"/></dir><file name="MutatieController.php" hash="57c2ca660be12f8d06357b89122f1541"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="54399a7923b44e0e0a0e30e5d147ae40"/><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.43.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>7.2.0</max></php></required></dependencies>
|
| 41 |
</package>
|
