-
Notifications
You must be signed in to change notification settings - Fork 11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Payroll #85
base: 8.0
Are you sure you want to change the base?
Payroll #85
Conversation
testing: - res_company - hr_contract - hr_holiday tbd: - views - default data - reports (specifically d112)
TDB create public holiday leaves
- api v8 - adauga condirile adecvate concediului
…in regula ca sa apara si qty)
removed allocation as it conflicts with adding leaves (overlapping exception)
_name = 'hr.advantages' | ||
_description = 'Advantages' | ||
|
||
company = fields.Many2one('res.company', _('Company'), required = True) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adi, de ce folosesti _( in loc de string='...', la ce te ajuta...ca nu am chef acuma sa caut...
@yoyo2k La holidays nu ai modificat sa ia zilele efective fara week-end??? |
programu se ia dupa scheduler (programul de lucru) si am modificat sa nu mai apara in calendar public holidays (se batea cap in cap cu orice alt concediu de ex medical) |
da ok...da i-am pus de luni pana vineri, cu holiday din 3 pana in 8 si ia 6 zile de concediu...trebuia sa ia 4 doar... |
pentru luarea in calcul a weekend-urilor (public holidays), am testat local cu codul de mai jos, este copy/paste si putin modidficat de la metoda get_employer_days(self), cred ca ar fi ok de integrat cu refactoringul corespunzator l10n_ro_hr_payroll/models/hr_holidays.py
|
Adaptare inițială de Salarizare.
Sugestiile și comentariile sunt întotdeauna binevenite.