diff --git a/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml b/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml index 1f0233d488190a6de04b9f082ddd6afef8394ab4..12fa564eabc706f49bd098088987162c4dc1a209 100644 --- a/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml +++ b/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml @@ -164,7 +164,7 @@ def getPaymentConditionText(paysheet):\n if date:\n if paysheet.getProperty(\'default_payment_condition_payment_mode_title\'):\n return \'%s: %s\' % (translateString(\'Payment\'),\n - translateString(\'${payment_mode} at ${payment_date}\', \n + translateString(\'${payment_mode} at ${payment_date}\',\n mapping = {\'payment_mode\': paysheet.getProperty(\'default_payment_condition_payment_mode_title\'),\n \'payment_date\':date}))\n else:\n diff --git a/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml b/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml index 1290041a58ca54d6cf842d90703c898c9aa7f82d..b2e445e9059a5f305aabf08f4813df393cb5d513 100644 --- a/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml +++ b/bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml @@ -68,48 +68,50 @@ from_date=DateTime(context.getStartDate().year(), 1, 1)\n to_date=context.getStartDate()\n \n search_params = \\\n - { \n + {\n \'portal_type\' : \'Pay Sheet Transaction\',\n \'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n \'delivery.source_section_uid\' : context.getSourceSectionUid(),\n - \'simulation_state\' : [\'confirmed\', \'stopped\', \'delivered\'],\n + \'simulation_state\' : [\'stopped\', \'delivered\'],\n }\n \n -paysheet_list = accounting_module.searchFolder(**search_params)\n +paysheet_list = [r.getObject() for r in accounting_module.searchFolder(**search_params)]\n \n yearly_slice_amount = 0\n # get the slice value for this paysheet :\n model = context.getSpecialiseValue().getEffectiveModel(context)\n -slice = model.getCell(slice_path)\n +slice = model.getCell(slice_path, paysheet=context)\n \n -if not slice:\n +if slice is None:\n return 0.0\n \n -plafond = slice.getQuantityRangeMax()\n +plafond_max = slice.getQuantityRangeMax()\n +plafond_min = slice.getQuantityRangeMin()\n \n -gross_salary = context.PaySheetTransaction_getAmountFromBaseParticipationList(\\\n - base_participation_list=(\'gross_salary\',),\n - category_list=\'tax_category/employee_share\')\n +gross_salary = context.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n + base_contribution=\'base_contribution/base_amount/gross_salary\',\n + tax_category=\'tax_category/employee_share\')\n \n -if gross_salary < plafond:\n - slice_amount = gross_salary\n +if gross_salary < plafond_max:\n + slice_amount = gross_salary - plafond_min\n else:\n - slice_amount = plafond\n + slice_amount = plafond_max - plafond_min\n yearly_slice_amount += slice_amount\n \n for paysheet in paysheet_list :\n model = paysheet.getSpecialiseValue().getEffectiveModel(paysheet)\n if model is not None:\n slice = model.getCell(slice_path)\n - plafond = slice.getQuantityRangeMax()\n - gross_salary=paysheet.PaySheetTransaction_getAmountFromBaseParticipationList(\\\n - base_participation_list=(\'gross_salary\',), \n - category_list=\'tax_category/employee_share\')\n + plafond_max = slice.getQuantityRangeMax()\n + plafond_min = slice.getQuantityRangeMin()\n + gross_salary=paysheet.PaySheetTransaction_getMovementTotalPriceFromCategory(\\\n + base_contribution=\'base_contribution/base_amount/gross_salary\',\n + tax_category=\'tax_category/employee_share\')\n slice_amount = 0\n - if gross_salary < plafond:\n - slice_amount = gross_salary\n + if gross_salary < plafond_max:\n + slice_amount = gross_salary - plafond_min\n else:\n - slice_amount = plafond\n + slice_amount = plafond_max - plafond_min\n yearly_slice_amount += slice_amount\n \n return yearly_slice_amount\n @@ -160,18 +162,22 @@ return yearly_slice_amount\n <string>from_date</string> <string>to_date</string> <string>search_params</string> + <string>append</string> + <string>$append0</string> + <string>_getiter_</string> <string>_apply_</string> + <string>r</string> <string>paysheet_list</string> <string>yearly_slice_amount</string> <string>model</string> <string>slice</string> - <string>plafond</string> + <string>None</string> + <string>plafond_max</string> + <string>plafond_min</string> <string>gross_salary</string> <string>slice_amount</string> <string>_inplacevar_</string> - <string>_getiter_</string> <string>paysheet</string> - <string>None</string> </tuple> </value> </item> diff --git a/bt5/erp5_payroll_l10n_fr/bt/revision b/bt5/erp5_payroll_l10n_fr/bt/revision index 56749c830e6a7dee4812f62215c7f689d791d8c7..d97edbb29fa140807215ea46cfdc2b84f4c97dcd 100644 --- a/bt5/erp5_payroll_l10n_fr/bt/revision +++ b/bt5/erp5_payroll_l10n_fr/bt/revision @@ -1 +1 @@ -96 \ No newline at end of file +99 \ No newline at end of file