[Erp5-report] r25963 - in /erp5/trunk/bt5/erp5_payroll: ActionTemplateItem/portal_types/Pay...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 10 18:12:05 CET 2009
Author: fabien
Date: Tue Mar 10 18:12:05 2009
New Revision: 25963
URL: http://svn.erp5.org?rev=25963&view=rev
Log:
- add reference on paysheet models
- fix some casse problems
- improve AsODT files to be able to displays more lines in one page
Modified:
erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml
erp5/trunk/bt5/erp5_payroll/bt/revision
Modified: erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%2520Sheet%2520Transaction/pay_sheet_print.xml?rev=25963&r1=25962&r2=25963&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml [utf8] Tue Mar 10 18:12:05 2009
@@ -49,7 +49,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Print Pay Sheet</string> </value>
+ <value> <string>Print Payslip</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml?rev=25963&r1=25962&r2=25963&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml [utf8] Tue Mar 10 18:12:05 2009
@@ -99,6 +99,7 @@
<value>
<list>
<string>my_title</string>
+ <string>my_reference</string>
<string>my_destination_section_title</string>
<string>my_source_section_title</string>
<string>my_social_insurance_annotation_line_source_title</string>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml?rev=25963&r1=25962&r2=25963&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODT.xml [utf8] Tue Mar 10 18:12:05 2009
@@ -139,7 +139,7 @@
</style:table-cell-properties>\n
</style:style>\n
<style:style style:family=\'table-row\' style:name=\'Tableau1.3\'>\n
- <style:table-row-properties style:min-row-height=\'0.4cm\'/>\n
+ <style:table-row-properties style:min-row-height=\'0.35cm\'/>\n
</style:style>\n
<style:style style:family=\'table-cell\' style:name=\'Tableau1.A3\'>\n
<style:table-cell-properties fo:padding=\'0cm\' fo:border-right=\'0.008cm solid #000000\' fo:border-top=\'none\' fo:background-color=\'transparent\' fo:border-left=\'0.008cm solid #000000\' fo:border-bottom=\'none\' style:vertical-align=\'middle\'>\n
@@ -592,7 +592,7 @@
</table:table-row>\n
<table:table-row table:style-name=\'Tableau1.5\'>\n
<table:table-cell table:style-name=\'Tableau1.A5\'\n
- table:number-columns-spanned=\'9\' office:value-type=\'string\'>\n
+ table:number-columns-spanned=\'6\' office:value-type=\'string\'>\n
<table:table table:style-name=\'Tableau3\' table:name=\'Tableau3\'>\n
<table:table-column table:style-name=\'Tableau3.A\'/>\n
<table:table-column table:style-name=\'Tableau3.B\'/>\n
@@ -619,20 +619,20 @@
<text:p text:style-name=\'Item_20_Table_20_Title_20_Right\' tal:content="python: \'%s %s\' % (quantity_renderer(context.PaySheetTransaction_getMovementTotalPriceFromCategory(base_contribution=\'base_contribution/base_amount/net_salary\', tax_category=\'tax_category/employee_share\')), data_dict[\'currency\'])">800.000,00</text:p>\n
</table:table-cell>\n
</table:table-row>\n
- <table:table-row table:style-name=\'Tableau3.1\'>\n
- <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'/>\n
- </table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'/>\n
- </table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'/>\n
- </table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
- <text:p text:style-name=\'Table_20_Contents\'/>\n
- </table:table-cell>\n
- <table:table-cell table:style-name=\'Tableau3.A1\' office:value-type=\'string\'>\n
+ <table:table-row table:style-name=\'Tableau1.4\'>\n
+ <table:table-cell table:style-name=\'Tableau3.A4\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A4\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A4\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A4\' office:value-type=\'string\'>\n
+ <text:p text:style-name=\'Table_20_Contents\'/>\n
+ </table:table-cell>\n
+ <table:table-cell table:style-name=\'Tableau3.A4\' office:value-type=\'string\'>\n
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
</table:table-row>\n
@@ -642,9 +642,6 @@
</table:table>\n
<text:p text:style-name=\'Table_20_Contents\'/>\n
</table:table-cell>\n
- <table:covered-table-cell/>\n
- <table:covered-table-cell/>\n
- <table:covered-table-cell/>\n
<table:covered-table-cell/>\n
<table:covered-table-cell/>\n
<table:covered-table-cell/>\n
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml?rev=25963&r1=25962&r2=25963&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml [utf8] Tue Mar 10 18:12:05 2009
@@ -117,7 +117,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Print Pay Sheet</string> </value>
+ <value> <string>Print Payslip</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=25963&r1=25962&r2=25963&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Tue Mar 10 18:12:05 2009
@@ -1,1 +1,1 @@
-360
+362
More information about the Erp5-report
mailing list