Skip to content
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

[FIX] contract_hourly_rate #139

Merged
merged 2 commits into from
Oct 15, 2015

Conversation

ghost
Copy link

@ghost ghost commented Sep 25, 2015

Fix field selection and french translation

Fix field selection and french translation
('hourly', 'Hourly Wage')],
string='Salary Computation Method',
help="Whether to use the annual wage or an hourly rate "
"for computation of payslip.",
required=True, default='monthly')
required=True,
default='yearly')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to me monthly preferable than yearly as default.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tafaRU well think it changes from a country to another. In Canada, it is clearly yearly but I can not speak for the whole planet. Lets make a vote.

@ehdem
Copy link

ehdem commented Oct 9, 2015

👍

@ghost
Copy link
Author

ghost commented Oct 14, 2015

@tafaRU I take your point, the default will be kept monthly.

@ghost
Copy link
Author

ghost commented Oct 14, 2015

@tarzan0820 can you review this please ?

@saltonmassally
Copy link

👍

@tafaRU
Copy link
Member

tafaRU commented Oct 15, 2015

@dufresnedavid, ok thanks, I merge then.

tafaRU added a commit that referenced this pull request Oct 15, 2015
@tafaRU tafaRU merged commit 38643d4 into OCA:8.0 Oct 15, 2015
sambarros pushed a commit to sambarros/hr that referenced this pull request Jul 26, 2018
[BSSFL-248] Add section on quotation and invoice reports
Mraimou pushed a commit to camptocamp/hr that referenced this pull request Nov 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants