Refactor variable substitution for receiving invoice numbers

Use localStorage to store selected printer Add printer selection for invoice template Print after sale checkbox is now present in receivings and sales screen Remove print after sale options from receipt_config Add default translations to receivings_lang.csv Fix some bugs preventing to print and email at the same time
2026-05-11 09:14:27 -04:00 · 2015-02-19 18:10:31 +01:00
parent 6ff19cb3f3
commit babddd524c
49 changed files with 469 additions and 343 deletions
--- a/application/controllers/config.php
+++ b/application/controllers/config.php
@@ -145,8 +145,6 @@ class Config extends Secure_area
 		'use_invoice_template' => $this->input->post ( 'use_invoice_template' ),
 		'invoice_default_comments' => $this->input->post ( 'invoice_default_comments' ),
 		'invoice_email_message' => $this->input->post ( 'invoice_email_message' ),
-		'print_after_sale' => $this->input->post ( 'print_after_sale' ),
-		'receipt_printer' => $this->input->post ( 'receipt_printer' ),
 		'receipt_show_taxes' => $this->input->post ( 'receipt_show_taxes' ),
 		'print_silently' => $this->input->post ( 'print_silently' ),
 		'print_header' => $this->input->post ( 'print_header' ),
--- a/application/controllers/receivings.php
+++ b/application/controllers/receivings.php
@@ -63,6 +63,11 @@ class Receivings extends Secure_area
 		$this->receiving_lib->set_invoice_number_enabled($this->input->post('recv_invoice_number_enabled'));
 	}
 	
+	function set_print_after_sale()
+	{
+		$this->receiving_lib->set_print_after_sale($this->input->post('recv_print_after_sale'));
+	}
+	
 	function set_invoice_number()
 	{
 		$this->receiving_lib->set_invoice_number($this->input->post('recv_invoice_number'));
@@ -218,12 +223,50 @@ class Receivings extends Secure_area
 			}
 			$barcode_config=array('barcode_type'=>1,'barcode_width'=>180, 'barcode_height'=>30, 'barcode_quality'=>100);
 			$data['barcode']=$this->barcode_lib->generate_barcode($data['receiving_id'],$barcode_config);
+			$data['print_after_sale'] = $this->receiving_lib->is_print_after_sale();
 			$this->load->view("receivings/receipt",$data);
 			$this->receiving_lib->clear_all();
 		}
 		$this->_remove_duplicate_cookies();
 	}
 	
+	function _substitute_variable($text, $variable, $object, $function)
+	{
+		// don't query if this variable isn't used
+		if (strstr($text, $variable))
+		{
+			$value = call_user_func(array($object, $function));
+			$text = str_replace($variable, $value, $text);
+		}
+		return $text;
+	}
+	
+	function _substitute_variables($text,$supplier_info)
+	{
+		$text=$this->_substitute_variable($text, '$YCO', $this->Receiving, 'get_invoice_number_for_year');
+		$text=$this->_substitute_variable($text, '$CO', $this->Receiving , 'get_invoice_count');
+		$text=strftime($text);
+		$text=$this->_substitute_supplier($text, $supplier_info);
+		return $text;
+	}
+	
+
+	function _substitute_supplier($text,$supplier_info)
+	{
+		$supplier_id=$this->receiving_lib->get_supplier();
+		if($supplier_id!=-1)
+		{
+			$text=str_replace('$SU',$supplier_info->company_name,$text);
+			$words = preg_split("/\s+/", trim($supplier_info->company_name));
+			$acronym = "";
+			foreach ($words as $w) {
+				$acronym .= $w[0];
+			}
+			$text=str_replace('$SI',$acronym,$text);
+		}
+		return $text;
+	}
+	
 	function _substitute_invoice_number($supplier_info='')
 	{
 		$invoice_number=$this->receiving_lib->get_invoice_number();
@@ -231,21 +274,7 @@ class Receivings extends Secure_area
 		{
 			$invoice_number=$this->config->config['recv_invoice_format'];
 		}
-		$invoice_count=$this->Receiving->get_invoice_count();
-		$invoice_number=str_replace('$CO',$invoice_count,$invoice_number);
-		$invoice_number=strftime($invoice_number);
-		
-		$supplier_id=$this->receiving_lib->get_supplier();
-		if($supplier_id!=-1)
-		{
-			$invoice_number=str_replace('$SU',$supplier_info->company_name,$invoice_number);
-			$words = preg_split("/\s+/", trim($supplier_info->company_name));
-			$acronym = "";
-			foreach ($words as $w) {
-				$acronym .= $w[0];
-			}
-			$invoice_number=str_replace('$SI',$acronym,$invoice_number);
-		}
+		$invoice_number = $this->_substitute_variables($invoice_number,$supplier_info);
 		$this->receiving_lib->set_invoice_number($invoice_number);
 		return $invoice_number;
 	}
@@ -295,6 +324,7 @@ class Receivings extends Secure_area
 			$supplier_info=$this->Supplier->get_info($supplier_id);
 			$data['supplier']=$supplier_info->first_name.' '.$supplier_info->last_name;
 		}
+		$data['print_after_sale'] = FALSE;
 		$this->load->view("receivings/receipt",$data);
 		$this->receiving_lib->clear_all();
 		$this->_remove_duplicate_cookies();
@@ -336,6 +366,7 @@ class Receivings extends Secure_area
 		}
 		$data['invoice_number']=$this->_substitute_invoice_number($suppl_info);
 		$data['invoice_number_enabled']=$this->receiving_lib->is_invoice_number_enabled();
+		$data['print_after_sale']=$this->receiving_lib->is_print_after_sale();
 		$this->load->view("receivings/receiving",$data);
 		$this->_remove_duplicate_cookies();
 	}
--- a/application/controllers/sales.php
+++ b/application/controllers/sales.php
@@ -65,6 +65,11 @@ class Sales extends Secure_area
 		$this->sale_lib->set_invoice_number_enabled($this->input->post('sales_invoice_number_enabled'));
 	}
 	
+	function set_print_after_sale()
+	{
+		$this->sale_lib->set_print_after_sale($this->input->post('sales_print_after_sale'));
+	}
+	
 	function set_email_receipt()
 	{
 	  $this->sale_lib->set_email_receipt($this->input->post('email_receipt'));
@@ -227,6 +232,7 @@ class Sales extends Secure_area
 		$emp_info=$this->Employee->get_info($employee_id);
 		$data['payments']=$this->sale_lib->get_payments();
 		$data['amount_change']=to_currency($this->sale_lib->get_amount_due() * -1);
+		$data['amount_due']=$this->sale_lib->get_amount_due();
 		$data['employee']=$emp_info->first_name.' '.$emp_info->last_name;
 		$data['company_info'] = implode("\n", array(
 				$this->config->item('address'),
@@ -265,6 +271,8 @@ class Sales extends Secure_area
 			}
 			else
 			{
+				$barcode_config=array('barcode_type'=>1,'barcode_width'=>180, 'barcode_height'=>30, 'barcode_quality'=>100);
+				$data['barcode']=$this->barcode_lib->generate_barcode($data['sale_id'],$barcode_config);
 				// if we want to email. .. just attach the pdf in there?
 				if ($this->sale_lib->get_email_receipt() && !empty($cust_info->email))
 				{
@@ -281,7 +289,7 @@ class Sales extends Secure_area
 						$filename = $this->_invoice_email_pdf($data);
 						$this->email->attach($filename);
 						$message = $this->config->item('invoice_email_message');
-						$message = $this->_substitute_variables($message);
+						$message = $this->_substitute_variables($message, $cust_info);
 						$this->email->message($message);
 					}
 					else
@@ -291,19 +299,10 @@ class Sales extends Secure_area
 					$this->email->send();
 				}
 			}
-			$barcode_config=array('barcode_type'=>1,'barcode_width'=>180, 'barcode_height'=>30, 'barcode_quality'=>100);
-			$data['barcode']=$this->barcode_lib->generate_barcode($data['sale_id'],$barcode_config);
 			$data['cur_giftcard_value']=$this->sale_lib->get_giftcard_remainder();
-			$data['print_receipt'] = $this->Appconfig->get('print_after_sale');
+			$data['print_after_sale'] = $this->sale_lib->is_print_after_sale();
 			if ($this->sale_lib->is_invoice_number_enabled() && $this->config->item('use_invoice_template'))
 			{
-				$data['customer_info'] = nl2br(implode("\n", array(
-						$data['customer'],
-						$data['customer_address'],
-						$data['customer_location'],
-						$data['account_number']
-				)));
-				
 				$this->load->view("sales/invoice",$data);
 			}
 			else
@@ -462,13 +461,13 @@ class Sales extends Secure_area
 		// static barcode config for receipts + invoices 
 		$barcode_config=array('barcode_type'=>1,'barcode_width'=>180, 'barcode_height'=>30, 'barcode_quality'=>100);
 		$data['barcode']=$this->barcode_lib->generate_barcode($data['sale_id'],$barcode_config);
+		$data['print_after_sale'] = FALSE;
 		return $data;
 	}
 	
 	function receipt($sale_id)
 	{
 		$data = $this->_load_sale_data($sale_id);	
-		$data['print_receipt'] = FALSE;
 		$this->load->view("sales/receipt",$data);
 		$this->sale_lib->clear_all();
 		$this->_remove_duplicate_cookies();
@@ -607,6 +606,7 @@ class Sales extends Secure_area
 		}
 		$data['invoice_number']=$this->_substitute_invoice_number($cust_info);
 		$data['invoice_number_enabled']=$this->sale_lib->is_invoice_number_enabled();
+		$data['print_after_sale']=$this->sale_lib->is_print_after_sale();
 		$data['payments_cover_total']=$this->_payments_cover_total();
 		$this->load->view("sales/register",$data);
 		$this->_remove_duplicate_cookies();
--- a/application/language/en/config_lang.php
+++ b/application/language/en/config_lang.php
@@ -61,7 +61,6 @@ $lang["config_info"] = "Store Configuration Information";
 $lang["config_language"] = "Language";
 $lang["config_phone"] = "Company Phone";
 $lang["config_phone_required"] = "Company phone is a required field";
-$lang["config_print_after_sale"] = "Print receipt after sale";
 $lang["config_recv_invoice_format"] = "Receivings Invoice Format";
 $lang["config_return_policy_required"] = "Return policy is a required field";
 $lang["config_sales_invoice_format"] = "Sales Invoice Format";
@@ -91,10 +90,11 @@ $lang["config_decimal_point"] = "Decimal Point";
 $lang["config_backup_button"] = "Backup";
 $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
 $lang["config_company_logo"] = "Company Logo";
+$lang["config_invoice_printer"] = "Invoice Printer";
 $lang["config_receipt_printer"] = "Ticket Printer";
 $lang["config_receipt_show_taxes"] = "Show Taxes";
 $lang["config_receipt_info"] = "Receipt Configuration Information";
-$lang["config_receipt_configuration"] = "Ticket Configuration";
+$lang["config_receipt_configuration"] = "Print Settings";
 $lang["config_print_footer"] = "Print Browser Footer";
 $lang["config_print_header"] = "Print Browser Header";
 $lang["config_print_silently"] = "Show Print Dialog";
--- a/application/language/en/receivings_lang.php
+++ b/application/language/en/receivings_lang.php
@@ -48,3 +48,4 @@ $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_invoice_enable"] = "Create Invoice";
+$lang["recvs_print_after_sale"] = "Print after sale";
--- a/application/language/en/sales_lang.php
+++ b/application/language/en/sales_lang.php
@@ -91,6 +91,7 @@ $lang["sales_unsuspend"] = "Unsuspend";
 $lang["sales_unsuspend_and_delete"] = "";
 $lang["sales_giftcard_balance"] = "Giftcard Balance";
 $lang["sales_discount_included"] = "% discount included";
+$lang["sales_print_after_sale"] = "Print after sale";
 $lang["sales_invoice"] = "Invoice";
 $lang["sales_total_tax_exclusive"] = "Tax excluded";
 $lang["sales_send_invoice"] = "Send Invoice";
--- a/application/language/es/config_lang.php
+++ b/application/language/es/config_lang.php
@@ -61,7 +61,6 @@ $lang["config_info"] = "Información del Comercio";
 $lang["config_language"] = "Idioma";
 $lang["config_phone"] = "Teléfono del Comercio";
 $lang["config_phone_required"] = "Teléfono del Comercio es requerido";
-$lang["config_print_after_sale"] = "Imprimir recibo después de una venta";
 $lang["config_recv_invoice_format"] = "";
 $lang["config_return_policy_required"] = "Política de Devolución es requerida";
 $lang["config_sales_invoice_format"] = "";
