diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php
index 64d8b40d2..17a80ac52 100644
--- a/application/controllers/Reports.php
+++ b/application/controllers/Reports.php
@@ -37,7 +37,7 @@ class Reports extends Secure_area
$report_data = $model->getDataBySaleId($sale_id);
$summary_data = array(
- 'id' => $report_data['sale_id'],
+ 'sale_id' => $report_data['sale_id'],
'sale_date' => $report_data['sale_date'],
'quantity' => to_quantity_decimals($report_data['items_purchased']),
'employee' => $report_data['employee_name'],
@@ -50,7 +50,7 @@ class Reports extends Secure_area
'payment_type' => $report_data['payment_type'],
'comment' => $report_data['comment'],
'edit' => anchor("sales/edit/". $report_data['sale_id'], '',
- array('class'=>"modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title'=>$CI->lang->line('sales_update'))
+ array('class'=>"modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title'=>$this->lang->line('sales_update'))
)
);
@@ -65,15 +65,17 @@ class Reports extends Secure_area
$report_data = $model->getDataByReceivingId($receiving_id);
$summary_data = array(
- 'id' => $report_data['receiving_id'],
+ 'receiving_id' => $report_data['receiving_id'],
'receiving_date' => $report_data['receiving_date'],
'quantity' => to_quantity_decimals($report_data['items_purchased']),
+ 'invoice_number' => $report_data['invoice_number'],
'employee' => $report_data['employee_name'],
'supplier' => $report_data['supplier_name'],
'total' => to_currency($report_data['total']),
+ 'comment' => $report_data['comment'],
'payment_type' => $report_data['payment_type'],
'edit' => anchor("receivings/edit/". $report_data['receiving_id'], '',
- array('class'=>"modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title'=>$CI->lang->line('receivings_update'))
+ array('class'=>"modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title'=>$this->lang->line('recvs_update'))
)
);
@@ -962,10 +964,10 @@ class Reports extends Secure_area
'invoice_number' => $row['invoice_number'],
'comment' => $row['comment'],
'edit' => anchor("receivings/edit/" . $row['receiving_id'], '',
- array('class' => "modal-dlg modal-btn-submit print_hide", 'title' => $this->lang->line('receivings_update'))
+ array('class' => "modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title' => $this->lang->line('receivings_update'))
)
);
- if($this->config->item('invoice_enable'))
+ if(!$this->config->item('invoice_enable'))
{
unset($summary_data['invoice_number']);
}
@@ -1025,8 +1027,8 @@ class Reports extends Secure_area
{
$data = array();
- $this->load->model('reports/Inventory_Summary');
- $model = $this->Inventory_Summary;
+ $this->load->model('reports/Inventory_summary');
+ $model = $this->Inventory_summary;
$data['item_count'] = $model->getItemCountDropdownArray();
$stock_locations = $this->Stock_location->get_allowed_locations();
diff --git a/application/language/de-CH/receivings_lang.php b/application/language/de-CH/receivings_lang.php
index 088ae674e..592f7bda7 100644
--- a/application/language/de-CH/receivings_lang.php
+++ b/application/language/de-CH/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Kosten";
$lang["recvs_date"] = "Eingangsdatum";
$lang["recvs_date_required"] = "Ein korrektes Datum ist erforderlich";
$lang["recvs_date_type"] = "Datum ist erforderlich";
-$lang["recvs_delete_confirmation"] = "Wollen Sie diesen Eingang wirklich löschen? Rückgängig nicht möglich";
+$lang["receivings_confirm_delete"] = "Wollen Sie diesen Eingang wirklich löschen? Rückgängig nicht möglich";
$lang["recvs_delete_entire_sale"] = "Wareneingang löschen";
$lang["recvs_discount"] = "Rabatt %";
$lang["recvs_edit"] = "Ändern";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "Lieferant";
$lang["recvs_total"] = "Total";
$lang["recvs_unable_to_add_item"] = "Kann Artikel nicht zum Eingang hinzufügen";
$lang["recvs_unsuccessfully_updated"] = "Eingang nicht erfolgreich geändert";
-$lang["recvs_update"] = "Ändern";
+$lang["receivings_update"] = "Ändern";
diff --git a/application/language/en/receivings_lang.php b/application/language/en/receivings_lang.php
index a6b8db90a..d970dfde2 100644
--- a/application/language/en/receivings_lang.php
+++ b/application/language/en/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Cost";
$lang["recvs_date"] = "Receiving Date";
$lang["recvs_date_required"] = "A correct date needs to be filled in";
$lang["recvs_date_type"] = "Date field is required";
-$lang["recvs_delete_confirmation"] = "Are you sure you want to delete this receiving, this action cannot be undone";
+$lang["receivings_confirm_delete"] = "Are you sure you want to delete this receiving, this action cannot be undone";
$lang["recvs_delete_entire_sale"] = "Delete entire sale";
$lang["recvs_discount"] = "Disc %";
$lang["recvs_edit"] = "Edit";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "Supplier";
$lang["recvs_total"] = "Total";
$lang["recvs_unable_to_add_item"] = "Unable to add item to receiving";
$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
-$lang["recvs_update"] = "Update";
+$lang["receivings_update"] = "Update";
diff --git a/application/language/es/receivings_lang.php b/application/language/es/receivings_lang.php
index 0986bd027..4b042c82c 100644
--- a/application/language/es/receivings_lang.php
+++ b/application/language/es/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Costo";
$lang["recvs_date"] = "Fecha de Recepción";
$lang["recvs_date_required"] = "Una fecha correcta debe ser ingresada";
$lang["recvs_date_type"] = "Campo Fecha es requerido";
-$lang["recvs_delete_confirmation"] = "¿Seguro(a) que desea borrar este ingreso? Esta acción no se puede deshacer";
+$lang["receivings_confirm_delete"] = "¿Seguro(a) que desea borrar este ingreso? Esta acción no se puede deshacer";
$lang["recvs_delete_entire_sale"] = "Borrar venta completa";
$lang["recvs_discount"] = "Descuento %";
$lang["recvs_edit"] = "Editar";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "Proveedor";
$lang["recvs_total"] = "Total";
$lang["recvs_unable_to_add_item"] = "No se puede agregar el artículo a la entrada";
$lang["recvs_unsuccessfully_updated"] = "Recepción actualizada sin exito";
-$lang["recvs_update"] = "Editar";
+$lang["receivings_update"] = "Editar";
diff --git a/application/language/fr/receivings_lang.php b/application/language/fr/receivings_lang.php
index c8c935dfb..de479e6fc 100644
--- a/application/language/fr/receivings_lang.php
+++ b/application/language/fr/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Cout";
$lang["recvs_date"] = "";
$lang["recvs_date_required"] = "";
$lang["recvs_date_type"] = "";
-$lang["recvs_delete_confirmation"] = "";
+$lang["receivings_confirm_delete"] = "";
$lang["recvs_delete_entire_sale"] = "Delete entire sale";
$lang["recvs_discount"] = "Remise %";
$lang["recvs_edit"] = "Éditer";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "Fournisseur";
$lang["recvs_total"] = "Total";
$lang["recvs_unable_to_add_item"] = "Impossible d'ajouter l'item aux arrivages";
$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
-$lang["recvs_update"] = "Éditer";
+$lang["receivings_update"] = "Éditer";
diff --git a/application/language/hr-HR/receivings_lang.php b/application/language/hr-HR/receivings_lang.php
index 6431698b2..acf0d5b54 100644
--- a/application/language/hr-HR/receivings_lang.php
+++ b/application/language/hr-HR/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Cijena";
$lang["recvs_date"] = "Datum";
$lang["recvs_date_required"] = "Potrebno je unijeti ispravan datum";
$lang["recvs_date_type"] = "Datum je potreban";
-$lang["recvs_delete_confirmation"] = "Želite li obrisati ovu primku? To ne ne može vratiti.";
+$lang["receivings_confirm_delete"] = "Želite li obrisati ovu primku? To ne ne može vratiti.";
$lang["recvs_delete_entire_sale"] = "Obrisati cijelu prodaju";
$lang["recvs_discount"] = "Rabat %";
$lang["recvs_edit"] = "Urediti";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "Dobavljač";
$lang["recvs_total"] = "Ukupno";
$lang["recvs_unable_to_add_item"] = "Ne mogu dodati artikal u primku";
$lang["recvs_unsuccessfully_updated"] = "Neuspješno ažurirana primka";
-$lang["recvs_update"] = "Ažuriraj";
+$lang["receivings_update"] = "Ažuriraj";
diff --git a/application/language/hu-HU/receivings_lang.php b/application/language/hu-HU/receivings_lang.php
index 0901888a1..12fa93540 100644
--- a/application/language/hu-HU/receivings_lang.php
+++ b/application/language/hu-HU/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Költség";
$lang["recvs_date"] = "Beérkezés dátuma";
$lang["recvs_date_required"] = "Korrekt dátumot kell megadni";
$lang["recvs_date_type"] = "Dátum mező kötelező";
-$lang["recvs_delete_confirmation"] = "Biztos, hogy törli az átvételt? Nem lehet visszavonni!";
+$lang["receivings_confirm_delete"] = "Biztos, hogy törli az átvételt? Nem lehet visszavonni!";
$lang["recvs_delete_entire_sale"] = "Teljes értékesités törlése";
$lang["recvs_discount"] = "Kedv. %";
$lang["recvs_edit"] = "Szerkeszt";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "Szállitó";
$lang["recvs_total"] = "Összesen";
$lang["recvs_unable_to_add_item"] = "Nem sikerült terméket hozzáadni";
$lang["recvs_unsuccessfully_updated"] = "Átvétel sikertelenül módositva";
-$lang["recvs_update"] = "Módosít";
+$lang["receivings_update"] = "Módosít";
diff --git a/application/language/id/receivings_lang.php b/application/language/id/receivings_lang.php
index c8b252125..ddf9f1daa 100644
--- a/application/language/id/receivings_lang.php
+++ b/application/language/id/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Harga";
$lang["recvs_date"] = "Tanggal";
$lang["recvs_date_required"] = "Tanngalnya harus diisi";
$lang["recvs_date_type"] = "Model Tanggal";
-$lang["recvs_delete_confirmation"] = "Konfirmasi Hapus";
+$lang["receivings_confirm_delete"] = "Konfirmasi Hapus";
$lang["recvs_delete_entire_sale"] = "Hapus Semua Penjualan";
$lang["recvs_discount"] = "Diskon %";
$lang["recvs_edit"] = "Ubah";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "Pemasok";
$lang["recvs_total"] = "Total";
$lang["recvs_unable_to_add_item"] = "Item tidak dapat ditambahkan ke penerimaan barang masuk";
$lang["recvs_unsuccessfully_updated"] = "Tidak Berhasil Diperbaharui";
-$lang["recvs_update"] = "Ubah";
+$lang["receivings_update"] = "Ubah";
diff --git a/application/language/nl-BE/receivings_lang.php b/application/language/nl-BE/receivings_lang.php
index bcdae3c61..9b072b188 100755
--- a/application/language/nl-BE/receivings_lang.php
+++ b/application/language/nl-BE/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Kost";
$lang["recvs_date"] = "Order Datum";
$lang["recvs_date_required"] = "Er moet een correcte datum ingevuld worden";
$lang["recvs_date_type"] = "Datum is vereist";
-$lang["recvs_delete_confirmation"] = "Bent u zeker dat u dit order wil verwijderen? Dit kan niet ongedaan gemaakt worden.";
+$lang["receivings_confirm_delete"] = "Bent u zeker dat u dit order wil verwijderen? Dit kan niet ongedaan gemaakt worden.";
$lang["recvs_delete_entire_sale"] = "Verwijder";
$lang["recvs_discount"] = "Korting %";
$lang["recvs_edit"] = "Bewerk";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "Leverancier";
$lang["recvs_total"] = "Totaal";
$lang["recvs_unable_to_add_item"] = "Onmogelijk om product aan order toe te voegen";
$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
-$lang["recvs_update"] = "Bewerk";
+$lang["receivings_update"] = "Bewerk";
diff --git a/application/language/pt-BR/receivings_lang.php b/application/language/pt-BR/receivings_lang.php
index 5cf4f3df8..2ab8fdfb7 100644
--- a/application/language/pt-BR/receivings_lang.php
+++ b/application/language/pt-BR/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Custo";
$lang["recvs_date"] = "Data Recebimento";
$lang["recvs_date_required"] = "A data correta precisa ser preenchida";
$lang["recvs_date_type"] = "Campo de data é obrigatório";
-$lang["recvs_delete_confirmation"] = "Tem certeza de que deseja excluir este recebimento esta ação não pode ser desfeita";
+$lang["receivings_confirm_delete"] = "Tem certeza de que deseja excluir este recebimento esta ação não pode ser desfeita";
$lang["recvs_delete_entire_sale"] = "Apagar toda a venda";
$lang["recvs_discount"] = "Desc. %";
$lang["recvs_edit"] = "Editar";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "Fornecedor";
$lang["recvs_total"] = "Total";
$lang["recvs_unable_to_add_item"] = "Não é possível adicionar item para recebimento";
$lang["recvs_unsuccessfully_updated"] = "Recebimento não atualizado";
-$lang["recvs_update"] = "Atualizar";
+$lang["receivings_update"] = "Atualizar";
diff --git a/application/language/ru/receivings_lang.php b/application/language/ru/receivings_lang.php
index 48caef538..640685f0a 100644
--- a/application/language/ru/receivings_lang.php
+++ b/application/language/ru/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "стоимость";
$lang["recvs_date"] = "";
$lang["recvs_date_required"] = "";
$lang["recvs_date_type"] = "";
-$lang["recvs_delete_confirmation"] = "";
+$lang["receivings_confirm_delete"] = "";
$lang["recvs_delete_entire_sale"] = "Delete entire sale";
$lang["recvs_discount"] = "Скидка %";
$lang["recvs_edit"] = "редактировать";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "поставщик";
$lang["recvs_total"] = "сумма";
$lang["recvs_unable_to_add_item"] = "Невозможно добавить товар на получение";
$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
-$lang["recvs_update"] = "редактировать";
+$lang["receivings_update"] = "редактировать";
diff --git a/application/language/th/receivings_lang.php b/application/language/th/receivings_lang.php
index c047a51f3..c6a73afe2 100644
--- a/application/language/th/receivings_lang.php
+++ b/application/language/th/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "";
$lang["recvs_date"] = "";
$lang["recvs_date_required"] = "";
$lang["recvs_date_type"] = "";
-$lang["recvs_delete_confirmation"] = "";
+$lang["receivings_confirm_delete"] = "";
$lang["recvs_delete_entire_sale"] = "";
$lang["recvs_discount"] = "ส่วนลด %";
$lang["recvs_edit"] = "แก้ไข";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "ผู้ผลิต";
$lang["recvs_total"] = "รวม";
$lang["recvs_unable_to_add_item"] = "ไม่สามารถเพิ่มสินค้าได้";
$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
-$lang["recvs_update"] = "แก้ไข";
+$lang["receivings_update"] = "แก้ไข";
diff --git a/application/language/tr/receivings_lang.php b/application/language/tr/receivings_lang.php
index 260dda724..50a47f859 100644
--- a/application/language/tr/receivings_lang.php
+++ b/application/language/tr/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "Ücret";
$lang["recvs_date"] = "";
$lang["recvs_date_required"] = "";
$lang["recvs_date_type"] = "";
-$lang["recvs_delete_confirmation"] = "";
+$lang["receivings_confirm_delete"] = "";
$lang["recvs_delete_entire_sale"] = "Delete entire sale";
$lang["recvs_discount"] = "İndirim %";
$lang["recvs_edit"] = "Düzenle";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "Sağlayıcı";
$lang["recvs_total"] = "Toplam";
$lang["recvs_unable_to_add_item"] = "Ürünler alıma eklenemedi";
$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
-$lang["recvs_update"] = "Düzenle";
+$lang["receivings_update"] = "Düzenle";
diff --git a/application/language/zh/receivings_lang.php b/application/language/zh/receivings_lang.php
index 230394fdb..220af252f 100755
--- a/application/language/zh/receivings_lang.php
+++ b/application/language/zh/receivings_lang.php
@@ -11,7 +11,7 @@ $lang["recvs_cost"] = "成本";
$lang["recvs_date"] = "";
$lang["recvs_date_required"] = "";
$lang["recvs_date_type"] = "";
-$lang["recvs_delete_confirmation"] = "";
+$lang["receivings_confirm_delete"] = "";
$lang["recvs_delete_entire_sale"] = "Delete entire sale";
$lang["recvs_discount"] = "折古 %";
$lang["recvs_edit"] = "編輯";
@@ -48,4 +48,4 @@ $lang["recvs_supplier"] = "供應商";
$lang["recvs_total"] = "總數量";
$lang["recvs_unable_to_add_item"] = "無法新增進貨資料";
$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
-$lang["recvs_update"] = "編輯";
+$lang["receivings_update"] = "編輯";
diff --git a/application/models/reports/Detailed_receivings.php b/application/models/reports/Detailed_receivings.php
index 9cf249b8c..7035c2b2f 100644
--- a/application/models/reports/Detailed_receivings.php
+++ b/application/models/reports/Detailed_receivings.php
@@ -19,7 +19,7 @@ class Detailed_receivings extends Report
'total' => $this->lang->line('reports_total'),
'payment_type' => $this->lang->line('reports_payment_type'),
'invoice_number' => $this->lang->line('recvs_invoice_number'),
- 'comments' => $this->lang->line('reports_comments'),
+ 'comment' => $this->lang->line('reports_comments'),
'edit' => ''),
'details' => array(
$this->lang->line('reports_item_number'),
@@ -30,7 +30,7 @@ class Detailed_receivings extends Report
$this->lang->line('reports_discount'))
);
- if (get_instance()->config->item('invoice_enable') == TRUE)
+ if (!get_instance()->config->item('invoice_enable'))
{
unset($columns['summary']['invoice_number']);
}
diff --git a/application/views/giftcards/manage.php b/application/views/giftcards/manage.php
index b94b36df6..9ea02c23b 100644
--- a/application/views/giftcards/manage.php
+++ b/application/views/giftcards/manage.php
@@ -7,8 +7,7 @@ $(document).ready(function()
resource: '',
headers: ,
pageSize: config->item('lines_per_page'); ?>,
- uniqueId: 'id',
- confirmDeleteMessage : 'lang->line($controller_name."_confirm_delete")?>'
+ uniqueId: 'id'
});
});
diff --git a/application/views/item_kits/manage.php b/application/views/item_kits/manage.php
index 75f5b1efc..78c69b843 100644
--- a/application/views/item_kits/manage.php
+++ b/application/views/item_kits/manage.php
@@ -9,8 +9,7 @@ $(document).ready(function()
resource: '',
headers: ,
pageSize: config->item('lines_per_page'); ?>,
- uniqueId: 'item_kit_id',
- confirmDeleteMessage: 'lang->line($controller_name."_confirm_delete")?>'
+ uniqueId: 'item_kit_id'
});
$('#generate_barcodes').click(function()
diff --git a/application/views/items/manage.php b/application/views/items/manage.php
index 673524251..370af6876 100644
--- a/application/views/items/manage.php
+++ b/application/views/items/manage.php
@@ -38,7 +38,6 @@ $(document).ready(function()
headers: ,
pageSize: config->item('lines_per_page'); ?>,
uniqueId: 'items.item_id',
- confirmDeleteMessage : 'lang->line($controller_name."_confirm_delete")?>',
queryParams: function() {
return $.extend(arguments[0], {
start_date: start_date,
diff --git a/application/views/partial/bootstrap_tables_locale.php b/application/views/partial/bootstrap_tables_locale.php
index a1db9b873..fff777260 100644
--- a/application/views/partial/bootstrap_tables_locale.php
+++ b/application/views/partial/bootstrap_tables_locale.php
@@ -32,6 +32,9 @@
},
formatAllRows: function () {
return 'lang->line('tables_all'); ?>';
+ },
+ formatConfirmDelete : function() {
+ return 'lang->line((isset($editable) ? $editable : $controller_name). "_confirm_delete")?>';
}
};
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index 107bd9e8c..5150ab8ad 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -64,7 +64,7 @@
-
+
diff --git a/application/views/people/manage.php b/application/views/people/manage.php
index f6538fbe6..61cacf663 100644
--- a/application/views/people/manage.php
+++ b/application/views/people/manage.php
@@ -10,7 +10,6 @@ $(document).ready(function()
headers: ,
pageSize: config->item('lines_per_page'); ?>,
uniqueId: 'person_id',
- confirmDeleteMessage : 'lang->line($controller_name."_confirm_delete")?>',
enableActions: function()
{
var email_disabled = $("tr.selected a[href^='mailto:']").length == 0;
diff --git a/application/views/receivings/form.php b/application/views/receivings/form.php
index a2bc23293..a9053168b 100755
--- a/application/views/receivings/form.php
+++ b/application/views/receivings/form.php
@@ -86,7 +86,8 @@ $(document).ready(function()
language: "config->item('language'); ?>"
});
- var fill_value = function(event, ui) {
+ var fill_value = function(event, ui)
+ {
event.preventDefault();
$("input[name='supplier_id']").val(ui.item.value);
$("input[name='supplier_name']").val(ui.item.label);
@@ -103,16 +104,22 @@ $(document).ready(function()
focus: fill_value
});
+ $('button#delete').click(function()
+ {
+ dialog_support.hide();
+ table_support.do_delete('', );
+ });
+
// declare submitHandler as an object.. will be reused
var submit_form = function()
- {
+ {
$(this).ajaxSubmit(
{
success:function(response)
{
dialog_support.hide();
table_support.handle_submit('', response);
- }
+ },
dataType:'json'
});
};
@@ -162,9 +169,5 @@ $(document).ready(function()
}
}, dialog_support.error));
- $('button#delete').click(function() {
- dialog_support.hide();
- table_support.do_delete('', );
- });
});
diff --git a/application/views/reports/tabular_details.php b/application/views/reports/tabular_details.php
index 6eed66c90..8f51ba964 100644
--- a/application/views/reports/tabular_details.php
+++ b/application/views/reports/tabular_details.php
@@ -22,6 +22,8 @@
+
diff --git a/translations/receivings_lang.csv b/translations/receivings_lang.csv
index ddb15623c..dd7dcf8b4 100644
--- a/translations/receivings_lang.csv
+++ b/translations/receivings_lang.csv
@@ -10,7 +10,7 @@ recvs_cost,Költség,Kosten,Kost,Costo,Cost,Cout,成本,стоимость,,Ücr
recvs_date,Beérkezés dátuma,Eingangsdatum,Order Datum,Fecha de Recepción,Receiving Date,,,,,,Tanggal,Data Recebimento,Datum
recvs_date_required,Korrekt dátumot kell megadni,Ein korrektes Datum ist erforderlich,Er moet een correcte datum ingevuld worden,Una fecha correcta debe ser ingresada,A correct date needs to be filled in,,,,,,Tanngalnya harus diisi,A data correta precisa ser preenchida,Potrebno je unijeti ispravan datum
recvs_date_type,Dátum mező kötelező,Datum ist erforderlich,Datum is vereist,Campo Fecha es requerido,Date field is required,,,,,,Model Tanggal,Campo de data é obrigatório,Datum je potreban
-recvs_delete_confirmation,"Biztos, hogy törli az átvételt? Nem lehet visszavonni!",Wollen Sie diesen Eingang wirklich löschen? Rückgängig nicht möglich,Bent u zeker dat u dit order wil verwijderen? Dit kan niet ongedaan gemaakt worden.,¿Seguro(a) que desea borrar este ingreso? Esta acción no se puede deshacer,"Are you sure you want to delete this receiving, this action cannot be undone",,,,,,Konfirmasi Hapus,Tem certeza de que deseja excluir este recebimento esta ação não pode ser desfeita,Želite li obrisati ovu primku? To ne ne može vratiti.
+receivings_confirm_delete,"Biztos, hogy törli az átvételt? Nem lehet visszavonni!",Wollen Sie diesen Eingang wirklich löschen? Rückgängig nicht möglich,Bent u zeker dat u dit order wil verwijderen? Dit kan niet ongedaan gemaakt worden.,¿Seguro(a) que desea borrar este ingreso? Esta acción no se puede deshacer,"Are you sure you want to delete this receiving, this action cannot be undone",,,,,,Konfirmasi Hapus,Tem certeza de que deseja excluir este recebimento esta ação não pode ser desfeita,Želite li obrisati ovu primku? To ne ne može vratiti.
recvs_delete_entire_sale,Teljes értékesités törlése,Wareneingang löschen,Verwijder,Borrar venta completa,Delete entire sale,Delete entire sale,Delete entire sale,Delete entire sale,,Delete entire sale,Hapus Semua Penjualan,Apagar toda a venda,Obrisati cijelu prodaju
recvs_discount,Kedv. %,Rabatt %,Korting %,Descuento %,Disc %,Remise %,折古 %,Скидка %,ส่วนลด %,İndirim %,Diskon %,Desc. %,Rabat %
recvs_edit,Szerkeszt,Ändern,Bewerk,Editar,Edit,Éditer,編輯,редактировать,แก้ไข,Düzenle,Ubah,Editar,Urediti
@@ -47,4 +47,4 @@ recvs_supplier,Szállitó,Lieferant,Leverancier,Proveedor,Supplier,Fournisseur,
recvs_total,Összesen,Total,Totaal,Total,Total,Total,總數量,сумма,รวม,Toplam,Total,Total,Ukupno
recvs_unable_to_add_item,Nem sikerült terméket hozzáadni,Kann Artikel nicht zum Eingang hinzufügen,Onmogelijk om product aan order toe te voegen,No se puede agregar el artículo a la entrada,Unable to add item to receiving,Impossible d'ajouter l'item aux arrivages,無法新增進貨資料,Невозможно добавить товар на получение,ไม่สามารถเพิ่มสินค้าได้,Ürünler alıma eklenemedi,Item tidak dapat ditambahkan ke penerimaan barang masuk,Não é possível adicionar item para recebimento,Ne mogu dodati artikal u primku
recvs_unsuccessfully_updated,Átvétel sikertelenül módositva,Eingang nicht erfolgreich geändert,Receiving unsuccessfully updated,Recepción actualizada sin exito,Receiving unsuccessfully updated,Receiving unsuccessfully updated,Receiving unsuccessfully updated,Receiving unsuccessfully updated,Receiving unsuccessfully updated,Receiving unsuccessfully updated,Tidak Berhasil Diperbaharui,Recebimento não atualizado,Neuspješno ažurirana primka
-recvs_update,Módosít,Ändern,Bewerk,Editar,Update,Éditer,編輯,редактировать,แก้ไข,Düzenle,Ubah,Atualizar,Ažuriraj
+receivings_update,Módosít,Ändern,Bewerk,Editar,Update,Éditer,編輯,редактировать,แก้ไข,Düzenle,Ubah,Atualizar,Ažuriraj