diff --git a/odoo-bringout-oca-payroll-payroll/payroll/i18n/bs.po b/odoo-bringout-oca-payroll-payroll/payroll/i18n/bs.po
index 2e91cbb..973fbb3 100644
--- a/odoo-bringout-oca-payroll-payroll/payroll/i18n/bs.po
+++ b/odoo-bringout-oca-payroll-payroll/payroll/i18n/bs.po
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: payroll
 #. odoo-python
-#: code:addons/payroll/models/hr_salary_rule.py
+#: code:addons/payroll/models/hr_salary_rule.py:0
 #, python-format
 msgid ""
 "\n"
@@ -46,7 +46,7 @@ msgstr ""
 
 #. module: payroll
 #. odoo-python
-#: code:addons/payroll/models/hr_salary_rule.py
+#: code:addons/payroll/models/hr_salary_rule.py:0
 #, python-format
 msgid ""
 "\n"
@@ -119,15 +119,12 @@ msgid ""
 "<code>categories:</code> contains the sum of amount of all rules belonging "
 "to that category"
 msgstr ""
-"<code>categories:</code> contains the sum of amount of all rules belonging "
-"to that category"
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_view_form
 msgid ""
 "<code>contract:</code> contains current contract object data (hr.contract)"
 msgstr ""
-"<code>contract:</code> contains current contract object data (hr.contract)"
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_view_form
@@ -135,15 +132,12 @@ msgid ""
 "<code>current_contract:</code> contains values related/calculated for "
 "current contract"
 msgstr ""
-"<code>current_contract:</code> contains values related/calculated for "
-"current contract"
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_view_form
 msgid ""
 "<code>employee:</code> contains current employee object data (hr.employee)"
 msgstr ""
-"<code>employee:</code> contains current employee object data (hr.employee)"
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_view_form
@@ -161,14 +155,12 @@ msgstr ""
 msgid ""
 "<code>payslip:</code> contains current payslip object data (hr.payslip)"
 msgstr ""
-"<code>payslip:</code> contains current payslip object data (hr.payslip)"
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_view_form
 msgid ""
 "<code>payslips:</code> contains payslips data (Payslips - Browsable Object)"
 msgstr ""
-"<code>payslips:</code> contains payslips data (Payslips - Browsable Object)"
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_view_form
@@ -181,8 +173,6 @@ msgid ""
 "<code>result:</code> the returned value should be in this variable. It "
 "matches with \"amount\" column."
 msgstr ""
-"<code>result:</code> the returned value should be in this variable. It "
-"matches with \"amount\" column."
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_view_form
@@ -190,8 +180,6 @@ msgid ""
 "<code>result_name:</code> overrides the current name of the rule and allows "
 "to make dynamic names"
 msgstr ""
-"<code>result_name:</code> overrides the current name of the rule and allows "
-"to make dynamic names"
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_view_form
@@ -199,8 +187,6 @@ msgid ""
 "<code>result_qty:</code> the quantity of units that will be multiplied to "
 "\"result\""
 msgstr ""
-"<code>result_qty:</code> the quantity of units that will be multiplied to "
-"\"result\""
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_view_form
@@ -213,8 +199,6 @@ msgid ""
 "<code>result_rules:</code> contains the values of previusly computed lines "
 "(qty, rate, amount, total)"
 msgstr ""
-"<code>result_rules:</code> contains the values of previusly computed lines "
-"(qty, rate, amount, total)"
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_view_form
@@ -227,8 +211,6 @@ msgid ""
 "<code>tools:</code> contains tools and libraries which help with "
 "mathematical operations"
 msgstr ""
-"<code>tools:</code> contains tools and libraries which help with "
-"mathematical operations"
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_view_form
@@ -443,7 +425,7 @@ msgstr "Dodaj internu zabilješku ..."
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_category_view_form
 msgid "Add your notes or category explanation here..."
-msgstr "Add your notes or category explanation here..."
+msgstr ""
 
 #. module: payroll
 #: model:ir.actions.act_window,name:payroll.act_children_salary_rules
@@ -453,7 +435,7 @@ msgstr "Sva podređena pravila"
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_hr_payslip__allow_cancel_payslips
 msgid "Allow Canceling Payslips"
