Merge branch 'master' into fix-acl

SE/procesy/ajax.php

@@ -1,9 +1,70 @@
 <?php
 
 Lib::loadClass('DB_Image');
+Lib::loadClass('Http');
 
 if (!class_exists('Lib')) die('404');
 
+function ajax_get_alias_info() {
+	header('Content-Type: text/html; charset=utf8');//utf8
+	$idZasob = V::get('idZasob', 0, $_REQUEST, 'int');
+	if (!$idZasob) die('Wrong param');
+	$sql = <<<SQL
+		select z.`ID`
+			,	z.`ALIAS_ID`
+			,	z.`ALIAS_MODE`
+			,	za.`DESC` as `ALIAS_DESC`
+			,	zap.`DESC` as `ALIAS_PARENT_DESC`
+			,	zv.`CHILDS`
+			,	zv.`PATH`
+		from `CRM_LISTA_ZASOBOW` z
+			join `CRM_LISTA_ZASOBOW_ALIASY_view` zv on(zv.`ID`=z.`ID`)
+			left join `CRM_LISTA_ZASOBOW` za on(za.`ID`=z.`ALIAS_ID`)
+			left join `CRM_LISTA_ZASOBOW` zap on(zap.`ID`=za.`PARENT_ID`)
+		where z.`ID`='{$idZasob}'
+SQL;
+	$db = DB::getDB();
+	$res = $db->query($sql);
+	$info = $db->fetch($res);
+	if (!$info) {
+		echo 'Brak danych';
+	} else {
+		$outLines = array();
+		if ($info->ALIAS_ID > 0) {
+			$js = "return treeAddToFiltr(this, {$info->ALIAS_ID});";
+			$outAliasedId = '<a href="#" onclick="' . $js . '" title="Dodaj do filtra ' . $info->ALIAS_ID . '">' . $info->ALIAS_ID . '</a>';
+			$outAliasType = ('VIRTUAL' == $info->ALIAS_MODE)? "ALIAS WIRTUALNY" : "ALIAS";
+			$outTitle = "{$outAliasType} DO [{$info->ALIAS_ID}] {$info->ALIAS_PARENT_DESC}/{$info->ALIAS_DESC}";
+			$outLabel = "{$outAliasType} DO [{$outAliasedId}] " . V::strShortUtf8($info->ALIAS_PARENT_DESC, 16, '...') . '/' . V::strShortUtf8($info->ALIAS_DESC, 16, '...');
+			$outLines[] = '<span title="'.$outTitle.'">'.$outLabel.'</span>';
+		}
+		if (!empty($info->PATH)) {
+			$outPaths = array();
+			$paths = explode(',', $info->PATH);
+			foreach ($paths as $path) {
+				$js = "return treeAddToFiltr(this, {$path});";
+				$outPaths[] = '<a href="#" onclick="' . $js . '">' . $path . '</a>';
+			}
+			$outLines[] = 'Ścieżka: ' . implode(', ', $outPaths);
+		}
+		if (!empty($info->CHILDS)) {
+			$outChilds = array();
+			$childs = explode(',', $info->CHILDS);
+			foreach ($childs as $child) {
+				$js = "return treeAddToFiltr(this, {$child});";
+				$outChilds[] = '<a href="#" onclick="' . $js . '">' . $child . '</a>';
+			}
+			$outLines[] = 'Aliasy: ' . implode(', ', $outChilds);
+		}
+	}
+	if (empty($outLines)) {
+		echo 'Brak danych';//Http::sendHeaderByCode(404);
+	} else {
+		echo implode('<br>', $outLines) . '<br/>';
+	}
+	exit;
+}
+
 function ajax_get_subtree() {
 	header('Content-Type: text/html; charset=utf8');//utf8
 

SE/procesy/zasob.php

@@ -485,6 +485,7 @@ echo'<br />';
 			$tree->_limit = 300;
 			$tree->_deep_limit = 2;
 		}
