Merge branch 'fronkdev' into 'master'

Billing: Treat Contract as domestic if b-address has UID starting with ATU

See merge request fronk/thetool!1629

application/Billing/BillingController.php

@@ -518,6 +518,10 @@ class BillingController extends mfBaseController {
                     $vatarea = "other";
                 }
 
+                if(substr(strtolower(preg_replace('/[^a-z0-9]/i', "", $billingaddress->uid)), 0, 3) == "atu") {
+                    $vatarea = "domestic";
+                }
+
                 $data["country"] = $billcountry->name;
                 $data["vatrate"] = $vatgroup->rates[$vatarea]->rate;
                 $data["vatgroup_id"] = $contract->vatgroup_id;