mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
migrate client task rate
This commit is contained in:
parent
98d62fa340
commit
a553bb8dff
@ -298,9 +298,12 @@ info("get company");
|
|||||||
$settings = new \stdClass();
|
$settings = new \stdClass();
|
||||||
$settings->currency_id = $client->currency_id ? (string) $client->currency_id : (string) $client->account->currency_id;
|
$settings->currency_id = $client->currency_id ? (string) $client->currency_id : (string) $client->account->currency_id;
|
||||||
|
|
||||||
if ($client->language_id) {
|
if($client->task_rate && $client->task_rate > 0)
|
||||||
|
$settings->default_task_rate = (float)$client->task_rate;
|
||||||
|
|
||||||
|
if ($client->language_id)
|
||||||
$settings->language_id = (string)$client->language_id;
|
$settings->language_id = (string)$client->language_id;
|
||||||
}
|
|
||||||
|
|
||||||
return $settings;
|
return $settings;
|
||||||
}
|
}
|
||||||
@ -418,7 +421,7 @@ info("get company");
|
|||||||
$credits = [];
|
$credits = [];
|
||||||
|
|
||||||
$export_credits = Invoice::where('account_id', $this->account->id)
|
$export_credits = Invoice::where('account_id', $this->account->id)
|
||||||
->where('balance', '<', '0')
|
->where('amount', '<', '0')
|
||||||
->where('invoice_type_id', '=', INVOICE_TYPE_STANDARD)
|
->where('invoice_type_id', '=', INVOICE_TYPE_STANDARD)
|
||||||
->where('is_public', true)
|
->where('is_public', true)
|
||||||
->withTrashed()
|
->withTrashed()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user