@@ -91,10 +90,11 @@ $lang["config_decimal_point"] = " Decimal Point";
 $lang["config_backup_button"] = "Backup";
 $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
 $lang["config_company_logo"] = "Company Logo";
+$lang["config_invoice_printer"] = "Invoice Printer";
 $lang["config_receipt_printer"] = "Ticket Printer";
 $lang["config_receipt_show_taxes"] = "Show Taxes";
 $lang["config_receipt_info"] = "Receipt Configuration Information";
-$lang["config_receipt_configuration"] = "Ticket Configuration";
+$lang["config_receipt_configuration"] = "Print Settings";
 $lang["config_print_footer"] = "Print Browser Footer";
 $lang["config_print_header"] = "Print Browser Header";
 $lang["config_print_silently"] = "Top Margin";
--- a/application/language/es/receivings_lang.php
+++ b/application/language/es/receivings_lang.php
@@ -13,11 +13,11 @@ $lang["recvs_date"] = "";
 $lang["recvs_date_required"] = "";
 $lang["recvs_date_type"] = "";
 $lang["recvs_delete_confirmation"] = "";
-$lang["recvs_delete_entire_sale"] = "";
+$lang["recvs_delete_entire_sale"] = "Delete entire sale";
 $lang["recvs_discount"] = "Descuento %";
 $lang["recvs_edit"] = "Editar";
-$lang["recvs_edit_sale"] = "";
-$lang["recvs_employee"] = "";
+$lang["recvs_edit_sale"] = "Edit Receiving";
+$lang["recvs_employee"] = "Employee";
 $lang["recvs_error_editing_item"] = "Error al editar artículo";
 $lang["recvs_error_requisition"] = "";
 $lang["recvs_find_or_scan_item"] = "Encontrar/Escanear Artículo";
@@ -28,7 +28,7 @@ $lang["recvs_invoice_number_duplicate"] = "";
 $lang["recvs_item_name"] = "Nombre del Artículo";
 $lang["recvs_mode"] = "Modo de Entradas";
 $lang["recvs_new_supplier"] = "Nuevo Proveedor";
-$lang["recvs_one_or_multiple"] = "";
+$lang["recvs_one_or_multiple"] = "receiving(s)";
 $lang["recvs_quantity"] = "Cant.";
 $lang["recvs_receipt"] = "Recibo de Entrada";
 $lang["recvs_receipt_number"] = "";
@@ -38,13 +38,14 @@ $lang["recvs_requisition"] = "";
 $lang["recvs_return"] = "Devolver";
 $lang["recvs_select_supplier"] = "Seleccionar Proveedor (Opcional)";
 $lang["recvs_start_typing_supplier_name"] = "Empieza a escribir el nombre del proveedor...";
-$lang["recvs_stock_destination"] = "";
-$lang["recvs_stock_locaiton"] = "";
-$lang["recvs_stock_source"] = "";
-$lang["recvs_successfully_deleted"] = "";
-$lang["recvs_successfully_updated"] = "";
+$lang["recvs_stock_destination"] = "Stock destination";
+$lang["recvs_stock_locaiton"] = "Stock destination";
+$lang["recvs_stock_source"] = "Stock destination";
+$lang["recvs_successfully_deleted"] = "You have successfully deleted";
+$lang["recvs_successfully_updated"] = "Receiving successfully updated";
 $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"] = "";
-$lang["recvs_invoice_enable"] = "";
+$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["recvs_invoice_enable"] = "Create Invoice";
+$lang["recvs_print_after_sale"] = "Imprimir recibo después de una venta";
--- a/application/language/es/sales_lang.php
+++ b/application/language/es/sales_lang.php
@@ -91,6 +91,7 @@ $lang["sales_unsuspend"] = "Retomar";
 $lang["sales_unsuspend_and_delete"] = "Retomar y Borrar";
 $lang["sales_giftcard_balance"] = "Giftcard Balance";
 $lang["sales_discount_included"] = "% discount included";
+$lang["sales_print_after_sale"] = "Imprimir recibo después de una venta";
 $lang["sales_invoice"] = "Invoice";
 $lang["sales_total_tax_exclusive"] = "Tax excluded";
 $lang["sales_send_invoice"] = "Send Invoice";
--- a/application/language/fr/config_lang.php
+++ b/application/language/fr/config_lang.php
@@ -61,7 +61,6 @@ $lang["config_info"] = "Çonfiguration de l\'Entreprise";
 $lang["config_language"] = "Langue";
 $lang["config_phone"] = "Téléphone";
 $lang["config_phone_required"] = "Le numéro de téléphone est requis";
-$lang["config_print_after_sale"] = "Imprimer un recu après vente";
 $lang["config_recv_invoice_format"] = "";
 $lang["config_return_policy_required"] = "Le Message est un champ requis";
 $lang["config_sales_invoice_format"] = "";
@@ -91,10 +90,11 @@ $lang["config_decimal_point"] = " Decimal Point";
 $lang["config_backup_button"] = "Backup";
 $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
 $lang["config_company_logo"] = "Company Logo";
+$lang["config_invoice_printer"] = "Invoice Printer";
 $lang["config_receipt_printer"] = "Ticket Printer";
 $lang["config_receipt_show_taxes"] = "Show Taxes";
 $lang["config_receipt_info"] = "Receipt Configuration Information";
-$lang["config_receipt_configuration"] = "Ticket Configuration";
+$lang["config_receipt_configuration"] = "Print Settings";
 $lang["config_print_footer"] = "Print Browser Footer";
 $lang["config_print_header"] = "Print Browser Header";
 $lang["config_print_silently"] = "Show Print Dialog";
--- a/application/language/fr/receivings_lang.php
+++ b/application/language/fr/receivings_lang.php
@@ -13,11 +13,11 @@ $lang["recvs_date"] = "";
 $lang["recvs_date_required"] = "";
 $lang["recvs_date_type"] = "";
 $lang["recvs_delete_confirmation"] = "";
-$lang["recvs_delete_entire_sale"] = "";
+$lang["recvs_delete_entire_sale"] = "Delete entire sale";
 $lang["recvs_discount"] = "Remise %";
 $lang["recvs_edit"] = "Éditer";
-$lang["recvs_edit_sale"] = "";
-$lang["recvs_employee"] = "";
+$lang["recvs_edit_sale"] = "Edit Receiving";
+$lang["recvs_employee"] = "Employee";
 $lang["recvs_error_editing_item"] = "Erreur d'édition";
 $lang["recvs_error_requisition"] = "";
 $lang["recvs_find_or_scan_item"] = "Chercher/Scanner Élément";
@@ -38,13 +38,14 @@ $lang["recvs_requisition"] = "";
 $lang["recvs_return"] = "Return";
 $lang["recvs_select_supplier"] = "Choisir Fournisseur (Facultatif)";
 $lang["recvs_start_typing_supplier_name"] = "Commencez à saisir le nom du fournisseur...";
-$lang["recvs_stock_destination"] = "";
-$lang["recvs_stock_locaiton"] = "";
-$lang["recvs_stock_source"] = "";
-$lang["recvs_successfully_deleted"] = "";
-$lang["recvs_successfully_updated"] = "";
+$lang["recvs_stock_destination"] = "Stock destination";
+$lang["recvs_stock_locaiton"] = "Stock location";
+$lang["recvs_stock_source"] = "Stock source";
+$lang["recvs_successfully_deleted"] = "You have successfully deleted";
+$lang["recvs_successfully_updated"] = "Receiving successfully updated";
 $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"] = "";
-$lang["recvs_invoice_enable"] = "";
+$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["recvs_invoice_enable"] = "Create Invoice";
+$lang["recvs_print_after_sale"] = "Imprimer un recu après vente";
--- a/application/language/fr/sales_lang.php
+++ b/application/language/fr/sales_lang.php
@@ -91,6 +91,7 @@ $lang["sales_unsuspend"] = "Débloquer";
 $lang["sales_unsuspend_and_delete"] = "";
 $lang["sales_giftcard_balance"] = "Giftcard Balance";
 $lang["sales_discount_included"] = "% discount included";
+$lang["sales_print_after_sale"] = "Imprimer un recu après vente";
 $lang["sales_invoice"] = "Invoice";
 $lang["sales_total_tax_exclusive"] = "Tax excluded";
 $lang["sales_send_invoice"] = "Send Invoice";
--- a/application/language/id/config_lang.php
+++ b/application/language/id/config_lang.php
@@ -61,7 +61,6 @@ $lang["config_info"] = "Informasi Konfigurasi Toko";
 $lang["config_language"] = "Bahasa";
 $lang["config_phone"] = "Telepon Perusahaan";
 $lang["config_phone_required"] = "Telepon Perusahaan wajib diisi";
-$lang["config_print_after_sale"] = "Cetak Faktur setelah penjualan";
 $lang["config_recv_invoice_format"] = "Format Nota";
 $lang["config_return_policy_required"] = "Kebijakan retur wajib diisi";
 $lang["config_sales_invoice_format"] = "Format Nota";
@@ -91,10 +90,11 @@ $lang["config_decimal_point"] = "Titik Desimal";
 $lang["config_backup_button"] = "Backup";
 $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
 $lang["config_company_logo"] = "Company Logo";
+$lang["config_invoice_printer"] = "Invoice Printer";
 $lang["config_receipt_printer"] = "Ticket Printer";
 $lang["config_receipt_show_taxes"] = "Show Taxes";
 $lang["config_receipt_info"] = "Receipt Configuration Information";
-$lang["config_receipt_configuration"] = "Ticket Configuration";
+$lang["config_receipt_configuration"] = "Print Settings";
 $lang["config_print_footer"] = "Print Browser Footer";
 $lang["config_print_header"] = "Print Browser Header";
 $lang["config_print_silently"] = "Show Print Dialog";
--- a/application/language/id/receivings_lang.php
+++ b/application/language/id/receivings_lang.php
@@ -47,4 +47,5 @@ $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_invoice_enable"] = "";
+$lang["recvs_invoice_enable"] = "Create Invoice";
+$lang["recvs_print_after_sale"] = "Cetak Faktur setelah penjualan";
--- a/application/language/id/sales_lang.php
+++ b/application/language/id/sales_lang.php
@@ -91,6 +91,7 @@ $lang["sales_unsuspend"] = "Batal Penangguhan";
 $lang["sales_unsuspend_and_delete"] = "Batalkan dan hapus penangguhan";
 $lang["sales_giftcard_balance"] = "Giftcard Balance";
 $lang["sales_discount_included"] = "% discount included";
+$lang["sales_print_after_sale"] = "Cetak Faktur setelah penjualan";
 $lang["sales_invoice"] = "Invoice";
 $lang["sales_total_tax_exclusive"] = "Tax excluded";
 $lang["sales_send_invoice"] = "Send Invoice";
--- a/application/language/nl-BE/config_lang.php
+++ b/application/language/nl-BE/config_lang.php
@@ -61,7 +61,6 @@ $lang["config_info"] = "Systeeminstellingen";
 $lang["config_language"] = "Taal";
 $lang["config_phone"] = "Telefoon";
 $lang["config_phone_required"] = "De telefoonnummer van het bedrijf moet ingevuld worden";
-$lang["config_print_after_sale"] = "Druk ticket na verkoop";
 $lang["config_recv_invoice_format"] = "";
 $lang["config_return_policy_required"] = "De retourvoorwaarden moeten ingevuld worden";
 $lang["config_sales_invoice_format"] = "";
@@ -91,10 +90,11 @@ $lang["config_decimal_point"] = "Decimal Point";
 $lang["config_backup_button"] = "Backup";
 $lang["config_stock_location_invalid_chars"] = "De bedrijfsnaam moet ingevuld worden";
 $lang["config_company_logo"] = "Logo";
+$lang["config_invoice_printer"] = "Factuur Printer";
 $lang["config_receipt_printer"] = "Ticket Printer";
 $lang["config_receipt_show_taxes"] = "Toon VAT";
 $lang["config_receipt_info"] = "Ticket Instellingen";
-$lang["config_receipt_configuration"] = "Ticket Configuratie";
+$lang["config_receipt_configuration"] = "Print Instellingen";
 $lang["config_print_footer"] = "Print Browser Footer";
 $lang["config_print_header"] = "Print Browser Header";
 $lang["config_print_silently"] = "Marge Boven";
--- a/application/language/nl-BE/receivings_lang.php
+++ b/application/language/nl-BE/receivings_lang.php
@@ -1,50 +1,51 @@
 <?php 

 $lang["receivings_transaction_failed"] = "Order transactie mislukt";