+
 		if ($tree_zasoby_filter->get_arg('filtr_id') != 0) {
 			$tree->showSubTree( $tree_zasoby_filter->get_arg('filtr_id') );
 		} else if ($tree_zasoby_filter->get_arg('filtr_search_id') > 0) {

SE/procesy5.php

@@ -2635,12 +2635,33 @@ function tree_callback__show_item_from_CRM_LISTA_ZASOBOW( &$r, &$tree ) {
 	else echo "(1)";
 
 	echo'<span class="desc">';
+	{
+		$outAliasStyle = 'color:#999';
+		$outAliasTitle = 'ALIAS INFO';
+		$outAliasLink .= '<i class="glyphicon glyphicon-share-alt"></i>';
 		if ($r->ALIAS_ID > 0) {
-			if($r->ALIAS_MODE=='VIRTUAL')
-				echo '<span title="' . htmlspecialchars($r->ALIAS_NAME) . '">' . "(<font color=green>ALIAS WIRTUALNY DO ".'<a href="#TREE'.$r->ALIAS_ID.'">'.$r->ALIAS_ID.'</font></a>'.")" . '</span>';
-			else 
-				echo '<span title="' . htmlspecialchars($r->ALIAS_NAME) . '">' . "(ALIAS DO ".'<a href="#TREE'.$r->ALIAS_ID.'">'.$r->ALIAS_ID.'</a>'.")" . '</span>';
+			$outAliasLink .= "{$r->ALIAS_ID}";
+			// '<a href="#TREE'.$r->ALIAS_ID.'">'.$r->ALIAS_ID.'</a>'
+			// '<a href="#TREE'.$r->ALIAS_ID.'">'.$r->ALIAS_ID.'</a>'
+			if ('VIRTUAL' == $r->ALIAS_MODE) {
+				$outAliasStyle = 'color:#CA06E2';
+				$outAliasTitle = "ALIAS WIRTUALNY DO {$r->ALIAS_ID}";
+			} else {
+				$outAliasStyle = 'color:#FF6900';
+				$outAliasTitle = "ALIAS DO {$r->ALIAS_ID}";
+			}
 		}
+		echo '<span style="' . $outAliasStyle . '">
+			<a href="#"
+				style="' . $outAliasStyle . '"
+				title="' . $outAliasTitle . '"
+				data-id="' . $r->ID . '"
+				onclick="return showZasobAliasTooltip(this);"
+			>' . "{$outAliasLink}" . '</a>'
+			. ' <span class="alias-description"></span>'
+			. '</span>'
+		;
+	}
 		echo '<b>'.$r->TYPE.'</b>';
 		$bold=false;
 		if ((!empty($_GET['arg1']) && $_GET['arg1'] == $r->ID)
@@ -2753,8 +2774,13 @@ function tree_callback__show_item_from_CRM_LISTA_ZASOBOW( &$r, &$tree ) {
 			$external_ids_allowed_type[] = 'MATERIAL_EKSPLOATACYJNY';
 			$external_ids_allowed_type[] = 'SOFTWARE';
 			$external_ids_allowed_type[] = 'OBSZAR';
+			$external_ids_allowed_type[] = 'REWIR';
 			$external_ids_allowed_type[] = 'DOKUMENTY';			
 			$external_ids_allowed_type[] = 'SEJF';			
+			$external_ids_allowed_type[] = 'DOSTEP-UPRAWNIENIA';	
+			$external_ids_allowed_type[] = 'PLYTA_CD';			
+			$external_ids_allowed_type[] = 'PROJEKT';			
+			$external_ids_allowed_type[] = 'SPRAWA';			
 			
 			if (in_array($r->TYPE, $external_ids_allowed_type)) {
 				echo '<span class="external-ids">' . "{";

SE/se-lib/Route/WindykacjaZestawienia.php

@@ -0,0 +1,397 @@
+<?php
+
+Lib::loadClass('RouteBase');
+
+class Route_WindykacjaZestawienia extends RouteBase {
+
+	public function handleAuth() {
+		if (!User::logged()) {
+			throw new HttpException('Unauthorized', 401);
+		}
+	}
+
+	public function defaultAction() {
+		SE_Layout::gora();
+		SE_Layout::menu();
+		echo'TODO: Main menu...';
+		SE_Layout::dol();
+	}
+
+	public function sendMassAction() {
+		$selectedMonth = V::get('zest_month', date("Y-m"), $_REQUEST);
+		$f_type = V::get('f_type', '', $_REQUEST);
+		$f_day = V::get('f_day', '', $_REQUEST);
+		$f_status = V::get('f_status', '', $_REQUEST);
+
+		SE_Layout::gora();
+		SE_Layout::menu();
+		$this->_sendMassMenu($selectedMonth);
+		$this->_showSendMass($selectedMonth);
+		if (!empty($f_day) && !empty($f_status)) {
+			if ('MAIL' == $f_type) {
+				$this->_showSendMassMailDetails($f_day, $f_status);
+			} else if ('SMS' == $f_type) {
+				$this->_showSendMassSmsDetails($f_day, $f_status);
+			}
+		}
+		SE_Layout::dol();
+	}
+
+	private function _showSendMass($selectedMonth) {
+		$zest = array();
+		if (strlen($selectedMonth) != 7) return;
+		$db = DB::getDB();
+		$sql = <<<SQL
+(
+	select statsMail.`TYPE`
+		, statsMail.`A_RECORD_UPDATE_AUTHOR`
+		, statsMail.`_wind_save`
+		, statsMail.`STATUS`
+		, count(*) as cnt
+	from (
+		select 'MAIL' as `TYPE`
+			, h.`A_RECORD_UPDATE_AUTHOR`
+			, substr(h.`A_RECORD_UPDATE_DATE`, 1, 10) as `_wind_save`
+		--	, hc.`STATUS_MAIL` as `STATUS`
+			, IF(hc.`REQUEST_STATUS_MAIL`='CONFIRM_SENT_MAIL' and hc.`STATUS_MAIL`='NONE'
+					, 'WAITING'
+					, IF(hc.`REQUEST_STATUS_MAIL`='CONFIRM_SENT_MAIL' and hc.`STATUS_MAIL`='SENT_MAIL'
+						, 'SENT'
+						, IF(hc.`REQUEST_STATUS_MAIL`='NONE' and hc.`STATUS_MAIL`='NONE'
+							, 'UNDELIVERED'
+							, 'UNKNOWN'
+						)
+					)
+				) as `STATUS`
+		from `SES_USERS2`.`USERS2_WINDYKACJA_STATUS_HIST` h
+			join `SES_USERS2`.`USERS2_WINDYKACJA_STATUS` w on(w.`ID`=h.`ID_USERS2`)
+			join `billing2013`.`HIST_CONTACTS` hc on(hc.`ID`=h.`LAST_MAIL_MSG_ID`)
+		where h.`LAST_MAIL_MSG_ID`>0
+			and h.`A_RECORD_UPDATE_DATE` like '{$selectedMonth}-%'
+	) as statsMail
+	group by statsMail.`A_RECORD_UPDATE_AUTHOR`, statsMail.`_wind_save`, statsMail.`STATUS`
+)
+union
+(
+	select statsSms.`TYPE`
+		, statsSms.`A_RECORD_UPDATE_AUTHOR`
+		, statsSms.`_wind_save`
+		, statsSms.`STATUS`
+		, count(*) as cnt
+	from (
+		select 'SMS' as `TYPE`
+			, h.`A_RECORD_UPDATE_AUTHOR`
+			, substr(h.`A_RECORD_UPDATE_DATE`, 1, 10) as `_wind_save`
+			, IF(hc.`REQUEST_STATUS_SMS`='SENT_SMS' and hc.`STATUS_SMS`='NONE'
+					, 'WAITING'
+					, IF(hc.`REQUEST_STATUS_SMS`='CONFIRM_SENT_SMS' and hc.`STATUS_SMS`='SENT_SMS'
+						, 'MONITOR'
+						, IF(hc.`REQUEST_STATUS_SMS`='NONE' and hc.`STATUS_SMS`='CONFIRM_SENT_SMS'
+							, 'SENT'
+							, IF(hc.`REQUEST_STATUS_SMS`='NONE' and hc.`STATUS_SMS` in('UNDELIVERED','NONE')
+								, 'UNDELIVERED'
+								, IF(hc.`REQUEST_STATUS_SMS`='NONE' and hc.`STATUS_SMS`='UNKNOWN'
+									, 'OFF_SOFT'
+									, 'UNKNOWN'
+								)
+							)
+						)
+					)
+				) as `STATUS`
+		from `SES_USERS2`.`USERS2_WINDYKACJA_STATUS_HIST` h
+			join `SES_USERS2`.`USERS2_WINDYKACJA_STATUS` w on(w.`ID`=h.`ID_USERS2`)
+			join `billing2013`.`HIST_CONTACTS` hc on(hc.`ID`=h.`LAST_SMS_MSG_ID`)
+		where h.`LAST_SMS_MSG_ID` > 0
+			and h.`A_RECORD_UPDATE_DATE` like '{$selectedMonth}-%'
+	) as statsSms
+	group by statsSms.`A_RECORD_UPDATE_AUTHOR`, statsSms.`_wind_save`, statsSms.`STATUS`
+)
+order by `_wind_save` ASC, `TYPE`
+;
+SQL;
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+		/*
+WAITING: REQUEST_STATUS_MAIL='CONFIRM_SENT_MAIL’ && STATUS_MAIL='NONE’ - mail czeka na wysłanie
+SENT: REQUEST_STATUS_MAIL='CONFIRM_SENT_MAIL’ && STATUS_MAIL=’SENT_MAIL’ - mail został wysłany
+UNDELIVERED: REQUEST_STATUS_MAIL=’NONE’ && STATUS_MAIL='NONE’ - mail nie został i nie zostanie wysłany (np. brak/błędny adres mailowy)
+
+WAITING: REQUEST_STATUS_SMS=’SENT_SMS’ && STATUS_SMS=’NONE' - sms do wysłania
+MONITOR: REQUEST_STATUS_SMS='CONFIRM_SENT_SMS’ && STATUS_SMS=’SENT_SMS’ - sms wysłany, oczekuje na potwierdzenie dostarczenia
+SENT: REQUEST_STATUS_SMS=’NONE’ && STATUS_SMS='CONFIRM_SENT_SMS' - sms dostarczony
+UNDELIVERED: REQUEST_STATUS_SMS=’NONE’ && STATUS_SMS='UNDELIVERED' - sms niedostarczony (musiał wystąpić jakiś błąd)
+UNDELIVERED: REQUEST_STATUS_SMS=’NONE’ && STATUS_SMS=‚NONE’ (obecnie nieużywana już kombinacja) - sms niedostarczony (musiał wystąpić jakiś błąd)
+OFF_SOFT: REQUEST_STATUS_SMS=’NONE’ && STATUS_SMS='UNKNOWN' - sms wysłany, ale nie wiadomo czy dostarczony (nie uzyskano odpowiedzi ze strony platformy na temat dostarczenia sms)
+
+*/
+			$r->STATUS_INFO = '';
+			if ('MAIL' == $r->TYPE) {
+				if ('WAITING' == $r->STATUS) {
+					$r->STATUS_INFO = 'do wysłania';
+				} else if ('SENT' == $r->STATUS) {
+					$r->STATUS_INFO = 'wysłano';
+				} else if ('UNDELIVERED' == $r->STATUS) {
+					$r->STATUS_INFO = 'niewysłano (np. brak/błędny adres mailowy)';
+				}
+			} else if ('SMS' == $r->TYPE) {
+				if ('WAITING' == $r->STATUS) {
+					$r->STATUS_INFO = 'do wysłania';
+				} else if ('MONITOR' == $r->STATUS) {
+					$r->STATUS_INFO = 'oczekiwanie na potwierdzenie odbioru';
+				} else if ('SENT' == $r->STATUS) {
+					$r->STATUS_INFO = 'wysłano';
+				} else if ('UNDELIVERED' == $r->STATUS) {
+					$r->STATUS_INFO = 'niedostarczono';
+				}
+			}
+			$zest[] = $r;
+		}
+		$this->_showCss();
+?>
+<div class="container">
+	<table class="table table-bordered">
+		<thead>
+			<th>Typ</th>
+			<th>User</th>
+			<th>Data</th>
+			<th>Status</th>
+			<th>Ilość</th>
+			<th>Szczegóły</th>
+		</thead>
+		<tbody>
+			<?php foreach ($zest as $r) : ?>
+				<?php
+		$link = "index.php?_route=WindykacjaZestawienia&_task=sendMass&zest_month={$selectedMonth}&f_type={$r->TYPE}&f_day={$r->_wind_save}&f_status={$r->STATUS}";
+				?>
+				<tr>
+					<td><?php echo $r->TYPE; ?></td>
+					<td><?php echo $r->A_RECORD_UPDATE_AUTHOR; ?></td>
+					<td><?php echo $r->_wind_save; ?></td>
+					<td class="status_cell-<?php echo $r->STATUS; ?>" title="<?php echo $r->STATUS_INFO; ?>"><?php echo $r->STATUS; ?> <i class="glyphicon glyphicon-info-sign"></i></td>
+					<td><?php echo $r->cnt; ?></td>
+					<td><a href="<?php echo $link; ?>">szczegóły</a></td>
+				</tr>
+			<?php endforeach; ?>
+		</tbody>
+</table>
+</div>
+<?php
+	}
+
+	private function _showSendMassMailDetails($f_day, $f_status) {
+		if (empty($f_day) || strlen($f_day) != 10
+				|| empty($f_status) || strlen($f_status) > 20) {
+			echo 'Wrong params';
+			return;
+		}
+		$zest = array();
+		$db = DB::getDB();
+		$sql = <<<SQL
+	select statsMail.`TYPE`
+		, statsMail.`A_RECORD_UPDATE_AUTHOR`
+		, statsMail.`_wind_save`
+		, statsMail.`STATUS`
+		, statsMail.`ID_BILLING_USERS`
+		, '' as `STATUS_INFO`
+	from (
+		select 'MAIL' as `TYPE`
+			, h.`A_RECORD_UPDATE_AUTHOR`
+			, substr(h.`A_RECORD_UPDATE_DATE`, 1, 10) as `_wind_save`
+			, IF(hc.`REQUEST_STATUS_MAIL`='CONFIRM_SENT_MAIL' and hc.`STATUS_MAIL`='NONE'
+					, 'WAITING'
+					, IF(hc.`REQUEST_STATUS_MAIL`='CONFIRM_SENT_MAIL' and hc.`STATUS_MAIL`='SENT_MAIL'
+						, 'SENT'
+						, IF(hc.`REQUEST_STATUS_MAIL`='NONE' and hc.`STATUS_MAIL`='NONE'
+							, 'UNDELIVERED'
+							, 'UNKNOWN'
+						)
+					)
+				) as `STATUS`
+			, hc.`ID_BILLING_USERS`
+		from `SES_USERS2`.`USERS2_WINDYKACJA_STATUS_HIST` h
+			join `SES_USERS2`.`USERS2_WINDYKACJA_STATUS` w on(w.`ID`=h.`ID_USERS2`)
+			join `billing2013`.`HIST_CONTACTS` hc on(hc.`ID`=h.`LAST_MAIL_MSG_ID`)
+		where h.`LAST_MAIL_MSG_ID`>0
+			and h.`A_RECORD_UPDATE_DATE` like '{$f_day}%'
+	) as statsMail
+	where statsMail.`STATUS`='{$f_status}'
+
+SQL;
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			if ('UNDELIVERED' == $r->STATUS) {
+				$r->STATUS_INFO = 'mail nie został i nie zostanie wysłany (np. brak/błędny adres mailowy)';
+			} else if ('SENT' == $r->STATUS) {
+				$r->STATUS_INFO = 'mail został wysłany';
+			}
+			$zest[] = $r;
+		}
+		$this->_showCss();
+		?>
+<div class="container">
+	<h3>Szczegóły (rodzaj: MAIL, dzień: <?php echo $f_day; ?>, status: <?php echo $f_status; ?>)</h3>
+	<table class="table table-bordered">
+		<thead>
+			<th>Typ</th>
+			<th>User</th>
+			<th>Data</th>
+			<th>Nr klienta</th>
+			<th>Status</th>
+			<th>Info</th>
+		</thead>
+		<tbody>
+			<?php foreach ($zest as $r) : ?>
+				<tr>
+					<td><?php echo $r->TYPE; ?></td>
+					<td><?php echo $r->A_RECORD_UPDATE_AUTHOR; ?></td>
+					<td><?php echo $r->_wind_save; ?></td>
+					<td><?php echo $r->ID_BILLING_USERS; ?></td>
+					<td class="status_cell-<?php echo $r->STATUS; ?>"><?php echo $r->STATUS; ?></td>
+					<td><?php echo $r->STATUS_INFO; ?></td>
+				</tr>
+			<?php endforeach; ?>
+		</tbody>
+</table>
+</div>
+<?php
+	}
+
+	private function _showSendMassSmsDetails($f_day, $f_status) {
+		if (empty($f_day) || strlen($f_day) != 10
+				|| empty($f_status) || strlen($f_status) > 20) {
+			echo 'Wrong params';
+			return;
+		}
+		$zest = array();
+		$db = DB::getDB();
+		$sql = <<<SQL
+	select statsSms.`TYPE`
+		, statsSms.`A_RECORD_UPDATE_AUTHOR`
+		, statsSms.`_wind_save`
+		, statsSms.`STATUS`
+		, statsSms.`ID_BILLING_USERS`
+		, statsSms.`STATUS_INFO`
+	from (
+		select 'SMS' as `TYPE`
+			, h.`A_RECORD_UPDATE_AUTHOR`
+			, substr(h.`A_RECORD_UPDATE_DATE`, 1, 10) as `_wind_save`
+			, IF(hc.`REQUEST_STATUS_SMS`='SENT_SMS' and hc.`STATUS_SMS`='NONE'
+					, 'WAITING'
+					, IF(hc.`REQUEST_STATUS_SMS`='CONFIRM_SENT_SMS' and hc.`STATUS_SMS`='SENT_SMS'
+						, 'MONITOR'
+						, IF(hc.`REQUEST_STATUS_SMS`='NONE' and hc.`STATUS_SMS`='CONFIRM_SENT_SMS'
+							, 'SENT'
+							, IF(hc.`REQUEST_STATUS_SMS`='NONE' and hc.`STATUS_SMS` in('UNDELIVERED','NONE')
+								, 'UNDELIVERED'
+								, IF(hc.`REQUEST_STATUS_SMS`='NONE' and hc.`STATUS_SMS`='UNKNOWN'
+									, 'OFF_SOFT'
+									, 'UNKNOWN'
+								)
+							)
+						)
+					)
+				) as `STATUS`
+			, hc.`ID_BILLING_USERS`
+			, hc.`STATUS_SMS_INFO` as `STATUS_INFO`
+		from `SES_USERS2`.`USERS2_WINDYKACJA_STATUS_HIST` h
+			join `SES_USERS2`.`USERS2_WINDYKACJA_STATUS` w on(w.`ID`=h.`ID_USERS2`)
+			join `billing2013`.`HIST_CONTACTS` hc on(hc.`ID`=h.`LAST_SMS_MSG_ID`)
+		where h.`LAST_SMS_MSG_ID` > 0
+			and h.`A_RECORD_UPDATE_DATE` like '{$f_day}%'
+	) as statsSms
+	where statsSms.`STATUS`='{$f_status}'
+
+SQL;
+		$res = $db->query($sql);
+		while ($r = $db->fetch($res)) {
+			if ('WAITING' == $r->STATUS) {
+				$r->STATUS_INFO = "do wysłania";
+			} else if ('MONITOR' == $r->STATUS) {
+				$r->STATUS_INFO = "oczekiwanie na potwierdzenie odbioru";
+			}
+			$zest[] = $r;
+		}
+		$this->_showCss();
+		?>
+<div class="container">
+	<h3>Szczegóły (rodzaj: SMS, dzień: <?php echo $f_day; ?>, status: <?php echo $f_status; ?>)</h3>
+	<table class="table table-bordered">
+		<thead>
+			<th>Typ</th>
+			<th>User</th>
+			<th>Data</th>
+			<th>Nr klienta</th>
+			<th>Status</th>
+			<th>Info</th>
+		</thead>
+		<tbody>
+			<?php foreach ($zest as $r) : ?>
+				<tr>
+					<td><?php echo $r->TYPE; ?></td>
+					<td><?php echo $r->A_RECORD_UPDATE_AUTHOR; ?></td>
+					<td><?php echo $r->_wind_save; ?></td>
+					<td><?php echo $r->ID_BILLING_USERS; ?></td>
+					<td class="status_cell-<?php echo $r->STATUS; ?>"><?php echo $r->STATUS; ?></td>
+					<td><?php echo $r->STATUS_INFO; ?></td>
+				</tr>
+			<?php endforeach; ?>
+		</tbody>
+</table>
+</div>
+<?php
+	}
+
+	private function _sendMassMenu($selectedMonth) {
+		$year = ($selectedMonth)? $selectedMonth : date("Y-m");
+		?>
+<div class="jumbotron">
+  <div class="container">
+		<form class="form-inline" method="POST">
+			<input type="hidden" name="task" value="sendMass" />
+			<label for="zest_month">Zestawienie masowej wysyłki sms/mail:</label>
+			<div class="input-group date" id="fldZestMonth">
+				<input type="text" name="zest_month" class="form-control" value="<?php echo $selectedMonth; ?>" />
+				<span class="input-group-addon"><span class="glyphicon glyphicon-time"></span></span>
+			</div>
+			<button type="submit" id="fldZestMonthBtn" class="btn btn-primary" autocomplete="off">
+				Generuj zestawienie
+			</button>
+		</form>
+	</div>
+</div>
+<script type="text/javascript">
+jQuery(document).ready(function () {
+  jQuery('#fldZestMonthBtn').on('click', function () {
+    jQuery(this).text(jQuery(this).text() + '...').attr('disabled', 'disabled');
+		jQuery(this).parent().submit();
+  })
+
+	jQuery("#fldZestMonth").datetimepicker({
+		format: "YYYY-MM",
+		defaultDate: new Date(<?php echo date("Y"); ?>, <?php echo intval(date("m")) - 1; ?>, 1),
+		minDate: new Date(2014, 11, 1),
+		// maxDate: "<?php echo date("Y"); ?>"
+	});
+});
+</script>
+		<?php
+	}
+
+	private function _showCss() {
+		static $_printed = false;
+		if ($_printed) return;
+		if (false == $_printed) $_printed = true;
+		?>
+<style type="text/css">
+	.status_cell-SENT { background:#aeffae; color:#000; text-align:center; }
+	.status_cell-WAITING { background:#ffd2ff; color:#000; text-align:center; }
+	.status_cell-MONITOR { background:#cccaff; color:#000; text-align:center; }
+	.status_cell-WARNING { background:#ffbaba; color:#000; text-align:center; }
+	.status_cell-UNDELIVERED { background:#e0e0e0; color:#808080; text-align:center; }
+	.status_cell-OFF_SOFT { background:#fce3b7; color:#808080; text-align:center; }
+	.status_cell-OFF_HARD { background:#eee; color:#808080; text-align:center; }
+</style>
+<?php
+	}
+
+}

SE/se-lib/Tree.php

@@ -377,17 +377,6 @@ class Tree {
 					)
 				) as PARENT_TYPE
 			";
-
-			$sql->select[] = "IF(t.`ALIAS_ID` > 0
-					, (select concat_ws('.', zap.`DESC`, za.`DESC`)
-							from `CRM_LISTA_ZASOBOW` as za
-								left join `CRM_LISTA_ZASOBOW` as zap on(zap.`ID`=za.`PARENT_ID`)
-							where za.`ID`=t.`ALIAS_ID`
-							limit 1
-						)
-					, ''
-				) as ALIAS_NAME
-			";
 		}
 
 		$sql->filter = array();
@@ -726,7 +715,64 @@ jQuery(document).ready(function(){
 	jQuery('.wsk-help').popover({trigger:'hover', html:true, placement:'top'});
 	//jQuery('.wsk-long-desc').modal();
 });
-			</script>
+
+function showZasobAliasTooltip(n) {
+	var $n = jQuery(n);
+	if ($n.data('id') <= 0) return false;
+	var $aliasDescNode = $n.parent().find('.alias-description');
+	if (!$aliasDescNode.length) return false;
+	if (!$aliasDescNode.html()) {
+		$aliasDescNode.html(' loading ...<br/>');
+	}
+	console.log('display: ', $aliasDescNode.children().css('display'));
+	if ('block' == $aliasDescNode.children().css('display')) {
+		$aliasDescNode.children().css('display', 'none');
+		return false;
+	} else if ('none' == $aliasDescNode.children().css('display')) {
+		$aliasDescNode.children().css('display', 'block');
+	}
+
+	jQuery.ajax({
+		data: null,
+		type: "GET",
+		url: 'procesy5.php?function_init=ajax_get_alias_info&HEADER_NOT_INIT=YES&idZasob=' + $n.data('id'),
+	})
+	.done(function(data, textStatus, jqXHR){
+		if ('Brak danych' == data) {
+			$n.parent().attr('title', $n.attr('title') + ' - Brak danych');
+			$n.css({color: '#ddd'});
+			$n.attr('onclick', 'return false;');
+			$aliasDescNode.html('');
+		} else {
+			$aliasDescNode.html('<div style="padding-left:40px">' + data + '</div>');
+		}
+	})
+	.fail(function(jqXHR){// jqXHR.fail(function( jqXHR, textStatus, errorThrown ) {});
+		$aliasDescNode.html("Error");
+	})
+	.always(function(data, textStatus, jqXHR) {
+	});
+
+	return false;
+}
+
+function treeAddToFiltr(n, idZasob) {
+	idZasob = parseInt(idZasob);
+	if (!idZasob) return false;
+	var $filters = jQuery(n).parents('.tree-wrap:first').prevAll('.filters:first');
+	if (!$filters.length) return false;
+	var $filtrIdInput = $filters.find('input[name="filtr_id"]');
+	if (!$filtrIdInput.length) return false;
+	var filtrVal = $filtrIdInput.val();
+	if (!filtrVal.length) {
+		$filtrIdInput.val(idZasob);
+	} else {
+		$filtrIdInput.val(filtrVal + ',' + idZasob);
+	}
+	$filtrIdInput.get(0).form.submit();
+	return false;
+}
+</script>
 		<?php
 	}
 

SE/se-lib/UserStorageMacOSX.php

@@ -200,6 +200,7 @@ class UserStorageMacOSX extends UserStorageBase {
 		$cmds[] = "{$cmdDsclAuth} -create /Users/{$login} RealName \"{$name}\" ";
 		if (!empty($email)) $cmds[] = "{$cmdDsclAuth} -create /Users/{$login} EMailAddress {$email} ";
 		$cmds[] = "{$cmdDsclAuth} -passwd /Users/{$login} \"{$pass}\" ";
+		$cmds[] = "sudo /usr/sbin/createhomedir -c -u {$login} 2>&1 ";// TODO:INSTALATOR: add to sudoers _www ALL = NOPASSWD: /usr/sbin/createhomedir
 
 		foreach ($cmds as $cmd) {
 			$cmdOut = null; $cmdRet = null;
@@ -210,8 +211,6 @@ class UserStorageMacOSX extends UserStorageBase {
 			}
 		}
 
-		// TODO: $cmd = "sudo createhomedir -c -u {$login} "; - zawiesza się (nie kończy działania) ale tworzy katalog domowy
-
 		return true;
 	}
 

SE/superedit-DB_PROCEDURES_CREATE.php

@@ -955,6 +955,63 @@ LEFT JOIN IN7_MK_BAZA_DYSTRYBUCJI AS t2 ON t1.ID = t2.ID;";
 
 
 
+
+
+//! bzyka funkcje @2015-07 do tree zasobow aliasow 
+$sql['drop_function_ALIAS_CHILDS_FROM_CRM_LISTA_ZASOBOW']="drop function if exists ALIAS_CHILDS_FROM_CRM_LISTA_ZASOBOW";
+$sql['create_function_ALIAS_CHILDS_FROM_CRM_LISTA_ZASOBOW']="CREATE DEFINER=`root`@`localhost` FUNCTION `ALIAS_CHILDS_FROM_CRM_LISTA_ZASOBOW`(`CRM_LISTA_ZASOBOW_ID` INT) RETURNS text CHARSET latin2
+   READS SQL DATA
+BEGIN
+   SELECT GROUP_CONCAT(`ID`)
+       INTO @RESULT
+       FROM `CRM_LISTA_ZASOBOW`
+       WHERE `ALIAS_ID`=CRM_LISTA_ZASOBOW_ID;
+
+   RETURN COALESCE(@RESULT,'');
+END";
+
+$sql['drop_function_ALIAS_PATH_FROM_CRM_LISTA_ZASOBOW']="drop function if exists ALIAS_PATH_FROM_CRM_LISTA_ZASOBOW";
+$sql['create_function_ALIAS_PATH_FROM_CRM_LISTA_ZASOBOW']="CREATE DEFINER=`root`@`localhost` FUNCTION `ALIAS_PATH_FROM_CRM_LISTA_ZASOBOW`(`CRM_LISTA_ZASOBOW_ID` INT) RETURNS text CHARSET latin2
+   READS SQL DATA
+BEGIN
+   SET @PARAM_ALIAS_ID=CRM_LISTA_ZASOBOW_ID;
+   SET @PATH='';
+   REPEAT
+       SELECT `ALIAS_ID`
+           INTO @ALIAS_ID
+           FROM `CRM_LISTA_ZASOBOW`
+           WHERE `ID`=@PARAM_ALIAS_ID;
+
+       IF @ALIAS_ID>0 AND @PATH!='' THEN
+           SET @PATH=CONCAT(',',@PATH);
+       END IF;
+
+       IF @ALIAS_ID=@PARAM_ALIAS_ID OR FIND_IN_SET(@ALIAS_ID,@PATH) THEN
+           SET @PATH=CONCAT('LOOP_ERROR,',@ALIAS_ID,@PATH);
+           SET @ALIAS_ID=0;
+       END IF;
+
+       IF @ALIAS_ID IS NULL THEN
+           SET @PATH=CONCAT('BRAK_ZASOBU',@PATH);
+       ELSEIF @ALIAS_ID>0 THEN
+           SET @PATH=CONCAT(@ALIAS_ID,@PATH);
+       END IF;
+
+       SET @PARAM_ALIAS_ID=@ALIAS_ID;
+   UNTIL COALESCE(@ALIAS_ID,0)=0 END REPEAT;
+   RETURN @PATH;
+END";
+
+
+
+
+$sql['view__CRM_LISTA_ZASOBOW_ALIASY_view']="CREATE or replace ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `CRM_LISTA_ZASOBOW_ALIASY_view` AS select `CRM_LISTA_ZASOBOW`.`ID` AS `ID`,`CRM_LISTA_ZASOBOW`.`ID` AS `CRM_LISTA_ZASOBOW_ID`,`ALIAS_CHILDS_FROM_CRM_LISTA_ZASOBOW`(`CRM_LISTA_ZASOBOW`.`ID`) AS `CHILDS`,`ALIAS_PATH_FROM_CRM_LISTA_ZASOBOW`(`CRM_LISTA_ZASOBOW`.`ID`) AS `PATH` from `CRM_LISTA_ZASOBOW`";
+
+
+
+
+
+
 $sql['event_shedule_init']="SET GLOBAL event_scheduler = ON";
 
 
@@ -973,6 +1030,10 @@ foreach($sql as $ind=>$sql_) {
 	$routeFixProjectPath = new Route_FixProjectPath();
 	$routeFixProjectPath->reinstall();
 
+	Lib::loadClass('Route_FixCrmProcesInitIdx');
+	$routeFixCrmProcesInitIdx = new Route_FixCrmProcesInitIdx();
+	$routeFixCrmProcesInitIdx->reinstall();
+
 }
 
 ?>

SE/superedit-SYNC_GIS_TABLES.php

@@ -468,14 +468,14 @@ function SYNC_GIS_TABLES() {
 
 		DEBUG_S(-3,'Agr rurociag',null,__FILE__,__FUNCTION__,__LINE__);
 //	gis_opto_calculations('Inwestycje_Planowane','gid','Agr_Rozdzielcza_rurociag_wsg84','Rozdzielcza_rurociag_wsg84','the_geom','******F**','and t1."ID_PROJECT"=t2."ID_PROJECT" ');
-		gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI','ID','Agr_Rozdzielcza_rurociag_wsg84','Rozdzielcza_rurociag_wsg84','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0 ');
+		gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI','ID','Agr_Rozdzielcza_rurociag_wsg84_ilosc','Rozdzielcza_rurociag_wsg84','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0 ');
 //	die('431');
 
 //	gis_opto_calculations('Inwestycje_Planowane','gid','Agr_Rozdzielcza_rurociag_wsg84_koszt','Rozdzielcza_rurociag_wsg84','the_geom','******F**','and t1."ID_PROJECT"=t2."ID_PROJECT" ','cena_jedn');
    		gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI','ID','Agr_Rozdzielcza_rurociag_wsg84_koszt','Rozdzielcza_rurociag_wsg84','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0 ','cena_jedn');
 
 //	gis_opto_calculations('Inwestycje_Planowane','gid','Agr_Rozdzielcza_Kabel_Swiatlowodowy_wsg84','Rozdzielcza_Kabel_Swiatlowodowy_wsg84','the_geom','******F**','and t1."ID_PROJECT"=t2."ID_PROJECT" ');
-	    gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_Rozdzielcza_Kabel_Swiatlowodowy_wsg84','Rozdzielcza_Kabel_Swiatlowodowy_wsg84','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
+	    gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_Rozdzielcza_Kabel_Swiatlowodowy_wsg84_ilosc','Rozdzielcza_Kabel_Swiatlowodowy_wsg84','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
 
 //	gis_opto_calculations('Inwestycje_Planowane','gid','Agr_Rozdzielcza_Kabel_Swiatlowodowy_wsg84_koszt','Rozdzielcza_Kabel_Swiatlowodowy_wsg84','the_geom','******F**','and t1."ID_PROJECT"=t2."ID_PROJECT" ','cena_jedn');
 		gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_Rozdzielcza_Kabel_Swiatlowodowy_wsg84_koszt','Rozdzielcza_Kabel_Swiatlowodowy_wsg84','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0','cena_jedn');
@@ -485,26 +485,26 @@ function SYNC_GIS_TABLES() {
 DEBUG_S(-3,'CheckPoint',null,__FILE__,__FUNCTION__,__LINE__);
 
 //	gis_opto_calculations('Inwestycje_Planowane','gid','Agr_metrow_mikrorurek','Rozdzielcza_Mikrokanalizacja_do_klienta','the_geom','******F**','and t1."ID_PROJECT"=t2."ID_PROJECT" ');
-	    gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_metrow_mikrorurek','Rozdzielcza_Mikrokanalizacja_do_klienta','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
+	    gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_Rozdzielcza_Mikrokanalizacja_do_klienta_ilosc','Rozdzielcza_Mikrokanalizacja_do_klienta','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
 
 //	gis_opto_calculations('Inwestycje_Planowane','gid','Agr_ilosc_wykopu','Rozdzielcza_Wykop_przedmiar_na_mikrorurki','the_geom','******F**','and t1."ID_PROJECT"=t2."ID_PROJECT" ');
-		gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_ilosc_wykopu','Rozdzielcza_Wykop_przedmiar_na_mikrorurki','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
+		gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_Rozdzielcza_Wykop_przedmiar_na_mikrorurki_ilosc','Rozdzielcza_Wykop_przedmiar_na_mikrorurki','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
 DEBUG_S(-3,'CheckPoint Wykop prev',null,__FILE__,__FUNCTION__,__LINE__);
 	
 //	gis_opto_calculations('Inwestycje_Planowane','gid','Agr_ilosc_przeciskow','Rozdzielcza_Przeciski_110mm','the_geom','******F**','and t1."ID_PROJECT"=t2."ID_PROJECT" ');
-		gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_ilosc_przeciskow','Rozdzielcza_Przeciski_110mm','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
+		gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_Rozdzielcza_Przeciski_110mm_ilosc','Rozdzielcza_Przeciski_110mm','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
 
 //	gis_opto_calculations('Inwestycje_Planowane','gid','Agr_ilosc_zabrukow','Rozdzielcza_Zabruki','the_geom','******F**','and t1."ID_PROJECT"=t2."ID_PROJECT" ');
-		gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_ilosc_zabrukow','Rozdzielcza_Zabruki','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
+		gis_opto_calculations('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_Rozdzielcza_Zabruki_ilosc','Rozdzielcza_Zabruki','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
 DEBUG_S(-3,'CheckPoint',null,__FILE__,__FUNCTION__,__LINE__);
 //	gis_opto_calculations_count('Inwestycje_Planowane','gid','Agr_ilosc_domow','MK_Mieszkania','the_geom','******F**','and t1."ID_PROJECT"=t2."ID_PROJECT" ');
-		gis_opto_calculations_count('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_ilosc_domow','MK_Mieszkania','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
+		gis_opto_calculations_count('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_USERS2_MARKETING_ilosc','MK_Mieszkania','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
 
 //	gis_opto_calculations_count('Inwestycje_Planowane','gid','Agr_ilosc_wezlow','Rozdzielcza_wezly','the_geom','******F**','and t1."ID_PROJECT"=t2."ID_PROJECT" ');
-		gis_opto_calculations_count('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_ilosc_wezlow','TELBOXES','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
+		gis_opto_calculations_count('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_Rozdzielcza_wezly_ilosc','TELBOXES','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0');
 
 //	gis_opto_calculations_count('Inwestycje_Planowane','gid','Agr_ilosc_wezlow_koszt','Rozdzielcza_wezly','the_geom','******F**','and t1."ID_PROJECT"=t2."ID_PROJECT" ','cena_jedn');
-		gis_opto_calculations_count('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_ilosc_wezlow_koszt','TELBOXES','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0','cena_jedn');
+		gis_opto_calculations_count('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_Rozdzielcza_wezly_koszt','TELBOXES','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0','cena_jedn');
 	
 //	gis_opto_calculations_sum('Inwestycje_Planowane','gid','Agr_Rozdzielcza_koszty_dodatkowe_wsg84','Rozdzielcza_koszty_dodatkowe_wsg84','the_geom','******F**','and t1."ID_PROJECT"=t2."ID_PROJECT"','Wartosc_kosztu');
 		gis_opto_calculations_sum('IN7_MK_BAZA_DYSTRYBUCJI',array('ID','gid'),'Agr_Rozdzielcza_koszty_dodatkowe_wsg84','Rozdzielcza_koszty_dodatkowe_wsg84','the_geom','******F**','and t1."ID"::int=t2."ID_PROJECT"::int and t1."ID"!=0','Wartosc_kosztu');	
@@ -528,7 +528,7 @@ DEBUG_S(-3,'CheckPoint',null,__FILE__,__FUNCTION__,__LINE__);
 //	  $sql_cena='update "Inwestycje_Planowane" set "Agr_ilosc_zabrukow"=0 where "Agr_ilosc_zabrukow" is null;';
 //	  $gdb->query($sql_cena);
 
-		$sql_cena='update "IN7_MK_BAZA_DYSTRYBUCJI" set "Agr_ilosc_zabrukow"=0 where "Agr_ilosc_zabrukow" is null;';
+		$sql_cena='update "IN7_MK_BAZA_DYSTRYBUCJI" set "Agr_Rozdzielcza_Zabruki_ilosc"=0 where "Agr_Rozdzielcza_Zabruki_ilosc" is null;';
 		$gdb->query($sql_cena);
 
 
@@ -548,16 +548,16 @@ DEBUG_S(-3,'CheckPoint',null,__FILE__,__FUNCTION__,__LINE__);
 		 $gdb->query($sql_cena);
 */
 		 $sql_cena='update "IN7_MK_BAZA_DYSTRYBUCJI" set 
-					koszt_wspolny="Agr_ilosc_wykopu"*"Agr_ilosc_wykopu_cena"
-					+"Agr_metrow_mikrorurek"*"Agr_metrow_mikrorurek_cena"
+					koszt_wspolny="Agr_Rozdzielcza_Wykop_przedmiar_na_mikrorurki_ilosc"*"Agr_Rozdzielcza_Wykop_przedmiar_na_mikrorurki_cena"
+					+"Agr_Rozdzielcza_Mikrokanalizacja_do_klienta_ilosc"*"Agr_Rozdzielcza_Mikrokanalizacja_do_klienta_cena"
 					+"Agr_metrow_mikrorurek_5szt"*"Agr_metrow_mikrorurek_5szt_cena"
-					+"Agr_ilosc_przeciskow"*"Agr_ilosc_przeciskow_cena"
-					+"Agr_ilosc_zabrukow"*"Agr_ilosc_zabrukow_cena"
-					+"Agr_ilosc_wezlow_koszt"
+					+"Agr_Rozdzielcza_Przeciski_110mm_ilosc"*"Agr_Rozdzielcza_Przeciski_110mm_cena"
+					+"Agr_Rozdzielcza_Zabruki_ilosc"*"Agr_Rozdzielcza_Zabruki_cena"
+					+"Agr_Rozdzielcza_wezly_koszt"
 					+"Agr_Rozdzielcza_koszty_dodatkowe_wsg84"
 					+"Agr_Rozdzielcza_rurociag_wsg84_koszt"
 					+"Agr_Rozdzielcza_Kabel_Swiatlowodowy_wsg84_koszt"
-					+"Agr_ilosc_domow"*"Agr_MK_Mieszkania_cena_jedn"
+					+"Agr_USERS2_MARKETING_ilosc"*"Agr_USERS2_MARKETING_cena"
 					;'; //"Agr_metrow_w_tpsa*3 +Agr_metrow_kabel*
 					////+ studnia1300 z pioh+ mufa 300 + spliter 200 = 1800 PLN za wezel 
 		  $gdb->query($sql_cena);
@@ -569,9 +569,9 @@ DEBUG_S(-3,'CheckPoint',null,__FILE__,__FUNCTION__,__LINE__);
 //		 $gdb->query($sql_cena);
 
 
-		 $sql_cena='update "IN7_MK_BAZA_DYSTRYBUCJI" set "Agr_MK_Mieszkania_koszt"=round("Agr_MK_Mieszkania_cena_jedn"*"Agr_ilosc_domow") where "Agr_ilosc_domow">0 '  ;
+		 $sql_cena='update "IN7_MK_BAZA_DYSTRYBUCJI" set "Agr_USERS2_MARKETING_koszt"=round("Agr_USERS2_MARKETING_cena"*"Agr_USERS2_MARKETING_ilosc") where "Agr_USERS2_MARKETING_ilosc">0 '  ;
 		 $gdb->query($sql_cena);
-		 $sql_cena='update "IN7_MK_BAZA_DYSTRYBUCJI" set "koszt_na_dom"=round("koszt_wspolny"/"Agr_ilosc_domow") where "Agr_ilosc_domow">0 '  ;
+		 $sql_cena='update "IN7_MK_BAZA_DYSTRYBUCJI" set "koszt_na_dom"=round("koszt_wspolny"/"Agr_USERS2_MARKETING_ilosc") where "Agr_USERS2_MARKETING_ilosc">0 '  ;
 		 $gdb->query($sql_cena);
 
 		 ///