EBoekhouden_Export - Version 4.1.28

Version Notes

When using the adjustment fees during refund they will now also be exported properly.

Download this release

Release Info

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


Code changes from version 4.1.27 to 4.1.28

Files changed (6) hide show
  1. app/code/community/Eboekhouden/Export/Helper/Data.php +1 -0
  2. app/code/community/Eboekhouden/Export/Model/Export/Sales.php +21 -0
  3. app/code/community/Eboekhouden/Export/etc/config.xml +1 -1
  4. app/code/community/Eboekhouden/Export/etc/system.xml +10 -0
  5. app/code/community/Eboekhouden/Export/sql/eboekhouden_setup/mysql4-install-4.1.28.php +33 -0
  6. package.xml +6 -6
app/code/community/Eboekhouden/Export/Helper/Data.php CHANGED
@@ -51,6 +51,7 @@ class Eboekhouden_Export_Helper_Data extends Mage_Core_Helper_Abstract
51
  $aSettings['sConWord'] = trim(Mage::getStoreConfig('eboekhouden/connector/securitycode1', $mStore));
52
  $aSettings['sConGuid'] = trim(Mage::getStoreConfig('eboekhouden/connector/securitycode2', $mStore));
53
  $aSettings['sShipLedgerAcc'] = intval( trim(Mage::getStoreConfig('eboekhouden/settings/shippingledgeraccount', $mStore)) );
 
54
  $aSettings['sShipCostcenter'] = intval( trim(Mage::getStoreConfig('eboekhouden/settings/shippingcostcenter', $mStore)) );
55
  if ( empty($aSettings['sShipLedgerAcc']) )
56
  {
51
  $aSettings['sConWord'] = trim(Mage::getStoreConfig('eboekhouden/connector/securitycode1', $mStore));
52
  $aSettings['sConGuid'] = trim(Mage::getStoreConfig('eboekhouden/connector/securitycode2', $mStore));
53
  $aSettings['sShipLedgerAcc'] = intval( trim(Mage::getStoreConfig('eboekhouden/settings/shippingledgeraccount', $mStore)) );
54
+ $aSettings['sAdjustmentLedgerAcc'] = intval( trim(Mage::getStoreConfig('eboekhouden/settings/adjustmentledgeraccount', $mStore)) );
55
  $aSettings['sShipCostcenter'] = intval( trim(Mage::getStoreConfig('eboekhouden/settings/shippingcostcenter', $mStore)) );
56
  if ( empty($aSettings['sShipLedgerAcc']) )
57
  {
app/code/community/Eboekhouden/Export/Model/Export/Sales.php CHANGED
@@ -358,6 +358,7 @@ class Eboekhouden_Export_Model_Export_Sales
358
  $sXml .= $this->_getItemXml($oContainer, $oItem); // Add XML for normal item
359
  $fDiscountLeft -= $oItem->getBaseDiscountAmount();
360
  }
 
361
  if (0 < $oContainer->getBaseShippingAmount())
362
  {
363
  $fShipFactor = 1;
@@ -394,6 +395,18 @@ class Eboekhouden_Export_Model_Export_Sales
394
  $iStoreId));
395
  $sXml .= $this->_getItemXml($oContainer, $oShippingItem);
396
  }
 
 
 
 
 
 
 
 
 
 
 
 
397
  $sXml .= '
398
  </MUTATIEREGELS>
399
  </MUTATIE>';
@@ -662,6 +675,10 @@ class Eboekhouden_Export_Model_Export_Sales
662
  $iProductTaxClassId = $oItem->getTaxClassId();
663
  $sComment .= 'Shipping';
664
  }
 
 
 
 
665
  else
