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/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 217e9e01301..6edbd5ed950 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -305,6 +305,8 @@ class Conf extends stdClass * @var stdClass */ public $productbatch; + public $api; + /** * @deprecated Use project */ @@ -470,6 +472,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(); @@ -738,6 +741,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/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 0877d18bdaf..51aba89c76f 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -1602,7 +1602,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl // Address - Phone - Email if (!empty($arrayfields['t.address']['checked'])) { $addresstoshow = $contactstatic->getBannerAddress('contact', $object); - print ''; + print ''; print $addresstoshow; print ''; } diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 969f585116c..f8b36da452c 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -1396,7 +1396,7 @@ class ProductFournisseur extends Product $label .= '
'.$langs->trans('ProductAccountancyBuyExportCode').': '.length_accountg($this->accountancy_code_buy_export); } - $logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC'); // set sort order here + $logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id, 'pfpl.datec', 'DESC', getDolGlobalInt('MAIN_TOOLTIP_PRICELOG_HISTORY_LIMIT', 10)); // set sort order here if (is_array($logPrices) && count($logPrices) > 0) { $label .= '

'; $label .= ''.$langs->trans("History").''; diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php index 06bad340cf7..d380b794485 100644 --- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php +++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php @@ -204,13 +204,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