Commit Graph

13293 Commits

Author SHA1 Message Date
Laurent Destailleur
db71fd54cc Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-07 16:20:34 +01:00
Laurent Destailleur
dfc79f3673 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-07 16:19:21 +01:00
Laurent Destailleur
b741db349e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-12-07 16:18:31 +01:00
Laurent Destailleur
2eb2437793 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-12-07 16:17:39 +01:00
Laurent Destailleur
0c2bcfa79e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-12-07 16:16:34 +01:00
Laurent Destailleur
ea7afeb007 Fix warning 2023-12-07 16:16:22 +01:00
Eric Seigne
5601fab14f fix sql error in case of balance is empty 2023-12-05 10:41:02 +01:00
Laurent Destailleur
9b8d0096e6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-02 14:20:50 +01:00
Laurent Destailleur
67dbfe118c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-02 12:48:00 +01:00
Laurent Destailleur
bae5934af7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-12-02 12:46:23 +01:00
Laurent Destailleur
09da842b68 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-12-02 12:44:33 +01:00
Eric Seigne
d6c97bd75e check if last_main_doc is not empty 2023-11-30 19:17:14 +01:00
Eric Seigne
951afdcb68 cleanup 2023-11-30 19:15:56 +01:00
Eric Seigne
7782ae4fd0 fix #26862 but on 14.0 where that bug was present 2023-11-30 19:12:26 +01:00
Kamel Khelifa
116ff4a985 FIX: Fix when options FAC_FORCE_DATE_VALIDATION and INVOICE_CHECK_POSTERIOR_DATE enabled. The date is forced after the test and not before 2023-11-27 16:54:52 +01:00
Maxime Kohlhaas
6b731626ac Fix : set date_creation in facture create() (#26851) 2023-11-26 15:50:35 +01:00
Laurent Destailleur
f755ad51ab Fix log 2023-11-21 12:17:30 +01:00
Laurent Destailleur
9748ece49f Fix phpcs 2023-11-17 01:40:11 +01:00
thibdrev
a97335ce3a fix Customer Invoice - Display payment delete button solely if payment isn't reconciled (#26568)
* add function isReconciled()

* display payment delete button solely if payment isn't reconciled

* phpcs

* phpcs
2023-11-14 02:05:40 +01:00
Alexandre SPANGARO
f5702f7710 FIX Social contribution - Payment list - Wrong information in type column (#26561) 2023-11-13 21:01:44 +01:00
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
2023-11-12 23:06:31 +01:00
Laurent Destailleur
201ad75360 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
2023-11-12 23:02:18 +01:00
Laurent Destailleur
bd2285ab91 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-12 22:58:37 +01:00
Laurent Destailleur
1dbb3f1f34 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/product/stock/stockatdate.php
2023-11-12 22:58:23 +01:00
Laurent Destailleur
17ca6f651c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-12 22:18:06 +01:00
daraelmin
129927047a FIX regression on planned bank entries (#26556) 2023-11-12 21:36:25 +01:00
atm-lena
0946220e9b Check price base type (#26503)
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2023-11-09 15:41:39 +01:00
thibdrev
a69fd2bc09 Fix PR #26501 (#26515) 2023-11-09 14:52:09 +01:00
lvessiller-opendsi
785c85205b FIX substitute project variables in invoice documents (#26445)
* FIX substitute project variables in invoice documents

* Keep key to substitute if no link with project
2023-11-08 17:32:23 +01:00
sonikf
e8b45a1ea9 Fix #26050 #26225 and fiscal year report (backport v 18) (#26474) 2023-11-08 17:27:52 +01:00
thibdrev
1eb0e66736 fix Rename is not translated because its translation isn't declared (#26447)
`htdocs/compta/bank/releve.php` calls for `$langs->trans("Rename") at line 374 , but this translation doesn't exists: `grep -Rl "Rename=" ./htdocs/langs/`

Also, this translation seems to be called only by `releve.php` (`grep -Rl '$langs->trans("Rename")'`)
2023-11-03 16:31:33 +01:00
Laurent Destailleur
127de7e7d8 FIX On object validation, ecm index are not updated for uploaded files 2023-11-01 16:17:54 +01:00
atm-jonathan
f36e8b935c Fix list agenda (#26394)
* int $nbtotalrecord list agenda

* nbtotal of record should  be number not a string

* ternaire isnumeric $nbtotalofrecords
2023-11-01 15:58:45 +01:00
Laurent Destailleur
777a22ebaa Fix warning 2023-10-24 18:11:09 +02:00
Laurent Destailleur
0ec22fb228 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-20 13:32:13 +02:00
Laurent Destailleur
492bdd4a0e Merge 2023-10-20 13:14:10 +02:00
Laurent Destailleur
ff03e34103 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-20 03:59:46 +02:00
Laurent Destailleur
f542b1de38 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-20 03:33:46 +02:00
Ferran Marcet
2f5df0f631 Fix: Not loading supplier name (#26278)
* Fix: Not loading thirdparty on supplier payment

* Fix: Not loading supplier name

* Fix: Not loading supplier name

---------

Co-authored-by: Juanjo Menent <jmenent@2byte.es>
2023-10-20 02:16:27 +02:00
William Mead
cee2fc6c5f FIX template invoice list extrafield filters (backport v17) (#26227)
* FIX extrafield list filter

* Added contributor details

---------

Co-authored-by: William Mead <william.mead@manchenumerique.fr>
2023-10-16 15:50:56 +02:00
Alexandre SPANGARO
95a15ae6f9 FIX #26195 - Various payment - List of project excluded those assigned to third parties (#26222) 2023-10-16 13:13:32 +02:00
Laurent Destailleur
9144293f0b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-16 06:02:17 +02:00
Laurent Destailleur
0360d61f9c Code comment for develop 2023-10-16 05:51:47 +02:00
Laurent Destailleur
abe3f00b11 Fix regression. Restore old behaviour even if some case are not tested. 2023-10-16 05:15:39 +02:00
Noé Cendrier
a92458ebbc FIX check tva_tx before comparing price_min_ttc (#25220)
* FIX check tva_tx before comparing price_min_ttc

* better price_ttc comparison for propal, commande, facture lines

* price_ht must be transformed into number before using it for calculating
2023-10-16 04:07:10 +02:00
Laurent Destailleur
94796d6154 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-12 15:00:15 +02:00
Laurent Destailleur
48e35b5f86 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-12 13:18:32 +02:00
am97
b9136ee59c FIX: modification of complementary attributes in invoices (#26180)
Fixes the following error:

PHP Fatal error:  Uncaught Exception: Serialization of PgSql\Connection is not allowed in /var/www/html/core/lib/functions.lib.php:1168
Stack trace:
#0 /var/www/html/core/lib/functions.lib.php(1168): serialize()
#1 /var/www/html/compta/facture/card.php(2798): dol_clone()
#2 {main}
2023-10-11 19:02:11 +02:00
Laurent Destailleur
5308e3e183 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-11 04:35:44 +02:00
Laurent Destailleur
465fe0ffd4 Close #24481 2023-10-11 04:29:52 +02:00