-$lang["recvs_basic_information"] = "";
-$lang["recvs_cancel_receiving"] = "";
-$lang["recvs_cannot_be_deleted"] = "";
-$lang["recvs_comments"] = "";
+$lang["recvs_basic_information"] = "Order informatie";
+$lang["recvs_cancel_receiving"] = "Annuleer";
+$lang["recvs_cannot_be_deleted"] = "Order(s) konden niet verwijderd worden";
+$lang["recvs_comments"] = "Commentaar";
 $lang["recvs_complete_receiving"] = "Bevestig";
 $lang["recvs_confirm_cancel_receiving"] = "Bent u zeker dat u dit order wil wissen?";
 $lang["recvs_confirm_finish_receiving"] = "Bent u zeker dat u dit order wil ingeven? Dit kan niet ongedaan gemaakt worden.";
 $lang["recvs_cost"] = "Kost";
-$lang["recvs_date"] = "";
-$lang["recvs_date_required"] = "";
-$lang["recvs_date_type"] = "";
-$lang["recvs_delete_confirmation"] = "";
-$lang["recvs_delete_entire_sale"] = "";
+$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["recvs_delete_entire_sale"] = "Verwijder";
 $lang["recvs_discount"] = "Korting %";
 $lang["recvs_edit"] = "Bewerk";
-$lang["recvs_edit_sale"] = "";
-$lang["recvs_employee"] = "";
-$lang["recvs_error_editing_item"] = "Fout bij het bewerken product";
-$lang["recvs_error_requisition"] = "";
+$lang["recvs_edit_sale"] = "Bewerk";
+$lang["recvs_employee"] = "Werknemer";
+$lang["recvs_error_editing_item"] = "Fout tijdens updaten product";
+$lang["recvs_error_requisition"] = "Kon de stock transfer niet vervolledigen";
 $lang["recvs_find_or_scan_item"] = "Zoek/Scan Product";
 $lang["recvs_find_or_scan_item_or_receipt"] = "Zoek/Scan Product OF Tickets";
 $lang["recvs_id"] = "Ordernummer";
-$lang["recvs_invoice_number"] = "";
-$lang["recvs_invoice_number_duplicate"] = "";
+$lang["recvs_invoice_number"] = "Factuur #";
+$lang["recvs_invoice_number_duplicate"] = "Gelieve een uniek factuurnummer in te voeren";
 $lang["recvs_item_name"] = "Productnaam";
 $lang["recvs_mode"] = "Order type";
 $lang["recvs_new_supplier"] = "N. Leverancier";
-$lang["recvs_one_or_multiple"] = "";
+$lang["recvs_one_or_multiple"] = "order(s)";
 $lang["recvs_quantity"] = "Aantal";
 $lang["recvs_receipt"] = "Ontvangstbewijs";
-$lang["recvs_receipt_number"] = "";
+$lang["recvs_receipt_number"] = "Order #";
 $lang["recvs_receiving"] = "Inkoop";
 $lang["recvs_register"] = "Orders";
-$lang["recvs_requisition"] = "";
+$lang["recvs_requisition"] = "Transfer";
 $lang["recvs_return"] = "Teruggave";
 $lang["recvs_select_supplier"] = "Selecteer Leverancier (Optioneel)";
 $lang["recvs_start_typing_supplier_name"] = "Typ naam leverancier..";
-$lang["recvs_stock_destination"] = "";
-$lang["recvs_stock_locaiton"] = "";
-$lang["recvs_stock_source"] = "";
-$lang["recvs_successfully_deleted"] = "";
-$lang["recvs_successfully_updated"] = "";
+$lang["recvs_stock_destination"] = "Stock bestemming";
+$lang["recvs_stock_locaiton"] = "Stock locatie";
+$lang["recvs_stock_source"] = "Stock bron";
+$lang["recvs_successfully_deleted"] = "Er werd(en)";
+$lang["recvs_successfully_updated"] = "Order werd geupdatet";
 $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"] = "";
+$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
 $lang["recvs_invoice_enable"] = "Maak Factuur";
+$lang["recvs_print_after_sale"] = "Print Ticket";
--- a/application/language/nl-BE/sales_lang.php
+++ b/application/language/nl-BE/sales_lang.php
@@ -91,6 +91,7 @@ $lang["sales_unsuspend"] = "Hervat";
 $lang["sales_unsuspend_and_delete"] = "";
 $lang["sales_giftcard_balance"] = "Waardebon Resterend";
 $lang["sales_discount_included"] = "% korting inbegrepen";
+$lang["sales_print_after_sale"] = "Print Ticket";
 $lang["sales_invoice"] = "Factuur";
 $lang["sales_total_tax_exclusive"] = "Totaal";
 $lang["sales_send_invoice"] = "Vestuur Factuur";
--- a/application/language/ru/config_lang.php
+++ b/application/language/ru/config_lang.php
@@ -61,7 +61,6 @@ $lang["config_info"] = "информация о магазин конфигур
 $lang["config_language"] = "Язик";
 $lang["config_phone"] = "Телефон Компании";
 $lang["config_phone_required"] = "Телефон Компании обязательный пробел";
-$lang["config_print_after_sale"] = "Распечатать квитанцию после продажи";
 $lang["config_recv_invoice_format"] = "";
 $lang["config_return_policy_required"] = "Возвратний полис обязательный пробел";
 $lang["config_sales_invoice_format"] = "";
@@ -91,10 +90,11 @@ $lang["config_decimal_point"] = " Decimal Point";
 $lang["config_backup_button"] = "Backup";
 $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
 $lang["config_company_logo"] = "Company Logo";
+$lang["config_invoice_printer"] = "Invoice Printer";
 $lang["config_receipt_printer"] = "Ticket Printer";
 $lang["config_receipt_show_taxes"] = "Show Taxes";
 $lang["config_receipt_info"] = "Receipt Configuration Information";
-$lang["config_receipt_configuration"] = "Ticket Configuration";
+$lang["config_receipt_configuration"] = "Print Settings";
 $lang["config_print_footer"] = "Print Browser Footer";
 $lang["config_print_header"] = "Print Browser Header";
 $lang["config_print_silently"] = "Show Print Dialog";
--- a/application/language/ru/receivings_lang.php
+++ b/application/language/ru/receivings_lang.php
@@ -13,11 +13,11 @@ $lang["recvs_date"] = "";
 $lang["recvs_date_required"] = "";
 $lang["recvs_date_type"] = "";
 $lang["recvs_delete_confirmation"] = "";
-$lang["recvs_delete_entire_sale"] = "";
+$lang["recvs_delete_entire_sale"] = "Delete entire sale";
 $lang["recvs_discount"] = "Скидка %";
 $lang["recvs_edit"] = "редактировать";
-$lang["recvs_edit_sale"] = "";
-$lang["recvs_employee"] = "";
+$lang["recvs_edit_sale"] = "Edit Receiving";
+$lang["recvs_employee"] = "Employee";
 $lang["recvs_error_editing_item"] = "Ошибка редактирования товар";
 $lang["recvs_error_requisition"] = "";
 $lang["recvs_find_or_scan_item"] = "Найти/Сканировать товар";
@@ -38,13 +38,14 @@ $lang["recvs_requisition"] = "";
 $lang["recvs_return"] = "возвращать";
 $lang["recvs_select_supplier"] = "Выберите поставщика (необязательно)";
 $lang["recvs_start_typing_supplier_name"] = "Начните вводить название поставщика...";
-$lang["recvs_stock_destination"] = "";
-$lang["recvs_stock_locaiton"] = "";
-$lang["recvs_stock_source"] = "";
-$lang["recvs_successfully_deleted"] = "";
-$lang["recvs_successfully_updated"] = "";
+$lang["recvs_stock_destination"] = "Stock destination";
+$lang["recvs_stock_locaiton"] = "Stock location";
+$lang["recvs_stock_source"] = "Stock source";
+$lang["recvs_successfully_deleted"] = "You have successfully deleted";
+$lang["recvs_successfully_updated"] = "Receiving successfully updated";
 $lang["recvs_supplier"] = "поставщик";
 $lang["recvs_total"] = "сумма";
 $lang["recvs_unable_to_add_item"] = "Невозможно добавить товар на получение";
-$lang["recvs_unsuccessfully_updated"] = "";
-$lang["recvs_invoice_enable"] = "";
+$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["recvs_invoice_enable"] = "Create Invoice";
+$lang["recvs_print_after_sale"] = "Распечатать квитанцию после продажи";
--- a/application/language/ru/sales_lang.php
+++ b/application/language/ru/sales_lang.php
@@ -91,6 +91,7 @@ $lang["sales_unsuspend"] = "Разблокировать";
 $lang["sales_unsuspend_and_delete"] = "Разблокировать и удалить";
 $lang["sales_giftcard_balance"] = "Giftcard Balance";
 $lang["sales_discount_included"] = "% discount included";
+$lang["sales_print_after_sale"] = "Распечатать квитанцию после продажи";
 $lang["sales_invoice"] = "Invoice";
 $lang["sales_total_tax_exclusive"] = "Tax excluded";
 $lang["sales_send_invoice"] = "Send Invoice";
--- a/application/language/th/config_lang.php
+++ b/application/language/th/config_lang.php
@@ -61,7 +61,6 @@ $lang["config_info"] = "ข้อมูลร้านค้า";
 $lang["config_language"] = "ภาษา";
 $lang["config_phone"] = "เบอร์โทรศัพท์";
 $lang["config_phone_required"] = "เบอร์โทรต้องกรอก";
-$lang["config_print_after_sale"] = "พิมพ์บิลหลังการขาย";
 $lang["config_recv_invoice_format"] = "รหัสใบแจ้งหนี้";
 $lang["config_return_policy_required"] = "กฎการคืนของต้องกรอก";
 $lang["config_sales_invoice_format"] = "รหัสใบเสร็จ";
@@ -91,10 +90,11 @@ $lang["config_decimal_point"] = "Decimal Point";
 $lang["config_backup_button"] = "Backup";
 $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
 $lang["config_company_logo"] = "Company Logo";
+$lang["config_invoice_printer"] = "Invoice Printer";
 $lang["config_receipt_printer"] = "Ticket Printer";
 $lang["config_receipt_show_taxes"] = "Show Taxes";
 $lang["config_receipt_info"] = "Receipt Configuration Information";
-$lang["config_receipt_configuration"] = "Ticket Configuration";
+$lang["config_receipt_configuration"] = "Print Settings";
 $lang["config_print_footer"] = "Print Browser Footer";
 $lang["config_print_header"] = "Print Browser Header";
 $lang["config_print_silently"] = "Show Print Dialog";
--- a/application/language/th/receivings_lang.php
+++ b/application/language/th/receivings_lang.php
@@ -13,11 +13,11 @@ $lang["recvs_date"] = "";
 $lang["recvs_date_required"] = "";
 $lang["recvs_date_type"] = "";
 $lang["recvs_delete_confirmation"] = "";
-$lang["recvs_delete_entire_sale"] = "";
+$lang["recvs_delete_entire_sale"] = "Delete entire sale";
 $lang["recvs_discount"] = "ส่วนลด %";
 $lang["recvs_edit"] = "แก้ไข";
-$lang["recvs_edit_sale"] = "";
-$lang["recvs_employee"] = "";
+$lang["recvs_edit_sale"] = "Edit Receiving";
+$lang["recvs_employee"] = "Employee";
 $lang["recvs_error_editing_item"] = "แก้ไขสินค้าล้มเหลว";
 $lang["recvs_error_requisition"] = "";
 $lang["recvs_find_or_scan_item"] = "ค้นหาสินค้า";
@@ -38,13 +38,14 @@ $lang["recvs_requisition"] = "เบิกสินค้า";
 $lang["recvs_return"] = "คืน";
 $lang["recvs_select_supplier"] = "เลือกผู้ผลิต (ทางเลือก)";
 $lang["recvs_start_typing_supplier_name"] = "เริ่มต้นพิมพ์ชื่อผู้ผลิต...";
-$lang["recvs_stock_destination"] = "";
-$lang["recvs_stock_locaiton"] = "";
-$lang["recvs_stock_source"] = "";
-$lang["recvs_successfully_deleted"] = "";
-$lang["recvs_successfully_updated"] = "";
+$lang["recvs_stock_destination"] = "Stock destination";
+$lang["recvs_stock_locaiton"] = "Stock location";
+$lang["recvs_stock_source"] = "Stock source";
+$lang["recvs_successfully_deleted"] = "You have successfully deleted";
+$lang["recvs_successfully_updated"] = "Receiving successfully updated";
 $lang["recvs_supplier"] = "ผู้ผลิต";
 $lang["recvs_total"] = "รวม";
 $lang["recvs_unable_to_add_item"] = "ไม่สามารถเพิ่มสินค้าได้";
