Skip to content

erp5
erp5
Commit 02663994 authored by Kevin Deldycke's avatar Kevin Deldycke
Browse files
Options

Add working duration property on pay sheets. 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11503 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent eb2b8c9b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 640 additions and 29 deletions
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_pdf_template.xml
View file @ 02663994
......@@ -137,11 +137,11 @@
\n
<pagetemplate startframe=\'content\' id=\'FirstPage\'>\n
<static>\n
<!-- ATTENTION : L\'image ne doit pas etre en format png -->\n
<!-- WARNING: the logo should be a PNG file -->\n
<fixedimage filename=\'zodb:logo.jpg\' y=\'27.275cm\' x=\'1.016cm\'/>\n
<infostring z=\'\' color=\'(0.0,0.0,0.0)\' align=\'center\' y=\'27.5160804cm\' x=\'14.208cm\' font=\'Helvetica\' size=\'20\'>FEUILLE DE SALAIRE</infostring>\n
\n
<!-- Cadre employeur -->\n
<!-- Employer Box -->\n
<tal:block tal:condition="python: employer not in (None, \'\') and employer.getPortalType() == \'Organisation\'">\n
<tal:block tal:define="employer_group python: employer.getGroup()">\n
<rectangle z=\'\' height=\'5.239cm\' width=\'7.038cm\' stroke=\'(0.4,0.4,0.4)\' y=\'21.074cm\' x=\'1.016cm\' linewidth=\'1\'/>\n
......@@ -186,12 +186,11 @@
</tal:block>\n
</tal:block>\n
\n
\n
<!-- Cadre employ\xc3\xa9 -->\n
<!-- Employee Box -->\n
<tal:block tal:condition="python: employee not in (None, \'\') and employee.getPortalType() == \'Person\'">\n
<rectangle z=\'\' height=\'5.239cm\' width=\'7.038cm\' stroke=\'(0.4,0.4,0.4)\' y=\'21.074cm\' x=\'12.065cm\' linewidth=\'1\'/>\n
<line y2=\'23.994cm\' linewidth=\'1\' z=\'\' x2=\'19.099cm\' stroke=\'(0.6,0.6,0.6)\' y1=\'23.994cm\' x1=\'12.073cm\'/>\n
<line y2=\'22.165cm\' linewidth=\'1\' z=\'\' x2=\'19.099cm\' stroke=\'(0.6,0.6,0.6)\' y1=\'22.165cm\' x1=\'12.073cm\'/>\n
<line y2=\'22.446cm\' linewidth=\'1\' z=\'\' x2=\'19.099cm\' stroke=\'(0.6,0.6,0.6)\' y1=\'22.446cm\' x1=\'12.073cm\'/>\n
<infostring z=\'\' color=\'(0.0,0.0,0.0)\' align=\'left\' y=\'25.91383216cm\' x=\'12.327cm\' font=\'Helvetica-Bold\' size=\'8\'\n
tal:content="python: employee.getTitle()"\n
tal:on-error="string:"/>\n
......@@ -216,12 +215,19 @@
<infostring z=\'\' color=\'(0.0,0.0,0.0)\' align=\'left\' y=\'22.74232864cm\' x=\'12.327cm\' font=\'Helvetica\' size=\'8\'\n
tal:content="python: \'Coefficient : %s\' % employee.getDefaultCareerSalaryCoefficient()"\n
tal:on-error="string:"/>\n
<infostring z=\'\' color=\'(0.0,0.0,0.0)\' align=\'left\' y=\'22.03799999cm\' x=\'12.327cm\' font=\'Helvetica\' size=\'8\'\n
tal:content="python: \'P\xc3\xa9riode de travail : du %s au %s\' % (start_date, here.getStopDate())"\n
tal:on-error="string:"/>\n
<infostring z=\'\' color=\'(0.0,0.0,0.0)\' align=\'left\' y=\'21.75683216cm\' x=\'12.327cm\' font=\'Helvetica\' size=\'8\'\n
tal:content="python: \'P\xc3\xa9riode : du %s au %s\' % (start_date, here.getStopDate())"\n
tal:content="python: \'Temps de travail : %s %s\' % (here.getWorkDuration(), here.getQuantityUnitTitle())"\n
tal:on-error="string:"/>\n
<infostring z=\'\' color=\'(0.0,0.0,0.0)\' align=\'left\' y=\'21.47566432cm\' x=\'12.327cm\' font=\'Helvetica\' size=\'8\'\n
tal:content="python: \'Date de paiement : %s\' % here.getPaymentConditionPaymentDate()"\n
tal:on-error="string:"/>\n
<infostring z=\'\' color=\'(0.0,0.0,0.0)\' align=\'left\' y=\'21.19449648cm\' x=\'12.327cm\' font=\'Helvetica\' size=\'8\'\n
tal:content="python: \'\'"\n
tal:on-error="string:"/>\n
\n
</tal:block>\n
<line y2=\'1.506cm\' linewidth=\'1\' z=\'\' x2=\'19.075cm\' stroke=\'(0.6,0.6,0.6)\' y1=\'1.506cm\' x1=\'1.905cm\'/>\n
<infostring z=\'\' color=\'(0.0,0.0,0.0)\' align=\'center\' y=\'1.00183216cm\' x=\'10.4855cm\' font=\'Helvetica\' size=\'8\'>Dans votre int\xc3\xa9r\xc3\xaat et pour vous aider \xc3\xa0 faire valoir vos droits, conservez ce bulletin de paie sans limitation de dur\xc3\xa9e.</infostring>\n
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml
View file @ 02663994
......@@ -110,9 +110,11 @@
<list>
<string>my_start_date</string>
<string>my_stop_date</string>
<string>my_payment_condition_payment_date</string>
<string>my_work_duration</string>
<string>my_quantity_unit</string>
<string>my_gross_salary</string>
<string>my_resource</string>
<string>my_payment_condition_payment_date</string>
<string>my_translated_simulation_state_title</string>
</list>
</value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_gross_salary.xml
View file @ 02663994
......@@ -187,7 +187,7 @@
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </value>
<value> <int>15</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_source_reference.xml
View file @ 02663994
......@@ -249,7 +249,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Section Transaction Reference</string> </value>
<value> <string>Transaction Reference</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_start_date.xml
View file @ 02663994
......@@ -283,6 +283,14 @@
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>hidden_day_is_last_day</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>hide_day</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>input_order</string> </key>
<value> <string>ymd</string> </value>
......@@ -307,7 +315,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Begin</string> </value>
<value> <string>Work Period Start</string> </value>
</item>
</dictionary>
</value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_stop_date.xml
View file @ 02663994
......@@ -283,6 +283,14 @@
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>hidden_day_is_last_day</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>hide_day</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>input_order</string> </key>
<value> <string>ymd</string> </value>
......@@ -307,7 +315,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>End</string> </value>
<value> <string>Work Period End</string> </value>
</item>
</dictionary>
</value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnualReportAsHTML.xml
View file @ 02663994
......@@ -100,10 +100,22 @@
]]></string> </value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>expand</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>PaySheetTransaction_viewAnnualReportAsHTML</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPaySheetTransactionAsPDF.xml
View file @ 02663994
......@@ -72,16 +72,11 @@
<tr stylecmd="(\'LEFTPADDING\',8)">\n
<td><tal:block content="python: (\' \' * 3) + line[\'service_title\']"/> </td>\n
<td><tal:block content="python: line[\'salary_range_title\']"/> </td>\n
<td><tal:block content="python: line[\'base\']"\n
condition="python: line[\'base\'] != None"/> </td>\n
<td><tal:block content="python: line[\'employer_rate\']"\n
condition="python: line[\'employer_rate\'] != None"/> </td>\n
<td><tal:block content="python: line[\'employer_share\']"\n
condition="python: line[\'employer_share\'] != None"/> </td>\n
<td><tal:block content="python: line[\'employee_rate\']"\n
condition="python: line[\'employee_rate\'] != None"/> </td>\n
<td><tal:block content="python: line[\'employee_share\']"\n
condition="python: line[\'employee_share\'] != None"/> </td>\n
<td><tal:block content="python: line[\'base\']" condition="python: line[\'base\'] != None"/> </td>\n
<td><tal:block content="python: line[\'employer_rate\']" condition="python: line[\'employer_rate\'] != None"/> </td>\n
<td><tal:block content="python: line[\'employer_share\']" condition="python: line[\'employer_share\'] != None"/> </td>\n
<td><tal:block content="python: line[\'employee_rate\']" condition="python: line[\'employee_rate\'] != None"/> </td>\n
<td><tal:block content="python: line[\'employee_share\']" condition="python: line[\'employee_share\'] != None"/> </td>\n
</tr>\n
<tr tal:condition="python: line[\'description\'] != None" stylecmd="(\'LEFTPADDING\',8)">\n
<td><tal:block content="python: (\' \' * 6) + line[\'description\']"/> </td>\n
......
bt5/erp5_payroll/bt/change_log
View file @ 02663994
2006-11-27 Kevin
* Make "prevoyance" payroll service accountable.
* Add working duration property on pay sheets.
2006-11-24 Kevin
* Add "prevoyance" payroll service and related organisation.
......
bt5/erp5_payroll/bt/revision
View file @ 02663994
138
\ No newline at end of file
141
\ No newline at end of file
bt5/erp5_payroll/bt/version
View file @ 02663994
0.2.13
\ No newline at end of file
0.2.14
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7