Merge branch 'master' of bn.git:plabudda/se

SE/procesy5.php

@@ -2636,6 +2636,7 @@ function tree_callback__show_item_from_CRM_LISTA_ZASOBOW( &$r, &$tree ) {
 		;
 	}
 		echo '<b>'.$r->TYPE.'</b>';
+		if($r->A_STATUS=='DELETED') echo " (D) ";
 		$bold=false;
 		if ((!empty($_GET['arg1']) && $_GET['arg1'] == $r->ID)
 			|| (!empty($_GET['EDIT']) && $_GET['EDIT']==$r->ID)

SE/projects/bocian

@@ -1 +1 @@
-Subproject commit 0739bd2b7f1e0f845c78aee032bc2fc22907183a
+Subproject commit 128cd800ba4538ff26ef50ec6aa03d941361b91b

SE/schema/ant-object/default_db.BI_audit_taxpayer/BI_audit_taxpayer/BI_audit_taxpayer.xsd

@@ -21,7 +21,7 @@
       schemaLocation="../SystemObjects/AccessGroup.xsd"/>
    <xs:import namespace="https://biuro.biall-net.pl/wfs/default_db/SystemObjects/AccessOwner.xsd"
       schemaLocation="../SystemObjects/AccessOwner.xsd"/>-->
-   <xs:simpleType name="A_STATUS_Type" id="it_taxpayer___d5e6245-1_A_STATUS_T">
+   <!--<xs:simpleType name="A_STATUS_Type" id="it_taxpayer___d5e6245-1_A_STATUS_T">
       <xs:restriction base="xs:string">
          <xs:enumeration value="NORMAL"/>
          <xs:enumeration value="WAITING"/>
@@ -31,7 +31,7 @@
          <xs:enumeration value="OFF_SOFT"/>
          <xs:enumeration value="OFF_HARD"/>
       </xs:restriction>
-   </xs:simpleType>
+   </xs:simpleType>-->
    <xs:complexType name="BI_audit_taxpayer" id="it_taxpayer___d5e6254-1_BI_audit_t">
       <xs:annotation>
          <xs:documentation>Tabela z aktualnymi statusami VAT</xs:documentation>

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -566,11 +566,13 @@ function INSTALL_GETCOMMANDS_XSL_ENGINES($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADM
  $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/jre-8u121-macosx-x64.dmg','/tmp/jre-8u121-macosx-x64.dmg');
  $cmd[]['rsh']='hdiutil mount /tmp/jre-8u121-macosx-x64.dmg -mountpoint /Volumes/jre-8u121-macosx-x64';
  $cmd[]['rsh']='installer -package /Volumes/jre-8u121-macosx-x64/Java\ 8\ Update\ 121.app/Contents/Resources/JavaAppletPlugin.pkg -target "/" -verbose';
+ $cmd[]['rsh']='hdiutil unmount /Volumes/jre-8u121-macosx-x64';
+
 //current dla dzialania dity
  $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/jdk-8u121-macosx-x64.dmg','/tmp/jdk-8u121-macosx-x64.dmg');
- $cmd[]['rsh']='hdiutil mount /tmp/jdk-8u121-macosx-x64.dmg -mountpoint /Volumes/jdk-8u121-macosx-x64.dmg';
+ $cmd[]['rsh']='hdiutil mount /tmp/jdk-8u121-macosx-x64.dmg -mountpoint /Volumes/jdk-8u121-macosx-x64';
  $cmd[]['rsh']='installer -package /Volumes/jdk-8u121-macosx-x64.dmg/JDK\ 8\ Update\ 121.pkg -target "/" -verbose';
-
+ $cmd[]['rsh']='hdiutil unmount /Volumes/jdk-8u121-macosx-x64';
 
  $cmd[]['rsh']='port -N install saxon';
  //todo repo-13 do stuff