use transfer in Budget

SE/se-lib/Route/Budget.php

@@ -646,16 +646,24 @@ jQuery(document).ready(function() {
 								*	[COST] => 1000.00
 								*	[INCOME] => 0.00
 								? [TRANSFER_OPPOSITE_ID_PROJECT] => int
-								*/ ?>
+								*/
+							$transferToId = V::get('TRANSFER_OPPOSITE_ID_PROJECT_TO', 0, $vKorespInfo);
+							$transferFromId = V::get('TRANSFER_OPPOSITE_ID_PROJECT_FROM', 0, $vKorespInfo);
+							$rowStyle = ($transferToId > 0)? 'font-style:italic;color:#bbb;' : '';
+							?>
 							<tr>
 								<td class="p2 r nr"><?php echo $vKorespInfo->ID; ?></td>
-								<td class="p2" style="max-width:400px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="<?php echo $vKorespInfo->K_ZAWARTOS; ?>"><?php echo $vKorespInfo->K_ZAWARTOS; ?></td>
+								<td class="p2"
+										style="max-width:400px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;<?php echo $rowStyle; ?>"
+										title="<?php echo $vKorespInfo->K_ZAWARTOS; ?>"><?php echo $vKorespInfo->K_ZAWARTOS; ?></td>
 								<?php $vKorespCostOut = number_format($vKorespInfo->COST, 2); ?>
 								<td class="cell-cost cell-cost-only_child"><?php echo $vKorespCostOut; ?></td>
-								<td class="cell-transfer_opposite_id_project">
-									<?php $dekretId = V::get('TRANSFER_OPPOSITE_ID_PROJECT', 0, $vKorespInfo) ?>
-									<?php if ($dekretId > 0) : ?>
-										Dekret z projektu nr <?php echo $dekretId; ?>
+								<td class="p2 cell-transfer_opposite_id_project">
+									<?php if ($transferFromId > 0) : ?>
+										Transfer z projektu nr <?php echo $transferFromId; ?>
+									<?php endif; ?>
+									<?php if ($transferToId > 0) : ?>
+										Transfer do projektu nr <?php echo $transferToId; ?>
 									<?php endif; ?>
 								</td>
 							</tr>
@@ -781,16 +789,15 @@ jQuery(document).ready(function() {
 				, date_format(k.`K_DATA_OTRZYMANEJ_KORESP`,'%Y-%m') AS `MONTH`
 				, k.`COST_VALUE` AS `COST`
 				, k.`INCOME_VALUE` AS `INCOME`
-				, 0 as `TRANSFER_OPPOSITE_ID_PROJECT` -- TRANSFER_OPPOSITE_ID_PROJECT
+				, k.`TRANSFER_OPPOSITE_ID_PROJECT`
 				, k.`path`
-			--	, IF(k.`TRANSFER_OPPOSITE_ID_PROJECT`>0
-			--		, (select p.`path`
-			--				from `IN7_MK_BAZA_DYSTRYBUCJI` p
-			--				where p.`ID`=k.`TRANSFER_OPPOSITE_ID_PROJECT`
-			--				limit 1
-			--			)
-			--		, '') as TRANSFER_OPPOSITE_PROJECT_PATH
-				, '' as TRANSFER_OPPOSITE_PROJECT_PATH
+				, IF(k.`TRANSFER_OPPOSITE_ID_PROJECT`>0
+					, (select p.`path`
+							from `IN7_MK_BAZA_DYSTRYBUCJI` p
+							where p.`ID`=k.`TRANSFER_OPPOSITE_ID_PROJECT`
+							limit 1
+						)
+					, '') as TRANSFER_OPPOSITE_PROJECT_PATH
 				, k.`K_ZAWARTOS`
 			from `IN7_DZIENNIK_KORESP` k
 			where ((k.`COST_VALUE` != 0) or (k.`INCOME_VALUE` != 0))
@@ -845,15 +852,24 @@ jQuery(document).ready(function() {
 			$korespInfo->MONTH = $r->MONTH;
 			$korespInfo->K_ZAWARTOS = $r->K_ZAWARTOS;
 			$monthNum = intval(substr($r->MONTH, 5, 2));
-			if ($r->TRANSFER_OPPOSITE_ID_PROJECT > 0) {
-				$korespInfo->COST = $r->COST;
-				$korespInfo->INCOME = $r->INCOME;
-				$korespInfo->TRANSFER_OPPOSITE_ID_PROJECT = $r->TRANSFER_OPPOSITE_ID_PROJECT;
-				$this->_costs[$r->TRANSFER_OPPOSITE_ID_PROJECT]->korespByMonth[$monthNum][] = $korespInfo;
-			} else if ($r->ID_PROJECT) {
-				$korespInfo->COST = $r->COST;
-				$korespInfo->INCOME = $r->INCOME;
-				$this->_costs[$r->ID_PROJECT]->korespByMonth[$monthNum][] = $korespInfo;
+			if ($r->ID_PROJECT > 0) {
+				if ($r->TRANSFER_OPPOSITE_ID_PROJECT > 0) {
+					$korespOppositeInfo = clone $korespInfo;
+
+					$korespInfo->COST = -1 * $r->COST;
+					$korespInfo->INCOME = -1 * $r->INCOME;
+					$korespInfo->TRANSFER_OPPOSITE_ID_PROJECT_TO = $r->TRANSFER_OPPOSITE_ID_PROJECT;
+					$this->_costs[$r->ID_PROJECT]->korespByMonth[$monthNum][] = $korespInfo;
+
+					$korespOppositeInfo->COST = $r->COST;
+					$korespOppositeInfo->INCOME = $r->INCOME;
+					$korespOppositeInfo->TRANSFER_OPPOSITE_ID_PROJECT_FROM = $r->ID_PROJECT;
+					$this->_costs[$r->TRANSFER_OPPOSITE_ID_PROJECT]->korespByMonth[$monthNum][] = $korespOppositeInfo;
+				} else {
+					$korespInfo->COST = $r->COST;
+					$korespInfo->INCOME = $r->INCOME;
+					$this->_costs[$r->ID_PROJECT]->korespByMonth[$monthNum][] = $korespInfo;
+				}
 			} else {
 				$korespInfo->COST = $r->COST;
 				$korespInfo->INCOME = $r->INCOME;