-$lang["recvs_unsuccessfully_updated"] = "";
-$lang["recvs_invoice_enable"] = "";
+$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["recvs_invoice_enable"] = "Create Invoice";
+$lang["recvs_print_after_sale"] = "พิมพ์บิลหลังการขาย";
--- a/application/language/th/sales_lang.php
+++ b/application/language/th/sales_lang.php
@@ -91,6 +91,7 @@ $lang["sales_unsuspend"] = "ยกเลิกการระงับ";
 $lang["sales_unsuspend_and_delete"] = "ยกเลิกการระงับ และ ลบ";
 $lang["sales_giftcard_balance"] = "Giftcard Balance";
 $lang["sales_discount_included"] = "% discount included";
+$lang["sales_print_after_sale"] = "พิมพ์บิลหลังการขาย";
 $lang["sales_invoice"] = "Invoice";
 $lang["sales_total_tax_exclusive"] = "Tax excluded";
 $lang["sales_send_invoice"] = "Send Invoice";
--- a/application/language/tr/config_lang.php
+++ b/application/language/tr/config_lang.php
@@ -61,7 +61,6 @@ $lang["config_info"] = "Mağaza yapılandırma bilgisi";
 $lang["config_language"] = "Dil";
 $lang["config_phone"] = "Şirket Telefonu";
 $lang["config_phone_required"] = "Şirket Telefonu zorunlu alandır";
-$lang["config_print_after_sale"] = "Satıştan sonra yazdır";
 $lang["config_recv_invoice_format"] = "";
 $lang["config_return_policy_required"] = "İade Politikası zorunlu alandır";
 $lang["config_sales_invoice_format"] = "";
@@ -91,10 +90,11 @@ $lang["config_decimal_point"] = " Decimal Point";
 $lang["config_backup_button"] = "Backup";
 $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
 $lang["config_company_logo"] = "Company Logo";
+$lang["config_invoice_printer"] = "Invoice Printer";
 $lang["config_receipt_printer"] = "Ticket Printer";
 $lang["config_receipt_show_taxes"] = "Show Taxes";
 $lang["config_receipt_info"] = "Receipt Configuration Information";
-$lang["config_receipt_configuration"] = "Ticket Configuration";
+$lang["config_receipt_configuration"] = "Print Settings";
 $lang["config_print_footer"] = "Print Browser Footer";
 $lang["config_print_header"] = "Print Browser Header";
 $lang["config_print_silently"] = "Show Print Dialog";
--- a/application/language/tr/receivings_lang.php
+++ b/application/language/tr/receivings_lang.php
@@ -13,11 +13,11 @@ $lang["recvs_date"] = "";
 $lang["recvs_date_required"] = "";
 $lang["recvs_date_type"] = "";
 $lang["recvs_delete_confirmation"] = "";
-$lang["recvs_delete_entire_sale"] = "";
+$lang["recvs_delete_entire_sale"] = "Delete entire sale";
 $lang["recvs_discount"] = "İndirim %";
 $lang["recvs_edit"] = "Düzenle";
-$lang["recvs_edit_sale"] = "";
-$lang["recvs_employee"] = "";
+$lang["recvs_edit_sale"] = "Edit Receiving";
+$lang["recvs_employee"] = "Employee";
 $lang["recvs_error_editing_item"] = "Ürün düzenleme hatası";
 $lang["recvs_error_requisition"] = "Ürün aynı yere taşınamaz";
 $lang["recvs_find_or_scan_item"] = "Ürün Bul/Oku";
@@ -41,10 +41,11 @@ $lang["recvs_start_typing_supplier_name"] = "Sağlayıcı Adı...";
 $lang["recvs_stock_destination"] = "Stok hedefi";
 $lang["recvs_stock_locaiton"] = "Stok yeri";
 $lang["recvs_stock_source"] = "Stok kaynağı";
-$lang["recvs_successfully_deleted"] = "";
-$lang["recvs_successfully_updated"] = "";
+$lang["recvs_successfully_deleted"] = "You have successfully deleted";
+$lang["recvs_successfully_updated"] = "Receiving successfully updated";
 $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"] = "";
-$lang["recvs_invoice_enable"] = "";
+$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["recvs_invoice_enable"] = "Create Invoice";
+$lang["recvs_print_after_sale"] = "Satıştan sonra yazdır";
--- a/application/language/tr/sales_lang.php
+++ b/application/language/tr/sales_lang.php
@@ -91,6 +91,7 @@ $lang["sales_unsuspend"] = "Satışa Al";
 $lang["sales_unsuspend_and_delete"] = "";
 $lang["sales_giftcard_balance"] = "Giftcard Balance";
 $lang["sales_discount_included"] = "% discount included";
+$lang["sales_print_after_sale"] = "Satıştan sonra yazdır";
 $lang["sales_invoice"] = "Invoice";
 $lang["sales_total_tax_exclusive"] = "Tax excluded";
 $lang["sales_send_invoice"] = "Send Invoice";
--- a/application/language/zh/config_lang.php
+++ b/application/language/zh/config_lang.php
@@ -61,7 +61,6 @@ $lang["config_info"] = "儲存組態";
 $lang["config_language"] = "語言";
 $lang["config_phone"] = "電話";
 $lang["config_phone_required"] = "公司電話為必填";
-$lang["config_print_after_sale"] = "出貨時打印收據";
 $lang["config_recv_invoice_format"] = "";
 $lang["config_return_policy_required"] = "退換貨政策為必填";
 $lang["config_sales_invoice_format"] = "";
@@ -91,10 +90,11 @@ $lang["config_decimal_point"] = "Decimal Point";
 $lang["config_backup_button"] = "Backup";
 $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
 $lang["config_company_logo"] = "Company Logo";
+$lang["config_invoice_printer"] = "Invoice Printer";
 $lang["config_receipt_printer"] = "Ticket Printer";
 $lang["config_receipt_show_taxes"] = "Show Taxes";
 $lang["config_receipt_info"] = "Receipt Configuration Information";
-$lang["config_receipt_configuration"] = "Ticket Configuration";
+$lang["config_receipt_configuration"] = "Print Settings";
 $lang["config_print_footer"] = "Print Browser Footer";
 $lang["config_print_header"] = "Print Browser Header";
 $lang["config_print_silently"] = "Show Print Dialog";
--- a/application/language/zh/receivings_lang.php
+++ b/application/language/zh/receivings_lang.php
@@ -13,11 +13,11 @@ $lang["recvs_date"] = "";
 $lang["recvs_date_required"] = "";
 $lang["recvs_date_type"] = "";
 $lang["recvs_delete_confirmation"] = "";
-$lang["recvs_delete_entire_sale"] = "";
+$lang["recvs_delete_entire_sale"] = "Delete entire sale";
 $lang["recvs_discount"] = "折古 %";
 $lang["recvs_edit"] = "編輯";
-$lang["recvs_edit_sale"] = "";
-$lang["recvs_employee"] = "";
+$lang["recvs_edit_sale"] = "Edit Receiving";
+$lang["recvs_employee"] = "Employee";
 $lang["recvs_error_editing_item"] = "產品編輯錯誤";
 $lang["recvs_error_requisition"] = "";
 $lang["recvs_find_or_scan_item"] = "查找 / 掃描產品";
@@ -38,13 +38,14 @@ $lang["recvs_requisition"] = "";
 $lang["recvs_return"] = "退貨";
 $lang["recvs_select_supplier"] = "選擇供應商 (Optional)";
 $lang["recvs_start_typing_supplier_name"] = "開始輸入供應商名稱...";
-$lang["recvs_stock_destination"] = "";
-$lang["recvs_stock_locaiton"] = "";
-$lang["recvs_stock_source"] = "";
-$lang["recvs_successfully_deleted"] = "";
-$lang["recvs_successfully_updated"] = "";
+$lang["recvs_stock_destination"] = "Stock destination";
+$lang["recvs_stock_locaiton"] = "Stock location";
+$lang["recvs_stock_source"] = "Stock source";
+$lang["recvs_successfully_deleted"] = "You have successfully deleted";
+$lang["recvs_successfully_updated"] = "Receiving successfully updated";
 $lang["recvs_supplier"] = "供應商";
 $lang["recvs_total"] = "總數量";
 $lang["recvs_unable_to_add_item"] = "無法新增進貨資料";
-$lang["recvs_unsuccessfully_updated"] = "";
-$lang["recvs_invoice_enable"] = "";
+$lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["recvs_invoice_enable"] = "Create Invoice";
+$lang["recvs_print_after_sale"] = "出貨時打印收據";
--- a/application/language/zh/sales_lang.php
+++ b/application/language/zh/sales_lang.php
@@ -91,6 +91,7 @@ $lang["sales_unsuspend"] = "取消暫停銷售";
 $lang["sales_unsuspend_and_delete"] = "取消暫停銷售並刪除";
 $lang["sales_giftcard_balance"] = "Giftcard Balance";
 $lang["sales_discount_included"] = "% discount included";
+$lang["sales_print_after_sale"] = "出貨時打印收據";
 $lang["sales_invoice"] = "Invoice";
 $lang["sales_total_tax_exclusive"] = "Tax excluded";
 $lang["sales_send_invoice"] = "Send Invoice";
--- a/application/libraries/Receiving_lib.php
+++ b/application/libraries/Receiving_lib.php
@@ -99,6 +99,17 @@ class Receiving_lib
    	return $this->CI->session->set_userdata('recv_invoice_number_enabled', $invoice_number_enabled);
    }
    
+    function is_print_after_sale()
+    {
+    	return $this->CI->session->userdata('recv_print_after_sale') == 'true' ||
+    	$this->CI->session->userdata('recv_print_after_sale') == '1';
+    }
+    
+    function set_print_after_sale($print_after_sale)
+    {
+    	return $this->CI->session->set_userdata('recv_print_after_sale', $print_after_sale);
+    }
+    
    function set_stock_source($stock_source)
    {
        $this->CI->session->set_userdata('recv_stock_source',$stock_source);
@@ -176,6 +187,7 @@ class Receiving_lib
 		$insertkey=$maxkey+1;
 		$item_info=$this->CI->Item->get_info($item_id,$item_location);
 		//array records are identified by $insertkey and item_id is just another field.
+		$price=$price!=null ? $price: $item_info->cost_price;
 		$item = array(($insertkey)=>
 		array(
 			'item_id'=>$item_id,
@@ -190,8 +202,9 @@ class Receiving_lib
 			'quantity'=>$quantity,
            'discount'=>$discount,
 			'in_stock'=>$this->CI->Item_quantities->get_item_quantity($item_id, $item_location)->quantity,
-			'price'=>$price!=null ? $price: $item_info->cost_price,
-			'receiving_quantity'=>$item_info->receiving_quantity
+			'price'=>$price,
+			'receiving_quantity'=>$item_info->receiving_quantity,
+			'total'=>$this->get_item_total($quantity, $price, $discount)
 			)
 		);

--- a/application/libraries/Sale_lib.php
+++ b/application/libraries/Sale_lib.php
@@ -78,6 +78,17 @@ class Sale_lib
 		return $this->CI->session->set_userdata('sales_invoice_number_enabled', $invoice_number_enabled);
 	}
 	
+	function is_print_after_sale() 
+	{
+		return $this->CI->session->userdata('sales_print_after_sale') == 'true' ||
+			$this->CI->session->userdata('sales_print_after_sale') == '1';
+	}
+	
+	function set_print_after_sale($print_after_sale)
+	{
+		return $this->CI->session->set_userdata('sales_print_after_sale', $print_after_sale);
+	}
+	
 	function get_email_receipt() 
 	{
 		return $this->CI->session->userdata('email_receipt');
--- a/application/models/receiving.php
+++ b/application/models/receiving.php
@@ -23,6 +23,17 @@ class Receiving extends CI_Model
 		return $this->db->get();
 	}
 	
