Merge branch 'master' into 1.1

src/QUI/ERP/Accounting/Invoice/Invoice.php

@@ -111,6 +111,7 @@ public function __construct($id, Handler $Handler)
             case Handler::TYPE_INVOICE_TEMPORARY:
             case Handler::TYPE_INVOICE_CREDIT_NOTE:
             case Handler::TYPE_INVOICE_REVERSAL:
+            case Handler::TYPE_INVOICE_CANCEL:
                 $this->type = (int)$this->getAttribute('type');
                 break;
         }
@@ -434,7 +435,7 @@ public function getShipping()
      */
     public function getInvoiceType()
     {
-        return $this->type;
+        return (int)$this->type;
     }
 
     /**

src/QUI/ERP/Accounting/Invoice/InvoiceView.php

@@ -316,7 +316,7 @@ protected function getOutputType()
                 break;
 
             case Handler::TYPE_INVOICE_CANCEL:
-                return 'Cancelled';
+                return 'Canceled';
                 break;
 
             default: