Rearrange files to have the directory structure of the final package

Ordernumber/Model/Observer.php → app/code/community/OpenTools/Ordernumber/Model/Observer.php

@@ -80,7 +80,7 @@ class OpenTools_Ordernumber_Model_Observer extends Mage_Core_Model_Abstract
             $digits = Mage::getStoreConfig($cfgprefix.'/digits', $storeId);
 
             // First, replace all variables:
-            $helper = Mage::helper('ordernumber');
+            $helper = Mage::helper('opentools/ordernumber');
             $info = array('order'=>$order, $nrtype=>$object);
             $nr = $helper->replace_fields ($format, $nrtype, $info);
 
@@ -102,7 +102,7 @@ class OpenTools_Ordernumber_Model_Observer extends Mage_Core_Model_Abstract
 
                 // Find the next counter value
                 $count = $model->getCounterValueIncremented($nrtype, $counterfmt);
-                $newnumber = str_replace ("#", sprintf('%0' . (int)$padding . 's', $count), $format);
+                $newnumber = str_replace ("#", sprintf('%0' . (int)$digits . 's', $count), $format);
                 
                 // Check whether that number is already in use. If so, attempt to create the next number:
                 $modelname=($nrtype=='order') ? 'sales/order' : ('sales/order_'.$nrtype);

Ordernumber/etc/config.xml → app/code/community/OpenTools/Ordernumber/etc/config.xml

@@ -49,6 +49,7 @@
                 </connection>
             </opentools_ordernumber_read>
         </resources>
+        
         <events>
             <sales_model_service_quote_submit_before>
                 <observers>
@@ -97,6 +98,7 @@
             </sales_order_creditmemo_save_before>
         </events>
     </global>
+        
     <adminhtml>
         <acl>
             <resources>