Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-26 10:43:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
145,227 Commits 38 Branches 191 Tags
0de4e225fb702681d7e9d19ecda1c1da170a357e
Commit Graph

15107 Commits

Author SHA1 Message Date
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
Alexandre SPANGARO
85d5e7caec Debug v19 (#26810) 
* Fix Warning: Invalid argument supplied for foreach()

* Fix Warning: Invalid argument supplied for foreach()

* Fix Undefined variable - Remove useless parameter

* Fix Undefined variable $helpurl

* Fix Undefined property $import_key

* Fix Undefined variable $totalpaid

* Fix undefined variable $nb

* Update payments.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-23 17:24:35 +01:00
Frédéric FRANCE
b5028c5592 Merge branch 'develop' into cleandeprecated 2023-11-21 23:34:55 +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
Frédéric FRANCE
7ac05c7549 fix phpstan (#26799) 
* fix phpstan

* Update commoninvoice.class.php

* Update facture.class.php

* Update commoninvoice.class.php

* fix properties
 2023-11-21 21:36:34 +01:00
Laurent Destailleur
f755ad51ab Fix log 2023-11-21 12:17:30 +01:00
Frédéric FRANCE
b21caf935a Merge branch 'develop' into cleandeprecated 2023-11-21 00:52:05 +01:00
MDW
3c966469ef QUAL No return values in __construct(), correct PHPDoc for typing (#26768) 2023-11-20 23:47:06 +01:00
Laurent Destailleur
a9c2a44074 CSS 2023-11-20 18:23:28 +01:00
Frédéric FRANCE
fbdfc7631f Merge branch 'develop' into cleandeprecated 2023-11-19 20:32:28 +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
Laurent Destailleur
f52beb7bce Fix phpcs 2023-11-18 23:51:52 +01:00
Marc de Lima Lucio
786ea1029e FIX: more correctly parse the select part to be replaced in sql queries, part 2 2023-11-18 12:40:10 +01:00
ayoubayed
1a9128e861 [#26692] Fixed : undefined var on accountacyexport.class.php && facture.class.php (#26698) 
Co-authored-by: Ayoub BAYED <ayoub@code42.fr>
 2023-11-18 12:11:08 +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
Frédéric FRANCE
28c05020aa Merge branch 'develop' into cleandeprecated 2023-11-18 00:11:08 +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
9748ece49f Fix phpcs 2023-11-17 01:40:11 +01:00
Frédéric FRANCE
a4c0089dc0 Merge branch 'develop' into cleandeprecated 2023-11-16 21:01:41 +01:00
Alexandre SPANGARO
631a5ea066 Invoice - payment list - Manage Checkbox on left column (#26604) 2023-11-16 15:32:50 +01:00
Laurent Destailleur
29e616fa8b CSS 2023-11-15 19:26:14 +01:00
Alexandre SPANGARO
b56b93e901 Cheque - List - Dolibarize (#26583) 
* Cheque - List - Dolibarize

* Double <tr class="liste_titre_filter">

* Remove double printFieldListWhere

* fix removefilter on date
 2023-11-14 12:02:58 +01:00
Frédéric FRANCE
502a854ddb clean deprecated 2023-11-14 11:43:13 +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
Alexandre SPANGARO
f5702f7710 FIX Social contribution - Payment list - Wrong information in type column (#26561) 2023-11-13 21:01:44 +01:00
Laurent Destailleur
f36154a14f css 2023-11-13 14:26:34 +01:00
Laurent Destailleur
7659bba97a Fix bad delete of lines into llx_ecm_files 2023-11-13 12:24:47 +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
sonikf
65b9f4e6de NEW: Add invoice subtype in customer template invoice (#26543) 
* Add invoice subtype in template invoice

* Add invoice subtype in template invoice

* Add invoice subtype in template invoice
 2023-11-12 22:08:46 +01:00
daraelmin
129927047a FIX regression on planned bank entries (#26556) 2023-11-12 21:36:25 +01:00
sonikf
455dcd8eb9 NEW: Propagate invoice extrafields into template invoice (#26529) 
* NEW: Propagate invoice extrafields into template invoice

Also rearrange form fields to be on par with other invoice creation screens look and feel

* fix PHPCS
 2023-11-10 19:03:39 +01:00
lamrani abdelwadoud
5a105ad462 NEW functionality for combined salary invoice and supplier invoice (#26541) 
* NEW functionality for combined salary invoice and supplier invoice

* remove print_r
 2023-11-10 19:00:30 +01:00
lamrani abdelwadoud
07d2d6b861 NEW functionality for get bon prelevement in ligne order (#26540) 
* Fix massaction checkbox for display it on right side

* get all order lines request
 2023-11-10 18:56:52 +01:00
lamrani abdelwadoud
01d3526d8d FIX sql request in function checkIfSalary (#26538) 
* fix sql request in function checkIfSalary

* Update bonprelevement.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-10 18:45:20 +01:00
Marc de Lima Lucio
a3fa8b82fa FIX: more correctly parse the select part to be replaced in sql queries 2023-11-09 17:04:13 +01:00
Laurent Destailleur
3118b9fb4c Debug v19 2023-11-09 15:50:42 +01:00
Laurent Destailleur
955af0695e Fix return code 2023-11-09 15:44:17 +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
Laurent Destailleur
ccfaaeb03b Debug v19 2023-11-08 16:25:49 +01:00