Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adjustments for RO E-invoicing

Browse Source
This commit is contained in:
David Bomba 2024-04-03 16:03:52 +11:00
parent 1a651f7144
commit b6d1a561c3
9 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/DataMapper/InvoiceItem.php
View File

@ -64,7 +64,9 @@ class InvoiceItem
public $task_id = '';
public $expense_id = '';
public $unit_code = 'C62';
public static $casts = [
'task_id' => 'string',
'expense_id' => 'string',
@ -92,5 +94,6 @@ class InvoiceItem
'custom_value2' => 'string',
'custom_value3' => 'string',
'custom_value4' => 'string',
'unit_code' => 'string',
];
}

1
app/Http/Controllers/PurchaseOrderController.php
View File

@ -646,7 +646,6 @@ class PurchaseOrderController extends BaseController
echo $file;
}, $purchase_order->numberFormatter().".pdf", ['Content-Type' => 'application/pdf']);
break;
case 'restore':
$this->purchase_order_repository->restore($purchase_order);

1
app/Jobs/Entity/CreateRawPdf.php
View File

@ -88,6 +88,7 @@ class CreateRawPdf
'quote' => $type = 'product',
'credit' => $type = 'product',
'recurring_invoice' => $type = 'product',
default => $type = 'product',
};
return $type;

2
app/Models/Expense.php
View File

@ -190,7 +190,7 @@ class Expense extends BaseModel
public function purchase_order()
{
return $this->hasOne(PurchaseOrder::class);
return $this->hasOne(PurchaseOrder::class)->withTrashed();
}
public function translate_entity()

2
app/Models/PurchaseOrder.php
View File

@ -265,7 +265,7 @@ class PurchaseOrder extends BaseModel
public function expense(): \Illuminate\Database\Eloquent\Relations\BelongsTo
{
return $this->belongsTo(Expense::class);
return $this->belongsTo(Expense::class)->withTrashed();
}
public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo

4
app/Repositories/ActivityRepository.php
View File

@ -41,7 +41,7 @@ class ActivityRepository extends BaseRepository
* Save the Activity.
*
* @param \stdClass $fields The fields
* @param \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder $entity
* @param \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder | \App\Models\Expense $entity
* @param array $event_vars
*/
public function save($fields, $entity, $event_vars)
@ -72,7 +72,7 @@ class ActivityRepository extends BaseRepository
/**
* Creates a backup.
*
* @param \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder $entity
* @param \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder | \App\Models\Expense $entity
* @param \App\Models\Activity $activity The activity
*/
public function createBackup($entity, $activity)

15
app/Repositories/ExpenseRepository.php
View File

@ -46,10 +46,12 @@ class ExpenseRepository extends BaseRepository
/** @var \App\Models\User $user */
$user = auth()->user();
if(isset($data['payment_date']) && $data['payment_date'] == $expense->payment_date) {
$payment_date = &$data['payment_date'];
$vendor_id = &$data['vendor_id'];
if($payment_date && $payment_date == $expense->payment_date) {
//do nothing
} elseif(isset($data['payment_date']) && strlen($data['payment_date']) > 1 && $user->company()->notify_vendor_when_paid && (isset($data['vendor_id']) || $expense->vendor_id)) {
nlog("ping");
} elseif($payment_date && strlen($payment_date) > 1 && $user->company()->notify_vendor_when_paid && ($vendor_id || $expense->vendor_id)) {
$this->notify_vendor = true;
}
@ -73,6 +75,13 @@ class ExpenseRepository extends BaseRepository
VendorExpenseNotify::dispatch($expense, $expense->company->db);
}
if($payment_date && strlen($payment_date) > 1 && $expense->purchase_order) {
$purchase_order = $expense->purchase_order;
$purchase_order->balance = round($purchase_order->amount - $expense->amount, 2);
$purchase_order->paid_to_date = $expense->amount;
$purchase_order->save();
}
return $expense;
}

32
app/Services/EDocument/Standards/RoEInvoice.php
View File