+	function get_invoice_number_for_year($year='', $start_from = 0)
+	{
+		$year = $year == '' ? date('Y') : $year;
+		$this->db->select("COUNT( 1 ) AS invoice_number_year", FALSE);
+		$this->db->from('receivings');
+		$this->db->where("DATE_FORMAT(receiving_time, '%Y' ) = ", $year, FALSE);
+		$this->db->where("invoice_number IS NOT ", "NULL", FALSE);
+		$result = $this->db->get()->row_array();
+		return ($start_from + $result[ 'invoice_number_year' ] + 1);
+	}
+	
 	function exists($receiving_id)
 	{
 		$this->db->from('receivings');
--- a/application/models/sale.php
+++ b/application/models/sale.php
@@ -25,7 +25,7 @@ class Sale extends CI_Model
 	
 	function get_invoice_number_for_year($year='', $start_from = 0) 
 	{
-		$year = $year = '' ? date('Y') : $year;
+		$year = $year == '' ? date('Y') : $year;
 		$this->db->select("COUNT( 1 ) AS invoice_number_year", FALSE);
 		$this->db->from('sales');
 		$this->db->where("DATE_FORMAT(sale_time, '%Y' ) = ", $year, FALSE);
--- a/application/views/configs/receipt_config.php
+++ b/application/views/configs/receipt_config.php
@@ -54,17 +54,6 @@ echo form_open('config/save_receipt/',array('id'=>'receipt_config_form'));
 	</div>
 </div>

-<div class="field_row clearfix">	
-<?php echo form_label($this->lang->line('config_print_after_sale').':', 'print_after_sale',array('class'=>'wide')); ?>
-	<div class='form_field'>
-	<?php echo form_checkbox(array(
-		'name'=>'print_after_sale',
-		'id'=>'print_after_sale',
-		'value'=>'print_after_sale',
-		'checked'=>$this->config->item('print_after_sale')));?>
-	</div>
-</div>
-
 <div class="field_row clearfix">	
 <?php echo form_label($this->lang->line('config_print_silently').':', 'print_silently',array('class'=>'wide')); ?>
 	<div class='form_field'>
@@ -104,7 +93,14 @@ echo form_open('config/save_receipt/',array('id'=>'receipt_config_form'));
 		<?php echo form_dropdown(
 			'receipt_printer',
 			array(),
-			$this->config->item('receipt_printer'),'id="receipt_printer"');?>
+			'','id="receipt_printer"');?>
+	</div>
+</div>
+
+<div class="field_row clearfix">	
+<?php echo form_label($this->lang->line('config_invoice_printer').':', 'config_invoice_printer',array('class'=>'wide')); ?>
+	<div class='form_field'>
+		<?php echo form_dropdown('invoice_printer', array(), ' ','id="invoice_printer"');?>
 	</div>
 </div>

@@ -184,19 +180,7 @@ echo form_close();
 //validation and submit handling
 $(document).ready(function()
 {
-	var printers = (window.jsPrintSetup && jsPrintSetup.getPrintersList() && jsPrintSetup.getPrintersList().split(',')) || [];
-	$.each(printers, function(key, value) 
-	{   
-	     $('#receipt_printer').append($('<option>', { value : value }).text(value)); 
-	});
-	
-	var enable_disable_print_settings = (function()
-	{
-		var print_after_sale = $("#print_after_sale").is(":checked");
-		$("input[id*='margin'], #print_footer, #print_header, #receipt_printer, #print_silently").prop('disabled', !window.jsPrintSetup || !print_after_sale);
-		return arguments.callee;
-	})();
-	$("#print_after_sale").change(enable_disable_print_settings);
+	$("input[id*='margin'], #print_footer, #print_header, #receipt_printer, #print_silently").prop('disabled', !window.jsPrintSetup);

 	var enable_disable_use_invoice_template = (function() 
 	{
@@ -205,8 +189,28 @@ $(document).ready(function()
 		return arguments.callee;
 	})();
 	$("#use_invoice_template").change(enable_disable_use_invoice_template);
-	
-	$('#receipt_printer option[value="<?php echo $this->config->item('receipt_printer'); ?>"]').prop('selected', true);
+
+	if (window.localStorage && window.jsPrintSetup) 
+	{
+		var printers = (jsPrintSetup.getPrintersList() && jsPrintSetup.getPrintersList().split(',')) || [];
+		$('#receipt_printer, #invoice_printer').each(function() 
+		{
+			var $this = $(this)
+			$(printers).each(function(key, value) 
+			{   
+			     $this.append($('<option>', { value : value }).text(value));
+  	 		});
+			$("option[value='" + localStorage[$(this).attr('id')] + "']", this).prop('selected', true);
+			$(this).change(function()
+			{
+				localStorage[$(this).attr('id')] = $(this).val();		
+			});
+		});
+	}
+	else
+	{
+		//$("#receipt_printer").prop('disabled', true).append($('<option>', {'N/A' : 'N/A'})).text('N/A');
+	}

 	var dialog_confirmed = window.jsPrintSetup;
 			
@@ -231,7 +235,6 @@ $(document).ready(function()
 				}
 				// set back disabled state
 				enable_disable_use_invoice_template();
-				enable_disable_print_settings();
 			},
 			dataType:'json'
 		});
--- a/application/views/partial/print_receipt.php
+++ b/application/views/partial/print_receipt.php
@@ -0,0 +1,75 @@
+<?php if ($print_after_sale)
+{
+?>
+<script type="text/javascript">
+$(window).load(function()
+{
+	// receipt layout sanity check
+	if ( $("#receipt_items").length > 0) 
+	{
+		// install firefox addon in order to use this plugin
+		if (window.jsPrintSetup) 
+		{
+			// set top margins in millimeters
+			jsPrintSetup.setOption('marginTop', <?php echo $this->Appconfig->get('print_top_margin'); ?>);
+			jsPrintSetup.setOption('marginLeft', <?php echo $this->Appconfig->get('print_left_margin'); ?>);
+			jsPrintSetup.setOption('marginBottom', <?php echo $this->Appconfig->get('print_bottom_margin'); ?>);
+			jsPrintSetup.setOption('marginRight', <?php echo $this->Appconfig->get('print_right_margin'); ?>);
+
+			<?php if (!$this->Appconfig->get('print_header'))
+			{
+			?>
+			// set page header
+			jsPrintSetup.setOption('headerStrLeft', '');
+			jsPrintSetup.setOption('headerStrCenter', '');
+			jsPrintSetup.setOption('headerStrRight', '');
+			<?php 
+			}
+			if (!$this->Appconfig->get('print_footer'))
+			{
+			?>
+			// set empty page footer
+			jsPrintSetup.setOption('footerStrLeft', '');
+			jsPrintSetup.setOption('footerStrCenter', '');
+			jsPrintSetup.setOption('footerStrRight', '');
+			<?php 
+			} 
+			?>
+			
+			var printers = jsPrintSetup.getPrintersList().split(',');
+			// get right printer here..
+			for(var index in printers) {
+				var default_ticket_printer = window.localStorage && localStorage['<?php echo $selected_printer; ?>'];
+				var selected_printer = printers[index];
+				if (selected_printer == default_ticket_printer) {
+					// select epson label printer
+					jsPrintSetup.setPrinter(selected_printer);
+					// clears user preferences always silent print value
+					// to enable using 'printSilent' option
+					jsPrintSetup.clearSilentPrint();
+					<?php if (!$this->Appconfig->get('print_silently')) 
+					{
+					?>
+					// Suppress print dialog (for this context only)
+					jsPrintSetup.setOption('printSilent', 1);
+					<?php 
+					}
+					?>
+					// Do Print 
+					// When print is submitted it is executed asynchronous and
+					// script flow continues after print independently of completetion of print process! 
+					jsPrintSetup.print();
+				}
+			}
+		
+		}
+		else
+		{
+			window.print();
+		}
+	}
+});
+</script>
+<?php
+}
+?>
--- a/application/views/receivings/receipt.php
+++ b/application/views/receivings/receipt.php
@@ -1,4 +1,8 @@
 <?php $this->load->view("partial/header"); ?>
+
+<?php $this->load->view('partial/print_receipt', array('print_after_sale', $print_after_sale, 
+		'selected_printer' => 'receipt_printer')); ?>
+
 <?php
 if (isset($error_message))
 {
@@ -8,7 +12,19 @@ if (isset($error_message))
 ?>
 <div id="receipt_wrapper">
 	<div id="receipt_header">
-		<div id="company_name"><?php echo $this->config->item('company'); ?></div>
+		<?php if ($this->Appconfig->get('company_logo') == '') 
+        { 
+        ?>
+        <div id="company_name"><?php echo $this->config->item('company'); ?></div>
+		<?php 
+		}
+		else 
+		{ 
+		?>
+		<div id="company_name"><img id="image" src="<?php echo base_url('uploads/' . $this->Appconfig->get('company_logo')); ?>" alt="company_logo" /></div>			
+		<?php
+		}
+		?>
 		<div id="company_address"><?php echo nl2br($this->config->item('address')); ?></div>
 		<div id="company_phone"><?php echo $this->config->item('phone'); ?></div>
 		<div id="sale_receipt"><?php echo $receipt_title; ?></div>
@@ -35,12 +51,10 @@ if (isset($error_message))

 	<table id="receipt_items">
 	<tr>
-	<th style="width:50%;"><?php echo $this->lang->line('items_item'); ?></th>
-	<th style="width:17%;"><?php echo $this->lang->line('common_price'); ?></th>
-	<th style="width:10%;text-align:center;"><?php echo $this->lang->line('sales_quantity'); ?></th>
-	<th style="width:6%;"></th>
-	<th style="width:16%;text-align:center;"><?php echo $this->lang->line('sales_discount'); ?></th>
-	<th style="width:17%;text-align:right;"><?php echo $this->lang->line('sales_total'); ?></th>
+	<th style="width:40%;"><?php echo $this->lang->line('items_item'); ?></th>
+	<th style="width:20%;"><?php echo $this->lang->line('common_price'); ?></th>
+	<th style="width:20%;"><?php echo $this->lang->line('sales_quantity'); ?></th>
+	<th style="width:15%;text-align:right;"><?php echo $this->lang->line('sales_total'); ?></th>
 	</tr>
 	<?php
 	foreach(array_reverse($cart, true) as $line=>$item)
@@ -49,33 +63,33 @@ if (isset($error_message))
 		<tr>
 		<td><span class='long_name'><?php echo $item['name']; ?></span><span class='short_name'><?php echo character_limiter($item['name'],10); ?></span></td>
 		<td><?php echo to_currency($item['price']); ?></td>
-		<td style='text-align:center;'><?php 
+		<td><?php 
 			echo $item['quantity'] . " " . ($show_stock_locations ? " [" . $item['stock_name'] . "]" : ""); 
-		?></td>
-        <td>x <?php echo $item['receiving_quantity'] != 0 ? $item['receiving_quantity'] : 1; ?></td>	
-		<td style='text-align:center;'><?php echo $item['discount']; ?></td>
-		<td style='text-align:right;'><?php echo to_currency($item['price']*$item['quantity']-$item['price']*$item['quantity']*$item['discount']/100); ?></td>
+		?>&nbsp;&nbsp;&nbsp;x <?php echo $item['receiving_quantity'] != 0 ? $item['receiving_quantity'] : 1; ?></td>
+		<td><div class="total-value"><?php echo to_currency($item['total']); ?></div></td>
 		</tr>
 	    <tr>
-
-	    <td colspan="2" align="center"><?php echo $item['description']; ?></td>
-		<td colspan="3	" ><?php echo $item['serialnumber']; ?></td>
-		<td colspan="1"><?php echo '---------'; ?></td>
+		<td ><?php echo $item['serialnumber']; ?></td>
 	    </tr>
+	    <?php if ($item['discount'] > 0 ) : ?>
+		<tr>
+			<td colspan="3" style="font-weight: bold;"> <?php echo number_format($item['discount'], 0) . " " . $this->lang->line("sales_discount_included")?> </td>
+		</tr>
+		<?php endif; ?>
 	<?php
 	}
 	?>	
 	<tr>
-	<td colspan="4" style='text-align:right;'><?php echo $this->lang->line('sales_total'); ?></td>
-	<td colspan="3" style='text-align:right'><?php echo to_currency($total); ?></td>
+	<td colspan="3" style='text-align:right;border-top:2px solid #000000;'><?php echo $this->lang->line('sales_total'); ?></td>
+	<td style='border-top:2px solid #000000;'><div class="total-value"><?php echo to_currency($total); ?></div></td>
 	</tr>
 	<?php 
    if($mode!='requisition')
    {
    ?>
 	<tr>
-	<td colspan="4" style='text-align:right;'><?php echo $this->lang->line('sales_payment'); ?></td>
-	<td colspan="3" style='text-align:right'><?php echo $payment_type; ?></td>
+	<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_payment'); ?></td>
+	<td><div class="total-value"><?php echo $payment_type; ?></div></td>
 	</tr>
 	

@@ -83,13 +97,13 @@ if (isset($error_message))
 	{
 	?>
 		<tr>
-		<td colspan="4" style='text-align:right;'><?php echo $this->lang->line('sales_amount_tendered'); ?></td>
-		<td colspan="3" style='text-align:right'><?php echo to_currency($amount_tendered); ?></td>
+		<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_amount_tendered'); ?></td>
+		<td><div class="total-value"><?php echo to_currency($amount_tendered); ?></div></td>
 		</tr>

 		<tr>
-		<td colspan="4" style='text-align:right;'><?php echo $this->lang->line('sales_change_due'); ?></td>
-		<td colspan="3" style='text-align:right'><?php echo $amount_change; ?></td>
+		<td colspan="3" style='text-align:right;'><?php echo $this->lang->line('sales_change_due'); ?></td>
+		<td><div class="total-value"><?php echo $amount_change; ?></div></td>
 		</tr>
 	<?php
 	}
@@ -108,16 +122,3 @@ if (isset($error_message))
 	</div>
 </div>
 <?php $this->load->view("partial/footer"); ?>
-
-<?php if ($this->Appconfig->get('print_after_sale'))
-{
-?>
-<script type="text/javascript">
-$(window).load(function()
-{
-	window.print();
-});
-</script>
-<?php
-}
-?>
--- a/application/views/receivings/receiving.php
+++ b/application/views/receivings/receiving.php
@@ -175,7 +175,7 @@ else
 	        	}
 			?>
 			</td>
-			<td colspan="5"></td>
+			<td colspan="6"></td>
 		</tr>
 		</form>
 	<?php
@@ -261,6 +261,22 @@ else
 		<?php echo form_textarea(array('name'=>'comment','id'=>'comment','value'=>$comment,'rows'=>'4','cols'=>'23'));?>
 		<br /><br />
 		<table width="100%">
+		<tr>
+			<td>
+				<?php echo $this->lang->line('recvs_print_after_sale'); ?>
+			</td>
+			<td>
+				<?php if ($print_after_sale)
+				{
+					echo form_checkbox(array('name'=>'recv_print_after_sale','id'=>'recv_print_after_sale','checked'=>'checked'));
+				}
+				else
+				{
+					echo form_checkbox(array('name'=>'recv_print_after_sale','id'=>'recv_print_after_sale'));
+				}
+				?>
+			</td>
+		</tr>
 		<?php if ($mode == "receive") 
 		{
 		?>
@@ -368,17 +384,15 @@ $(document).ready(function()
 		$.post('<?php echo site_url("receivings/set_invoice_number");?>', {recv_invoice_number: $('#recv_invoice_number').val()});
 	});

+	$("#recv_print_after_sale").change(function()
+	{
+		$.post('<?php echo site_url("receivings/set_print_after_sale");?>', {recv_print_after_sale: $(this).is(":checked")});
+	});
+
 	var enable_invoice_number = function() 
 	{
 		var enabled = $("#recv_invoice_enable").is(":checked");
-		if (enabled)
-		{
-			$("#recv_invoice_number").removeAttr("disabled").parents('tr').show();
-		}
-		else
-		{
-			$("#recv_invoice_number").attr("disabled", "disabled").parents('tr').hide();
-		}
+		$("#recv_invoice_number").prop("disabled", !enabled).parents('tr').show();
 		return enabled;
 	}

--- a/application/views/sales/invoice.php
+++ b/application/views/sales/invoice.php
@@ -7,6 +7,9 @@ if (isset($error_message))
 }
 ?>

