Merge branch 'main' of github.com:Spoje-NET/php-abraflexi

Spoje-NET · Sep 14, 2023 · 597ab88 · 597ab88
2 parents 60693f2 + 483cf3b
commit 597ab88
Show file tree

Hide file tree

Showing 80 changed files with 179 additions and 76 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,4 @@
-/testing               export-ignore
+/test               export-ignore
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
 /.scrutinizer.yml  export-ignore

diff --git a/Examples/config.php b/Examples/config.php
@@ -6,4 +6,4 @@
  * @copyright  (G) 2017 Vitex Software
  */
 
-require_once '../testing/bootstrap.php';
+require_once '../test/bootstrap.php';
diff --git a/Examples/demo.php b/Examples/demo.php
@@ -2,7 +2,7 @@
 
 namespace AbraFlexi;
 
-require_once '../testing/bootstrap.php';
+require_once '../test/bootstrap.php';
 
 echo _('FlexiBee Connection Test')."\n\n";
 

diff --git a/README.md b/README.md
@@ -339,9 +339,9 @@ Přidejte do vašeho composer.json i cesty k původním testům:
 ```json
     "autoload-dev": {
         "psr-4": {
-            "Test\\": "vendor/spojenet/php-abraflexi/testing/src/AbraFlexi/testing/",
+            "Test\\": "vendor/spojenet/php-abraflexi/test/src/AbraFlexi/test/",
             "Test\\Ease\\": "vendor/vitexsoftware/ease-core/tests/src/Ease",
-            "Test\\AbraFlexi\\": "vendor/spojenet/php-abraflexi/testing/src/AbraFlexi/",
+            "Test\\AbraFlexi\\": "vendor/spojenet/php-abraflexi/test/src/AbraFlexi/",
          }
     }
 ```

diff --git a/debian/Jenkinsfile b/debian/Jenkinsfile
@@ -1,6 +1,6 @@
 #!groovy
 
-String[] distributions = ['debian:buster', 'debian:bullseye', 'debian:bookworm', 'ubuntu:focal', 'ubuntu:jammy', 'ubuntu:kinetic']
+String[] distributions = ['debian:bullseye', 'debian:bookworm', 'ubuntu:focal', 'ubuntu:jammy']
 
 String vendor = 'vitexsoftware'
 String distribution = ''
