fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [13346] fetch missing data


From: Sigurd Nes
Subject: [Fmsystem-commits] [13346] fetch missing data
Date: Thu, 04 Jun 2015 09:34:39 +0000

Revision: 13346
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13346
Author:   sigurdne
Date:     2015-06-04 09:34:38 +0000 (Thu, 04 Jun 2015)
Log Message:
-----------
fetch missing data

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.sopricebook.inc.php
    branches/dev-syncromind/property/js/portico/pricebook.index.js

Modified: branches/dev-syncromind/property/inc/class.sopricebook.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.sopricebook.inc.php      
2015-06-04 07:54:16 UTC (rev 13345)
+++ branches/dev-syncromind/property/inc/class.sopricebook.inc.php      
2015-06-04 09:34:38 UTC (rev 13346)
@@ -234,7 +234,7 @@
                        $sql = "SELECT DISTINCT fm_activities.num, 
fm_activities.unit, fm_activities.dim_d, fm_activities.ns3420, 
fm_activities.descr AS descr,"
                                . " fm_activities.base_descr, 
fm_activity_price_index.activity_id, fm_branch.descr AS branch,"
                                . " fm_agreement.vendor_id, 
fm_activity_price_index.total_cost, fm_activity_price_index.m_cost,"
-                               . " fm_activity_price_index.w_cost, 
fm_activity_price_index.index_count, fm_activity_price_index.this_index, 
fm_agreement.id,"
+                               . " fm_activity_price_index.w_cost, 
fm_activity_price_index.index_count, fm_activity_price_index.this_index, 
fm_agreement.id as agreement_id,"
                                . " fm_standard_unit.name AS unit_name"
                                . " FROM  fm_activities "
                                . " $this->join fm_activity_price_index ON 
fm_activities.id = fm_activity_price_index.activity_id "
@@ -279,7 +279,7 @@
                                                'descr'                 => 
$this->db->f('descr',true),
                                                'base_descr'    => 
$this->db->f('base_descr',true),
                                                'index_count'   => 
$this->db->f('index_count'),
-                                               'agreement_id'  => 
$this->db->f('fm_agreement.id')
+                                               'agreement_id'  => 
$this->db->f('agreement_id')
                                        );
                        }
                        //              _debug_array($pricebook);

Modified: branches/dev-syncromind/property/js/portico/pricebook.index.js
===================================================================
--- branches/dev-syncromind/property/js/portico/pricebook.index.js      
2015-06-04 07:54:16 UTC (rev 13345)
+++ branches/dev-syncromind/property/js/portico/pricebook.index.js      
2015-06-04 09:34:38 UTC (rev 13346)
@@ -20,6 +20,7 @@
        
        var values = {};
 
+       values['agreement_id'] = {};
        values['activity_id'] = {};
        values['vendor_id'] = {};
        values['old_m_cost'] = {};
@@ -33,13 +34,14 @@
        var api = oTable.api();
        api.data().each( function (d) 
        {
+               values['agreement_id'][d.counter] = d.agreement_id;
                values['activity_id'][d.counter] = d.activity_id;
                values['vendor_id'][d.counter] = d.vendor_id;
                values['old_m_cost'][d.counter] = d.m_cost;
                values['old_w_cost'][d.counter] = d.w_cost;
                values['old_total_cost'][d.counter] = d.total_cost;
        });
-               
+
        select_check.each(function(i, obj) {
                if (obj.checked) 
                {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]