[Fmsystem-commits] [16093] more on integration

[sigurdne]

Revision: 16093
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16093
Author:   sigurdne
Date:     2016-12-17 11:09:13 +0000 (Sat, 17 Dec 2016)
Log Message:
-----------
more on integration

Modified Paths:
--------------
    trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
    trunk/property/js/portico/workorder.edit.js

Modified: 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
===================================================================
--- 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php    
    2016-12-17 11:08:41 UTC (rev 16092)
+++ 
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php    
    2016-12-17 11:09:13 UTC (rev 16093)
@@ -59,19 +59,23 @@
                        $config->read();
                        $approval_level = 
!empty($config->config_data['approval_level']) ? 
$config->config_data['approval_level'] : 'order';
 
+                       $approval_amount = 0;
                        $price = 0;
                        if($approval_level == 'project')
                        {
-                               $price = 
ExecMethod('property.boworkorder.get_accumulated_budget_amount', 
$workorder['project_id']);
+                               $approval_amount = 
ExecMethod('property.boworkorder.get_accumulated_budget_amount', 
$workorder['project_id']);
+                               $price = 
ExecMethod('property.boworkorder.get_budget_amount', $workorder['id']);
                        }
                        else
                        {
-                               $price = 
ExecMethod('property.boworkorder.get_budget_amount', $workorder['id']);
+                               $approval_amount = 
ExecMethod('property.boworkorder.get_budget_amount', $workorder['id']);
+                               $price = $approval_amount;
+
                        }
 
                        try
                        {
-                               $purchase_grant_ok = 
CreateObject('property.botts')->validate_purchase_grant( $workorder['ecodimb'], 
$price, $workorder['id']);
+                               $purchase_grant_ok = 
CreateObject('property.botts')->validate_purchase_grant( $workorder['ecodimb'], 
$approval_amount, $workorder['id']);
                        }
                        catch (Exception $ex)
                        {

Modified: trunk/property/js/portico/workorder.edit.js
===================================================================
--- trunk/property/js/portico/workorder.edit.js 2016-12-17 11:08:41 UTC (rev 
16092)
+++ trunk/property/js/portico/workorder.edit.js 2016-12-17 11:09:13 UTC (rev 
16093)
@@ -544,8 +544,10 @@
        (budget_sum - Number(local_value_budget) + 
Number(accumulated_budget_amount)),
        (Number(local_value_budget),Number(accumulated_budget_amount)));
 
-       $("#order_received_amount").val(total_amount);
+       var order_received_amount = Math.max(contract_sum,      budget_sum,     
Number(local_value_budget));
 
+       $("#order_received_amount").val(order_received_amount);
+
        var oArgs = {menuaction: 'property.uitts.check_purchase_right', 
ecodimb: ecodimb, amount: total_amount, order_id: order_id};
        var requestUrl = phpGWLink('index.php', oArgs, true);
        var htmlString = "";