Commit Graph

11892 Commits

Author SHA1 Message Date
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
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
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
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
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
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
f542b1de38 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-20 03:33:46 +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
Quentin VIAL-GOUTEYRON
ad188c9804 FIX missing fk_account situation invoice 2023-09-29 14:38:30 +02:00
Laurent Destailleur
63f112aea0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/product/card.php
	htdocs/projet/activity/perday.php
2023-07-19 01:46:22 +02:00
Laurent Destailleur
2182cb6f16 Fix css 2023-07-10 02:27:01 +02:00
Laurent Destailleur
ebb1504fde Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-07-06 22:05:15 +02:00
atm-greg
dccaf116a2 fix bankentries label for supplier payments 2023-07-06 12:03:16 +02:00
Laurent Destailleur
5443b7c4bc Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-06-19 19:19:22 +02:00
Laurent Destailleur
bdd48c38b0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2023-06-19 19:16:03 +02:00
Laurent Destailleur
d10f277bba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2023-06-19 19:13:54 +02:00
atm-greg
e5193f16cc add printFieldListJoin 2023-06-19 16:09:34 +02:00
atm-greg
9abde6c057 add missing hook printFieldListValue 2023-06-19 14:26:49 +02:00
Laurent Destailleur
48e2c4f5bf Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-04-04 21:10:40 +02:00
Laurent Destailleur
d22ab42031
Merge pull request #24431 from Easya-Solutions/14.0_fix-prelevement-line-supplier-link
FIX supplier link on bank transfer line
2023-04-04 19:51:25 +02:00
VESSILLER
9f8b67a6ec FIX supplier invoice status on bank transfer line 2023-04-04 11:33:23 +02:00
VESSILLER
144d061db3 FIX supplier link on bank transfer line 2023-04-04 11:01:03 +02:00
Laurent Destailleur
88353ee5ba Fix tests 2023-03-19 17:38:22 +01:00
stickler-ci
390e7c83b2 Fixing style errors. 2023-02-16 10:48:41 +00:00
GregM
9e1b8bcd4c FIX parse error and NAN 2023-02-16 11:33:43 +01:00
Laurent Destailleur
7db2c9706d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-14 10:59:23 +01:00
Laurent Destailleur
3278b7bc86 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-02-13 23:38:07 +01:00
Laurent Destailleur
5217ae28f8 Fix load of margin infos 2023-02-13 21:35:48 +01:00
Laurent Destailleur
927a87851d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-13 13:57:02 +01:00
Laurent Destailleur
802ee770c3 FIX #23860 2023-02-09 19:25:55 +01:00
Laurent Destailleur
f8efc35531 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-02-09 15:15:20 +01:00
tnegre
55d6e2ead0 Fix prelevement line : the link to the facture was to a customer facture, even when it was a facturefourn. 2023-02-07 17:32:35 +01:00
Frédéric FRANCE
ff7a666c2b
Update bonprelevement.class.php 2023-01-18 23:43:54 +01:00
Laurent Destailleur
2a299068ad Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-18 20:45:44 +01:00
stickler-ci
4ee0ede6d8 Fixing style errors. 2023-01-18 08:53:28 +00:00
Noé Courtier
d344e108c9 FIX: Errors Handling for CreateFrom Hooks 2023-01-18 09:44:23 +01:00
Laurent Destailleur
0eb0ee5bb1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-06 16:52:06 +01:00
Laurent Destailleur
25eac607eb
Merge pull request #23407 from daraelmin/daraelmin-patch-2
Fix v14 fatal error undefined fct lenght_accounta
2023-01-04 17:48:08 +01:00
stickler-ci
1d29400cdf Fixing style errors. 2023-01-04 08:15:39 +00:00
daraelmin
23d535197d
Fix v14 fatal error undefined fct lenght_accounta
Following #23403
See https://www.dolibarr.fr/forum/t/erreur-fatal-paiements-divers-v15-0-3/41914
2023-01-04 09:13:40 +01:00
Laurent Destailleur
10674a59bb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-03 02:33:59 +01:00
Laurent Destailleur
af45ef8799
Merge pull request #23294 from atm-gauthier/fix_multicurrency_when_create_order_from_propal
FIX : get multicurrency infos of propal when create order from propal…
2023-01-03 01:36:57 +01:00
Eric Seigne
2aa271d96e avoid editretainedwarranty if invoice is not draft 2022-12-28 17:50:16 +01:00