666
  {
667
  $sProductCode = 'ID: ' . $sProductId;
@@ -998,6 +1015,10 @@ class Eboekhouden_Export_Model_Export_Sales
998
  {
999
  $sType = 'shipping';
1000
  }
 
 
 
 
1001
  elseif ( !empty($oOrderItem) )
1002
  {
1003
  $sType = $oOrderItem->getProductType();
358
  $sXml .= $this->_getItemXml($oContainer, $oItem); // Add XML for normal item
359
  $fDiscountLeft -= $oItem->getBaseDiscountAmount();
360
  }
361
+ // Add shipping
362
  if (0 < $oContainer->getBaseShippingAmount())
363
  {
364
  $fShipFactor = 1;
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();
402
+ $oAdjustmentItem->setStoreId($iStoreId);
403
+ $oAdjustmentItem->setProductId('adjustment_fee');
404
+ $oAdjustmentItem->setBaseRowTotal($oContainer->getAdjustment());
405
+ $oAdjustmentItem->setBaseRowTotalInclTax($oContainer->getAdjustment());
406
+ $oAdjustmentItem->setBaseTaxAmount(0);
407
+
408
+ $sXml .= $this->_getItemXml($oContainer, $oAdjustmentItem);
409
+ }
410
  $sXml .= '
411
  </MUTATIEREGELS>
412
  </MUTATIE>';
675
  $iProductTaxClassId = $oItem->getTaxClassId();
676
  $sComment .= 'Shipping';
677
  }
678
+ else if ('adjustment_fee' == $sProductId) {
679
+ $iGbRekening = $aSettings['sAdjustmentLedgerAcc'];
680
+ $sComment .= 'Adjustment';
681
+ }
682
  else
683
  {
684
  $sProductCode = 'ID: ' . $sProductId;
1015
  {
1016
  $sType = 'shipping';
1017
  }
1018
+ elseif ('adjustment_fee' == $sProductId)
1019
+ {
1020
+ $sType = 'adjustment';
1021
+ }
1022
  elseif ( !empty($oOrderItem) )
1023
  {
1024
  $sType = $oOrderItem->getProductType();
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.25</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.28</version>
39
  </Eboekhouden_Export>
40
  </modules>
41
 
app/code/community/Eboekhouden/Export/etc/system.xml CHANGED
@@ -110,6 +110,16 @@
110
  <show_in_website>1</show_in_website>
111
  <show_in_store>1</show_in_store>
112
  </shippingcostcenter>
 
 
 
 
 
 
 
 
 
 
113
  </fields>
114
  </settings>
115
  <info>
110
  <show_in_website>1</show_in_website>
111
  <show_in_store>1</show_in_store>
112
  </shippingcostcenter>
113
+ <adjustmentledgeraccount translate="label">
114
+ <sort_order>250</sort_order>
115
+ <label>Grootboekrek. voor aanpassings kosten</label>
116
+ <frontend_type>select</frontend_type>
117
+ <source_model>Eboekhouden_Export/config_ledgeraccount</source_model>
118
+ <show_in_default>1</show_in_default>
119
+ <show_in_website>1</show_in_website>
120
+ <show_in_store>1</show_in_store>
121
+ <comment>Bij het aanmaken van een credit memo kun je een extra verrekening aangeven, voor die verrekening hebben we een tegenrekening nodig</comment>
122
+ </adjustmentledgeraccount>
123
  </fields>
124
  </settings>
125
  <info>
app/code/community/Eboekhouden/Export/sql/eboekhouden_setup/mysql4-install-4.1.28.php ADDED
@@ -0,0 +1,33 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
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';
package.xml CHANGED
@@ -1,8 +1,8 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>EBoekhouden_Export</name>
4
- <version>4.1.27</version>
5
- <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/mit-license.php">MIT</license>
7
  <channel>community</channel>
8
  <extends/>
@@ -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 VAT calculations when 'all inclusive' VAT setting was used.</notes>
35
  <authors><author><name>Ronald Kas</name><user>eboekhoudennl</user><email>info@e-boekhouden.nl</email></author></authors>
36
- <date>2014-03-26</date>
37
- <time>09:38:09</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="649880c1071e2453ae8536e89349527c"/></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="12f86eb53fdad3f20dd75e68d95b5cf7"/></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="ef4d19fe8edcaa22557fd95e25c7dea9"/><file name="system.xml" hash="8f9f3db645acf4e736d80e4f50510428"/></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-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.28</version>
5
+ <stability>alpha</stability>
6
  <license uri="http://opensource.org/licenses/mit-license.php">MIT</license>
7
  <channel>community</channel>
8
  <extends/>
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-10</date>
37
+ <time>14:50: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="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="df55ec2929e72a4d2311b3709264cf6b"/><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-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>