Commit 7f49e735 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files
parent 744f6592
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -254,10 +254,10 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_ROUEN AS



      -- AH=IF(ISERROR([.J20]);1;IF([.I20]="TP";IF([.$AG$15]<i_heures_decharge;[.J20];([.$AG$16]-(([.$AG$15]-i_heures_decharge)*[.$AG$17])+(([.$AG$15]-i_heures_decharge)*[.$AG$17]*[.K20]))/[.$AG$16]);[.J20]))
      -- AH=IF(ISERROR([.J20]);1;IF([.I20]="TP";IF(AND([.$AG$15]<i_heures_decharge;[.$AG16]<>0);[.J20];([.$AG$16]-(([.$AG$15]-i_heures_decharge)*[.$AG$17])+(([.$AG$15]-i_heures_decharge)*[.$AG$17]*[.K20]))/[.$AG$16]);[.J20]))
      WHEN 'AH' THEN
        IF vh.type_intervention_code = 'TP' THEN
          IF cell('AG15') < i.heures_service_statutaire THEN
          IF cell('AG15') < i.heures_service_statutaire AND cell('AG16') <> 0 THEN
            RETURN vh.taux_service_du;
          ELSE
            RETURN (cell('AG16') - ((cell('AG15') - i.heures_service_statutaire) * cell('AG17')) + ((cell('AG15') - i.heures_service_statutaire) * cell('AG17') * vh.taux_service_compl)) / cell('AG16');
@@ -268,10 +268,10 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_ROUEN AS



      -- AI=IF(ISERROR([.K20]);1;IF([.I20]="TP";IF([.$AG$15]<i_heures_decharge;[.J20];([.$AG$16]-(([.$AG$15]-i_heures_decharge)*[.$AG$17])+(([.$AG$15]-i_heures_decharge)*[.$AG$17]*[.K20]))/[.$AG$16]);[.K20]))
      -- AI=IF(ISERROR([.K20]);1;IF([.I20]="TP";IF(AND([.$AG$15]<i_heures_decharge;[.$AG16]<>0);[.J20];([.$AG$16]-(([.$AG$15]-i_heures_decharge)*[.$AG$17])+(([.$AG$15]-i_heures_decharge)*[.$AG$17]*[.K20]))/[.$AG$16]);[.K20]))
      WHEN 'AI' THEN
        IF vh.type_intervention_code = 'TP' THEN
          IF cell('AG15') < i.heures_service_statutaire THEN
          IF cell('AG15') < i.heures_service_statutaire AND cell('AG16') <> 0 THEN
            RETURN vh.taux_service_du;
          ELSE
            RETURN (cell('AG16') - ((cell('AG15') - i.heures_service_statutaire) * cell('AG17')) + ((cell('AG15') - i.heures_service_statutaire) * cell('AG17') * vh.taux_service_compl)) / cell('AG16');