-msgstr "Allow Canceling Payslips"
+msgstr ""
 
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_res_config_settings__allow_cancel_payslips
@@ -473,7 +455,7 @@ msgstr "Dozvoli uređivanje stavki platne liste"
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.res_config_settings_view_form
 msgid "Allow users to cancel confirmed payslips"
-msgstr "Allow users to cancel confirmed payslips"
+msgstr ""
 
 #. module: payroll
 #: model:ir.model.fields,help:payroll.field_res_config_settings__allow_cancel_payslips
@@ -540,7 +522,7 @@ msgstr ""
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_category_view_form
 msgid "Associated Salary Rules"
-msgstr "Associated Salary Rules"
+msgstr ""
 
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_hr_payslip__message_attachment_count
@@ -577,7 +559,7 @@ msgstr "Dvotjedno"
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.res_config_settings_view_form
 msgid "Calculation Settings"
-msgstr "Calculation Settings"
+msgstr ""
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_payslip_line_view_form
@@ -690,13 +672,13 @@ msgstr "Šifra:"
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_payslip_view_search
 msgid "Companies"
-msgstr "Kompanije"
+msgstr "Preduzeća"
 
 # taken from hr.po
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_hr_contribution_register__company_id
 msgid "Company"
-msgstr "Kompanija"
+msgstr "Preduzeće"
 
 #. module: payroll
 #: model:hr.salary.rule.category,name:payroll.COMP
@@ -751,7 +733,7 @@ msgstr "Konfiguracija"
 #. module: payroll
 #: model:ir.model.fields.selection,name:payroll.selection__hr_payslip_change_state__state__done
 msgid "Confirm"
-msgstr "Portvrdi"
+msgstr "Potvrdi"
 
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_res_config_settings__prevent_compute_on_confirm
@@ -870,10 +852,10 @@ msgid ""
 "mandatory anymore and thus the rules applied will be all the rules set on "
 "the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
-"Definira pravila koja se moraju primijeniti na ovu platnu listu, u skladu sa"
-" odabranim ugovorom. Ako polje za ugovor ostavite praznim, ovo polje više "
-"nije obavezno, te će se primijeniti sva pravila postavljena u strukturi svih"
-" ugovora zaposlenika koji su važeći za odabrani period"
+"Definiše pravila koja trebaju biti primjenjena na ovu platnu listu, u skladu"
+" sa odabranim ugovorom. Ako ostavite prazan ugovor, ovo polje nije neophodno"
+" te se primjenjuju sva pravila postavljena za strukturu svih aktivnih "
+"ugovora zaposlenog za navedeni periodu"
 
 # taken from hr.po
 #. module: payroll
@@ -1036,19 +1018,19 @@ msgstr "Sadržaj form nedostaje, ovaj izvještaj ne može biti odštampan."
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.view_hr_payslip_by_employees
 msgid "Generate"
-msgstr "Generiraj"
+msgstr "Generiši"
 
 # taken from hr.po
 #. module: payroll
 #: model:ir.actions.act_window,name:payroll.action_hr_payslip_by_employees
 msgid "Generate Payslips"
-msgstr "Generiši obračunske listiće"
+msgstr "Generiši plate"
 
 # taken from hr.po
 #. module: payroll
 #: model:ir.model,name:payroll.model_hr_payslip_employees
 msgid "Generate payslips for all selected employees"
-msgstr "Generiši obračunske listiće za sve odabrane zaposlene"
+msgstr "Generiši za sve odabrane zaposlene"
 
 #. module: payroll
 #: model:hr.salary.rule,name:payroll.hr_salary_rule_sales_commission
@@ -1161,8 +1143,6 @@ msgid ""
 "If you have doubts about coding salary rules, check the \"Help\" tab in this"
 " form."
 msgstr ""
-"If you have doubts about coding salary rules, check the \"Help\" tab in this"
-" form."
 
 #. module: payroll
 #: model:ir.model.fields,help:payroll.field_res_config_settings__leaves_positive
@@ -1232,7 +1212,7 @@ msgstr ""
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_hr_contribution_register____last_update
 msgid "Last Modified on"
-msgstr "Zadnje mijenjano"
+msgstr "Posljednja promjena"
 
 # taken from hr.po
 #. module: payroll
