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

7.0 add payslip with ytd amount and translated lines #69

Merged
merged 5 commits into from
Feb 26, 2015

Conversation

ghost
Copy link

@ghost ghost commented Jan 28, 2015

This payslip is the similar to the regular one in hr_payroll, but the columns are different.
The names of payslip lines can be translated.
Added the ytd amount column after the amount for the period.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.11%) to 27.68% when pulling a70f8c2 on savoirfairelinux:7.0-ddufresne-payslip_ytd_amount into 5e2f29e on OCA:7.0.

@max3903
Copy link
Sponsor Member

max3903 commented Feb 3, 2015

👍

@@ -0,0 +1,44 @@
# -*- coding:utf-8 -*-#########################################################

Choose a reason for hiding this comment

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

Missing a \n here

@max3903 max3903 modified the milestone: 7.0 Feb 14, 2015
@max3903 max3903 removed the 7.0 label Feb 14, 2015
@max3903 max3903 mentioned this pull request Feb 14, 2015
7 tasks
if line.appears_on_payslip and line.amount
]

def translate_in_employee_lang(self, term, payslip, is_payslip_line=False):
Copy link

Choose a reason for hiding this comment

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

@dufresnedavid Thanks for the contribution.

What's wrong with the standard report translation function?

Copy link
Author

Choose a reason for hiding this comment

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

@joaoalf We want the lang of the employee even if an other user is printing it for the employee.

Choose a reason for hiding this comment

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

Can't you just get the lang of the employee and call setLang whenever it's necessary?

@bwrsandman
Copy link

👍

max3903 pushed a commit that referenced this pull request Feb 26, 2015
…d_amount

[ADD] payslip with year-to-date amounts and translated lines
@max3903 max3903 merged commit 19925d3 into OCA:7.0 Feb 26, 2015
#. module: hr_payslip_ytd_amount
#: report:payslip_ytd_amount:0
#, fuzzy
msgid "Amount Year-to-date"

Choose a reason for hiding this comment

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

Translation is fuzzy it might not get translated and instead of "Total Année Courante" "Total de l'année courante"

@max3903 max3903 deleted the 7.0-ddufresne-payslip_ytd_amount branch February 26, 2015 20:45

#. module: hr_payslip_ytd_amount
#: field:hr.payslip.line,total_ytd:0
msgid "Total Year-to-date"

Choose a reason for hiding this comment

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

Traduction en double?

</blockTable>
<para style="P3">
<font color="white"> </font>
</para>
Copy link
Member

Choose a reason for hiding this comment

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

Is there a use for all this whitespace? I know RML is a bit horrible, but in case specific positioning is required then
frames can be used. (See check writing in l10n-canada). Otherwise, this seems like useless whitespace.

Choose a reason for hiding this comment

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

This also can be replaced by one <spacer length="" /> element. Here it might even create new empty pages if it overflow.

Copy link
Author

Choose a reason for hiding this comment

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

To answer your questions here, I did not actually write all that code. I simply took the existing report from the hr_payroll module and changed a few lines. I know its a lot of useless whitespaces but it does what we need.

@veloutin
Copy link
Member

👍 , see my comments for minor non-blocking things to look at.

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

7 participants