2
0
forked from Wavyzz/dolibarr
Commit Graph

2588 Commits

Author SHA1 Message Date
Frédéric FRANCE
57aa02f0f4 Fix missing translation (#34014)
* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation

* fix missing translation
2025-04-29 10:53:52 +02:00
Charlène Benke
af07c504a8 if localtaxes_type is empty no array return (#33938) 2025-04-22 11:44:30 +02:00
Frédéric FRANCE
255300a29e test fix phan (#33879)
* test fix phan

* test fix phan

* test fix phan

* test fix phan

* test fix phan
2025-04-16 19:55:44 +02:00
Florian Mortgat
0031210040 NEW hidden conf for api contrat putLine endpoint to only return the line (#33809)
* NEW: hidden conf for endpoint PUT {id}/lines/{lineid} to return only the modified line and remove more attributes from the object

* Fixing pre-commit error

* FIX: cherry-picked commit (designed for v17.0) was incompatible with v22
Feature: hiden conf 'API_CONTRAT_PUTLINE_OUTPUT_LINE_ONLY'
- use $lineid ($id is the ID of the contract)
- instantiate ContratLigne (the attribute $this->contractLine no longer exists)
- more attributes to be unset
2025-04-12 16:41:34 +02:00
Etienne BENDER
285950a684 feat(contract): add new printObjectLinesBlock hook (#33771)
* feat(contract): add new printObjectLinesBlock hook

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-09 00:25:28 +02:00
ldestailleur
6af8298736 Fix related to #33449 2025-04-07 15:46:10 +02:00
ldestailleur
f9e4e20ab7 Clean code 2025-04-02 12:46:40 +02:00
Florian Mortgat
78dee78508 FIX v22 warnings and remove seemingly useless code (#33622) 2025-04-02 12:43:37 +02:00
atm-irvine
ce0bcdf6cc feat(contract-line): created new endpoint paginated with limit and page (#33222)
* feat(contract-line): created new endpoint paginated with limit and page

* fix(api-contract): added type to php doc

* Update api_contracts.class.php

* fix(contrat): edit getLines endpoint to add pagination

* feat(contract): added pagination and sqlfilters on getLines contract api'

* Update api_contracts.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-31 19:52:36 +02:00
Florian Mortgat
c9ecc5dfad Remove deprecated columns price_ht and remise from llx_contratdet (#33616)
* [breaking change] Remove deprecated columns `price_ht` and `remise` from llx_contratdet and corresponding class properties

* FIX: remove references to deleted field `price_ht` from module
descriptor (exports)
2025-03-29 17:25:00 +01:00
ldestailleur
d9753254b1 Look and feel v22 for description/notes into lines 2025-03-26 14:39:42 +01:00
ldestailleur
ae59c409f6 Modulebuilderization 2025-03-26 00:56:24 +01:00
Yannis Hoareau
1f15c35b15 Removed unnecessary tests (#33603) 2025-03-25 16:29:44 +01:00
Vaadasch
6e381671ff FIX: PRODUIT_AUTOFILL_DESC works even if line_desc is empty. Removing MAIN_NO_CONCAT_DESCRIPTION (#33489)
La variable MAIN_NO_CONCAT_DESCRIPTION est redondante avec PRODUIT_AUTOFILL_DESC.
Cette redondance créée une difficulté de compréhension et des effets de bord, principalement lorsqu'un utilisateur souhaite mettre une description à vide.

# Confirmation de la redondance de MAIN_NO_CONCAT_DESCRIPTION
Pour confirmation : Ajout de lignes de débug pour constatation.
Lignes 1116 à 1122 de DOL_ROOT/core/class/conf.class.php
```php
			print "<p>Before : PRODUIT_AUTOFILL_DESC = " . $this->global->PRODUIT_AUTOFILL_DESC . " ; MAIN_NO_CONCAT_DESCRIPTION = ".$this->global->MAIN_NO_CONCAT_DESCRIPTION . "</p>";
            if (!empty($this->global->PRODUIT_AUTOFILL_DESC)) {
                $this->global->MAIN_NO_CONCAT_DESCRIPTION = 1;
            } else {
                unset($this->global->MAIN_NO_CONCAT_DESCRIPTION);
            }
            print "<p>After : PRODUIT_AUTOFILL_DESC = " . $this->global->PRODUIT_AUTOFILL_DESC . " ; MAIN_NO_CONCAT_DESCRIPTION = ".$this->global->MAIN_NO_CONCAT_DESCRIPTION . "</p>";
```
Application d'une valeur à MAIN_NO_CONCAT_DESCRIPTION = 4 depuis l'interface Configuration -> Divers.
Modification de la variable PRODUIT_AUTOFILL_DESC par l'interface d'admin du module Produit :
```
Before : PRODUIT_AUTOFILL_DESC = 0 ; MAIN_NO_CONCAT_DESCRIPTION = 4
After : PRODUIT_AUTOFILL_DESC = 0 ; MAIN_NO_CONCAT_DESCRIPTION =
```
```
Before : PRODUIT_AUTOFILL_DESC = 1 ; MAIN_NO_CONCAT_DESCRIPTION = 4
After : PRODUIT_AUTOFILL_DESC = 1 ; MAIN_NO_CONCAT_DESCRIPTION = 1
```
```
Before : PRODUIT_AUTOFILL_DESC = 2 ; MAIN_NO_CONCAT_DESCRIPTION = 4
After : PRODUIT_AUTOFILL_DESC = 2 ; MAIN_NO_CONCAT_DESCRIPTION = 1
```

# Conservation de la valeur dans conf.class.php
Pour des raisons de compatibilités, je pense qu'il vaut mieux laisser la partie de conf.class.php pour définir la valeur si jamais il y a des modules tiers qui l'utilisent.

En dehors de cet usage de rétrocompatibilité, je suis passé sur tous les autres fichiers pour la retirer. Je modifierai le wiki pour l'en retirer aussi une fois la PR intégrée.

# Modification des card.php
## Modification de $product_desc en $line_desc.
L'utilisation de $product_desc laissait supposer que le contenu de cette variable était récupérée de la description renseignée dans le produit, or elle est en réalité récupérée du formulaire envoyé.
Je l'ai donc modifiée pour correspondre davantage à la réalité.
## Comportement
Dans le cas où PRODUIT_AUTOFILL_DESC == 0, on concatene la $line_desc avec la description issue du produit, récupérée préalablement par $desc

Co-authored-by: Arnaud Serrut <arnaud.serrut@gmail.com>
2025-03-19 15:50:07 +01:00
ldestailleur
66e14bb708 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 14:28:20 +01:00
ldestailleur
5c1f8b58c4 Merge 2025-03-19 14:23:19 +01:00
ldestailleur
bb719f73cf Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-03-19 14:19:01 +01:00
ldestailleur
1ab438d62e Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-03-19 14:17:37 +01:00
Frédéric FRANCE
869d7af747 comment test not needed (#33504) 2025-03-19 13:48:56 +01:00
ldestailleur
ae10954b65 NEW Can set aspecific permission on an extrafields 2025-03-18 15:21:20 +01:00
Eric - CAP-REL
8073c0e1be FIX : close all services on contract will close all lines (#33466)
* close line : line could be inactive or open

* Update contrat.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-15 12:03:37 +01:00
ldestailleur
4897c9de7f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-03-14 12:20:56 +01:00
ldestailleur
16c7192d98 Clean code 2025-03-13 10:45:40 +01:00
ldestailleur
3404e37aae Fix CI 2025-03-13 09:58:56 +01:00
ldestailleur
b685be67e9 Standardize 2025-03-12 20:09:09 +01:00
Florian Mortgat
f7fe6c4f1a FIX warnings (#33423)
* FIX warnings

* fix: empty({function call})
2025-03-12 19:15:24 +01:00
MDW
ee9e89efaa Qual: Fix phan notices (facture/3 + filefunc.inc) (#33383)
* Qual: Fix PhanMismatchType

* Finalize rename of $attrV into $value

* Correct getGlobalString into getGlobalInt

* Do not require some fields in the 'title' definition of $cols

* Qual: Fix phan notices (core/lib)

* Qual: Fix phan (contrat)

* Qual: Fix phan notices (facture/3 + filefunc.in)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 01:59:34 +01:00
MDW
988fc75ca2 Qual: Fix phan notices (emailcollector, bookkeeping) (#33375)
* Qual: Fix phan notices (mostly propal)

* Fix some const arguments to Form::select_dolusers()

* Update phan baseline

* Qual: Fix phan notices (propal)

* Qual: Fix phan notices (emailcollector, bookkeeping)
2025-03-10 15:47:55 +01:00
ldestailleur
ae196154af Fix SQL error 2025-03-07 15:45:20 +01:00
Laurent Destailleur
aad4a2bc7e Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-06 04:57:15 +01:00
ldestailleur
d20e730c66 Clean code 2025-03-06 04:56:54 +01:00
MDW
f625f8de60 Qual: Fix api phan notices 2025-03-05 13:22:08 +01:00
MDW
eac44b164a Qual: Fix phpdoc index(), FIELDS 2025-03-05 13:21:05 +01:00
yannis
3519174adf Added retrieving extraparams for some object lines 2025-03-03 16:57:32 +01:00
MDW
035ede5874 Qual: Fix phan notices in API classes 2025-03-02 20:49:46 +01:00
MDW
c02293a880 Qual: Add phpdoc for request_data param 2025-03-02 20:49:45 +01:00
Laurent Destailleur
e3b52283af Merge pull request #33225 from OPEN-DSI/develop_new_customer_price_period_and_discount
NEW: Add management of date begin/end and discount for a customer price (Code)
2025-03-01 00:44:26 +01:00
Laurent Destailleur
0b3d3c3a2b Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-27 02:06:35 +01:00
ldestailleur
b9646fbfbe Debug v21 2025-02-26 02:41:47 +01:00
Kamel Khelifa
7ba21bd23d NEW: Add management of date begin/end and discount for a customer price (Code) 2025-02-25 15:09:05 +01:00
Laurent Destailleur (aka Eldy)
d223f8a0b9 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-13 20:42:23 +01:00
Regis Houssin
521a8b7f0a FIX sql "order by" is defined twice 2025-02-13 14:41:18 +01:00
Regis Houssin
e0370a5143 FIX sql "order by" is defined twice 2025-02-13 11:00:22 +01:00
MDW
928402c847 Qual: Fix phan (project-1) 2025-02-11 00:22:39 +01:00
MDW
4168a16151 Qual: Fix ifsql argument type 2025-02-09 20:14:22 +01:00
MDW
24fa28dfe2 Qual: Fix getKanban phpdoc
# Qual: Fix getKanban phpdoc

Array phpdoc for getKanban corrections.
2025-02-05 01:43:37 +01:00
Laurent Destailleur (aka Eldy)
732f97d73c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-02-05 00:40:06 +01:00
Laurent Destailleur (aka Eldy)
58134e840d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-01-30 13:14:15 +01:00
Laurent Destailleur (aka Eldy)
12da2ba814 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-30 13:12:44 +01:00
Laurent Destailleur (aka Eldy)
ea8de773b6 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-01-30 13:02:03 +01:00