@@ -1278,7 +1258,7 @@ msgstr "Upravljanje platama zaposlenika"
 #. module: payroll
 #: model:res.groups,name:payroll.group_payroll_manager
 msgid "Manager"
-msgstr "Upravitelj"
+msgstr "Menadžer"
 
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_hr_payslip_line__condition_range_max
@@ -1329,7 +1309,7 @@ msgstr "Rok za moju aktivnost"
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_hr_contribution_register__name
 msgid "Name"
-msgstr "Naziv:"
+msgstr "Ime"
 
 #. module: payroll
 #: model:hr.salary.rule.category,name:payroll.NET
@@ -1418,34 +1398,29 @@ msgstr "Oficir"
 
 #. module: payroll
 #. odoo-python
-#: code:addons/payroll/wizard/hr_payslip_change_state.py
+#: code:addons/payroll/wizard/hr_payslip_change_state.py:0
 #, python-format
 msgid ""
 "Only draft payslips can be verified,the payslip %(nm)s is in %(st)s state"
 msgstr ""
-"Only draft payslips can be verified,the payslip %(nm)s is in %(st)s state"
 
 #. module: payroll
 #. odoo-python
-#: code:addons/payroll/wizard/hr_payslip_change_state.py
+#: code:addons/payroll/wizard/hr_payslip_change_state.py:0
 #, python-format
 msgid ""
 "Only payslips in states verify or draft can be confirmed, the payslip %(nm)s"
 " is in %(st)s state"
 msgstr ""
-"Only payslips in states verify or draft can be confirmed, the payslip %(nm)s"
-" is in %(st)s state"
 
 #. module: payroll
 #. odoo-python
-#: code:addons/payroll/wizard/hr_payslip_change_state.py
+#: code:addons/payroll/wizard/hr_payslip_change_state.py:0
 #, python-format
 msgid ""
 "Only rejected payslips can be reset to draft, the payslip %(nm)s is in "
 "%(st)s state"
 msgstr ""
-"Only rejected payslips can be reset to draft, the payslip %(nm)s is in "
-"%(st)s state"
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_payslip_view_form
@@ -1478,7 +1453,7 @@ msgstr "Partner"
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_hr_payslip_input__payslip_id
 msgid "Pay Slip"
-msgstr "Obračun"
+msgstr "Platna lista"
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_payslip_view_search
@@ -1527,7 +1502,7 @@ msgstr "Računovodstvo plata"
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_hr_leave_type__code
 msgid "Payroll Code"
-msgstr "Payroll Code"
+msgstr ""
 
 #. module: payroll
 #: model:ir.model,name:payroll.model_report_payroll_report_contributionregister
@@ -1567,7 +1542,7 @@ msgstr "Datum početka ugovora"
 #. module: payroll
 #: model:ir.model,name:payroll.model_hr_payslip_run
 msgid "Payslip Batches"
-msgstr "Skupni obračunski listići"
+msgstr "Grupne platne liste"
 
 #. module: payroll
 #: model:ir.actions.act_window,name:payroll.hr_payslip_line_action_computation_details
@@ -1650,10 +1625,10 @@ msgstr ""
 # taken from hr.po
 #. module: payroll
 #. odoo-python
-#: code:addons/payroll/wizard/hr_payslip_change_state.py
+#: code:addons/payroll/wizard/hr_payslip_change_state.py:0
 #, python-format
 msgid "Payslips"
-msgstr "Obračunski listići"
+msgstr "Platne liste"
 
 #. module: payroll
 #: model:ir.actions.act_window,name:payroll.hr_payslip_run_action
@@ -1695,12 +1670,12 @@ msgstr "Period"
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.res_config_settings_view_form
 msgid "Post payslips in accounting"
-msgstr "Post payslips in accounting"
+msgstr ""
 
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_hr_payslip__prevent_compute_on_confirm
 msgid "Prevent Compute on Confirm"
-msgstr "Prevent Compute on Confirm"
+msgstr ""
 
 #. module: payroll
 #: model:ir.model.fields,help:payroll.field_res_config_settings__prevent_compute_on_confirm
@@ -1842,7 +1817,7 @@ msgstr "Odbijeno"
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_hr_payroll_structure__require_code
 msgid "Require code"
