Forráskód Böngészése

Merge branch 'master' of biuro.biall-net.pl:plabudda/se

Arkadiusz Binder 11 éve
szülő
commit
92bb89317a

+ 1 - 1
SE/VERSION

@@ -1 +1 @@
-3.10.9
+3.10.9-unstable

+ 1 - 1
SE/se-lib/UserStorageDB.php

@@ -256,7 +256,7 @@ class UserStorageDB extends UserStorageBase {
 	public function addNestedGroup($groupID, $nestedGroupID) {
 		if (!$this->_db) return null;
 		if ($groupID <= 0) return null;
-		if ($nestedGroupID) return null;
+		if ($nestedGroupID <= 0) return null;
 		return $this->_setGroupConnection($groupID, $nestedGroupID);
 	}
 

+ 3 - 1
SE/superedit-POKAZ_OFERTY_AKTUALNE_FUNC.php

@@ -5274,7 +5274,9 @@ class Services_Converter {
 
 			$srv_map = $this->get_srv_map_by_deal($old_deal_id);
 			if (empty($srv_map)) {
-				$this->add_error("Brak srv_map dla old_deal_id = $old_deal_id!");
+				$errLink = "index.php?MENU_INIT=POKAZ_OFERTY_AKTUALNE_FUNC&task=klient_umowy&id_user=" . $this->_deal->get('ID_BILLING_USERS');
+				$errLink = ' <span style="color:red">Sprawdź aktualne <a href="' . $errLink . '">umowy klienta</a></span>';
+				$this->add_error("Brak srv_map dla old_deal_id = $old_deal_id!{$errLink}");
 				echo'<pre style="display:none;max-height:200px;overflow:auto;border:1px solid red;text-align:left;"> (F.' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($this);echo'</pre>';
 			}
 		}