diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index fa5e777e50..1aa162c9f9 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -111,6 +111,8 @@ class Invoice extends EntityModel implements BalanceAffecting 'due_date', 'paid', 'terms', + 'public_notes', + 'private_notes', 'item_product', 'item_notes', 'item_quantity', @@ -133,10 +135,12 @@ class Invoice extends EntityModel implements BalanceAffecting 'po number' => 'po_number', 'due date' => 'due_date', 'terms' => 'terms', - 'product|item' => 'item_product', - 'notes' => 'item_notes', + 'public notes' => 'public_notes', + 'private notes' => 'private_notes', + 'description' => 'item_notes', 'quantity|qty' => 'item_quantity', 'amount|cost' => 'item_cost', + 'product|item' => 'item_product', 'tax' => 'item_tax1', ]; } diff --git a/app/Ninja/Import/CSV/InvoiceTransformer.php b/app/Ninja/Import/CSV/InvoiceTransformer.php index e09760c443..5e54e94778 100644 --- a/app/Ninja/Import/CSV/InvoiceTransformer.php +++ b/app/Ninja/Import/CSV/InvoiceTransformer.php @@ -33,6 +33,7 @@ class InvoiceTransformer extends BaseTransformer 'po_number' => $this->getString($data, 'po_number'), 'terms' => $this->getString($data, 'terms'), 'public_notes' => $this->getString($data, 'public_notes'), + 'private_notes' => $this->getString($data, 'private_notes'), 'invoice_date_sql' => $this->getDate($data, 'invoice_date'), 'due_date_sql' => $this->getDate($data, 'due_date'), 'invoice_items' => [ diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 7cfa98a179..1d36482a83 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2411,6 +2411,8 @@ $LANG = array( 'item_quantity' => 'Item Quantity', 'item_tax_rate' => 'Item Tax Rate', 'item_tax_name' => 'Item Tax Name', + 'item_tax1' => 'Item Tax', + 'item_tax2' => 'Item Tax', );