-msgstr "Require code"
+msgstr ""
 
 #. module: payroll
 #: model:ir.model.fields,field_description:payroll.field_hr_payslip_line__require_code_and_category
@@ -1873,7 +1848,7 @@ msgstr "Pravilo"
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_view_form
 msgid "Rule Configuration"
-msgstr "Rule Configuration"
+msgstr ""
 
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_salary_rule_category_view_form
@@ -1929,10 +1904,10 @@ msgstr "Salary Rules formula definition (Python)"
 
 #. module: payroll
 #. odoo-python
-#: code:addons/payroll/models/hr_payslip.py
+#: code:addons/payroll/models/hr_payslip.py:0
 #, python-format
 msgid "Salary Slip of %(name)s for %(dt)s"
-msgstr "Salary Slip of %(name)s for %(dt)s"
+msgstr ""
 
 #. module: payroll
 #: model:ir.model,name:payroll.model_hr_payroll_structure
@@ -1975,7 +1950,7 @@ msgstr "Pretraži pravilo obračuna plate"
 #. module: payroll
 #: model_terms:ir.ui.view,arch_db:payroll.hr_payslip_input_view_search
 msgid "Search all"
-msgstr "Search all"
+msgstr ""
 
 #. module: payroll
 #: model:ir.model.fields.selection,name:payroll.selection__hr_contract__schedule_pay__semi-annually
@@ -2036,8 +2011,8 @@ msgid ""
 "Planned: Future activities."
 msgstr ""
 "Status baziran na aktivnostima\n"
-"Zakašnjelo: Rok je već prošao\n"
-"Danas: Datum aktivnosti je danas\n"
+"Prekoračenje: Rok izvršenja je već prošao\n"
+"Danas: Datum za aktivnost je danas\n"
 "Planirano: Buduće aktivnosti."
 
 #. module: payroll
@@ -2090,8 +2065,6 @@ msgid ""
 "The following objects and variables are available to you to use it in salary"
 " rules calculations."
 msgstr ""
-"The following objects and variables are available to you to use it in salary"
-" rules calculations."
 
 #. module: payroll
 #: model:ir.model.fields,help:payroll.field_hr_payslip_line__condition_range_max
@@ -2107,10 +2080,10 @@ msgstr "Minimalan iznos, primjenjeno za ovo pravilo."
 
 #. module: payroll
 #. odoo-python
-#: code:addons/payroll/wizard/hr_payslip_change_state.py
+#: code:addons/payroll/wizard/hr_payslip_change_state.py:0
 #, python-format
 msgid "The payslip %(nm)s is already canceled please deselect it"
-msgstr "The payslip %(nm)s is already canceled please deselect it"
+msgstr ""
 
 #. module: payroll
 #: model:ir.model.fields,help:payroll.field_hr_payslip_line__condition_range
@@ -2208,36 +2181,30 @@ msgstr "Write salary rule notes or observations here..."
 
 #. module: payroll
 #. odoo-python
-#: code:addons/payroll/models/hr_salary_rule.py
+#: code:addons/payroll/models/hr_salary_rule.py:0
 #, python-format
 msgid ""
 "Wrong percentage base or quantity defined for salary rule %(nm)s (%(code)s) "
 "for employee %(ee)s."
 msgstr ""
-"Wrong percentage base or quantity defined for salary rule %(nm)s (%(code)s) "
-"for employee %(ee)s."
 
 #. module: payroll
 #. odoo-python
-#: code:addons/payroll/models/hr_salary_rule.py
+#: code:addons/payroll/models/hr_salary_rule.py:0
 #, python-format
 msgid ""
 "Wrong quantity defined for salary rule %(nm)s (%(code)s) for employee "
 "%(ee)s."
 msgstr ""
-"Wrong quantity defined for salary rule %(nm)s (%(code)s) for employee "
-"%(ee)s."
 
 #. module: payroll
 #. odoo-python
-#: code:addons/payroll/models/hr_salary_rule.py
+#: code:addons/payroll/models/hr_salary_rule.py:0
 #, python-format
 msgid ""
 "Wrong range condition defined for salary rule %(nm)s (%(code)s) for employee"
 " %(ee)s."
 msgstr ""
-"Wrong range condition defined for salary rule %(nm)s (%(code)s) for employee"
-" %(ee)s."
 
 #. module: payroll
 #. odoo-python