mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-10-31 08:57:34 -04:00 
			
		
		
		
	Merge pull request #5004 from turbo124/master
Fixes for custom value nullables
This commit is contained in:
		
						commit
						7e4593cd89
					
				| @ -885,8 +885,8 @@ info("get company"); | |||||||
|                 'tax_name3' => (string) '', |                 'tax_name3' => (string) '', | ||||||
|                 'tax_rate3' => (float) 0, |                 'tax_rate3' => (float) 0, | ||||||
|                 'date' => Carbon::parse($item->created_at)->toDateString(), |                 'date' => Carbon::parse($item->created_at)->toDateString(), | ||||||
|                 'custom_value1' => $item->custom_value1, |                 'custom_value1' => $item->custom_value1 ?: '', | ||||||
|                 'custom_value2' => $item->custom_value2, |                 'custom_value2' => $item->custom_value2 ?: '', | ||||||
|                 'custom_value3' => '', |                 'custom_value3' => '', | ||||||
|                 'custom_value4' => '', |                 'custom_value4' => '', | ||||||
|                 'type_id' => (string)$item->invoice_item_type_id, |                 'type_id' => (string)$item->invoice_item_type_id, | ||||||
| @ -917,8 +917,8 @@ info("get company"); | |||||||
|                 'tax_name3' => (string) '', |                 'tax_name3' => (string) '', | ||||||
|                 'tax_rate3' => (float) 0, |                 'tax_rate3' => (float) 0, | ||||||
|                 'date' => Carbon::parse($item->created_at)->toDateString(), |                 'date' => Carbon::parse($item->created_at)->toDateString(), | ||||||
|                 'custom_value1' => $item->custom_value1, |                 'custom_value1' => $item->custom_value1 ?: '', | ||||||
|                 'custom_value2' => $item->custom_value2, |                 'custom_value2' => $item->custom_value2 ?: '', | ||||||
|                 'custom_value3' => '', |                 'custom_value3' => '', | ||||||
|                 'custom_value4' => '', |                 'custom_value4' => '', | ||||||
|                 'type_id' => (string)$item->invoice_item_type_id, |                 'type_id' => (string)$item->invoice_item_type_id, | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user