diff --git a/.github/workflows/code_quality_qodana.yml.disabled b/.github/workflows/code_quality_qodana.yml.disabled deleted file mode 100644 index f9296bf377e..00000000000 --- a/.github/workflows/code_quality_qodana.yml.disabled +++ /dev/null @@ -1,28 +0,0 @@ -name: Qodana -on: - schedule: - - cron: "0 20 * * 1,3,5" - workflow_dispatch: - branches: - - develop -# push: -# branches: -# - develop - -permissions: - contents: read - -jobs: - qodana: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 1 - #php-version: '7.1' - - name: 'Qodana Scan' - uses: JetBrains/qodana-action@v2023.2.1 - #with: - # php-version: '7.1' - env: - QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/pr-18-autolabel.yaml.disabled b/.github/workflows/pr-18-autolabel.yaml.disabled deleted file mode 100644 index feb9ee17c97..00000000000 --- a/.github/workflows/pr-18-autolabel.yaml.disabled +++ /dev/null @@ -1,21 +0,0 @@ -name: "Set label for v18" -on: - pull_request: - types: [opened, synchronize, reopened] - branches: - - "18.0" - push: - branches: - - "18.0" - -jobs: - changed-lines-count-labeler: - runs-on: ubuntu-latest - name: An action for automatically labelling pull requests based on the changed lines count - steps: - - name: Set a label - uses: vkirilichev/changed-lines-count-labeler@v0.2 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - configuration-path: .github/changed-lines-count-labeler.yml - continue-on-error: true diff --git a/.github/workflows/pr-18.yaml.disabled b/.github/workflows/pr-18.yaml.disabled deleted file mode 100644 index 4f274e28c8f..00000000000 --- a/.github/workflows/pr-18.yaml.disabled +++ /dev/null @@ -1,45 +0,0 @@ -# Action to prepare the github action -# Go on Dolibarr - Settings - Developer settings - Enter a name + webhook to disable + Permissions (see app test) + Can install by any account -# Click on generate the private keys -# Click on Install application - choose user of the Organization -# Go on Organisation - Secret and variables and create a secret PR18_SECRET_KEY and copy the content of received private key. Choose the repository access to "Repository Dolibarr". -# Go on Organisation - Secret and variables and create a variable PR18_APP_ID and copy the ID of the previously create ID. Choose the repository access to "Repository Dolibarr". -# - -name: Set reviewer for v18 -on: - pull_request: - types: [opened, synchronize, reopened] - branches: - - "18.0" - push: - branches: - - "18.0" - -jobs: - pr18: - runs-on: ubuntu-latest - - #env: - # GH_TOKEN: ${{ github.token }} - # GH_TOKENS: ${{ secrets.GITHUB_TOKEN }} - - steps: - - name: Generate a token - id: generate-token - uses: actions/create-github-app-token@v2 - with: - app-id: ${{ vars.PR18_APP_ID }} - private-key: ${{ secrets.PR18_SECRET_KEY }} - - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Assign reviewer - env: - GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }} - url: ${{ github.event.pull_request.html_url }} - run: | - gh pr edit "$url" --add-reviewer rycks - gh pr edit "$url" --add-reviewer lvessiller-opendsi - diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 29c34cb64d0..98d0146fa4e 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -5846,7 +5846,7 @@ class Facture extends CommonInvoice } // Errors Recipient - $errors_to = $conf->global->MAIN_MAIL_ERRORS_TO; + $errors_to = getDolGlobalString('MAIN_MAIL_ERRORS_TO'); $trackid = 'inv'.$tmpinvoice->id; $sendcontext = 'standard'; diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 5171aa23006..fc3f69bd586 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -191,6 +191,8 @@ class Conf extends stdClass public $notification; public $expensereport; public $productbatch; + public $api; + /** * @deprecated Use project */ @@ -335,6 +337,7 @@ class Conf extends stdClass $this->notification = new stdClass(); $this->expensereport = new stdClass(); $this->productbatch = new stdClass(); + $this->api = new stdClass(); // Common arrays $this->cache = array(); @@ -601,6 +604,10 @@ class Conf extends stdClass $this->admin->dir_output = $rootfordata.'/admin'; $this->admin->dir_temp = $rootfortemp.'/admin/temp'; + // For api storage + $this->api->dir_output = $rootfordata.'/api'; + $this->api->dir_temp = $rootfortemp.'/api/temp'; + // For user storage $this->user->multidir_output = array($this->entity => $rootfordata."/users"); $this->user->multidir_temp = array($this->entity => $rootfortemp."/users/temp"); diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php index 8a722bd74d9..65878673978 100644 --- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php +++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php @@ -201,13 +201,13 @@ class modMyModule extends DolibarrModules // 'group' to add a tab in group view // 'intervention' to add a tab in intervention view // 'invoice' to add a tab in customer invoice view - // 'invoice_supplier' to add a tab in supplier invoice view + // 'supplier_invoice' to add a tab in supplier invoice view // 'member' to add a tab in foundation member view // 'opensurveypoll' to add a tab in opensurvey poll view // 'order' to add a tab in sale order view - // 'order_supplier' to add a tab in supplier order view + // 'supplier_order' to add a tab in supplier order view // 'payment' to add a tab in payment view - // 'payment_supplier' to add a tab in supplier payment view + // 'supplier_payment' to add a tab in supplier payment view // 'product' to add a tab in product view // 'propal' to add a tab in propal view // 'project' to add a tab in project view