Skip to content

erp5
erp5
Commit 34d50a78 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Enable coding style on erp5_payroll 

See merge request nexedi/erp5!1637
parents e83e7960 12672876
Pipeline #22046 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 516 additions and 588 deletions
    bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Model%20Ratio%20Line/view.xml
    View file @ 34d50a78
    ......@@ -71,7 +71,7 @@
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>string:${object_url}/RatioSettings_view</string> </value>
    <value> <string>string:${object_url}/PaySheetModelRatioLine_view</string> </value>
    </item>
    </dictionary>
    </pickle>
    ......
    bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml
    View file @ 34d50a78
    ......@@ -73,7 +73,7 @@
    <dictionary>
    <item>
    <key> <string>text</string> </key>
    <value> <string>string:${object_url}/PaySheet_viewODTPrintDialog</string> </value>
    <value> <string>string:${object_url}/PaySheetTransaction_viewODTPrintDialog</string> </value>
    </item>
    </dictionary>
    </pickle>
    ......
    bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModelLine.py
    View file @ 34d50a78
    ......@@ -66,7 +66,7 @@ class PaySheetModelLine(TradeModelLine):
    security.declareProtected(Permissions.ModifyPortalContent,
    'newCellContent' )
    def newCellContent(self, id, portal_type='Pay Sheet Model Cell', **kw):
    def newCellContent(self, id, portal_type='Pay Sheet Model Cell', **kw): # pylint:disable=redefined-builtin
    """Overriden to specify default portal type
    """
    return self.newContent(id=id, portal_type=portal_type, **kw)
    bt5/erp5_payroll/DocumentTemplateItem/portal_components/document.erp5.PaySheetModelLine.xml
    View file @ 34d50a78
    ......@@ -37,9 +37,7 @@
    <item>
    <key> <string>text_content_warning_message</string> </key>
    <value>
    <tuple>
    <string>W: 69, 27: Redefining built-in \'id\' (redefined-builtin)</string>
    </tuple>
    <tuple/>
    </value>
    </item>
    <item>
    ......
    bt5/erp5_payroll/ModuleTemplateItem/paysheet_model_module.xml
    View file @ 34d50a78
    ......@@ -10,9 +10,6 @@
    <role>Author</role>
    <role>Manager</role>
    </permission>
    <permission type='tuple'>
    <name>Add ERP5TioSafe Tools</name>
    </permission>
    <permission type='tuple'>
    <name>Add portal content</name>
    <role>Assignor</role>
    ......
    bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Line.xml
    View file @ 34d50a78
    ......@@ -64,7 +64,7 @@
    </item>
    <item>
    <key> <string>init_script</string> </key>
    <value> <string>PaySheetModeLine_init</string> </value>
    <value> <string>PaySheetModelLine_init</string> </value>
    </item>
    <item>
    <key> <string>permission</string> </key>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_getNetSalaryReportSectionLineList.py
    View file @ 34d50a78
    ......@@ -3,7 +3,6 @@ from DateTime import DateTime
    request = context.REQUEST
    portal = context.getPortalObject()
    translateString = portal.Base_translateString
    net_salary_base_amount_uid = \
    portal.portal_categories.base_amount.payroll.report.salary.net.getUid()
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReport/your_section_category.xml
    View file @ 34d50a78
    ......@@ -10,10 +10,10 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>required</string>
    <string>editable</string>
    <string>default</string>
    <string>editable</string>
    <string>items</string>
    <string>required</string>
    </list>
    </value>
    </item>
    ......@@ -86,6 +86,10 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <int>0</int> </value>
    ......@@ -98,6 +102,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <int>0</int> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReport/your_simulation_state.xml
    View file @ 34d50a78
    ......@@ -10,10 +10,10 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>required</string>
    <string>editable</string>
    <string>default</string>
    <string>editable</string>
    <string>items</string>
    <string>required</string>
    </list>
    </value>
    </item>
    ......@@ -86,6 +86,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <int>0</int> </value>
    ......@@ -98,6 +104,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <int>0</int> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_at_date.xml
    View file @ 34d50a78
    ......@@ -10,9 +10,9 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    <string>required</string>
    <string>title</string>
    <string>default</string>
    </list>
    </value>
    </item>
    ......@@ -79,6 +79,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_date</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_from_date.xml
    View file @ 34d50a78
    ......@@ -10,8 +10,8 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>default</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -78,6 +78,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_date</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportDialog/your_simulation_state.xml
    View file @ 34d50a78
    ......@@ -10,12 +10,12 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    <string>description</string>
    <string>title</string>
    <string>items</string>
    <string>required</string>
    <string>size</string>
    <string>default</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -94,6 +94,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string>Only consider transactions in those states.</string> </value>
    ......@@ -106,6 +112,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <int>1</int> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_section_category.xml
    View file @ 34d50a78
    ......@@ -10,10 +10,10 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>required</string>
    <string>editable</string>
    <string>default</string>
    <string>editable</string>
    <string>items</string>
    <string>required</string>
    </list>
    </value>
    </item>
    ......@@ -86,6 +86,10 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <int>0</int> </value>
    ......@@ -98,6 +102,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <int>0</int> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_simulation_state.xml
    View file @ 34d50a78
    ......@@ -10,10 +10,10 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>required</string>
    <string>editable</string>
    <string>default</string>
    <string>editable</string>
    <string>items</string>
    <string>required</string>
    </list>
    </value>
    </item>
    ......@@ -86,6 +86,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <int>0</int> </value>
    ......@@ -98,6 +104,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <int>0</int> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_at_date.xml
    View file @ 34d50a78
    ......@@ -10,9 +10,9 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    <string>required</string>
    <string>title</string>
    <string>default</string>
    </list>
    </value>
    </item>
    ......@@ -79,6 +79,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_date</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_from_date.xml
    View file @ 34d50a78
    ......@@ -10,8 +10,8 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>default</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -78,6 +78,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_date</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_simulation_state.xml
    View file @ 34d50a78
    ......@@ -10,12 +10,12 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>default</string>
    <string>description</string>
    <string>title</string>
    <string>items</string>
    <string>required</string>
    <string>size</string>
    <string>default</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -94,6 +94,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string>Only consider transactions in those states.</string> </value>
    ......@@ -106,6 +112,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <int>1</int> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListAsODTStyles.xml
    View file @ 34d50a78
    ......@@ -62,7 +62,7 @@ AAA=</string> </value>
    </item>
    <item>
    <key> <string>ooo_stylesheet</string> </key>
    <value> <string>PaySheet_getODTStyleSheet</string> </value>
    <value> <string>PaySheetTransaction_getODTStyleSheet</string> </value>
    </item>
    <item>
    <key> <string>ooo_xml_file_id</string> </key>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListPrintDialog/your_format.xml
    View file @ 34d50a78
    ......@@ -10,10 +10,10 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>default</string>
    <string>description</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -86,6 +86,10 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string>Printing format</string> </value>
    ......@@ -98,6 +102,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_quantity_unit.xml
    View file @ 34d50a78
    ......@@ -11,8 +11,8 @@
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -91,6 +91,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_price.xml
    View file @ 34d50a78
    ......@@ -10,11 +10,11 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>css_class</string>
    <string>input_style</string>
    <string>description</string>
    <string>display_width</string>
    <string>input_style</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -89,6 +89,10 @@
    <key> <string>description</string> </key>
    <value> <string>The price paid for the one unit of quantity</string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_float_field</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_quantity_unit.xml
    View file @ 34d50a78
    ......@@ -11,8 +11,8 @@
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -91,6 +91,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetCell_view/my_price.xml
    View file @ 34d50a78
    ......@@ -10,11 +10,11 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>css_class</string>
    <string>input_style</string>
    <string>description</string>
    <string>display_width</string>
    <string>input_style</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -89,6 +89,10 @@
    <key> <string>description</string> </key>
    <value> <string>The Ratio applied to the Base.</string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_float_field</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_asCellRange.py
    View file @ 34d50a78
    ......@@ -14,20 +14,20 @@ if resource is not None:
    for v in base_application_variation_dict.values():
    if matrixbox == 1:
    cell_range.append(map(lambda x: (x[1],x[0]), v))
    cell_range.append([(y, x) for x, y in v])
    else:
    cell_range.append(v)
    else:
    if matrixbox == 1:
    # XXX matrixbox is right_display (not as listfield) => invert display and value in item
    if context.getVariationCategoryList(base_category_list=(base_category,)):
    cell_range.append(map(lambda x: (x[1],x[0]),
    cell_range.append([(y, x) for x, y in
    context.getVariationCategoryItemList(base_category_list=\
    (base_category,) ) ) )
    (base_category,) )])
    else:
    cell_range.append(context.getVariationCategoryList(base_category_list=\
    (base_category,)))
    cell_range = filter(lambda x: x != [], cell_range )
    cell_range = [x for x in cell_range if x]
    return cell_range
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_variation_category_list.xml
    View file @ 34d50a78
    ......@@ -11,8 +11,8 @@
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -91,6 +91,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_price.xml
    View file @ 34d50a78
    ......@@ -10,12 +10,12 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>css_class</string>
    <string>input_style</string>
    <string>default</string>
    <string>description</string>
    <string>display_width</string>
    <string>input_style</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -92,10 +92,18 @@
    <key> <string>css_class</string> </key>
    <value> <string>figure</string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string>The Ratio applied to the Base.</string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_float_field</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_quantity.xml
    View file @ 34d50a78
    ......@@ -10,13 +10,13 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>css_class</string>
    <string>input_style</string>
    <string>default</string>
    <string>description</string>
    <string>display_width</string>
    <string>input_style</string>
    <string>precision</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -99,10 +99,18 @@
    <key> <string>css_class</string> </key>
    <value> <string>figure</string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string>The Base used to calculate the tax.</string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_float_field</string> </value>
    ......@@ -115,6 +123,10 @@
    <key> <string>input_style</string> </key>
    <value> <string>-1 234.5</string> </value>
    </item>
    <item>
    <key> <string>precision</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_total_price.xml
    View file @ 34d50a78
    ......@@ -10,13 +10,13 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>css_class</string>
    <string>editable</string>
    <string>input_style</string>
    <string>default</string>
    <string>display_width</string>
    <string>editable</string>
    <string>input_style</string>
    <string>precision</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -99,6 +99,14 @@
    <key> <string>css_class</string> </key>
    <value> <string>figure</string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <int>0</int> </value>
    ......@@ -115,6 +123,10 @@
    <key> <string>input_style</string> </key>
    <value> <string>-1 234.5</string> </value>
    </item>
    <item>
    <key> <string>precision</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_variation_category_list.xml
    View file @ 34d50a78
    ......@@ -10,9 +10,9 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>hidden</string>
    <string>default</string>
    <string>hidden</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -79,6 +79,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_lines_field</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_asCellRange.py
    View file @ 34d50a78
    ......@@ -50,7 +50,7 @@ if matrixbox :
    % script.id)
    cell_range.append(category_cell_range)
    cell_range = filter(lambda x: x != [], cell_range)
    cell_range = [x for x in cell_range if x]
    while len(cell_range) < 3:
    cell_range.append([])
    return cell_range
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModeLine_init.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_init.xml
    View file @ 34d50a78
    ......@@ -60,7 +60,7 @@
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>PaySheetModeLine_init</string> </value>
    <value> <string>PaySheetModelLine_init</string> </value>
    </item>
    </dictionary>
    </pickle>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_predicate_category_list.xml
    View file @ 34d50a78
    ......@@ -10,9 +10,9 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>hidden</string>
    <string>default</string>
    <string>hidden</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -79,6 +79,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_lines_field</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_price.xml
    View file @ 34d50a78
    ......@@ -10,12 +10,12 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>css_class</string>
    <string>input_style</string>
    <string>default</string>
    <string>description</string>
    <string>display_width</string>
    <string>input_style</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -92,10 +92,18 @@
    <key> <string>css_class</string> </key>
    <value> <string>figure</string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string>The Ratio applied to the Base.</string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_float_field</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox_variation_category_list.xml
    View file @ 34d50a78
    ......@@ -10,9 +10,9 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>hidden</string>
    <string>default</string>
    <string>hidden</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -79,6 +79,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_lines_field</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelModule_viewPaySheetModelList/listbox_specialise_title_list.xml
    View file @ 34d50a78
    ......@@ -10,9 +10,9 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>display_width</string>
    <string>default</string>
    <string>display_width</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -79,6 +79,10 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view.xml
    View file @ 34d50a78
    ......@@ -113,7 +113,7 @@
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>RatioSettings_view</string> </value>
    <value> <string>PaySheetModelRatioLine_view</string> </value>
    </item>
    <item>
    <key> <string>method</string> </key>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_payment_condition_payment_date.xml
    View file @ 34d50a78
    ......@@ -11,8 +11,8 @@
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>enabled</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -83,6 +83,10 @@
    <key> <string>description</string> </key>
    <value> <string>The absolute date at which payment is expected to be made.</string> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_date</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_price_currency.xml
    View file @ 34d50a78
    ......@@ -10,8 +10,8 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -86,6 +86,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_variation_settings_category_list.xml
    View file @ 34d50a78
    ......@@ -10,8 +10,8 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -86,6 +86,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_work_time_annotation_line_quantity_unit.xml
    View file @ 34d50a78
    ......@@ -11,8 +11,8 @@
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -91,6 +91,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox.xml
    View file @ 34d50a78
    ......@@ -11,11 +11,11 @@
    <value>
    <list>
    <string>cell_portal_type</string>
    <string>columns</string>
    <string>editable_attributes</string>
    <string>lines</string>
    <string>title</string>
    <string>update_cell_range</string>
    <string>lines</string>
    <string>columns</string>
    </list>
    </value>
    </item>
    ......@@ -92,6 +92,12 @@
    <key> <string>cell_portal_type</string> </key>
    <value> <string>Pay Sheet Model Slice</string> </value>
    </item>
    <item>
    <key> <string>columns</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>editable_attributes</string> </key>
    <value>
    ......@@ -115,6 +121,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>lines</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_predicate_category_list.xml
    View file @ 34d50a78
    ......@@ -10,9 +10,9 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>hidden</string>
    <string>default</string>
    <string>hidden</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -79,6 +79,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_lines_field</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_quantity_range_max.xml
    View file @ 34d50a78
    ......@@ -10,12 +10,12 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>css_class</string>
    <string>input_style</string>
    <string>default</string>
    <string>display_width</string>
    <string>input_style</string>
    <string>precision</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -98,6 +98,14 @@
    <key> <string>css_class</string> </key>
    <value> <string>figure</string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_float_field</string> </value>
    ......@@ -110,6 +118,10 @@
    <key> <string>input_style</string> </key>
    <value> <string>-1 234.5</string> </value>
    </item>
    <item>
    <key> <string>precision</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_quantity_range_min.xml
    View file @ 34d50a78
    ......@@ -10,12 +10,12 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>css_class</string>
    <string>input_style</string>
    <string>default</string>
    <string>display_width</string>
    <string>input_style</string>
    <string>precision</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -98,6 +98,14 @@
    <key> <string>css_class</string> </key>
    <value> <string>figure</string> </value>
    </item>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_float_field</string> </value>
    ......@@ -110,6 +118,10 @@
    <key> <string>input_style</string> </key>
    <value> <string>-1 234.5</string> </value>
    </item>
    <item>
    <key> <string>precision</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_viewSliceSettings/matrixbox_variation_category_list.xml
    View file @ 34d50a78
    ......@@ -10,9 +10,9 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>hidden</string>
    <string>default</string>
    <string>hidden</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -79,6 +79,12 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_lines_field</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_checkParameters.py
    View file @ 34d50a78
    ......@@ -30,7 +30,6 @@ if not employer:
    if not quantity_unit:
    return redirect('The work duration unit must be defined')
    employer_obj = paysheet.getDestinationSectionValue()
    employee_obj = paysheet.getSourceSectionValue()
    if not employee_obj.getCareerGrade():
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_copySubObject.xml
    View file @ 34d50a78
    ......@@ -50,7 +50,7 @@
    </item>
    <item>
    <key> <string>_params</string> </key>
    <value> <string>portal_type_list=[], property_list=()</string> </value>
    <value> <string>portal_type_list=(), property_list=()</string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createAllPaySheetLineList.py
    View file @ 34d50a78
    ......@@ -2,7 +2,6 @@
    this script is the conductor. All other scripts that permit to create a
    paysheet are called here
    '''
    import pprint
    # Delete all objects in the paysheet
    id_list = []
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_createAllPaySheetLineList.xml
    View file @ 34d50a78
    ......@@ -50,7 +50,7 @@
    </item>
    <item>
    <key> <string>_params</string> </key>
    <value> <string>listbox=[], **kw</string> </value>
    <value> <string>listbox=(), **kw</string> </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.py
    View file @ 34d50a78
    ......@@ -7,7 +7,6 @@
    """
    from Products.ERP5Type.Utils import cartesianProduct
    import pprint
    from Products.ERP5Type.Message import translateString
    def sortByIntIndex(a, b):
    ......@@ -24,7 +23,7 @@ model_line_list = [x.getObject() for x in model_line_list \
    line_list = []
    object_dict_list = []
    id = 0
    id_ = 0
    for model_line in model_line_list:
    base_category_list = model_line.getVariationBaseCategoryList()
    ......@@ -33,24 +32,19 @@ for model_line in model_line_list:
    base_application_list = ', '.join(translated_base_application_list)
    list_of_list = []
    for base_category in base_category_list:
    list = model_line.getVariationCategoryList(base_category_list=\
    base_category)
    list_of_list.append(list)
    list_of_list.append(model_line.getVariationCategoryList(base_category_list=\
    base_category))
    cartesian_product = cartesianProduct(list_of_list)
    previous_share = None
    object_dict = {}
    if cartesian_product == [[]]:
    share_dict = {}
    if 0:
    share_dict[cell.getContributionShare()+'_price'] = 0
    share_dict[cell.getContributionShare()+'_quantity'] = 0
    continue
    for tuple in cartesian_product:
    for tuple_ in cartesian_product:
    share_dict = {}
    cell = model_line.getCell(*tuple)
    cell = model_line.getCell(*tuple_)
    if cell is None:
    continue
    ......@@ -71,7 +65,7 @@ for model_line in model_line_list:
    share_dict[cell.getContributionShare()+'_quantity'] = quantity
    tuple_dict = {}
    for item in tuple:
    for item in tuple_:
    # the dict key is the base category and value is the category path
    tuple_dict[item.split('/')[0]]=context.portal_categories.restrictedTraverse(item).getTitle()
    tuple_dict[item.split('/')[0]+'_relative_url']=item
    ......@@ -92,8 +86,8 @@ for model_line in model_line_list:
    if tuple_dict.has_key('salary_range'):
    salary_range_title = tuple_dict['salary_range']
    salary_range_relative_url = tuple_dict['salary_range_relative_url']
    new_uid = "new_%s" % id
    id += 1
    new_uid = "new_%s" % id_
    id_ += 1
    object_dict[salary_range]={
    'uid':new_uid,
    'salary_range_title':salary_range_title,
    ......@@ -139,14 +133,14 @@ def sortByIntIndexDescending(x, y):
    sortByDefaultSortMethod = sortByIntIndexAscending
    if kw.has_key('sort_on'):
    list = kw['sort_on']
    if list[0][0] == 'title' and list[0][1]=='ascending':
    sort_on = kw['sort_on']
    if sort_on[0][0] == 'title' and sort_on[0][1]=='ascending':
    line_list.sort(sortByTitleAscending)
    elif list[0][0] == 'title' and list[0][1]=='descending':
    elif sort_on[0][0] == 'title' and sort_on[0][1]=='descending':
    line_list.sort(sortByTitleDescending)
    elif list[0][0] == 'int_index' and list[0][1]=='ascending':
    elif sort_on[0][0] == 'int_index' and sort_on[0][1]=='ascending':
    line_list.sort(sortByIntIndexAscending)
    elif list[0][0] == 'int_index' and list[0][1]=='descending':
    elif sort_on[0][0] == 'int_index' and sort_on[0][1]=='descending':
    line_list.sort(sortByIntIndexDescending)
    else:
    line_list.sort(sortByDefaultSortMethod)
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.py
    View file @ 34d50a78
    ......@@ -5,8 +5,8 @@
    line_list = context.PaySheetTransaction_getMovementList(sort_on=[('int_index',
    'ascending')])
    def addProperties(line, line_dict, property_list):
    for property in property_list:
    line_dict[property] = getattr(line, property, None)
    for prop in property_list:
    line_dict[prop] = getattr(line, prop, None)
    return line_dict
    line_dict_list = []
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.py
    View file @ 34d50a78
    ......@@ -7,10 +7,9 @@
    from Products.ERP5Type.Utils import cartesianProduct
    import pprint
    from Products.ERP5Type.Message import translateString
    portal = context.getPortalObject();
    portal = context.getPortalObject()
    paysheet_line_list = context.contentValues(portal_type=('Pay Sheet Line', 'Pay Sheet Model Line'))
    if context.getPriceCurrencyValue() is not None:
    precision = context.getPriceCurrencyValue().getQuantityPrecision()
    ......@@ -35,14 +34,11 @@ for paysheet_line in paysheet_line_list:
    list_of_list = []
    for base_category in base_category_list:
    list = paysheet_line.getVariationCategoryList(base_category_list=\
    base_category)
    list_of_list.append(list)
    list_of_list.append(
    paysheet_line.getVariationCategoryList(base_category_list=\
    base_category))
    cartesian_product = cartesianProduct(list_of_list)
    previous_share = None
    indice = 0
    if cartesian_product == [[]] or cartesian_product == []:
    params = {
    'base':paysheet_line.getTotalPrice(),
    ......@@ -56,7 +52,6 @@ for paysheet_line in paysheet_line_list:
    object_dict = {}
    for product in cartesian_product:
    indice += 1
    share_dict = {}
    cell = paysheet_line.getCell(base_id='movement', *product)
    if cell is None:
    ......@@ -80,14 +75,14 @@ for paysheet_line in paysheet_line_list:
    # we want to display as lines as a paysheet line as slices
    # this is easier to read
    slice = cell.getSalaryRange()
    if slice is None:
    slice = 'no_slice'
    if not object_dict.has_key(slice):
    salary_range_slice = cell.getSalaryRange()
    if salary_range_slice is None:
    salary_range_slice = 'no_slice'
    if not object_dict.has_key(salary_range_slice):
    slice_title = None
    if tuple_dict.has_key('salary_range'):
    slice_title=tuple_dict['salary_range']
    object_dict[slice]={
    object_dict[salary_range_slice]={
    'slice':slice_title,
    'base_name':base_name,
    'base':base,
    ......@@ -96,9 +91,9 @@ for paysheet_line in paysheet_line_list:
    'service': service is not None and\
    service.getId() or '',
    'causality': causality,}
    object_dict[slice].update(share_dict)
    object_dict[salary_range_slice].update(share_dict)
    else:
    object_dict[slice].update(**share_dict)
    object_dict[salary_range_slice].update(**share_dict)
    if not object_dict:
    # when the variation categories are set, but no cells.
    ......@@ -120,8 +115,6 @@ for paysheet_line in paysheet_line_list:
    line_list.append(paysheet_line.asContext(**params))
    continue
    # print pprint.pformat(object_dict)
    for object_key in paysheet_line.getSalaryRangeList():
    line_list.append(paysheet_line.asContext(**object_dict[object_key]))
    if object_dict.has_key('no_slice'):
    ......@@ -145,14 +138,14 @@ def sortByIntIndexDescending(x, y):
    sortByDefaultSortMethod = sortByIntIndexAscending
    if kw.has_key('sort_on'):
    list = kw['sort_on']
    if list[0][0] == 'title' and list[0][1]=='ascending':
    sort_on = kw['sort_on']
    if sort_on[0][0] == 'title' and sort_on[0][1]=='ascending':
    line_list.sort(sortByTitleAscending)
    elif list[0][0] == 'title' and list[0][1]=='descending':
    elif sort_on[0][0] == 'title' and sort_on[0][1]=='descending':
    line_list.sort(sortByTitleDescending)
    elif list[0][0] == 'int_index' and list[0][1]=='ascending':
    elif sort_on[0][0] == 'int_index' and sort_on[0][1]=='ascending':
    line_list.sort(sortByIntIndexAscending)
    elif list[0][0] == 'int_index' and list[0][1]=='descending':
    elif sort_on[0][0] == 'int_index' and sort_on[0][1]=='descending':
    line_list.sort(sortByIntIndexDescending)
    else:
    line_list.sort(sortByDefaultSortMethod)
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTDataDict.py
    View file @ 34d50a78
    translateString = context.Base_translateString
    specialise_value = context.getSpecialiseValue()
    def getFieldAsString(field):
    ......@@ -12,14 +11,6 @@ def getFieldAsLineList(field):
    text_list = text.split('\n')
    return [x for x in text_list if x]
    def getProductAndLineDesc(prod_desc, line_desc):
    line_list = []
    if line_desc:
    line_list.extend(getFieldAsLineList(line_desc))
    elif prod_desc:
    line_list.extend(getFieldAsLineList(prod_desc))
    return line_list
    def getOneLineAddress(text, region):
    text_list = [getFieldAsString(text)]
    if region:
    ......@@ -117,7 +108,6 @@ def getSocialOrganisationValue():
    line_list = []
    total_price = 0.0
    total_vat = 0.0
    def unicodeDict(d):
    for k, v in d.items():
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_getODTStyleSheet.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTStyleSheet.xml
    View file @ 34d50a78
    ......@@ -8,7 +8,7 @@
    <dictionary>
    <item>
    <key> <string>__name__</string> </key>
    <value> <string>PaySheet_getODTStyleSheet</string> </value>
    <value> <string>PaySheetTransaction_getODTStyleSheet</string> </value>
    </item>
    <item>
    <key> <string>content_type</string> </key>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateBaseContributionTotalPrice.py
    View file @ 34d50a78
    ......@@ -8,7 +8,7 @@
    # are not in stock table due to the lack of source/destination definition
    if paysheet is None:
    paysheet = context
    paysheet = context
    # test the list parameters
    if base_contribution_list is None:
    ......@@ -17,7 +17,7 @@ elif not (same_type(base_contribution_list, []) or
    same_type(base_contribution_list, ())):
    base_contribution_list = [base_contribution_list]
    portal = context.getPortalObject();
    portal = context.getPortalObject()
    portal_simulation = portal.portal_simulation
    base_amount = portal.portal_categories.base_amount
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_printAsODT.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_printAsODT.xml
    View file @ 34d50a78
    ......@@ -54,7 +54,7 @@
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>PaySheet_printAsODT</string> </value>
    <value> <string>PaySheetTransaction_printAsODT</string> </value>
    </item>
    </dictionary>
    </pickle>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_base.xml
    View file @ 34d50a78
    ......@@ -10,12 +10,12 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>css_class</string>
    <string>display_width</string>
    <string>editable</string>
    <string>input_style</string>
    <string>display_width</string>
    <string>precision</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -92,6 +92,10 @@
    <key> <string>css_class</string> </key>
    <value> <string>figure</string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    </item>
    <item>
    <key> <string>editable</string> </key>
    <value> <int>0</int> </value>
    ......@@ -108,6 +112,10 @@
    <key> <string>input_style</string> </key>
    <value> <string>-1 234.5</string> </value>
    </item>
    <item>
    <key> <string>precision</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_payment_condition_payment_date.xml
    View file @ 34d50a78
    ......@@ -11,8 +11,8 @@
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>enabled</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -83,6 +83,10 @@
    <key> <string>description</string> </key>
    <value> <string>The absolute date at which payment is expected to be made.</string> </value>
    </item>
    <item>
    <key> <string>enabled</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_date</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_price_currency.xml
    View file @ 34d50a78
    ......@@ -10,8 +10,8 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -86,6 +86,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_work_time_annotation_line_quantity_unit.xml
    View file @ 34d50a78
    ......@@ -11,8 +11,8 @@
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -91,6 +91,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml
    View file @ 34d50a78
    ......@@ -10,15 +10,15 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>stat_columns</string>
    <string>editable_columns</string>
    <string>stat_method</string>
    <string>title</string>
    <string>selection_name</string>
    <string>anchor</string>
    <string>columns</string>
    <string>editable_columns</string>
    <string>list_method</string>
    <string>anchor</string>
    <string>portal_types</string>
    <string>selection_name</string>
    <string>stat_columns</string>
    <string>stat_method</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -155,6 +155,12 @@
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    <item>
    <key> <string>portal_types</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>selection_name</string> </key>
    <value> <string>pay_sheet_transaction_line_list_selection</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination.xml
    View file @ 34d50a78
    ......@@ -10,8 +10,8 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -86,6 +86,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination_credit.xml
    View file @ 34d50a78
    ......@@ -10,11 +10,11 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>css_class</string>
    <string>input_style</string>
    <string>display_width</string>
    <string>input_style</string>
    <string>precision</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -91,6 +91,10 @@
    <key> <string>css_class</string> </key>
    <value> <string>figure</string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_float_field</string> </value>
    ......@@ -103,6 +107,10 @@
    <key> <string>input_style</string> </key>
    <value> <string>-1 234.5</string> </value>
    </item>
    <item>
    <key> <string>precision</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox_destination_debit.xml
    View file @ 34d50a78
    ......@@ -10,11 +10,11 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>css_class</string>
    <string>input_style</string>
    <string>display_width</string>
    <string>input_style</string>
    <string>precision</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -91,6 +91,10 @@
    <key> <string>css_class</string> </key>
    <value> <string>figure</string> </value>
    </item>
    <item>
    <key> <string>display_width</string> </key>
    <value> <int>20</int> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_float_field</string> </value>
    ......@@ -103,6 +107,10 @@
    <key> <string>input_style</string> </key>
    <value> <string>-1 234.5</string> </value>
    </item>
    <item>
    <key> <string>precision</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_destination_section.xml
    View file @ 34d50a78
    ......@@ -10,8 +10,8 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -86,6 +86,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_resource.xml
    View file @ 34d50a78
    ......@@ -11,8 +11,8 @@
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -91,6 +91,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox_quantity_unit.xml
    View file @ 34d50a78
    ......@@ -11,9 +11,9 @@
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>editable</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -96,6 +96,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_overtime_annotation_line_quantity_unit.xml
    View file @ 34d50a78
    ......@@ -11,8 +11,8 @@
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -91,6 +91,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_work_time_annotation_line_quantity_unit.xml
    View file @ 34d50a78
    ......@@ -11,8 +11,8 @@
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -91,6 +91,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml
    View file @ 34d50a78
    ......@@ -62,7 +62,7 @@ AAA=</string> </value>
    </item>
    <item>
    <key> <string>ooo_stylesheet</string> </key>
    <value> <string>PaySheet_getODTStyleSheet</string> </value>
    <value> <string>PaySheetTransaction_getODTStyleSheet</string> </value>
    </item>
    <item>
    <key> <string>ooo_xml_file_id</string> </key>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewFieldLibrary/my_price_currency.xml
    View file @ 34d50a78
    ......@@ -10,8 +10,8 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -86,6 +86,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog.xml
    View file @ 34d50a78
    ......@@ -35,7 +35,7 @@
    </item>
    <item>
    <key> <string>action</string> </key>
    <value> <string>PaySheet_printAsODT</string> </value>
    <value> <string>PaySheetTransaction_printAsODT</string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    ......@@ -90,7 +90,7 @@
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>PaySheet_viewODTPrintDialog</string> </value>
    <value> <string>PaySheetTransaction_viewODTPrintDialog</string> </value>
    </item>
    <item>
    <key> <string>method</string> </key>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_format.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_format.xml
    View file @ 34d50a78
    ......@@ -10,10 +10,10 @@
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>description</string>
    <string>title</string>
    <string>default</string>
    <string>description</string>
    <string>items</string>
    <string>title</string>
    </list>
    </value>
    </item>
    ......@@ -86,6 +86,10 @@
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>default</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string>Printing format</string> </value>
    ......@@ -98,6 +102,12 @@
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewPayrollFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>items</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view.xml
    View file @ 34d50a78
    ......@@ -82,7 +82,7 @@
    <key> <string>right</string> </key>
    <value>
    <list>
    <string>my_validation_state_title</string>
    <string>my_translated_validation_state_title</string>
    </list>
    </value>
    </item>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view/my_validation_state_title.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollDisenrollmentRecord_view/my_translated_validation_state_title.xml
    View file @ 34d50a78
    ......@@ -8,7 +8,7 @@
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>my_validation_state_title</string> </value>
    <value> <string>my_translated_validation_state_title</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view.xml
    View file @ 34d50a78
    ......@@ -82,7 +82,7 @@
    <key> <string>right</string> </key>
    <value>
    <list>
    <string>my_validation_state_title</string>
    <string>my_translated_validation_state_title</string>
    </list>
    </value>
    </item>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view/my_validation_state_title.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollEnrollmentRecord_view/my_translated_validation_state_title.xml
    View file @ 34d50a78
    ......@@ -8,7 +8,7 @@
    <dictionary>
    <item>
    <key> <string>id</string> </key>
    <value> <string>my_validation_state_title</string> </value>
    <value> <string>my_translated_validation_state_title</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.py
    View file @ 34d50a78
    ......@@ -4,10 +4,10 @@
    portal = context.getObject()
    organisation_module = portal.getDefaultModuleValue("Organisation")
    def getObjectOrRaise(module, id):
    obj = getattr(module, id, None)
    def getObjectOrRaise(module, object_id):
    obj = getattr(module, object_id, None)
    if obj is None:
    raise AttributeError("%s doesn't have sub-object with id %s" % (module, id))
    raise AttributeError("%s doesn't have sub-object with id %s" % (module, object_id))
    else:
    return obj
    ......
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary.xml deleted 100644 → 0
    View file @ e83e7960
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ERP5 Form" module="erp5.portal_type"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_bind_names</string> </key>
    <value>
    <object>
    <klass>
    <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
    </klass>
    <tuple/>
    <state>
    <dictionary>
    <item>
    <key> <string>_asgns</string> </key>
    <value>
    <dictionary/>
    </value>
    </item>
    </dictionary>
    </state>
    </object>
    </value>
    </item>
    <item>
    <key> <string>_objects</string> </key>
    <value>
    <tuple/>
    </value>
    </item>
    <item>
    <key> <string>action</string> </key>
    <value> <string>Base_edit</string> </value>
    </item>
    <item>
    <key> <string>description</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>encoding</string> </key>
    <value> <string>UTF-8</string> </value>
    </item>
    <item>
    <key> <string>enctype</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>group_list</string> </key>
    <value>
    <list>
    <string>left</string>
    <string>right</string>
    <string>center</string>
    <string>bottom</string>
    <string>hidden</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>groups</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>bottom</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>center</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>hidden</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>left</string> </key>
    <value>
    <list>
    <string>my_reference</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>right</string> </key>
    <value>
    <list>
    <string>my_quantity</string>
    </list>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>RatioSettings_viewFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>method</string> </key>
    <value> <string>POST</string> </value>
    </item>
    <item>
    <key> <string>name</string> </key>
    <value> <string>PaySheetTransaction_viewAnnotationLine</string> </value>
    </item>
    <item>
    <key> <string>pt</string> </key>
    <value> <string>form_view</string> </value>
    </item>
    <item>
    <key> <string>row_length</string> </key>
    <value> <int>4</int> </value>
    </item>
    <item>
    <key> <string>stored_encoding</string> </key>
    <value> <string>UTF-8</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Ratio Settings</string> </value>
    </item>
    <item>
    <key> <string>unicode_mode</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>update_action</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary/my_quantity.xml deleted 100644 → 0
    View file @ e83e7960
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>description</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>my_quantity</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>external_validator_failed</string> </key>
    <value> <string>The input failed the external validator.</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>overrides</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>description</string> </key>
    <value> <string>The Value for this ratio setting.</string> </value>
    </item>
    <item>
    <key> <string>editable_permission</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>editable_role</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_quantity</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>not_viewable</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>read_only</string> </key>
    <value> <int>0</int> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Ratio Setting Value</string> </value>
    </item>
    <item>
    <key> <string>viewable_permission</string> </key>
    <value>
    <list/>
    </value>
    </item>
    <item>
    <key> <string>viewable_role</string> </key>
    <value>
    <list/>
    </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_viewFieldLibrary/my_reference.xml deleted 100644 → 0
    View file @ e83e7960
    <?xml version="1.0"?>
    <ZopeData>
    <record id="1" aka="AAAAAAAAAAE=">
    <pickle>
    <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>delegated_list</string> </key>
    <value>
    <list>
    <string>title</string>
    <string>description</string>
    <string>required</string>
    </list>
    </value>
    </item>
    <item>
    <key> <string>id</string> </key>
    <value> <string>my_reference</string> </value>
    </item>
    <item>
    <key> <string>message_values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>external_validator_failed</string> </key>
    <value> <string>The input failed the external validator.</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>overrides</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>tales</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string></string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    <item>
    <key> <string>values</string> </key>
    <value>
    <dictionary>
    <item>
    <key> <string>description</string> </key>
    <value> <string>The Reference for this Ratio. A ratio can be overriden by another one from another model, if the use the same reference.</string> </value>
    </item>
    <item>
    <key> <string>field_id</string> </key>
    <value> <string>my_string_field</string> </value>
    </item>
    <item>
    <key> <string>form_id</string> </key>
    <value> <string>Base_viewFieldLibrary</string> </value>
    </item>
    <item>
    <key> <string>required</string> </key>
    <value> <int>1</int> </value>
    </item>
    <item>
    <key> <string>target</string> </key>
    <value> <string>Click to edit the target</string> </value>
    </item>
    <item>
    <key> <string>title</string> </key>
    <value> <string>Reference</string> </value>
    </item>
    </dictionary>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    </ZopeData>
    bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.py
    View file @ 34d50a78
    ......@@ -28,7 +28,6 @@
    ##############################################################################
    from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5ReportTestCase
    from erp5.component.test.testTradeModelLine import TestTradeModelLineMixin
    from AccessControl.SecurityManagement import newSecurityManager
    from Products.ERP5Type.tests.Sequence import SequenceList
    from Products.ERP5Type.tests.utils import reindex
    from DateTime import DateTime
    ......@@ -148,13 +147,6 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
    self.portal.business_process_module.manage_delObjects(list([x for x in self.portal.business_process_module.objectIds() if x != "erp5_default_business_process"]))
    def login(self):
    uf = self.getPortal().acl_users
    uf._doAddUser('admin', '', ['Manager', 'Assignee', 'Assignor',
    'Associate', 'Auditor', 'Author'], [])
    user = uf.getUserById('admin').__of__(uf)
    newSecurityManager(None, user)
    @reindex
    def createCategories(self):
    """Create the categories for our test. """
    ......@@ -328,10 +320,12 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
    )
    sequence.edit(model = model)
    def addSlice(self, model, slice, min_value, max_value, base_id='cell'):
    def addSlice(self, model, paysheet_model_slice, min_value, max_value, base_id='cell'):
    '''add a new slice in the model'''
    slice_value = model.newCell(slice, portal_type='Pay Sheet Model Slice',
    base_id=base_id)
    slice_value = model.newCell(
    paysheet_model_slice,
    portal_type='Pay Sheet Model Slice',
    base_id=base_id)
    slice_value.setQuantityRangeMax(max_value)
    slice_value.setQuantityRangeMin(min_value)
    return slice_value
    ......@@ -588,7 +582,7 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
    expected_movement_to_delete_count, expected_movement_to_add_count):
    movement_dict = paysheet.updateAggregatedAmountList()
    movement_to_delete = movement_dict['movement_to_delete_list']
    movement_to_add = movement_dict['movement_to_add_list']
    # movement_to_add = movement_dict['movement_to_add_list']
    self.assertEqual(len(movement_to_delete),
    expected_movement_to_delete_count)
    # self.assertEqual(len(movement_to_add), expected_movement_to_add_count)
    ......@@ -1540,7 +1534,7 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
    portal_type_list = ['Pay Sheet Model Line',]
    # if no reference, we don't care about dates
    sub_object_list = paysheet.getInheritedObjectValueList(portal_type_list)
    paysheet.getInheritedObjectValueList(portal_type_list)
    self.assertEqual(len(paysheet.contentValues(\
    portal_type='Pay Sheet Line')), 0)
    ......@@ -1607,8 +1601,6 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
    paysheet_with_date.PaySheetTransaction_applyModel()
    self.tic()
    portal_type_list = ['Pay Sheet Model Line',]
    # check the paysheet contains no lines before calculation
    self.assertEqual(len(paysheet_with_date.contentValues(\
    portal_type='Pay Sheet Line')), 0)
    ......@@ -1954,9 +1946,8 @@ class TestPayrollMixin(TestTradeModelLineMixin, ERP5ReportTestCase):
    form = getattr(here, report_section.getFormId())
    self.portal.REQUEST['here'] = here
    if form.has_field('listbox'):
    result = form.listbox.get_value('default',
    render_format='list',
    REQUEST=self.portal.REQUEST)
    form.listbox.get_value(
    'default', render_format='list', REQUEST=self.portal.REQUEST)
    self.assertEqual(precision, self.portal.REQUEST.get('precision'))
    report_section.popReport(self.portal)
    ......
    bt5/erp5_payroll/TestTemplateItem/portal_components/test.erp5.testPayroll.xml
    View file @ 34d50a78
    ......@@ -43,14 +43,7 @@
    <item>
    <key> <string>text_content_warning_message</string> </key>
    <value>
    <tuple>
    <string>W:151, 2: Arguments number differs from overridden \'login\' method (arguments-differ)</string>
    <string>W:331, 28: Redefining built-in \'slice\' (redefined-builtin)</string>
    <string>W:591, 4: Unused variable \'movement_to_add\' (unused-variable)</string>
    <string>W:1543, 4: Unused variable \'sub_object_list\' (unused-variable)</string>
    <string>W:1610, 4: Unused variable \'portal_type_list\' (unused-variable)</string>
    <string>W:1957, 6: Unused variable \'result\' (unused-variable)</string>
    </tuple>
    <tuple/>
    </value>
    </item>
    <item>
    ......
    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