Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-19 16:01:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
118,804 Commits 36 Branches 190 Tags
86971c7b863c1b891c30f901b5ed3751eeaa720d
Commit Graph

12823 Commits

Author SHA1 Message Date
atm-lena
4d32d93ee2 Clean Travis 2023-12-18 17:28:41 +01:00
atm-lena
ec19dcc8f8 Invoice 2023-12-18 13:34:50 +01:00
Laurent Destailleur
22c93cb029 Fix phpcs 2023-12-17 22:59:15 +01:00
Laurent Destailleur
8cb9bdd852 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
	htdocs/ticket/list.php
 2023-12-17 22:06:48 +01:00
Laurent Destailleur
21b7d68f49 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
 2023-12-17 21:49:08 +01:00
Laurent Destailleur
c5ccf54572 Merge pull request #26525 from marc-dll/15.0_FIX_sql_select_replacement 
FIX: more correctly parse the select part to be replaced in sql queries
 2023-12-09 00:17:42 +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
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
Maxime Kohlhaas
6b731626ac Fix : set date_creation in facture create() (#26851) 2023-11-26 15:50:35 +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
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
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
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
Laurent Destailleur
777a22ebaa Fix warning 2023-10-24 18:11:09 +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
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
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
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
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
12a9a1ce4d FIX Bad value of accounting account shown in list. Edit fails. 2023-10-02 14:51:15 +02:00
Laurent Destailleur
9016ed0c28 Fix warning 2023-10-02 14:39:49 +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
Laurent Destailleur
d2a9fe70c6 Fix phpcs 2023-09-01 00:36:53 +02:00
Marc de Lima Lucio
37276cae5f FIX: payment card: misleading message when delete button disabled 2023-08-29 17:27:50 +02:00
Laurent Destailleur
5047fc20ea Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-23 23:59:55 +02:00
Laurent Destailleur
c065675f57 FIX Bad calculation of localtax when price_base_type not defined. 2023-08-23 23:41:16 +02:00