@ -31,6 +31,7 @@ use CleverIt\UBL\Invoice\TaxCategory;
use CleverIt\UBL\Invoice\TaxScheme;
use CleverIt\UBL\Invoice\TaxSubTotal;
use CleverIt\UBL\Invoice\TaxTotal;
use App\Models\Product;
class RoEInvoice extends AbstractService
{
@ -130,7 +131,7 @@ class RoEInvoice extends AbstractService
->setTaxAmount($invoicing_data->getItemTotalTaxes())
->setTaxableAmount($taxable)
->setTaxCategory((new TaxCategory())
->setId(explode('-', $company->settings->custom_value3)[0])
->setId("S")
->setPercent($taxRatePercent)
->setTaxScheme(($taxNameScheme === 'TVA') ? 'VAT' : $taxNameScheme)));
$ubl_invoice->setTaxTotal($taxtotal);
@ -212,29 +213,29 @@ class RoEInvoice extends AbstractService
{
if (strlen($item->tax_name1) > 1) {
$classifiedTaxCategory = (new ClassifiedTaxCategory())
->setId(explode('-', $item->custom_value4)[0])
->setId($this->resolveTaxCode($item->tax_id ?? 1))
->setPercent($item->tax_rate1)
->setTaxScheme(($item->tax_name1 === 'TVA') ? 'VAT' : $item->tax_name1);
} elseif (strlen($item->tax_name2) > 1) {
$classifiedTaxCategory = (new ClassifiedTaxCategory())
->setId(explode('-', $item->custom_value4)[0])
->setId($this->resolveTaxCode($item->tax_id ?? 1))
->setPercent($item->tax_rate2)
->setTaxScheme(($item->tax_name2 === 'TVA') ? 'VAT' : $item->tax_name2);
} elseif (strlen($item->tax_name3) > 1) {
$classifiedTaxCategory = (new ClassifiedTaxCategory())
->setId(explode('-', $item->custom_value4)[0])
->setId($this->resolveTaxCode($item->tax_id ?? 1))
->setPercent($item->tax_rate3)
->setTaxScheme(($item->tax_name3 === 'TVA') ? 'VAT' : $item->tax_name3);
}
$invoiceLine = (new InvoiceLine())
->setId($index + 1)
->setInvoicedQuantity($item->quantity)
->setUnitCode($item->custom_value3)
->setUnitCode($item->unit_code ?? 'C62')
->setLineExtensionAmount($item->line_total)
->setItem((new Item())
->setName($item->product_key)
->setDescription($item->notes)
->setClassifiedTaxCategory($classifiedTaxCategory))
->setClassifiedTaxCategory([$classifiedTaxCategory]))
->setPrice((new Price())
->setPriceAmount($this->costWithDiscount($item)));
@ -365,6 +366,25 @@ class RoEInvoice extends AbstractService
}
}
private function resolveTaxCode($tax_id)
{
$code = $tax_id;
match($tax_id){
Product::PRODUCT_TYPE_REVERSE_TAX => $code = 'AE', // VAT_REVERSE_CHARGE =
Product::PRODUCT_TYPE_EXEMPT => $code = 'E', // EXEMPT_FROM_TAX =
Product::PRODUCT_TYPE_PHYSICAL => $code = 'S', // STANDARD_RATE =
Product::PRODUCT_TYPE_ZERO_RATED => $code = 'Z', // ZERO_RATED_GOODS =
Product::PRODUCT_TYPE_REDUCED_TAX => $code = 'AA', // LOWER_RATE =
Product::PRODUCT_TYPE_SERVICE => $code = 'S', // STANDARD_RATE =
Product::PRODUCT_TYPE_DIGITAL => $code = 'S', // STANDARD_RATE =
Product::PRODUCT_TYPE_SHIPPING => $code = 'S', // STANDARD_RATE =
Product::PRODUCT_TYPE_OVERRIDE_TAX => $code = 'S', // STANDARD_RATE =
};
return $code;
}
public function generateXml(): string
{
$ubl_invoice = $this->run(); // Call the existing handle method to get the UBLInvoice

2
app/Services/Email/EmailDefaults.php
View File

@ -301,7 +301,7 @@ class EmailDefaults
$documents = [];
/* Return early if the user cannot attach documents */
if (!$this->email->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT) || $this->email->email_object->email_template_subject == 'email_subject_statement') {
if (!$this->email->email_object->invitation || !$this->email->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT) || $this->email->email_object->email_template_subject == 'email_subject_statement') {
return $this;
}