@@ -33,13 +33,14 @@ distributions.each {
     node {
         ansiColor('xterm') {
             stage('Checkout ' + distribution) {
+            checkout scm
                 buildImage = docker.image(vendor + '/' + distribution)
-		sh 'git checkout debian/changelog'
-                def VERSION = sh (
+                sh 'git checkout debian/changelog'
+                def version = sh (
                     script: 'dpkg-parsechangelog --show-field Version',
                     returnStdout: true
                 ).trim()
-                ver = VERSION + '~' + distroCodename + '~' + env.BUILD_NUMBER
+                ver = version + '.' + env.BUILD_NUMBER  + '~' + distroCodename
             }
             stage('Build ' + distribution) {
                 buildImage.inside {

diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-php-spojenet-abraflexi (2.24.0) UNRELEASED; urgency=medium
+php-spojenet-abraflexi (2.24.1) UNRELEASED; urgency=medium
 
   [ Vítězslav Dvořák ]
   * ease-core based
@@ -46,8 +46,9 @@ php-spojenet-abraflexi (2.24.0) UNRELEASED; urgency=medium
   * release v2.23 dueDays
   * Attachment Downloader fixed
   * Document interface added
+  * jenkins-Spoje.Net-php-spojenet-abraflexi-67
 
- -- vitex <info@vitexsoftware.cz>  Sat, 29 Apr 2023 11:20:38 +0200
+ -- vitex <jenkins@vyvojar.spoje.net>  Tue, 11 Jul 2023 07:43:49 +0000
 
 flexipeehp (1.12) experimental; urgency=medium
 

diff --git a/debian/php-spojenet-abraflexi-dev.install b/debian/php-spojenet-abraflexi-dev.install
@@ -1,3 +1,3 @@
-testing/AbraFlexi/*.php		 /usr/share/php/AbraFlexiDev
+test/src/AbraFlexi/*.php	 /usr/share/php/AbraFlexiDev
 debian/composer.json		 /usr/share/php/AbraFlexiDev
 debian/test/*                    /usr/share/doc/AbraFlexiDev
diff --git a/debian/rules b/debian/rules
@@ -24,6 +24,6 @@ override_dh_install:
 	jq '.version = "'`dpkg-parsechangelog | sed -n 's/^Version: //p'| sed 's/~.*//' `'"'  debian/composer.json |sponge debian/composer.json
 	dh_install	
 	sed -i -e  "s/\/\.\.\/\.\.\//\//g" debian/php-spojenet-abraflexi/usr/share/php/AbraFlexi/RO.php
-	sed -i -e  "s/\.\.\/testing\//\/usr\/share\/php\/AbraFlexi\/tools\//g" debian/php-spojenet-abraflexi/usr/share/php/AbraFlexi/tools/*.php
+	sed -i -e  "s/\.\.\/test\//\/usr\/share\/php\/AbraFlexi\/tools\//g" debian/php-spojenet-abraflexi/usr/share/php/AbraFlexi/tools/*.php
 	sed -i '/git/d' debian/php-spojenet-abraflexi/usr/share/php/AbraFlexi/tools/force_update_all.sh
 	sed -i -e  "s/src\/AbraFlexi\///g" debian/php-spojenet-abraflexi/usr/share/php/AbraFlexi/tools/force_update_all.sh
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="./testing/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="./test/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <coverage>
     <include>
       <directory suffix=".php">src/AbraFlexi</directory>
     </include>
   </coverage>
   <testsuites>
     <testsuite name="all">
-      <directory>./testing</directory>
+      <directory>./test</directory>
     </testsuite>
   </testsuites>
   <!-- logging>

diff --git a/src/AbraFlexi/EvidenceList.php b/src/AbraFlexi/EvidenceList.php
@@ -2,7 +2,7 @@
 /**
  * AbraFlexi - List of Evidencies.
  *
- * Generated: Thu, 14 Sep 2023 18:16:17 +0000 
+ * Generated: Thu, 14 Sep 2023 16:40:32 +0200 
  * From:      https://demo.flexibee.eu
  *    
  * @author     Vítězslav Dvořák <vitex@arachne.cz>
@@ -46,7 +46,7 @@ class EvidenceList extends RO
      *
      * @var string
      */
- static public $version = '2023.4.3';
+ static public $version = '2023.4.1';
 
     /**
      * Evidences Path/Name listing.

diff --git a/static/Properties.analyza-zakazky.json b/static/Properties.analyza-zakazky.json
diff --git a/static/Properties.banka-polozka.json b/static/Properties.banka-polozka.json
diff --git a/static/Properties.banka.json b/static/Properties.banka.json
diff --git a/static/Properties.cenikovy-pohyb-nakup.json b/static/Properties.cenikovy-pohyb-nakup.json
diff --git a/static/Properties.cenikovy-pohyb-prodej.json b/static/Properties.cenikovy-pohyb-prodej.json
diff --git a/static/Properties.doklad-k-uhrade.json b/static/Properties.doklad-k-uhrade.json
diff --git a/static/Properties.doklad.json b/static/Properties.doklad.json
@@ -1 +1 @@
-{"idDokladView":{"showToUser":"true","propertyName":"idDokladView","name":"ID (n\u00e1hled)","title":"ID (n\u00e1hled)","type":"integer","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"idDokl":{"showToUser":"true","propertyName":"idDokl","name":"ID dokladu","title":"ID dokladu","type":"integer","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"kod":{"showToUser":"true","propertyName":"kod","name":"Zkratka","title":"Zkratka","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"true","inDetail":"true","inExpensive":"false","mandatory":"true","maxLength":"20","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"true","isLowerCase":"false","links":null},"popis":{"showToUser":"true","propertyName":"popis","name":"Popis","title":"Popis","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"varSym":{"showToUser":"true","propertyName":"varSym","name":"Variabiln\u00ed symbol","title":"Variabiln\u00ed symbol","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","maxLength":"30","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"sumCelkem":{"showToUser":"true","propertyName":"sumCelkem","name":"Celkem [K\u010d]","title":"Celkem [K\u010d]","type":"numeric","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"true","inDetail":"true","inExpensive":"false","mandatory":"false","digits":"15","decimal":"2","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"nazFirmy":{"showToUser":"true","propertyName":"nazFirmy","name":"N\u00e1zev firmy nebo jm\u00e9no osoby","title":"N\u00e1zev firmy - jm\u00e9no","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","maxLength":"255","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"ic":{"showToUser":"true","propertyName":"ic","name":"I\u010cO","title":"I\u010cO","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","maxLength":"20","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":{"link":"https:\/\/support.flexibee.eu\/remote\/ident-num\/<#if object.stat??>${object.stat.kod}<#else>CZ<\/#if>\/${value}"}},"dic":{"showToUser":"true","propertyName":"dic","name":"DI\u010c","title":"DI\u010c","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","maxLength":"20","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":{"link":"https:\/\/support.flexibee.eu\/remote\/vat-id\/${value}"}},"faNazev":{"showToUser":"true","propertyName":"faNazev","name":"Po\u0161t. jm\u00e9no firmy","title":"Firma","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","maxLength":"255","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"modul":{"showToUser":"true","propertyName":"modul","name":"Modul","title":"Modul","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"true","isLowerCase":"false","links":null},"evdName":{"showToUser":"true","propertyName":"evdName","name":"N\u00e1zev evidence","title":"N\u00e1zev evidence","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"subModul":{"showToUser":"true","propertyName":"subModul","name":"Podmodul (z\u00e1po\u010det, prodejka)","title":"Podmodul (z\u00e1po\u010det, prodejka)","type":"logic","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"external-ids":{"showToUser":"false","propertyName":"external-ids","fkEvidencePath":"external-ids","dbName":"extid","name":"external-ids","title":"extIDs","type":"relation","isVisible":"true","isSortable":"false","isHighlight":"false","inId":"true","inSummary":"true","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null}}
+{"idDokladView":{"showToUser":"true","propertyName":"idDokladView","name":"ID (n\u00e1hled)","title":"ID (n\u00e1hled)","type":"integer","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"idDokl":{"showToUser":"true","propertyName":"idDokl","name":"ID dokladu","title":"ID dokladu","type":"integer","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"kod":{"showToUser":"true","propertyName":"kod","name":"Zkratka","title":"Zkratka","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"true","inDetail":"true","inExpensive":"false","mandatory":"true","maxLength":"20","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"true","isLowerCase":"false","links":null},"popis":{"showToUser":"true","propertyName":"popis","name":"Popis","title":"Popis","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"varSym":{"showToUser":"true","propertyName":"varSym","name":"Variabiln\u00ed symbol","title":"Variabiln\u00ed symbol","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","maxLength":"30","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"sumCelkem":{"showToUser":"true","propertyName":"sumCelkem","name":"Celkem [\u20ac]","title":"Celkem [\u20ac]","type":"numeric","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"true","inDetail":"true","inExpensive":"false","mandatory":"false","digits":"15","decimal":"2","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"nazFirmy":{"showToUser":"true","propertyName":"nazFirmy","name":"N\u00e1zev firmy nebo jm\u00e9no osoby","title":"N\u00e1zev firmy - jm\u00e9no","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","maxLength":"255","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"ic":{"showToUser":"true","propertyName":"ic","name":"I\u010cO","title":"I\u010cO","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","maxLength":"20","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":{"link":"https:\/\/support.flexibee.eu\/remote\/ident-num\/<#if object.stat??>${object.stat.kod}<#else>CZ<\/#if>\/${value}"}},"dic":{"showToUser":"true","propertyName":"dic","name":"DI\u010c","title":"DI\u010c","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","maxLength":"20","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":{"link":"https:\/\/support.flexibee.eu\/remote\/vat-id\/${value}"}},"faNazev":{"showToUser":"true","propertyName":"faNazev","name":"Po\u0161t. jm\u00e9no firmy","title":"Firma","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","maxLength":"255","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"modul":{"showToUser":"true","propertyName":"modul","name":"Modul","title":"Modul","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"true","isLowerCase":"false","links":null},"evdName":{"showToUser":"true","propertyName":"evdName","name":"N\u00e1zev evidence","title":"N\u00e1zev evidence","type":"string","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"subModul":{"showToUser":"true","propertyName":"subModul","name":"Podmodul (z\u00e1po\u010det, prodejka)","title":"Podmodul (z\u00e1po\u010det, prodejka)","type":"logic","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"false","inSummary":"false","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"external-ids":{"showToUser":"false","propertyName":"external-ids","fkEvidencePath":"external-ids","dbName":"extid","name":"external-ids","title":"extIDs","type":"relation","isVisible":"true","isSortable":"false","isHighlight":"false","inId":"true","inSummary":"true","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null}}
diff --git a/static/Properties.faktura-prijata-polozka.json b/static/Properties.faktura-prijata-polozka.json
diff --git a/static/Properties.faktura-prijata.json b/static/Properties.faktura-prijata.json
diff --git a/static/Properties.faktura-vydana-polozka.json b/static/Properties.faktura-vydana-polozka.json
diff --git a/static/Properties.faktura-vydana.json b/static/Properties.faktura-vydana.json
diff --git a/static/Properties.interni-doklad-polozka.json b/static/Properties.interni-doklad-polozka.json
diff --git a/static/Properties.interni-doklad.json b/static/Properties.interni-doklad.json
diff --git a/static/Properties.leasing.json b/static/Properties.leasing.json