Commit Graph

9552 Commits

Author SHA1 Message Date
Frédéric FRANCE
2c3cb5806d fix CI (#33827)
* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* fix CI

* try to fix

* fix
2025-04-14 19:37:33 +02:00
Laurent Destailleur
e12d4deba2 CSS v22 2025-04-14 19:05:45 +02:00
ldestailleur
b14d28c983 Fix filter on agenda list 2025-04-11 23:42:18 +02:00
Eric - CAP-REL
be1948e1eb better fields definition with full objects reference (#33798) 2025-04-09 16:36:42 +02:00
Vaadasch
facb31000d FIX $object not initialised in extrafields_list_print for propals (#33753)
* FIX object->id not initialise for propal / objectoffield

* Update extrafields_list_print_fields.tpl.php

* Update extrafields_list_print_fields.tpl.php

* Update list.php

* Update list.php

* Update list.php

---------

Co-authored-by: Arnaud Serrut <arnaud.serrut@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-08 15:28:41 +02:00
Anthony Berton
664ea5f8c1 FIX - const for affect warehouse (#33751)
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-07 18:29:42 +02:00
ldestailleur
16e05c08a7 Fix CI 2025-04-07 16:40:15 +02:00
Frédéric FRANCE
a427277958 fix phpstan (#33709)
* fix phpstan

* remove debug

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-07 15:48:16 +02:00
ldestailleur
6af8298736 Fix related to #33449 2025-04-07 15:46:10 +02:00
ldestailleur
fa5c98824f Fix related to #33449 2025-04-07 15:10:51 +02:00
ldestailleur
ab742e7bd8 NEW Support of monthly or weekly recurring events 2025-04-03 14:58:41 +02:00
ldestailleur
9a54786884 Factorize code for tooltip of actioncomm 2025-04-03 14:23:16 +02:00
ldestailleur
10c0fba6b0 WIP Recurring events 2025-04-03 13:59:46 +02:00
ldestailleur
18cc530d40 Remove useless colspan 2025-04-03 13:34:06 +02:00
ldestailleur
a0079c802b WIP Recurring events 2025-04-03 13:31:21 +02:00
ldestailleur
b3f3da4a79 Look and feel v22 2025-04-03 13:04:23 +02:00
ldestailleur
191f6ba00e NEW Look and feel - Checkboxes and radio buttons are larger 2025-04-03 13:00:19 +02:00
ldestailleur
c4c3906297 Enhance recurring events 2025-04-03 12:19:11 +02:00
ldestailleur
c0d3e87746 Debug v22 2025-04-03 12:09:48 +02:00
ldestailleur
ebe60801c4 Enhance code for recurring events 2025-04-02 23:51:03 +02:00
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
ldestailleur
6361c1032b Debug v22 2025-03-27 14:18:52 +01:00
ldestailleur
6f9d1a50dd Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-27 13:43:22 +01:00
ldestailleur
576ea1fe56 Fix responsive 2025-03-27 10:54:43 +01: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
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
ldestailleur
8d15000050 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-25 17:12:04 +01:00
ldestailleur
6ff05d188a Fix warning 2025-03-25 17:11:55 +01:00
Yannis Hoareau
1f15c35b15 Removed unnecessary tests (#33603) 2025-03-25 16:29:44 +01:00
ldestailleur
facf32c5a9 Clean code 2025-03-25 13:40:42 +01:00
ldestailleur
705eb17310 Clean code 2025-03-25 12:42:51 +01:00
ldestailleur
db7a2ce4d5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-20 12:01:43 +01:00
ldestailleur
9a851ce488 Debug v22 2025-03-20 12:01:29 +01:00
Laurent Destailleur
8c5ae9fa0e Fix duplicate calendar of bookcal module in aganda view 2025-03-20 03:39:11 +01:00
Laurent Destailleur
ff3f39c18a Fix duplicate entry of bookcal calendar selection in agenda view. 2025-03-20 03:36:12 +01:00
ldestailleur
fd18506c86 Debug v22 Try to make code simpler. 2025-03-19 18:16:54 +01:00
ThomasNgr-OpenDSI
643564d45c add advanced right to reopen a propal (#33416)
* add advanced right to reopen a propal

* use NOT insetad of empty() for getDolGlobalBool()

* fix travis
2025-03-19 18:12:02 +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
a0ec0002f6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-19 13:47:25 +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
462ed9c6a3 Fix look and feel v21 2025-03-18 21:44:55 +01:00
Frédéric FRANCE
b7a00127a9 add missing translation (#33461)
* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation

* add missing translation
2025-03-15 11:21:03 +01:00
MDW
d64298f6c1 Qual: Fix phan notices (htdocs/compta) (#33427) 2025-03-12 20:41:50 +01:00
Vincent Maury
68818a451c Fix Deposit percent on new propal (#33395)
When deposit is activated, on new propal deposit percent is'nt proposed, and isn't saved in the propal, causing a display bug in pdf.

I just reported the same modif than in command
2025-03-11 03:27:08 +01:00
Vincent Maury
4d26130212 Fix Deposit percent on new propal (#33395)
When deposit is activated, on new propal deposit percent is'nt proposed, and isn't saved in the propal, causing a display bug in pdf.

I just reported the same modif than in command
2025-03-11 03:26:45 +01:00
Vincent Maury
fcaf26c253 Fk account not saved (#33396)
When bank account is set but there's an error, it's lost

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 03:25:12 +01:00
Vincent Maury
a93ca347c3 Fk account not saved (#33396)
When bank account is set but there's an error, it's lost

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-11 03:24:52 +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