+<?php $this->load->view('partial/print_receipt', array('print_after_sale', $print_after_sale, 
+		'selected_printer' => 'invoice_printer')); ?>
+
 <div id="page-wrap">
 	<div id="header"><?php echo $this->lang->line('sales_invoice'); ?></div>
 	<div id="block1">
--- a/application/views/sales/receipt.php
+++ b/application/views/sales/receipt.php
@@ -1,76 +1,7 @@
 <?php $this->load->view("partial/header"); ?>

-<?php if ($print_receipt)
-{
-?>
-<script type="text/javascript">
-$(window).load(function()
-{
-	// install firefox addon in order to use this plugin
-	if (window.jsPrintSetup) 
-	{
-		// set top margins in millimeters
-		jsPrintSetup.setOption('marginTop', <?php echo $this->Appconfig->get('print_top_margin'); ?>);
-		jsPrintSetup.setOption('marginLeft', <?php echo $this->Appconfig->get('print_left_margin'); ?>);
-		jsPrintSetup.setOption('marginBottom', <?php echo $this->Appconfig->get('print_bottom_margin'); ?>);
-		jsPrintSetup.setOption('marginRight', <?php echo $this->Appconfig->get('print_right_margin'); ?>);
-
-		<?php if (!$this->Appconfig->get('print_header'))
-		{
-		?>
-		// set page header
-		jsPrintSetup.setOption('headerStrLeft', '');
-		jsPrintSetup.setOption('headerStrCenter', '');
-		jsPrintSetup.setOption('headerStrRight', '');
-		<?php 
-		}
-		if (!$this->Appconfig->get('print_footer'))
-		{
-		?>
-		// set empty page footer
-		jsPrintSetup.setOption('footerStrLeft', '');
-		jsPrintSetup.setOption('footerStrCenter', '');
-		jsPrintSetup.setOption('footerStrRight', '');
-		<?php 
-		} 
-		?>
-		
-		var printers = jsPrintSetup.getPrintersList().split(',');
-		// get right printer here..
-		for(var index in printers) {
-			var default_ticket_printer = '<?php echo $this->Appconfig->get('receipt_printer'); ?>';
-			var selected_printer = printers[index];ta
-			if (selected_printer == default_ticket_printer) {
-				// select epson label printer
-				jsPrintSetup.setPrinter(selected_printer);
-				// clears user preferences always silent print value
-				// to enable using 'printSilent' option
-				jsPrintSetup.clearSilentPrint();
-				<?php if (!$this->Appconfig->get('print_silently')) 
-				{
-				?>
-				// Suppress print dialog (for this context only)
-				jsPrintSetup.setOption('printSilent', 1);
-				<?php 
-				}
-				?>
-				// Do Print 
-				// When print is submitted it is executed asynchronous and
-				// script flow continues after print independently of completetion of print process! 
-				jsPrintSetup.print();
-			}
-		}
-	
-	}
-	else
-	{
-		window.print();
-	}
-});
-</script>
-<?php
-}
-?>
+<?php $this->load->view('partial/print_receipt', array('print_after_sale', $print_after_sale, 
+		'selected_printer' => 'receipt_printer')); ?>

 <?php
 if (isset($error_message))
@@ -140,7 +71,7 @@ if (isset($error_message))
 			<td><div class="total-value"><?php echo to_currency($item['total']); ?></div></td>
 		</tr>
 	    <tr>
-	    <td colspan="3" align="center"><?php echo $item['description']; ?></td>
+	    <td colspan="2" align="center"><?php echo $item['description']; ?></td>
 		<td ><?php echo $item['serialnumber']; ?></td>
 	    </tr>
 	    <?php if ($item['discount'] > 0 ) : ?>
@@ -182,7 +113,7 @@ if (isset($error_message))
  		?>
 		<tr>
 		<td colspan="3" style="text-align:right;"><?php $splitpayment=explode(':',$payment['payment_type']); echo $splitpayment[0]; ?> </td>
-		<td style="text-align:right"><div class="total-value"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></div></td>
+		<td><div class="total-value"><?php echo to_currency( $payment['payment_amount'] * -1 ); ?></div></td>
 	    </tr>
 	<?php
 	}
--- a/application/views/sales/register.php
+++ b/application/views/sales/register.php
@@ -299,6 +299,22 @@ else

 			<?php echo form_open("sales/add_payment",array('id'=>'add_payment_form')); ?>
 			<table width="100%">
