Commit Graph

15034 Commits

Author SHA1 Message Date
ldestailleur
7df240c25b Fix CI 2025-04-07 12:28:05 +02:00
ldestailleur
c7ec63b702 Look and feel v22 2025-04-05 12:55:04 +02:00
Frédéric FRANCE
47c1346699 add missing translation (#33724)
* add missing translation

* add missing translation

* add missing translation
2025-04-04 15:17:26 +02:00
ldestailleur
1aac6e3c34 Clean code by using the ACCOUNTING_MODE var for both modules 2025-04-03 16:41:41 +02:00
ldestailleur
d06fdc068e FIX tooltip info on recuring invoice must be into tthe tooltip 2025-04-03 13:10:25 +02:00
ldestailleur
b466b7ab5a NEW The link "In accountancy" is now clicable to reach bookkeeping 2025-04-02 18:51:51 +02:00
atm-jonathan
d72d69e55c NEW add home box mrp (#33549)
* add box Mo

* tests ok

* comparaison dates

* before Wysy

* after wysy

* Update mo.class.php

* Update mo.class.php

* Update conf.class.php

* retour PR

* add parenthesis

* Update mo_list.php

---------

Co-authored-by: x <x@x.x>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-02 12:22:59 +02:00
MDW
6fe1effa5e Qual: Fix PhanTypeMismatchArgumentNullable notices (#33684) 2025-04-02 11:35:53 +02:00
MDW
5cc0bd0a3f Fix #33689 - missing rename (#33693)
# Fix #33689 - missing rename

Assignment to $result in code before fixing phan notice
seem be an error, but in fact the assignment is useless
and the code only expects a potential exception.
2025-04-02 11:31:10 +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
8efa60f4b0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-04-01 13:53:52 +02:00
ldestailleur
1535db72a6 Fix load status 2025-03-31 18:40:38 +02:00
ldestailleur
6c8ae0b2a6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-31 16:28:08 +02:00
ldestailleur
f543dac233 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-31 16:02:59 +02:00
atm-corentin
7cadf5d53e FIX|Fix # fatal trying update desc invoice situation (#33607)
* fix fatal trying to do a sub between an int and a string

* fix trad unknow issue

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-31 13:14:32 +02:00
rogue-spectre
bc5b4cff67 Update clientfourn.php (#33663)
correction of a sql request returning a buggy result. 

Instead of the sum of the different donations payments the request returned the number of payment multiplied by the global amount of donation.
2025-03-31 11:44:11 +02:00
rogue-spectre
d74383afce Update clientfourn.php (#33663)
correction of a sql request returning a buggy result. 

Instead of the sum of the different donations payments the request returned the number of payment multiplied by the global amount of donation.
2025-03-31 11:43:18 +02:00
Jyhere
38e21a1ef6 FIX: missing formObjectOptions hook on payment card (#33629) 2025-03-28 15:01:32 +01:00
ldestailleur
30801214ce Code comment 2025-03-28 12:07:51 +01:00
ldestailleur
74f85c8622 FIX Report by custom groupe was empty 2025-03-28 04:27:36 +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
ae59c409f6 Modulebuilderization 2025-03-26 00:56:24 +01:00
Josep Lluís
f8550ed45d NEW: Add DateMaxPayment option on selectDate (#33601)
* Add DateMaxPayment option on selectDate

Add DateMaxPayment option on selectDate, in customers invoices, as in suppliers invoices

* Update paiement.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-25 16:34:28 +01:00
Frédéric FRANCE
c753078b36 fix missings translations (#33585)
* fix missings translations

* fix

* fix

* fix

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-24 22:01:55 +01:00
Charlène Benke
936d0eeae1 Add sold amount on api call (V2) (#33589)
* Add sold amount on api call (V2)

other way to implement it

* Update api_bankaccounts.class.php

Use the non deprecated property name.

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-24 16:43:32 +01:00
kkhelifa-opendsi
963fb2a41c FIX : If the global INVOICE_CAN_NEVER_BE_EDITED disabled the action 'modify' of a invoice, we test in the point of entry of the action and not after we make many useless tests (#33594)
* FIX : If the global INVOICE_CAN_NEVER_BE_EDITED disabled the action 'modify' of a invoice, we test in the point of entry of the action and not after we make many useless tests

* Correction
2025-03-24 15:34:58 +01:00
ldestailleur
7ce20a5ff3 FIX blank page on smartphone for bank SEPA direct transfer page 2025-03-24 13:01:08 +01:00
ldestailleur
ad36e0f33f FIX blank page on smartphone for bank SEPA direct transfer page 2025-03-24 13:00:35 +01:00
ldestailleur
2e3c4d57a6 Fix includes 2025-03-24 12:56:11 +01:00
ldestailleur
e1351bdd18 FIX Translation of column in list of invoice 2025-03-24 12:54:32 +01:00
ldestailleur
911bfa2883 FIX Translation of column in list of invoice 2025-03-24 12:49:46 +01:00
lvessiller-opendsi
f9e42e82d5 FIX #33563 - Discount amount count twice when create a discount from a deposit invoice (#33564) 2025-03-24 01:22:16 +01:00
Frédéric FRANCE
fded6d7855 fix CI branch 21 (#33535) 2025-03-19 15:53:00 +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
MDW
8669993ecf Qual: Fix phan notices (compta/prel..fichinter) (#33485)
* Qual: Fix phan notices (asset..compta/paiement)

* Qual: Fix phan notices (compta/prel..fichinter)
2025-03-19 15:21:48 +01:00
ldestailleur
a3f3f28362 Fix warnings 2025-03-19 14:42:04 +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
kkhelifa-opendsi
f3b146a1ab FIX: Need missing translation file in result index page of accountancy repport (#33527) 2025-03-19 14:10:44 +01:00
ldestailleur
0a4f1ffc06 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-03-19 14:09:41 +01:00
atm-lucas
42a1cde41a useless product fetch on invoice create (#33505) 2025-03-19 14:00:03 +01:00
Vaadasch
8a8608fa91 Update paiement.class.php add $error++ if invoice not linked (#33500) 2025-03-19 13:55:13 +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
ldestailleur
e72299126c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
Signed-off-by: ldestailleur <eldy@destailleur.fr>
2025-03-18 16:39:04 +01:00
ldestailleur
b085145cc5 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-18 16:37:50 +01:00
ldestailleur
7465d54335 Fix renaming dire must be at end outside of translation. 2025-03-18 16:36:18 +01:00