+
@@ -356,19 +356,19 @@
Start Date
|
- [[ formatLang(cont.date_start,date=True) or '' ]]
+ [[ employee.contract_id and formatLang(employee.contract_id.date_start,date=True) or '' ]]
|
End Date
|
- [[ formatLang(cont.date_end,date=True) or removeParentNode('para') ]]
+ [[ employee.contract_id and formatLang(employee.contract_id.date_end,date=True) or removeParentNode('para') ]]
|
Type
|
- [[ get_type(cont.wage_type_id.type) or '' ]]
+ [[ employee.contract_id and get_type(employee.contract_id.wage_type_id.type) or '' ]]
|
@@ -378,13 +378,13 @@
Salary
- [[ formatLang(cont.wage) or '' ]] [[ employee.company_id.currency_id.symbol]]
+ [[ employee.contract_id and formatLang(employee.contract_id.wage) or '' ]] [[ employee.company_id.currency_id.symbol]]
|
Notes:
|
- [[ cont.notes or '' ]]
+ [[ employee.contract_id and employee.contract_id.notes or '' ]]
|
@@ -394,19 +394,19 @@
Basic
- [[ cont.basic ]] [[ employee.company_id.currency_id.symbol ]]
+ [[ employee.basic ]] [[ employee.company_id.currency_id.symbol ]]
|
Allowances
|
- [[ cont.advantages_gross ]] [[ employee.company_id.currency_id.symbol ]]
+ [[ employee.advantages_gross ]] [[ employee.company_id.currency_id.symbol ]]
|
Gross Salary
|
- [[ cont.gross ]] [[ employee.company_id.currency_id.symbol ]]
+ [[ employee.gross ]] [[ employee.company_id.currency_id.symbol ]]
|
@@ -416,17 +416,17 @@
Deductions
- [[ cont.advantages_net ]] [[ employee.company_id.currency_id.symbol ]]
+ [[ employee.advantages_net ]] [[ employee.company_id.currency_id.symbol ]]
|
Net Salary
|
- [[ cont.net ]] [[ employee.company_id.currency_id.symbol ]]
+ [[ employee.net ]] [[ employee.company_id.currency_id.symbol ]]
|
-
+
@@ -463,7 +463,7 @@
- [[repeatIn(cont.struct_id.line_ids,'line')]]
+ [[repeatIn(employee.contract_id and employee.contract_id.struct_id and employee.contract_id.struct_id.line_ids or [],'line')]]
|
@@ -473,7 +473,7 @@
[[ line.name ]]
|
- [[ formatLang(line.amount) or '']][[ get_line_amount_symbol(line.amount_type) ]]
+ [[ line.amount or '']] [[ get_line_amount_symbol(line.amount_type) ]]
|
[[ get_line_amount_type(line.amount_type) ]]
@@ -489,7 +489,7 @@
-
+
@@ -536,7 +536,7 @@
[[ line1.name ]]
|
- [[ formatLang(line1.amount) ]]
+ [[ line1.amount ]] [[ get_line_amount_symbol(line1.amount_type) ]]
|
[[ get_line_amount_type(line1.amount_type) ]]
|