diff --git a/application/controllers/Receivings.php b/application/controllers/Receivings.php index 3be9eba63..b12a53c34 100644 --- a/application/controllers/Receivings.php +++ b/application/controllers/Receivings.php @@ -93,7 +93,7 @@ class Receivings extends Secure_Controller } else if(!$this->receiving_lib->add_item($item_id_or_number_or_item_kit_or_receipt, $quantity, $item_location)) { - $data['error'] = $this->lang->line('recvs_unable_to_add_item'); + $data['error'] = $this->lang->line('receivings_unable_to_add_item'); } $this->_reload($data); @@ -120,7 +120,7 @@ class Receivings extends Secure_Controller } else { - $data['error']=$this->lang->line('recvs_error_editing_item'); + $data['error']=$this->lang->line('receivings_error_editing_item'); } $this->_reload($data); @@ -164,12 +164,12 @@ class Receivings extends Secure_Controller if($this->Receiving->delete_list($receiving_ids, $employee_id, $update_inventory)) { - echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('recvs_successfully_deleted') . ' ' . - count($receiving_ids) . ' ' . $this->lang->line('recvs_one_or_multiple'), 'ids' => $receiving_ids)); + echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('receivings_successfully_deleted') . ' ' . + count($receiving_ids) . ' ' . $this->lang->line('receivings_one_or_multiple'), 'ids' => $receiving_ids)); } else { - echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('recvs_cannot_be_deleted'))); + echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('receivings_cannot_be_deleted'))); } } @@ -187,7 +187,7 @@ class Receivings extends Secure_Controller $data['cart'] = $this->receiving_lib->get_cart(); $data['total'] = $this->receiving_lib->get_total(); - $data['receipt_title'] = $this->lang->line('recvs_receipt'); + $data['receipt_title'] = $this->lang->line('receivings_receipt'); $data['transaction_time'] = date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat')); $data['mode'] = $this->receiving_lib->get_mode(); $data['comment'] = $this->receiving_lib->get_comment(); @@ -232,7 +232,7 @@ class Receivings extends Secure_Controller if($data['receiving_id'] == 'RECV -1') { - $data['error_message'] = $this->lang->line('recvs_transaction_failed'); + $data['error_message'] = $this->lang->line('receivings_transaction_failed'); } else { @@ -261,7 +261,7 @@ class Receivings extends Secure_Controller } else { - $data['error'] = $this->lang->line('recvs_error_requisition'); + $data['error'] = $this->lang->line('receivings_error_requisition'); $this->_reload($data); } @@ -274,7 +274,7 @@ class Receivings extends Secure_Controller $data['cart'] = $this->receiving_lib->get_cart(); $data['total'] = $this->receiving_lib->get_total(); $data['mode'] = $this->receiving_lib->get_mode(); - $data['receipt_title'] = $this->lang->line('recvs_receipt'); + $data['receipt_title'] = $this->lang->line('receivings_receipt'); $data['transaction_time'] = date($this->config->item('dateformat') . ' ' . $this->config->item('timeformat'), strtotime($receiving_info['receiving_time'])); $data['show_stock_locations'] = $this->Stock_location->show_locations('receivings'); $data['payment_type'] = $receiving_info['payment_type']; @@ -315,13 +315,13 @@ class Receivings extends Secure_Controller private function _reload($data = array()) { $data['cart'] = $this->receiving_lib->get_cart(); - $data['modes'] = array('receive' => $this->lang->line('recvs_receiving'), 'return' => $this->lang->line('recvs_return')); + $data['modes'] = array('receive' => $this->lang->line('receivings_receiving'), 'return' => $this->lang->line('receivings_return')); $data['mode'] = $this->receiving_lib->get_mode(); $data['stock_locations'] = $this->Stock_location->get_allowed_locations('receivings'); $data['show_stock_locations'] = count($data['stock_locations']) > 1; if($data['show_stock_locations']) { - $data['modes']['requisition'] = $this->lang->line('recvs_requisition'); + $data['modes']['requisition'] = $this->lang->line('receivings_requisition'); $data['stock_source'] = $this->receiving_lib->get_stock_source(); $data['stock_destination'] = $this->receiving_lib->get_stock_destination(); } @@ -375,11 +375,11 @@ class Receivings extends Secure_Controller if($this->Receiving->update($receiving_data, $receiving_id)) { - echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('recvs_successfully_updated'), 'id' => $receiving_id)); + echo json_encode(array('success' => TRUE, 'message' => $this->lang->line('receivings_successfully_updated'), 'id' => $receiving_id)); } else { - echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('recvs_unsuccessfully_updated'), 'id' => $receiving_id)); + echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('receivings_unsuccessfully_updated'), 'id' => $receiving_id)); } } diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php index b596ffc5e..095089032 100644 --- a/application/controllers/Reports.php +++ b/application/controllers/Reports.php @@ -887,7 +887,7 @@ class Reports extends Secure_Controller 'reference' => $report_data['reference'], 'comment' => $report_data['comment'], 'edit' => anchor("receivings/edit/". $report_data['receiving_id'], '', - array('class'=>"modal-dlg print_hide", 'data-btn-delete' => $this->lang->line('common_delete'), 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('recvs_update')) + array('class'=>"modal-dlg print_hide", 'data-btn-delete' => $this->lang->line('common_delete'), 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('receivings_update')) ) )); @@ -920,7 +920,7 @@ class Reports extends Secure_Controller 'reference' => $row['reference'], 'comment' => $row['comment'], 'edit' => anchor("receivings/edit/" . $row['receiving_id'], '', - array('class' => "modal-dlg print_hide", 'data-btn-delete' => $this->lang->line('common_delete'), 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('recvs_update')) + array('class' => "modal-dlg print_hide", 'data-btn-delete' => $this->lang->line('common_delete'), 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('receivings_update')) ) )); diff --git a/application/language/de-CH/receivings_lang.php b/application/language/de-CH/receivings_lang.php index dfd2bcd25..9a8a9849a 100644 --- a/application/language/de-CH/receivings_lang.php +++ b/application/language/de-CH/receivings_lang.php @@ -1,52 +1,52 @@ $this->lang->line('reports_supplied_by'), 'total' => $this->lang->line('reports_total'), 'payment_type' => $this->lang->line('reports_payment_type'), - 'reference' => $this->lang->line('recvs_reference'), + 'reference' => $this->lang->line('receivings_reference'), 'comment' => $this->lang->line('reports_comments'), 'edit' => ''), 'details' => array( diff --git a/application/views/receivings/form.php b/application/views/receivings/form.php index c95b28136..430bd0fb0 100755 --- a/application/views/receivings/form.php +++ b/application/views/receivings/form.php @@ -2,22 +2,22 @@
-'recvs_edit_form', 'class'=>'form-horizontal')); ?> +'receivings_edit_form', 'class'=>'form-horizontal')); ?>