+				<tr>
+					<td>
+						<?php echo $this->lang->line('sales_print_after_sale'); ?>
+					</td>
+					<td>
+						<?php if ($print_after_sale)
+						{
+							echo form_checkbox(array('name'=>'sales_print_after_sale','id'=>'sales_print_after_sale','checked'=>'checked'));
+						}
+						else
+						{
+							echo form_checkbox(array('name'=>'sales_print_after_sale','id'=>'sales_print_after_sale'));
+						}
+						?>
+					</td>
+				</tr>
 				<?php if ($mode == "sale") 
 				{
 				?>
@@ -309,11 +325,11 @@ else
 					<td>
 						<?php if ($invoice_number_enabled)
 						{
-							echo form_checkbox(array('name'=>'sales_invoice_enable','id'=>'sales_invoice_enable','size'=>10,'checked'=>'checked'));
+							echo form_checkbox(array('name'=>'sales_invoice_enable','id'=>'sales_invoice_enable','checked'=>'checked'));
 						}
 						else
 						{
-							echo form_checkbox(array('name'=>'sales_invoice_enable','id'=>'sales_invoice_enable','size'=>10));
+							echo form_checkbox(array('name'=>'sales_invoice_enable','id'=>'sales_invoice_enable'));
 						}
 						?>
 					</td>
@@ -472,18 +488,15 @@ $(document).ready(function()
 	var enable_invoice_number = function() 
 	{
 		var enabled = $("#sales_invoice_enable").is(":checked");
-		if (enabled)
-		{
-			$("#sales_invoice_number").removeAttr("disabled").parents('tr').show();
-		}
-		else
-		{
-			$("#sales_invoice_number").attr("disabled", "disabled").parents('tr').hide();
-		}
+		$("#sales_invoice_number").prop("disabled", enabled).parents('tr').show();
 		return enabled;
 	}

 	enable_invoice_number();
+
+	$("#sales_print_after_sale").change(function() {
+		$.post('<?php echo site_url("sales/set_print_after_sale");?>', {sales_print_after_sale: $(this).is(":checked")});
+	});
 	
 	$("#sales_invoice_enable").change(function() {
 		var enabled = enable_invoice_number();
--- a/css/invoice.css
+++ b/css/invoice.css
@@ -16,6 +16,7 @@

 /* first row */
 #logo { text-align: right; margin-top: 15px; float: left; position: relative; border: 1px solid #fff; max-width: 150px; max-height: 150px; overflow: hidden; }
+#logo img { max-height: 150px; max-width: 150px; }
 /*#logo:hover, #logo.edit { border: 1px solid #000; margin-top: 0px; max-height: 125px; }*/
 #logoctr { display: none; }
 #logo:hover #logoctr, #logo.edit #logoctr { display: block; text-align: right; line-height: 25px; background: #eee; padding: 0 5px; }
--- a/css/invoice_email.css
+++ b/css/invoice_email.css
@@ -18,6 +18,7 @@ pre { font-family: Helvetica; font-size: 13px; }
 /* first row */
 #info { width: 100%; margin: 10px 0 30px 0; }
 #logo { width: 50%; text-align: left; border: 1px solid #ffffff; overflow: hidden; }
+
 #image { height: 120px; width: 163px; }
 #logoctr { display: none; }
 #logo:hover #logoctr, #logo.edit #logoctr { display: block; text-align: right; line-height: 25px; background: #eee; padding: 0 5px; }
--- a/database/2.3.1_to_2.3.2.sql
+++ b/database/2.3.1_to_2.3.2.sql
@@ -7,7 +7,6 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('company_logo', ''),
 ('barcode_page_width', '100'),      
 ('barcode_page_cellspacing', '20'),
-('receipt_printer', ''),
 ('receipt_show_taxes', '0'),
 ('use_invoice_template', '1'),
 ('invoice_default_comments', 'This is a default comment'),
--- a/database/database.sql
+++ b/database/database.sql
@@ -55,7 +55,6 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('barcode_num_in_row', '2'),
 ('barcode_page_width', '100'),      
 ('barcode_page_cellspacing', '20'),
-('receipt_printer', ''),
 ('receipt_show_taxes', '0'),
 ('use_invoice_template', '1'),
 ('invoice_email_message', 'Dear $CU, In attachment the receipt for sale $CO'),
--- a/generate_languages.php
+++ b/generate_languages.php
@@ -59,6 +59,8 @@ $dir = new DirectoryIterator(__DIR__ . "/translations");
 foreach ($dir as $fileinfo) {
    if (!$fileinfo->isDot()) {
        $file = $fileinfo->getFilename();
+        // temporary skip validation file (should be inside the system/language folder)
+        if (strstr($file, 'form_validation_lang.csv')) continue;
        print_r("generating $file...\n");
        $fh = fopen ( __DIR__ . "/translations/" . $file, 'r' );
        $language_files = array ();
--- a/translations/config_lang.csv
+++ b/translations/config_lang.csv
@@ -60,7 +60,6 @@ config_info,Systeeminstellingen,Información del Comercio,Store Configuration In
 config_language,Taal,Idioma,Language,Langue,語言,Язик,ภาษา,Dil,Bahasa
 config_phone,Telefoon,Teléfono del Comercio,Company Phone,Téléphone,電話,Телефон Компании,เบอร์โทรศัพท์,Şirket Telefonu,Telepon Perusahaan
 config_phone_required,De telefoonnummer van het bedrijf moet ingevuld worden,Teléfono del Comercio es requerido,Company phone is a required field,Le numéro de téléphone est requis,公司電話為必填,Телефон Компании обязательный пробел,เบอร์โทรต้องกรอก,Şirket Telefonu zorunlu alandır,Telepon Perusahaan wajib diisi
-config_print_after_sale,Druk ticket na verkoop,Imprimir recibo después de una venta,Print receipt after sale,Imprimer un recu après vente,出貨時打印收據,Распечатать квитанцию после продажи,พิมพ์บิลหลังการขาย,Satıştan sonra yazdır,Cetak Faktur setelah penjualan
 config_recv_invoice_format,,,Receivings Invoice Format,,,,รหัสใบแจ้งหนี้,,Format Nota
 config_return_policy_required,De retourvoorwaarden moeten ingevuld worden,Política de Devolución es requerida,Return policy is a required field,Le Message est un champ requis,退換貨政策為必填,Возвратний полис обязательный пробел,กฎการคืนของต้องกรอก,İade Politikası zorunlu alandır,Kebijakan retur wajib diisi
 config_sales_invoice_format,,,Sales Invoice Format,,,,รหัสใบเสร็จ,,Format Nota
@@ -90,10 +89,11 @@ config_decimal_point,Decimal Point, Decimal Point,Decimal Point, Decimal Point,D
 config_backup_button,Backup,Backup,Backup,Backup,Backup,Backup,Backup,Backup,Backup
 config_stock_location_invalid_chars,De bedrijfsnaam moet ingevuld worden,The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_'
 config_company_logo,Logo,Company Logo,Company Logo,Company Logo,Company Logo,Company Logo,Company Logo,Company Logo,Company Logo
+config_invoice_printer,Factuur Printer,Invoice Printer,Invoice Printer,Invoice Printer,Invoice Printer,Invoice Printer,Invoice Printer,Invoice Printer,Invoice Printer
 config_receipt_printer,Ticket Printer,Ticket Printer,Ticket Printer,Ticket Printer,Ticket Printer,Ticket Printer,Ticket Printer,Ticket Printer,Ticket Printer
 config_receipt_show_taxes,Toon VAT,Show Taxes,Show Taxes,Show Taxes,Show Taxes,Show Taxes,Show Taxes,Show Taxes,Show Taxes
 config_receipt_info,Ticket Instellingen,Receipt Configuration Information,Receipt Configuration Information,Receipt Configuration Information,Receipt Configuration Information,Receipt Configuration Information,Receipt Configuration Information,Receipt Configuration Information,Receipt Configuration Information
-config_receipt_configuration,Ticket Configuratie,Ticket Configuration,Ticket Configuration,Ticket Configuration,Ticket Configuration,Ticket Configuration,Ticket Configuration,Ticket Configuration,Ticket Configuration
+config_receipt_configuration,Print Instellingen,Print Settings,Print Settings,Print Settings,Print Settings,Print Settings,Print Settings,Print Settings,Print Settings
 config_print_footer,Print Browser Footer,Print Browser Footer,Print Browser Footer,Print Browser Footer,Print Browser Footer,Print Browser Footer,Print Browser Footer,Print Browser Footer,Print Browser Footer
 config_print_header,Print Browser Header,Print Browser Header,Print Browser Header,Print Browser Header,Print Browser Header,Print Browser Header,Print Browser Header,Print Browser Header,Print Browser Header
 config_print_silently,Marge Boven,Top Margin,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog,Show Print Dialog
--- a/translations/receivings_lang.csv
+++ b/translations/receivings_lang.csv
@@ -1,49 +1,50 @@
-"label","nl-BE","es","en","fr","zh","ru","th","tr","id"
-"receivings_transaction_failed","Order transactie mislukt","Las Transacciones de Entrada Fallaron","Receivings Transactions Failed","Échec d'opération d'arrivage","進貨交易失敗","Ошибка Получение транзакции","ดำเนินการรับสินค้าล้มเหลว","Alım İşlemi Hatası","Transaksi Penerimaan Salah"
-recvs_basic_information,,,Receiving information,,,,,,Informasi Penerimaan Barang
-recvs_cancel_receiving,,,Cancel,,,,,,Batal
-recvs_cannot_be_deleted,,,Receiving(s) could not be deleted,,,,,,Tidak bisa dihapus
-recvs_comments,,,Comments,,,,,,Keterangan
-"recvs_complete_receiving","Bevestig","Terminar","Finish","Fin","完成","заканчивать","เสร็จสิ้น","Tamamla","Selesai"
-"recvs_confirm_cancel_receiving","Bent u zeker dat u dit order wil wissen?","¿Estás seguro(a) de querer limpiar esta entrada? Todos los artículos serán limpiados.","Are you sure you want to clear this receiving? All items will cleared.","Etes vous sûr(e) de vouloir annuler cet arrivage?","您確定要刪除此進貨資料嗎？本資料中所有的產品資料也將會被清空。","Вы уверены, что хотите удалить это получение? Все детали будут очищены.","แน่ใจหรือไม่ที่จะล้างรายการสินค้าเข้า? ถ้าตกลงไม่สามารถย้อนกลับใด้.","Bu alımı iptal etmek istiyor musunuz? Tüm ürünler çıkarılacak.","Apakah anda yakin untuk menghapus Penerimaan Barang masuk ini? Semua item Akan dihapus."
-"recvs_confirm_finish_receiving","Bent u zeker dat u dit order wil ingeven? Dit kan niet ongedaan gemaakt worden.","¿Estás seguro(a) de querer procesar esta entrada? Ésto no puede ser deshecho.","Are you sure you want to submit this receiving? This cannot be undone.","Etes vous sûr(e) de vouloir valider cet arrivage (Irréversible)?","您確定要提交此進貨資料嗎？一旦送出將不能撤消。","Вы уверены, что хотите представить это получение? Это не может быть отменено.","แน่ใจหรือไม่ที่จะส่งรายการสินค้าเข้า? ถ้าตกลงไม่สามารถย้อนกลับใด้.","Alımı tamamlamak istediğinize emin misiniz? İşlem geri alınamaz.","Apakah anda yakin untuk memproses Penerimaan Barang masuk ini? Proses ini tidak dapat dibatalkan."
-"recvs_cost","Kost","Costo","Cost","Cout","成本","стоимость","ราคา","Ücret","Harga"
-recvs_date,,,Receiving Date,,,,,,Tanggal
-recvs_date_required,,,A correct date needs to be filled in,,,,,,Tanngalnya harus diisi
-recvs_date_type,,,Date field is required,,,,,,Model Tanggal
-recvs_delete_confirmation,,,"Are you sure you want to delete this receiving, this action cannot be undone",,,,,,Konfirmasi Hapus
-recvs_delete_entire_sale,,,Delete entire sale,,,,,,Hapus Semua Penjualan
-"recvs_discount","Korting %","Descuento %","Disc %","Remise %","折古 %","Скидка %","ส่วนลด %","İndirim %","Diskon %"
-"recvs_edit","Bewerk","Editar","Edit","Éditer","編輯","редактировать","แก้ไข","Düzenle","Ubah"
-recvs_edit_sale,,,Edit Receiving,,,,,,Ubah Penerimaan
-recvs_employee,,,Employee,,,,,,Karyawan
-"recvs_error_editing_item","Fout bij het bewerken product","Error al editar artículo","Error editing item","Erreur d'édition","產品編輯錯誤","Ошибка редактирования товар","แก้ไขสินค้าล้มเหลว","Ürün düzenleme hatası","Pengubahan Item Salah"
-recvs_error_requisition,,,Unable to move inventory from and to the same stock location,,,,,Ürün aynı yere taşınamaz,Kesalahan Daftar Permintaan
-"recvs_find_or_scan_item","Zoek/Scan Product","Encontrar/Escanear Artículo","Find/Scan Item","Chercher/Scanner Élément","查找 / 掃描產品","Найти/Сканировать товар","ค้นหาสินค้า","Ürün Bul/Oku","Cari/Scan Item"
-"recvs_find_or_scan_item_or_receipt","Zoek/Scan Product OF Tickets","Encontrar/Escanear Artículo o Entrada","Find/Scan Item OR Receipt","Chercher Elément OU Recu","查找 / 掃描產品或收據","Найти/Сканировать товар ИЛИ квитанция","ค้นหาสินค้าหรือบิล","Ürün yada Fatura Bul/Oku","Cari/Scan Item ATAU Faktur"
-"recvs_id","Ordernummer","ID de Entrada","Receiving ID","ID Arrivage","進貨編號","получение ID","รายการสินค้าเข้า ID","Alım No","ID Penerimaan"
-recvs_invoice_number,,,Invoice #,,,,,,Nomer Nota
-recvs_invoice_number_duplicate,,,Please enter an unique invoice number,,,,,,Nomer Nota Double
-"recvs_item_name","Productnaam","Nombre del Artículo","Item Name","Nom d'Élément","產品名稱","Название товара","ชื่อสินคัา","Ürün Adı","Nama Item"
-"recvs_mode","Order type","Modo de Entradas","Receiving Mode","Receiving Mode","進貨模式","получая режим","วิธีการรับสินค้า","Alım Türü","Jenis Penerimaan"
-"recvs_new_supplier","N. Leverancier","Nuevo Proveedor","New Supplier","Nouveau Fournisseur","新供應商","Новый поставщик","ผู้ผลิตรายใหม่","Yeni Sağlayıcı","Pemasok Baru"
-recvs_one_or_multiple,,,receiving(s),,,,,,Satu Atau Double
-"recvs_quantity","Aantal","Cant.","Qty.","Qté.","數量.","Кол-во.","จำนวน.","Adet","Jumlah"
-"recvs_receipt","Ontvangstbewijs","Recibo de Entrada","Receivings Receipt","Recu des Arrivages","收貨憑證","квитанция о получении","บิลสินค้าเข้า","Alım Faturası","Faktur Penerimaan"
-recvs_receipt_number,,,Receiving #,,,,,,No. Faktur Penerimaan
-"recvs_receiving","Inkoop","Recibir","Receive","Receive","收貨","получать","รับ","Alım","Barang Masuk"
-"recvs_register","Orders","Entrada de Artículos","Items Receiving","Items Receiving","產品進貨","Получение товаров","รับสินค้า","Ürün Alımları","Penerimaan Barang Masuk"
-recvs_requisition,,,Requisition,,,,เบิกสินค้า,Talepler,Mutasi Antar Gudang
-"recvs_return","Teruggave","Devolver","Return","Return","退貨","возвращать","คืน","İade","Retur"
-"recvs_select_supplier","Selecteer Leverancier (Optioneel)","Seleccionar Proveedor (Opcional)","Select Supplier (Optional)","Choisir Fournisseur (Facultatif)","選擇供應商 (Optional)","Выберите поставщика (необязательно)","เลือกผู้ผลิต (ทางเลือก)","Sağlayıcı Seç (İsteğe Bağlı)","Pilih Pemasok (Opsional)"
-"recvs_start_typing_supplier_name","Typ naam leverancier..","Empieza a escribir el nombre del proveedor...","Start Typing supplier's name...","Commencez à saisir le nom du fournisseur...","開始輸入供應商名稱...","Начните вводить название поставщика...","เริ่มต้นพิมพ์ชื่อผู้ผลิต...","Sağlayıcı Adı...","Ketik nama pemasok ..."
-recvs_stock_destination,,,Stock destination,,,,,Stok hedefi,Tujuan Stok
-recvs_stock_locaiton,,,Stock location,,,,,Stok yeri,Lokasi Stok
-recvs_stock_source,,,Stock source,,,,,Stok kaynağı,Asal Stok
-recvs_successfully_deleted,,,You have successfully deleted,,,,,,Berhasil Dihapus
-recvs_successfully_updated,,,Receiving successfully updated,,,,,,Berhasil Diperbaharui
-"recvs_supplier","Leverancier","Proveedor","Supplier","Fournisseur","供應商","поставщик","ผู้ผลิต","Sağlayıcı","Pemasok"
-"recvs_total","Totaal","Total","Total","Total","總數量","сумма","รวม","Toplam","Total"
-"recvs_unable_to_add_item","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"
-recvs_unsuccessfully_updated,,,Receiving unsuccessfully updated,,,,,,Tidak Berhasil Diperbaharui
-"recvs_invoice_enable","Maak Factuur","","Create Invoice","","","","","",""
+label,nl-BE,es,en,fr,zh,ru,th,tr,id
+receivings_transaction_failed,Order transactie mislukt,Las Transacciones de Entrada Fallaron,Receivings Transactions Failed,Échec d'opération d'arrivage,進貨交易失敗,Ошибка Получение транзакции,ดำเนินการรับสินค้าล้มเหลว,Alım İşlemi Hatası,Transaksi Penerimaan Salah
+recvs_basic_information,Order informatie,,Receiving information,,,,,,Informasi Penerimaan Barang
+recvs_cancel_receiving,Annuleer,,Cancel,,,,,,Batal
+recvs_cannot_be_deleted,Order(s) konden niet verwijderd worden,,Receiving(s) could not be deleted,,,,,,Tidak bisa dihapus
+recvs_comments,Commentaar,,Comments,,,,,,Keterangan
+recvs_complete_receiving,Bevestig,Terminar,Finish,Fin,完成,заканчивать,เสร็จสิ้น,Tamamla,Selesai
+recvs_confirm_cancel_receiving,Bent u zeker dat u dit order wil wissen?,¿Estás seguro(a) de querer limpiar esta entrada? Todos los artículos serán limpiados.,Are you sure you want to clear this receiving? All items will cleared.,Etes vous sûr(e) de vouloir annuler cet arrivage?,您確定要刪除此進貨資料嗎？本資料中所有的產品資料也將會被清空。,"Вы уверены, что хотите удалить это получение? Все детали будут очищены.",แน่ใจหรือไม่ที่จะล้างรายการสินค้าเข้า? ถ้าตกลงไม่สามารถย้อนกลับใด้.,Bu alımı iptal etmek istiyor musunuz? Tüm ürünler çıkarılacak.,Apakah anda yakin untuk menghapus Penerimaan Barang masuk ini? Semua item Akan dihapus.
+recvs_confirm_finish_receiving,Bent u zeker dat u dit order wil ingeven? Dit kan niet ongedaan gemaakt worden.,¿Estás seguro(a) de querer procesar esta entrada? Ésto no puede ser deshecho.,Are you sure you want to submit this receiving? This cannot be undone.,Etes vous sûr(e) de vouloir valider cet arrivage (Irréversible)?,您確定要提交此進貨資料嗎？一旦送出將不能撤消。,"Вы уверены, что хотите представить это получение? Это не может быть отменено.",แน่ใจหรือไม่ที่จะส่งรายการสินค้าเข้า? ถ้าตกลงไม่สามารถย้อนกลับใด้.,Alımı tamamlamak istediğinize emin misiniz? İşlem geri alınamaz.,Apakah anda yakin untuk memproses Penerimaan Barang masuk ini? Proses ini tidak dapat dibatalkan.
+recvs_cost,Kost,Costo,Cost,Cout,成本,стоимость,ราคา,Ücret,Harga
+recvs_date,Order Datum,,Receiving Date,,,,,,Tanggal
+recvs_date_required,Er moet een correcte datum ingevuld worden,,A correct date needs to be filled in,,,,,,Tanngalnya harus diisi
+recvs_date_type,Datum is vereist,,Date field is required,,,,,,Model Tanggal
+recvs_delete_confirmation,Bent u zeker dat u dit order wil verwijderen? Dit kan niet ongedaan gemaakt worden.,,"Are you sure you want to delete this receiving, this action cannot be undone",,,,,,Konfirmasi Hapus
+recvs_delete_entire_sale,Verwijder,Delete entire sale,Delete entire sale,Delete entire sale,Delete entire sale,Delete entire sale,Delete entire sale,Delete entire sale,Hapus Semua Penjualan
+recvs_discount,Korting %,Descuento %,Disc %,Remise %,折古 %,Скидка %,ส่วนลด %,İndirim %,Diskon %
+recvs_edit,Bewerk,Editar,Edit,Éditer,編輯,редактировать,แก้ไข,Düzenle,Ubah
+recvs_edit_sale,Bewerk,Edit Receiving,Edit Receiving,Edit Receiving,Edit Receiving,Edit Receiving,Edit Receiving,Edit Receiving,Ubah Penerimaan
+recvs_employee,Werknemer,Employee,Employee,Employee,Employee,Employee,Employee,Employee,Karyawan
+recvs_error_editing_item,Fout tijdens updaten product,Error al editar artículo,Error editing item,Erreur d'édition,產品編輯錯誤,Ошибка редактирования товар,แก้ไขสินค้าล้มเหลว,Ürün düzenleme hatası,Pengubahan Item Salah
+recvs_error_requisition,Kon de stock transfer niet vervolledigen,,Unable to move inventory from and to the same stock location,,,,,Ürün aynı yere taşınamaz,Kesalahan Daftar Permintaan
+recvs_find_or_scan_item,Zoek/Scan Product,Encontrar/Escanear Artículo,Find/Scan Item,Chercher/Scanner Élément,查找 / 掃描產品,Найти/Сканировать товар,ค้นหาสินค้า,Ürün Bul/Oku,Cari/Scan Item
+recvs_find_or_scan_item_or_receipt,Zoek/Scan Product OF Tickets,Encontrar/Escanear Artículo o Entrada,Find/Scan Item OR Receipt,Chercher Elément OU Recu,查找 / 掃描產品或收據,Найти/Сканировать товар ИЛИ квитанция,ค้นหาสินค้าหรือบิล,Ürün yada Fatura Bul/Oku,Cari/Scan Item ATAU Faktur
+recvs_id,Ordernummer,ID de Entrada,Receiving ID,ID Arrivage,進貨編號,получение ID,รายการสินค้าเข้า ID,Alım No,ID Penerimaan
+recvs_invoice_number,Factuur #,,Invoice #,,,,,,Nomer Nota
+recvs_invoice_number_duplicate,Gelieve een uniek factuurnummer in te voeren,,Please enter an unique invoice number,,,,,,Nomer Nota Double
+recvs_item_name,Productnaam,Nombre del Artículo,Item Name,Nom d'Élément,產品名稱,Название товара,ชื่อสินคัา,Ürün Adı,Nama Item
+recvs_mode,Order type,Modo de Entradas,Receiving Mode,Receiving Mode,進貨模式,получая режим,วิธีการรับสินค้า,Alım Türü,Jenis Penerimaan
+recvs_new_supplier,N. Leverancier,Nuevo Proveedor,New Supplier,Nouveau Fournisseur,新供應商,Новый поставщик,ผู้ผลิตรายใหม่,Yeni Sağlayıcı,Pemasok Baru
+recvs_one_or_multiple,order(s),receiving(s),receiving(s),,,,,,Satu Atau Double
+recvs_quantity,Aantal,Cant.,Qty.,Qté.,數量.,Кол-во.,จำนวน.,Adet,Jumlah
+recvs_receipt,Ontvangstbewijs,Recibo de Entrada,Receivings Receipt,Recu des Arrivages,收貨憑證,квитанция о получении,บิลสินค้าเข้า,Alım Faturası,Faktur Penerimaan
+recvs_receipt_number,Order #,,Receiving #,,,,,,No. Faktur Penerimaan
+recvs_receiving,Inkoop,Recibir,Receive,Receive,收貨,получать,รับ,Alım,Barang Masuk
+recvs_register,Orders,Entrada de Artículos,Items Receiving,Items Receiving,產品進貨,Получение товаров,รับสินค้า,Ürün Alımları,Penerimaan Barang Masuk
+recvs_requisition,Transfer,,Requisition,,,,เบิกสินค้า,Talepler,Mutasi Antar Gudang
+recvs_return,Teruggave,Devolver,Return,Return,退貨,возвращать,คืน,İade,Retur
+recvs_select_supplier,Selecteer Leverancier (Optioneel),Seleccionar Proveedor (Opcional),Select Supplier (Optional),Choisir Fournisseur (Facultatif),選擇供應商 (Optional),Выберите поставщика (необязательно),เลือกผู้ผลิต (ทางเลือก),Sağlayıcı Seç (İsteğe Bağlı),Pilih Pemasok (Opsional)
+recvs_start_typing_supplier_name,Typ naam leverancier..,Empieza a escribir el nombre del proveedor...,Start Typing supplier's name...,Commencez à saisir le nom du fournisseur...,開始輸入供應商名稱...,Начните вводить название поставщика...,เริ่มต้นพิมพ์ชื่อผู้ผลิต...,Sağlayıcı Adı...,Ketik nama pemasok ...
+recvs_stock_destination,Stock bestemming,Stock destination,Stock destination,Stock destination,Stock destination,Stock destination,Stock destination,Stok hedefi,Tujuan Stok
+recvs_stock_locaiton,Stock locatie,Stock destination,Stock location,Stock location,Stock location,Stock location,Stock location,Stok yeri,Lokasi Stok
+recvs_stock_source,Stock bron,Stock destination,Stock source,Stock source,Stock source,Stock source,Stock source,Stok kaynağı,Asal Stok
+recvs_successfully_deleted,Er werd(en),You have successfully deleted,You have successfully deleted,You have successfully deleted,You have successfully deleted,You have successfully deleted,You have successfully deleted,You have successfully deleted,Berhasil Dihapus
+recvs_successfully_updated,Order werd geupdatet,Receiving successfully updated,Receiving successfully updated,Receiving successfully updated,Receiving successfully updated,Receiving successfully updated,Receiving successfully updated,Receiving successfully updated,Berhasil Diperbaharui
+recvs_supplier,Leverancier,Proveedor,Supplier,Fournisseur,供應商,поставщик,ผู้ผลิต,Sağlayıcı,Pemasok
+recvs_total,Totaal,Total,Total,Total,總數量,сумма,รวม,Toplam,Total
+recvs_unable_to_add_item,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
+recvs_unsuccessfully_updated,Receiving unsuccessfully updated,Receiving unsuccessfully updated,Receiving unsuccessfully updated,Receiving unsuccessfully updated,Receiving unsuccessfully updated,Receiving unsuccessfully updated,Receiving unsuccessfully updated,Receiving unsuccessfully updated,Tidak Berhasil Diperbaharui
+recvs_invoice_enable,Maak Factuur,Create Invoice,Create Invoice,Create Invoice,Create Invoice,Create Invoice,Create Invoice,Create Invoice,Create Invoice
+recvs_print_after_sale,Print Ticket,Imprimir recibo después de una venta,Print after sale,Imprimer un recu après vente,出貨時打印收據,Распечатать квитанцию после продажи,พิมพ์บิลหลังการขาย,Satıştan sonra yazdır,Cetak Faktur setelah penjualan
--- a/translations/sales_lang.csv
+++ b/translations/sales_lang.csv
@@ -90,6 +90,7 @@ sales_unsuspend,Hervat,Retomar,Unsuspend,Débloquer,取消暫停銷售,Разб
 sales_unsuspend_and_delete,,Retomar y Borrar,,,取消暫停銷售並刪除,Разблокировать и удалить,ยกเลิกการระงับ และ ลบ,,Batalkan dan hapus penangguhan
 sales_giftcard_balance,Waardebon Resterend,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance,Giftcard Balance
 sales_discount_included,% korting inbegrepen,% discount included,% discount included,% discount included,% discount included,% discount included,% discount included,% discount included,% discount included
+sales_print_after_sale,Print Ticket,Imprimir recibo después de una venta,Print after sale,Imprimer un recu après vente,出貨時打印收據,Распечатать квитанцию после продажи,พิมพ์บิลหลังการขาย,Satıştan sonra yazdır,Cetak Faktur setelah penjualan
 sales_invoice,Factuur,Invoice,Invoice,Invoice,Invoice,Invoice,Invoice,Invoice,Invoice
 sales_total_tax_exclusive,Totaal,Tax excluded,Tax excluded,Tax excluded,Tax excluded,Tax excluded,Tax excluded,Tax excluded,Tax excluded
 sales_send_invoice,Vestuur Factuur,Send Invoice,Send Invoice,Send Invoice,Send Invoice,Send Invoice,Send Invoice,Send Invoice,Send Invoice