Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
126,990 Commits 35 Branches 179 Tags 1.7 GiB
c2c99ab2b8
Commit Graph

1129 Commits

Author SHA1 Message Date
Laurent Destailleur
fb083a6cfc Fix warning with rector 2023-12-13 16:33:17 +01:00
Laurent Destailleur
ba10d60a0b Fix with php-cs-fixer 2023-12-04 12:02:35 +01:00
Laurent Destailleur
7c756574b6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-12-02 14:52:36 +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
Laurent Destailleur
53dab922fd Fix php8.2 warnings 2023-11-27 11:39:32 +01:00
atm-jonathan
69f66f2a48
FIX warning addLine Facture fk_prev_id and situation_percent (#26825) 
* addLine Facture fk_prev_id and situation_percent

* retour PR
 2023-11-23 17:44:32 +01:00
sonikf
a8b2c631ab
fix #25348 (#26806) 
* fix #25348

* fix #25348
 2023-11-23 17:28:32 +01:00
Sylvain Legrand
83b4ddc0cd
New variable to accept a deposit invoice as available credit even unpaid (#26792) 
* New variable to accept a deposit invoice as available credit even unpaid

In many activities, the final invoice must be issued while the requested deposit has not yet been paid.
Often it is the payment deadlines which generate this situation (for example in the finishing work)

* Update card.php

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-21 23:20:20 +01:00
Regis Houssin
030f7ffde1
FIX avoid php8.2 warnings (#26720) 
* FIX avoid php8.2 warnings

* FIX avoid travis error

* FIX travis error

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-19 00:56:46 +01:00
Rémi Champlon
54bc3e69f8
New : Authorize credit note to 0 (#26710) 
* authorize credit not to 0

* fix

---------

Co-authored-by: Rémi Champlon <remi.champlon@vold.lu>
 2023-11-18 12:00:46 +01:00
Regis Houssin
295d5a167c
FIX avoid php8.2 warning : undefined variable (#26712) 2023-11-18 11:51:41 +01:00
Laurent Destailleur
a0bba05b02 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
 2023-11-17 18:24:53 +01:00
Laurent Destailleur
0770ce640e Debug v19 2023-11-14 02:42:02 +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
Laurent Destailleur
a48e541093 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/core/class/html.formadmin.class.php
	htdocs/core/lib/functions.lib.php
 2023-11-12 23:18:19 +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
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
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
Christophe Battarel
3afaa266c3
add hook tabContentCreateInvoice (#26413) 
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-11-01 14:25:14 +01:00
Christophe Battarel
4c8870f205
add hook tabContentViewInvoice (#26402) 
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-10-31 11:54:39 +01:00
lamrani abdelwadoud
40fb7c5fa7
FIX Payement infos for Fournisseur add change company condition for get default infos (#26305) 
* add change company condition for get default infos

* fix it for compta/facture also
 2023-10-26 17:12:57 +02:00
Laurent Destailleur
e1bf377f20 QUAL: Removed deprecated field remise, remise_percent, remise_absolute 2023-10-20 10:47:08 +02:00
sonikf
732fb2fa04
NEW: Invoice subtypes for customers and vendors (#26233) 
* NEW: Invoice subtypes for customers and vendors

* fix PHPCS

* fix PHPCS

* fix PHPCS

* fix PHPCS

* fix possible SQL Injection

* remove hardcoded tests

* remove hardcoded tests

* fix travis ci error
 2023-10-18 02:33:14 +02:00
Laurent Destailleur
0fbffea663 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-17 14:49:16 +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
1f38e54e78 Clean code 2023-10-15 15:32:35 +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
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +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
Laurent Destailleur
98ca102e1c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-10 21:48:07 +02:00
Laurent Destailleur
68404bec9b
Merge pull request #22619 from mbinformatique68/develop 
NEW Add the formEditObjectLine hook on commande card and invoice card
 2023-10-06 19:13:58 +02:00
Laurent Destailleur
4298150413 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:22:33 +02:00
Laurent Destailleur
b8bd760e28 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 16:06:58 +02:00
Laurent Destailleur
d5443010f2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-01 16:04:16 +02:00
Laurent Destailleur
5e76fea64d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-01 15:53:36 +02:00
Laurent Destailleur
5560aab98e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-01 15:50:25 +02:00
Quentin VIAL-GOUTEYRON
ad188c9804 FIX missing fk_account situation invoice 2023-09-29 14:38:30 +02:00
Quentin-Seekness
70ecf5a123
Update card.php line desc 
We don't need the label to be the description if there was not any in origin line.
 2023-09-26 10:27:59 +02:00
Regis Houssin
d133075fca FIX #25982 and avoid lose selected value if error 2023-09-24 15:56:18 +02:00
Laurent Destailleur
aab30d7638 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 15:33:04 +02:00