Commit Graph

1348 Commits

Author SHA1 Message Date
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
Yannis Hoareau
e62f9cce4a Fix bug where invoice situation invoices could not be created (#33842) 2025-04-14 20:01:35 +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
6af8298736 Fix related to #33449 2025-04-07 15:46:10 +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
d06fdc068e FIX tooltip info on recuring invoice must be into tthe tooltip 2025-04-03 13:10:25 +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
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
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
19e63684c7 Look and feel v22: Smaller label with tooltip for customs code. 2025-03-19 11:45:15 +01:00
HENRY Florian
9266408dd5 NEW: new option in invoice setup to limit options of deposit invoice (#33468)
* NEW: new option in invoice seup to limit choice of deposit invoice

* Update card.php

* Update card.php

* Update invoice.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-03-16 20:44:39 +01:00
ldestailleur
9c6488d018 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-15 15:47:14 +01:00
ldestailleur
bb5f22264b Fix bad var name 2025-03-15 15:47:01 +01:00
Frédéric FRANCE
36c4676d99 display invoice model deleted (#33471) 2025-03-15 15:40:33 +01:00
ldestailleur
781db766a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-15 15:05:33 +01:00
ldestailleur
f618ee5029 Look and feel v22 2025-03-15 15:05:02 +01:00
Alexandre SPANGARO
1316263236 NEW Invoice - Add constant to prevent modification of an invoice (#33455)
* NEW Invoice - Add constant to prevent modification of an invoice

* CI
2025-03-15 11:13:57 +01:00
MDW
56e354e112 Qual: Fix phan notices (facture/2) 2025-03-05 21:17:58 +01:00
Alexandre SPANGARO
7eb0f22084 CI 2025-02-27 10:01:05 +01:00
Alexandre SPANGARO
98461cc957 CI 2025-02-27 09:34:59 +01:00
Alexandre SPANGARO
d58fbd8eb4 NEW Add invoice tags 2025-02-27 06:51:00 +01:00
Eric Seigne
950d7259f0 Fix Situation Percent with USE_INVOICE_SITUATION = 2 2025-02-25 15:20:25 +01:00
ldestailleur
0acaf5eff8 Debug v21 2025-02-21 21:05:54 +01:00
ldestailleur
4fcf24292f Debug v21 2025-02-21 21:05:27 +01:00
EchoLoGeek
fda1d8056e Fix Situation Percent with USE_INVOICE_SITUATION = 2
Lines situation percent on new lines must be 0 (No cumulative)
2025-02-21 15:48:04 +01:00
ldestailleur
113ac3607d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-21 15:46:56 +01:00
ldestailleur
f199d3fd61 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-21 15:46:33 +01:00
ldestailleur
344eca46ef Debug v21 - Fix pb with detection of situation invoices 2025-02-21 15:34:58 +01:00
EchoLoGeek
1b0cd777c2 Fix Situation Percent with USE_INVOICE_SITUATION = 2
Lines situation percent on new lines must be 0 (No cumulative)
2025-02-21 12:23:30 +01:00
Frédéric FRANCE
d917d4896e clean code 2025-02-21 09:45:20 +01:00
ldestailleur
177b5de737 Clean code - no duplicate amount if not foreign currency 2025-02-19 18:10:45 +01:00
MDW
928402c847 Qual: Fix phan (project-1) 2025-02-11 00:22:39 +01:00
Laurent Destailleur (aka Eldy)
6efcada2c9 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-06 18:14:33 +01:00
Laurent Destailleur (aka Eldy)
4e4e3d41b7 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-02-06 18:14:00 +01:00
Laurent Destailleur (aka Eldy)
40f86ca101 FIX extrafields lost during creation from rec invoice 2025-02-06 18:13:25 +01:00
Laurent Destailleur (aka Eldy)
d23ca9083c Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-02-06 16:15:13 +01:00
Laurent Destailleur (aka Eldy)
13ac8170c2 Debug v21 2025-02-06 16:12:04 +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
Florian HENRY
9bb9ecd304 fix: phpwarning version 8.0 for TVA calulation 2025-01-27 17:20:55 +01:00
Laurent Destailleur (aka Eldy)
30dc853bb7 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-01-20 15:09:16 +01:00
Laurent Destailleur (aka Eldy)
fa9fe2efa7 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-01-20 15:02:37 +01:00