Merge branch 'issue-213' into develop

wandersonwhcr · Jan 22, 2018 · b811eee · b811eee
2 parents cbc867a + e009382
commit b811eee
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/module/Balance/src/Balance/Model/Persistence/Db/Balance.php b/module/Balance/src/Balance/Model/Persistence/Db/Balance.php
@@ -62,19 +62,19 @@ public function fetch(Parameters $params)
             ->columns(['id', 'value' => $eValue])
             ->join(['e' => 'entries'], 'a.id = e.account_id', [])
             ->join(['p' => 'postings'], 'p.id = e.posting_id', []);
-        // Captura
-        $subselect = clone($balanceSelect);
-        // Filtro de Não Acumulados
-        $subselect->where(function ($where) {
-            $where->equalTo('a.accumulate', 0);
-        });
         // Filtro?
         if ($datetime) {
             // Aplicar Filtro de Data Limite
-            $subselect->where(function ($where) use ($datetime) {
+            $balanceSelect->where(function ($where) use ($datetime) {
                 $where->lessThanOrEqualTo('p.datetime', $datetime);
             });
         }
+        // Captura
+        $subselect = clone($balanceSelect);
+        // Filtro de Não Acumulados
+        $subselect->where(function ($where) {
+            $where->equalTo('a.accumulate', 0);
+        });
         // Seletor
         $select = (new Select())
             ->from(['b' => $subselect])