Commit Graph

5662 Commits

Author SHA1 Message Date
Frédéric FRANCE
6164a9c9cc fix CI (#33866)
* fix CI

* Update facture.class.php
2025-04-16 11:10:38 +02:00
lvessiller-opendsi
4963639d67 NEW input reason for customer invoice (#33599)
* NEW input reason for customer invoice

* Fix CI error

* Fix format fk_input_reason in array of fileds

* Add invoices in translate key of source dictionary
2025-04-16 01:02:26 +02:00
Laurent Destailleur
b38779ec99 Fix CI 2025-04-15 23:35:54 +02:00
Laurent Destailleur
3085c0762f Fix remove print 2025-04-15 02:51:00 +02:00
Laurent Destailleur
b27c3b692e FIX #33843 More complete fix. 2025-04-15 02:42:48 +02:00
Eric - CAP-REL
a89a917adc PERF: hidden var to limit list of invoices for credit note list (#33839)
* PERF: hidden var to limit list of invoices for credit note list

* Update facture.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-14 20:12:19 +02:00
Yannis Hoareau
e62f9cce4a Fix bug where invoice situation invoices could not be created (#33842) 2025-04-14 20:01:35 +02:00
ldestailleur
0b8324fc89 FIX #33784 2025-04-12 16:58:50 +02:00
Frédéric FRANCE
1eb27d5bd5 clean code (#33805) 2025-04-09 23:05:17 +02:00
ldestailleur
8cc5bc3e7e NEW The closing reason of invoice appear on tooltip of invoice status 2025-04-09 19:07:31 +02:00
ldestailleur
9550106ded FIX to have the remain to pay in invoice listsame than on card 2025-04-09 18:08:08 +02:00
ldestailleur
4ba1f204fd Fix need refresh to see status updated 2025-04-09 17:41:33 +02:00
ldestailleur
e6fdf698b3 Fix trans 2025-04-09 17:21:59 +02:00
Vaadasch
e469131327 Add hook before each generated invoice by createRecurringInvoices (#33780)
* Add hook before each generated invoice by createRecurringInvoices

* Update new hook to respect parameters constraints

* Add global action

* Move "global $action" at the beginning of the function

* Update facture-rec.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Arnaud Serrut <arnaud.serrut@gmail.com>
2025-04-09 16:00:17 +02:00
ldestailleur
eb4e5a4685 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-09 15:40:02 +02:00
ldestailleur
c09f7a235c Fix type 2025-04-09 11:56:21 +02:00
atm-irvine
9f89417391 New/group fetch and fetch optionals (#33257)
* feat(facture): group classic fetch and fetch optionals depending on conf

* feat(facture): group new fetch optionals

* feat(facture): group new fetch optionals for lines

* chore: phan fixes

* feat(factureligne): grouped fetch and fetch optionals

* Fix regression in missing $conf

* Update factureligne.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-09 00:10:02 +02:00
ldestailleur
be21aa7c6d FIX CI 2025-04-07 17:00:18 +02:00
ldestailleur
91e0b52630 Fix CI 2025-04-07 16:38:37 +02:00
ldestailleur
6af8298736 Fix related to #33449 2025-04-07 15:46:10 +02:00
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
5494affea9 Update card.php (#33725) 2025-04-04 15:29:41 +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
7096eff264 FIX tooltip info on recuring invoice must be into tthe tooltip 2025-04-03 13:11:23 +02:00
ldestailleur
d06fdc068e FIX tooltip info on recuring invoice must be into tthe tooltip 2025-04-03 13:10:25 +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
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
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
ldestailleur
30801214ce Code comment 2025-03-28 12:07:51 +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
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
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
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
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
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
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