0.6.1

bilalnaqvi · Dec 24, 2016 · 4ed0284 · 4ed0284
1 parent 810c1e3
commit 4ed0284
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/inoerp/modules/hr/payroll_process/process_template.php b/inoerp/modules/hr/payroll_process/process_template.php
@@ -1,11 +1,12 @@
 <div id="form_all">
- <form method="post" id="hr_payroll_process"  name="hr_payroll_process"><span class="heading">Payroll Process </span>
+ <form method="post" id="hr_payroll_process"  name="hr_payroll_process">
+	<span class="heading"><?php echo gettext('Payroll Process') ; ?></span>
   <div id ="form_header">
    <div id="tabsHeader">
     <ul class="tabMain">
-     <li><a href="#tabsHeader-1">Basic Info</a></li>
-     <li><a href="#tabsHeader-2">Action</a></li>
-     <li><a href="#tabsHeader-3">Notes</a></li>
+     <li><a href="#tabsHeader-1"><?php echo gettext('Basic Info') ; ?></a></li>
+     <li><a href="#tabsHeader-2"><?php echo gettext('Action') ; ?></a></li>
+     <li><a href="#tabsHeader-3"><?php echo gettext('Notes') ; ?></a></li>
     </ul>
     <div class="tabContainer">
      <div id="tabsHeader-1" class="tabContent">
@@ -49,10 +50,10 @@
    </div>
   </div>
  </form>
- <div id ="form_line" class="form_line"><span class="heading">Line Details </span>
+ <div id ="form_line" class="form_line"><span class="heading"><?php echo gettext('Line Details') ; ?></span>
   <div id="tabsLine">
    <ul class="tabMain">
-    <li><a href="#tabsLine-1">Schedules</a></li>
+    <li><a href="#tabsLine-1"><?php echo gettext('Schedules') ; ?></a></li>
    </ul>
    <div class="tabContainer"> 
     <form action=""  method="post" id="hr_payslip_header_line"  name="hr_payslip_header_line">

diff --git a/inoerp/modules/hr/payslip_user/pay_slip_template.php b/inoerp/modules/hr/payslip_user/pay_slip_template.php
@@ -5,8 +5,7 @@
     <span class="heading"><?php echo gettext('Employee Pay Slip') ?></span>
     <div class="tabContainer">
      <ul class="column header_field">
-      <li><?php $f->l_text_field_dr('hr_payslip_header_id') ?>
-      </li>
+      <li><?php $f->l_text_field_dr('hr_payslip_header_id') ?> </li>
       <li><?php $f->l_text_field_dr('employee_name'); ?>
        <?php echo $f->hidden_field_withId('employee_id', $$class->hr_employee_id); ?>
       </li>

diff --git a/inoerp/modules/hr/pos_hierarchy/position_hierarchy_template.php b/inoerp/modules/hr/pos_hierarchy/position_hierarchy_template.php
@@ -1,8 +1,9 @@
 <div id ="form_header">
- <form method="post" id="hr_pos_hierarchy_header"  name="hr_pos_hierarchy_header"><span class="heading">Position Hierarchy </span>
+ <form method="post" id="hr_pos_hierarchy_header"  name="hr_pos_hierarchy_header">
+	<span class="heading"><?php echo gettext('Position Hierarchy') ; ?></span>
   <div id="tabsHeader">
    <ul class="tabMain">
-    <li><a href="#tabsHeader-1">Basic Info</a></li>
+    <li><a href="#tabsHeader-1"><?php echo gettext('Basic Info') ; ?></a></li>
    </ul>
    <div class="tabContainer">
     <div id="tabsHeader-1" class="tabContent">
@@ -24,22 +25,22 @@
  </form>
 </div>
 
-<div id="form_line" class="form_line"><span class="heading">Hierarchy Lines </span>
+<div id="form_line" class="form_line"><span class="heading"><?php echo gettext('Hierarchy Lines') ; ?></span>
  <form action=""  method="post" id="hr_pos_hierarchy_line"  name="hr_pos_hierarchy_line">
   <div id="tabsLine">
    <ul class="tabMain">
-    <li><a href="#tabsLine-1">Main</a></li>
+    <li><a href="#tabsLine-1"><?php echo gettext('Main') ; ?></a></li>
    </ul>
    <div class="tabContainer">
     <div id="tabsLine-1" class="tabContent">
      <table class="form_line_data_table">
       <thead> 
        <tr>
-        <th>Action</th>
-        <th>Line Id</th>
-        <th>Position</th>
-        <th>Start Date</th>
-        <th>End Date</th>
+        <th><?php echo gettext('Action') ; ?></th>
+        <th><?php echo gettext('Line Id') ; ?></th>
+        <th><?php echo gettext('Position') ; ?></th>
+        <th><?php echo gettext('Start Date') ; ?></th>
+        <th><?php echo gettext('End Date') ; ?></th>
        </tr>
       </thead>
       <tbody class="form_data_line_tbody">

diff --git a/inoerp/modules/hr/position_hierarchy/class_hr_position_hierarchy_line.inc b/inoerp/modules/hr/position_hierarchy/class_hr_position_hierarchy_line.inc
@@ -35,9 +35,6 @@
   public $last_update_by;
   public $last_update_date;
 
-  public function __set($name, $value) {
-   $this->$name = $value;
-  }
 
   public static function find_all_by_hr_position_hierarchyHeaderId($hr_position_hierarchy_headerId) {