Merge branch 'master' of github.com:lawipac/acare_ts

 Conflicts:

	.idea/php.xml

	XeroOauth2.php

	XeroOauth2Sync.php

	ts.php

.idea/php.xml

@@ -27,9 +27,7 @@
       <path value="$PROJECT_DIR$/xero-php-master/vendor/phpdocumentor/reflection-common" />
     </include_path>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="7.0">
-    <option name="suggestChangeDefaultLanguageLevel" value="false" />
-  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="5.5.0" />
   <component name="PhpUnit">
     <phpunit_settings>
       <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/xero-php-master/vendor/autoload.php" />

XeroOauth2Timesheet.php

@@ -67,6 +67,7 @@ class XeroOauth2Timesheet
                 $ts->setStatus(\XeroAPI\XeroPHP\Models\PayrollAu\TimesheetStatus::DRAFT);
             }
             //adding lines
+            $tsLines = [];
             foreach ($rateshours as $rateId => $hours)
             {
                 $ts_line = new \XeroAPI\XeroPHP\Models\PayrollAu\TimesheetLine;
@@ -147,6 +148,7 @@ class XeroOauth2Timesheet
             }
         }
         $this->apiPayrollAu->createTimesheet($this->oauth2->getTenantId(),$to_save);
+        return;
     }
 
     public function approve_all(){