Commit Graph

4958 Commits

Author SHA1 Message Date
Jon Bendtsen
27dc84fe3b NEW Can link member subscription/contribution with proposal, order and invoice (#33647)
* linking member subscription contribution <-> proposal, order and invoice
This can both be done manually from an existing proposal/order/invoice to a subscription created without creating an invoice. I use this when we sell memberships as part of registration for our membership classes.

The link will also be shown on the invoice that can be created as part of the subscription contribution creation.

These links show up in the json from the API on proposals, orders and invoices. The subscription does not show anything. It is currently unknown if the API can do this link or it will have to be done manually in the GUI.

* Update html.form.class.php

---------

Co-authored-by: Jon Bendtsen <xcodeauthor@jonb.dk>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-01 21:36:35 +02:00
Frédéric FRANCE
387e3b1da7 shipping can manage its contacts (#33680)
* shipping can manage its contacts

* shipping can manage its contacts

* fix

* add contacts from origin

* clean code

* apply changes

* apply changes
2025-04-01 20:47:40 +02:00
atm-jonathan
0595e2556d NEW_SUBMIT_FOR_ALL_MARK_RESPAWN (#32101)
* reprise ancienne PR

* add variable

* correction foreach

* retour precommit

* delete Blank line

* mass brand tx propal

* clean

* clean

* condition foreach

* clean code

* Fix ci

---------

Co-authored-by: x <x@x.x>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-27 01:03:05 +01:00
Clément
84ceccee32 Disable intervention creation from an order (#33625)
* Disable intervention creation from an order

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-26 20:47:19 +01:00
ldestailleur
d9753254b1 Look and feel v22 for description/notes into lines 2025-03-26 14:39:42 +01:00
ldestailleur
ec0b487b28 NEW Can filter on public/private notes in list sale orders thirdparties 2025-03-26 14:12:55 +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
Frédéric FRANCE
869d7af747 comment test not needed (#33504) 2025-03-19 13:48:56 +01:00
ldestailleur
19e63684c7 Look and feel v22: Smaller label with tooltip for customs code. 2025-03-19 11:45:15 +01:00
Laurent Destailleur
395157d16c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-17 19:46:08 +01:00
ldestailleur
2858d4e544 Debug message on tooltip of not allowed button. 2025-03-17 11:42:39 +01:00
ldestailleur
07d517ec49 FIX text in tooltip on buttons when pb is not a permission problem 2025-03-17 11:05:41 +01:00
Laurent Destailleur
119716bd82 Fix button "Create shipment" if no permission 2025-03-16 23:56:14 +01:00
MDW
0cc1aa6d80 Qual: Fix phan notices (asset..compta/paiement) (#33484)
* Qual: Fix phan notices (accountancy, adherents)

* Qual: Fix phan notices (admin)

* Qual: Fix phan notices (asset..compta/paiement)

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:45:04 +01:00
ldestailleur
6eb65f383d Clean code 2025-03-16 20:15:52 +01:00
ldestailleur
b4bf192e37 Doc 2025-03-16 20:04:52 +01:00
Laurent Destailleur
aad4a2bc7e Merge branch 'develop' into retrieving-extraparams-for-lines 2025-03-06 04:57:15 +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
Laurent Destailleur
41377a9917 Merge pull request #33313 from mdeweerd/phan/big_violators
Fix PhanTypeMismatchArgument in commonobject, commande/card,
2025-03-05 13:05:42 +01:00
ldestailleur
6c9e25677c close #33310 2025-03-05 13:03:35 +01:00
MDW
4096d0ee2f Qual: Fix phan notices for commande 2025-03-05 12:15:14 +01:00
MDW
acf6b62822 Fix PhanTypeMismatchArgument in commonobject, commande/card, 2025-03-05 12:15:12 +01:00
yannis
cf83c6668e Retrieve extraparams from db to objectline 2025-03-03 16:01:38 +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
Noé Cendrier
08327dd08b Merge pull request #29 from altairis-melina/fix_msg_customer_packaging
FIX: Success message when add a product line that has packaging
2025-02-27 10:31:40 +01:00
Kamel Khelifa
4d2ad0aadf Fix CI-PULL-REQUEST / pre-commit / pre-commit (pull_request) 2025-02-25 15:25:33 +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
ldestailleur
34ecda6994 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-25 02:47:26 +01:00
ldestailleur
030d83145f Merge 2025-02-25 02:44:30 +01:00
Mélina JOUM
d2387dd8bc FIX: Success message when add a product line that has packaging 2025-02-24 17:23:34 +01:00
Anthony Berton
c295314edc FIX - Warehouse default 2025-02-22 02:00:19 +01:00
Frédéric FRANCE
d917d4896e clean code 2025-02-21 09:45:20 +01:00
Frédéric FRANCE
d67816aa18 clean code 2025-02-21 08:57:42 +01:00
ldestailleur
e8f8416215 NEW Filter on date creation/date modification in invoice list 2025-02-18 13:56:44 +01:00
ldestailleur
cabd8a680e Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-18 10:25:53 +01:00
Laurent Destailleur (aka Eldy)
9d61b20ecd Fix php stan 2025-02-18 10:24:00 +01:00
Florent Poinsaut
fa512af180 NEW #22848 FIx phpstan alert 2025-02-14 15:46:40 +01:00
Florent Poinsaut
c8cc7884e4 NEW #22848 Fix CI 2025-02-14 14:35:44 +01:00
Florent Poinsaut
ee8791666c NEW #22848 Remove linked categories 2025-02-14 14:32:59 +01:00
Florent Poinsaut
bfed762fe9 NEW Dolibarr#22848 Add order tags 2025-02-14 14:29:49 +01:00
Laurent Destailleur
652e31982d Merge pull request #32860 from leninrivas/patch-23
NEW ORDER_TYPE_CONTACT_DEFAULT
2025-02-12 04:46:28 +01:00
Laurent Destailleur (aka Eldy)
9bc2a3a6bd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-11 22:24:47 +01:00
Laurent Destailleur (aka Eldy)
2fc2e045be NEW Add link to create shipment on picto 2025-02-11 18:45:39 +01:00
Laurent Destailleur (aka Eldy)
d6aac69d90 Debug v21 2025-02-11 16:28:37 +01:00
MDW
928402c847 Qual: Fix phan (project-1) 2025-02-11 00:22:39 +01:00