change edit in sales/register and receiving to be a glyphicon with update label (#405 #116)

application/language/de-CH/receivings_lang.php

@@ -48,3 +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";

application/language/de-CH/sales_lang.php

@@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "Löschung nicht erfolgreich";
 $lang["sales_unsuccessfully_updated"] = "Änderung nicht erfolgreich";
 $lang["sales_unsuspend"] = "Aktivieren";
 $lang["sales_unsuspend_and_delete"] = "Aktivieren und löschen";
-$lang["sales_update"] = "Ändere Auftrag";
+$lang["sales_update"] = "Ändern";
 $lang["sales_date_range"] = "Zeitrahmen";
 $lang["sales_none_selected"] = "Sie haben keinen Auftrag zum Löschen ausgewählt";

application/language/en/receivings_lang.php

@@ -48,3 +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";

application/language/en/sales_lang.php

@@ -32,7 +32,7 @@ $lang["sales_discount_included"] = "% Discount";
 $lang["sales_discount"] = "Discount";
 $lang["sales_discount_short"] = "%";
 $lang["sales_edit"] = "Edit";
-$lang["sales_edit_item"] = "Update";
+$lang["sales_edit_item"] = "Edit Item";
 $lang["sales_edit_sale"] = "Edit Sale";
 $lang["sales_email_receipt"] = "Email Receipt";
 $lang["sales_employee"] = "Employee";
@@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "Sale(s) could not be deleted";
 $lang["sales_unsuccessfully_updated"] = "Sale unsuccessfully updated";
 $lang["sales_unsuspend"] = "Unsuspend";
 $lang["sales_unsuspend_and_delete"] = "";
-$lang["sales_update"] = "Edit Sale";
+$lang["sales_update"] = "Update";
 $lang["sales_date_range"] = "Date Range";
 $lang["sales_none_selected"] = "You have not selected any sales to delete";

application/language/es/receivings_lang.php

@@ -48,3 +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";

application/language/es/sales_lang.php

@@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "Ha fallado la eliminación de la Venta"
 $lang["sales_unsuccessfully_updated"] = "Ha fallado la actualización de la venta";
 $lang["sales_unsuspend"] = "Retomar";
 $lang["sales_unsuspend_and_delete"] = "Retomar y Borrar";
-$lang["sales_update"] = "Editar Venta";
+$lang["sales_update"] = "Editar";
 $lang["sales_date_range"] = "Rango de Fecha";
 $lang["sales_none_selected"] = "No has seleccionado venta para editar";

application/language/fr/receivings_lang.php

@@ -48,3 +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";

application/language/fr/sales_lang.php

@@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "Échec de suppression";
 $lang["sales_unsuccessfully_updated"] = "Échec d'édition";
 $lang["sales_unsuspend"] = "Débloquer";
 $lang["sales_unsuspend_and_delete"] = "";
-$lang["sales_update"] = "Edit Sale";
+$lang["sales_update"] = "Éditer";
 $lang["sales_date_range"] = "Plage de dates";
 $lang["sales_none_selected"] = "Vous n'avez sélectionné aucun élément";

application/language/id/receivings_lang.php

@@ -48,3 +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";

application/language/id/sales_lang.php

@@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "Transaksi Penjualan tidak berhasil diha
 $lang["sales_unsuccessfully_updated"] = "Penjualan tidak berhasil diperbarui";
 $lang["sales_unsuspend"] = "Batal Penangguhan";
 $lang["sales_unsuspend_and_delete"] = "Batalkan dan hapus penangguhan";
-$lang["sales_update"] = "Edit Sale";
+$lang["sales_update"] = "Ubah";
 $lang["sales_date_range"] = "Rentang Tanggal";
 $lang["sales_none_selected"] = "Anda belum memilih item untuk diubah";

application/language/nl-BE/receivings_lang.php

@@ -48,3 +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";

application/language/nl-BE/sales_lang.php

@@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "De aankoop kon niet verwijderd worden";
 $lang["sales_unsuccessfully_updated"] = "Fout bij het bewaren van ticket";
 $lang["sales_unsuspend"] = "Hervat";
 $lang["sales_unsuspend_and_delete"] = "";
-$lang["sales_update"] = "Bewerk Ticket";
+$lang["sales_update"] = "Bewerk";
 $lang["sales_date_range"] = "Periode";
 $lang["sales_none_selected"] = "U hebt geen aankopen geselecteerd";

application/language/ru/receivings_lang.php

@@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "поставщик";
 $lang["recvs_total"] = "сумма";
 $lang["recvs_unable_to_add_item"] = "Невозможно добавить товар на получение";
 $lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["recvs_update"] = "редактировать";

application/language/ru/sales_lang.php

@@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "продажи безуспешно у
 $lang["sales_unsuccessfully_updated"] = "Продажа безуспешно обновлен";
 $lang["sales_unsuspend"] = "Разблокировать";
 $lang["sales_unsuspend_and_delete"] = "Разблокировать и удалить";
-$lang["sales_update"] = "Edit Sale";
+$lang["sales_update"] = "редактировать";
 $lang["sales_date_range"] = "размах числа";
 $lang["sales_none_selected"] = "Вы не выбрали ни одной товари для редактирования";

application/language/th/receivings_lang.php

@@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "ผู้ผลิต";
 $lang["recvs_total"] = "รวม";
 $lang["recvs_unable_to_add_item"] = "ไม่สามารถเพิ่มสินค้าได้";
 $lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["recvs_update"] = "แก้ไข";

application/language/th/sales_lang.php

@@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "ลบการขายไม่สำ
 $lang["sales_unsuccessfully_updated"] = "อัพเดทการขายไม่สมบูรณ์";
 $lang["sales_unsuspend"] = "ยกเลิกการระงับ";
 $lang["sales_unsuspend_and_delete"] = "ยกเลิกการระงับ และ ลบ";
-$lang["sales_update"] = "แก้ไขการขาย";
+$lang["sales_update"] = "แก้ไข";
 $lang["sales_date_range"] = "ระหว่างวันที่";
 $lang["sales_none_selected"] = "กรุณาเลือสินค้าที่ต้องการแก้ไข";

application/language/tr/receivings_lang.php

@@ -48,3 +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";

application/language/tr/sales_lang.php

@@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "Satış silinemedi";
 $lang["sales_unsuccessfully_updated"] = "Satış düzenlenemedi";
 $lang["sales_unsuspend"] = "Satışa Al";
 $lang["sales_unsuspend_and_delete"] = "";
-$lang["sales_update"] = "Edit Sale";
+$lang["sales_update"] = "Düzenle";
 $lang["sales_date_range"] = "Tarih Aralığı";
 $lang["sales_none_selected"] = "Düzenlemek için ürün seçmediniz";

application/language/zh/receivings_lang.php

@@ -48,3 +48,4 @@ $lang["recvs_supplier"] = "供應商";
 $lang["recvs_total"] = "總數量";
 $lang["recvs_unable_to_add_item"] = "無法新增進貨資料";
 $lang["recvs_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["recvs_update"] = "編輯";

application/language/zh/sales_lang.php

@@ -112,6 +112,6 @@ $lang["sales_unsuccessfully_deleted"] = "銷售資料刪除失敗";
 $lang["sales_unsuccessfully_updated"] = "銷售資料更新失敗";
 $lang["sales_unsuspend"] = "取消暫停銷售";
 $lang["sales_unsuspend_and_delete"] = "取消暫停銷售並刪除";
-$lang["sales_update"] = "Edit Sale";
+$lang["sales_update"] = "編輯";
 $lang["sales_date_range"] = "日期範圍";
 $lang["sales_none_selected"] = "您還沒有選擇任何產品進行編輯";

application/views/receivings/receiving.php

@@ -89,14 +89,14 @@ if (isset($error))
 	<table class="sales_table_100" id="register">
 		<thead>
 			<tr>
-				<th style="width:10%;"><?php echo $this->lang->line('common_delete'); ?></th>
-				<th style="width:35%;"><?php echo $this->lang->line('recvs_item_name'); ?></th>
+				<th style="width:5%;"><?php echo $this->lang->line('common_delete'); ?></th>
+				<th style="width:45%;"><?php echo $this->lang->line('recvs_item_name'); ?></th>
 				<th style="width:10%;"><?php echo $this->lang->line('recvs_cost'); ?></th>
 				<th style="width:10%;"><?php echo $this->lang->line('recvs_quantity'); ?></th>
 				<th style="width:5%;"></th>
 				<th style="width:10%;"><?php echo $this->lang->line('recvs_discount'); ?></th>
 				<th style="width:10%;"><?php echo $this->lang->line('recvs_total'); ?></th>
-				<th style="width:10%;"><?php echo $this->lang->line('recvs_edit'); ?></th>
+				<th style="width:5%;"><?php echo $this->lang->line('recvs_update'); ?></th>
 			</tr>
 		</thead>
 
@@ -117,11 +117,13 @@ if (isset($error))
 				foreach(array_reverse($cart, true) as $line=>$item)
 				{
 			?>
-					<?php echo form_open("receivings/edit_item/$line", array('class'=>'form-horizontal')); ?>
+					<?php echo form_open("receivings/edit_item/$line", array('class'=>'form-horizontal', 'id'=>'cart_'.$line)); ?>
 						<tr>
 							<td><?php echo anchor("receivings/delete_item/$line", '<span class="glyphicon glyphicon-trash"></span>');?></td>
-							<td style="align:center;"><?php echo $item['name']; ?><br /> [<?php echo $item['in_stock']; ?> in <?php echo $item['stock_name']; ?>]
-								<?php echo form_hidden('location', $item['item_location']); ?></td>
+							<td style="align:center;">
+								<?php echo $item['name']; ?><br /> [<?php echo $item['in_stock']; ?> in <?php echo $item['stock_name']; ?>]
+								<?php echo form_hidden('location', $item['item_location']); ?>
+							</td>
 
 							<?php 
 							if ($items_module_allowed && $mode !='requisition')
@@ -133,8 +135,10 @@ if (isset($error))
 							else
 							{
 							?>
-								<td><?php echo $item['price']; ?></td>
-								<?php echo form_hidden('price',$item['price']); ?>
+								<td>
+									<?php echo $item['price']; ?>
+									<?php echo form_hidden('price', $item['price']); ?>
+								</td>
 							<?php
 							}
 							?>
@@ -144,7 +148,7 @@ if (isset($error))
 							if ($item['receiving_quantity'] > 1) 
 							{
 							?>
-								<td>x <?php echo $item['receiving_quantity']; ?></td>	
+								<td><?php echo 'x'.$item['receiving_quantity']; ?></td>	
 							<?php 
 							}
 							else
@@ -171,7 +175,7 @@ if (isset($error))
 							}
 							?>
 							<td><?php echo to_currency($item['price']*$item['quantity']-$item['price']*$item['quantity']*$item['discount']/100); ?></td>
-							<td><?php echo form_submit(array('name'=>'edit_item', 'value'=>$this->lang->line('sales_edit_item'), 'class'=>'btn btn-default btn-xs'));?></td>
+							<td><a href="javascript:document.getElementById('<?php echo 'cart_'.$line ?>').submit();" title=<?php echo $this->lang->line('recvs_update')?> ><span class="glyphicon glyphicon-refresh"></span></a></td>
 						</tr>
 						<tr>
 							<?php 

application/views/sales/register.php

@@ -90,14 +90,14 @@ if (isset($success))
 	<table class="sales_table_100" id="register">
 		<thead>
 			<tr>
-				<th style="width: 10%;"><?php echo $this->lang->line('common_delete'); ?></th>
+				<th style="width: 5%;"><?php echo $this->lang->line('common_delete'); ?></th>
 				<th style="width: 15%;"><?php echo $this->lang->line('sales_item_number'); ?></th>
-				<th style="width: 25%;"><?php echo $this->lang->line('sales_item_name'); ?></th>
+				<th style="width: 35%;"><?php echo $this->lang->line('sales_item_name'); ?></th>
 				<th style="width: 10%;"><?php echo $this->lang->line('sales_price'); ?></th>
 				<th style="width: 10%;"><?php echo $this->lang->line('sales_quantity'); ?></th>
 				<th style="width: 10%;"><?php echo $this->lang->line('sales_discount'); ?></th>
 				<th style="width: 10%;"><?php echo $this->lang->line('sales_total'); ?></th>
-				<th style="width: 10%;"><?php echo $this->lang->line('sales_edit'); ?></th>
+				<th style="width: 5%;"><?php echo $this->lang->line('sales_update'); ?></th>
 			</tr>
 		</thead>
 
@@ -123,11 +123,12 @@ if (isset($success))
 						$tabindex = 5;
 					}
 			?>
-					<?php echo form_open("sales/edit_item/$line", array('class'=>'form-horizontal')); ?>
+					<?php echo form_open("sales/edit_item/$line", array('class'=>'form-horizontal', 'id'=>'cart_'.$line)); ?>
 						<tr>
 							<td><?php echo anchor("sales/delete_item/$line", '<span class="glyphicon glyphicon-trash"></span>');?></td>
 							<td><?php echo $item['item_number']; ?></td>
-							<td style="align: center;"><?php echo $item['name']; ?><br /> [<?php echo $item['in_stock'] ?> in <?php echo $item['stock_name']; ?>]
+							<td style="align: center;">
+								<?php echo $item['name']; ?><br /> [<?php echo $item['in_stock'] ?> in <?php echo $item['stock_name']; ?>]
 								<?php echo form_hidden('location', $item['item_location']); ?>
 							</td>
 
@@ -141,8 +142,10 @@ if (isset($success))
 							else
 							{
 							?>
-								<td><?php echo to_currency($item['price']); ?></td>
-								<?php echo form_hidden('price',$item['price']); ?>
+								<td>
+									<?php echo to_currency($item['price']); ?>
+									<?php echo form_hidden('price', $item['price']); ?>
+								</td>
 							<?php
 							}
 							?>
@@ -163,7 +166,7 @@ if (isset($success))
 
 							<td><?php echo form_input(array('name'=>'discount', 'class'=>'form-control input-sm', 'value'=>$item['discount']));?></td>
 							<td><?php echo to_currency($item['price']*$item['quantity']-$item['price']*$item['quantity']*$item['discount']/100); ?></td>
-							<td><?php echo form_submit(array('name'=>'edit_item', 'value'=>$this->lang->line('sales_edit_item'), 'class'=>'btn btn-default btn-xs'));?></td>
+							<td><a href="javascript:document.getElementById('<?php echo 'cart_'.$line ?>').submit();" title=<?php echo $this->lang->line('sales_update')?> ><span class="glyphicon glyphicon-refresh"></span></a></td>
 						</tr>
 						<tr>
 							<?php 

translations/receivings_lang.csv

@@ -47,3 +47,4 @@ recvs_supplier,Lieferant,Leverancier,Proveedor,Supplier,Fournisseur,供應商,п
 recvs_total,Total,Totaal,Total,Total,Total,總數量,сумма,รวม,Toplam,Total
 recvs_unable_to_add_item,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
 recvs_unsuccessfully_updated,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
+recvs_update,Ändern,Bewerk,Editar,Update,Éditer,編輯,редактировать,แก้ไข,Düzenle,Ubah

translations/sales_lang.csv

@@ -31,7 +31,7 @@ sales_discount_included,Rabatt %,% Korting,% Descuento,% Discount,% Discount,% D
 sales_discount,Rabatt,Korting,Descuento,Discount,Discount,Discount,Discount,ส่วนลด,Discount,Discount
 sales_discount_short,%,%,%,%,%,%,%,,%,%
 sales_edit,Ändern,Bewerk,Editar,Edit,Éditer,編輯,редактировать,แก้ไข,Düzenle,Ubah
-sales_edit_item,Ändere Art.,Bewaar,Editar Artículo,Update,Éditer Item,編輯產品,Редактировать Товар,แก้ไขสินค้า,Düzenle,Ubah Item
+sales_edit_item,Ändere Art.,Bewaar,Editar Artículo,Edit Item,Éditer Item,編輯產品,Редактировать Товар,แก้ไขสินค้า,Düzenle,Ubah Item
 sales_edit_sale,Auftrag ändern,Bewerk Ticket,Editar Venta,Edit Sale,Éditer Vente,編輯銷售資料,Редактировать продажи,แก้ไขการขาย,Satışı Düzenle,Ubah Penjualan
 sales_email_receipt,Quittung per Email,Email Ticket,Enviar Ticket,Email Receipt,Recu par Email,Email 銷售單,послать квитанция по Email,อีเมลบิล,E-Fatura,email Faktur
 sales_employee,Mitarbeiter,Werknemer,Empleado,Employee,Employé,員工,сотрудник,พนักงาน,Personel,Karyawan
@@ -111,6 +111,6 @@ sales_unsuccessfully_deleted,Löschung nicht erfolgreich,De aankoop kon niet ver
 sales_unsuccessfully_updated,Änderung nicht erfolgreich,Fout bij het bewaren van ticket,Ha fallado la actualización de la venta,Sale unsuccessfully updated,Échec d'édition,銷售資料更新失敗,Продажа безуспешно обновлен,อัพเดทการขายไม่สมบูรณ์,Satış düzenlenemedi,Penjualan tidak berhasil diperbarui
 sales_unsuspend,Aktivieren,Hervat,Retomar,Unsuspend,Débloquer,取消暫停銷售,Разблокировать,ยกเลิกการระงับ,Satışa Al,Batal Penangguhan
 sales_unsuspend_and_delete,Aktivieren und löschen,,Retomar y Borrar,,,取消暫停銷售並刪除,Разблокировать и удалить,ยกเลิกการระงับ และ ลบ,,Batalkan dan hapus penangguhan
-sales_update,Ändere Auftrag,Bewerk Ticket,Editar Venta,Edit Sale,Edit Sale,Edit Sale,Edit Sale,แก้ไขการขาย,Edit Sale,Edit Sale
+sales_update,Ändern,Bewerk,Editar,Update,Éditer,編輯,редактировать,แก้ไข,Düzenle,Ubah
 sales_date_range,Zeitrahmen,Periode,Rango de Fecha,Date Range,Plage de dates,日期範圍,размах числа,ระหว่างวันที่,Tarih Aralığı,Rentang Tanggal
 sales_none_selected,Sie haben keinen Auftrag zum Löschen ausgewählt,U hebt geen aankopen geselecteerd,No has seleccionado venta para editar,You have not selected any sales to delete,Vous n'avez sélectionné aucun élément,您還沒有選擇任何產品進行編輯,Вы не выбрали ни одной товари для редактирования,กรุณาเลือสินค้าที่ต้องการแก้ไข,Düzenlemek için ürün seçmediniz,Anda belum memilih item untuk diubah