Commit Graph

987 Commits

Author SHA1 Message Date
Alexandre SPANGARO
3f832c1c5d FIX Accountancy - Export format FEC - Prevent tab in label with the formats for which it is the separator 2022-04-27 04:46:09 +02:00
Laurent Destailleur
5eb6ddd7b4 Merge 20374 and add some fix. Need to be restested. 2022-03-23 15:32:05 +01:00
lvessiller
566bced9dc FIX escape values and find indexed columns by key 2022-03-18 08:53:54 +01:00
lvessiller
254ae943e1 FIX conflicts with develop 2022-03-17 12:33:13 +01:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-16 21:31:08 +01:00
Laurent Destailleur
6c210f72dc Fix missing var declaration and constructor 2022-03-16 20:31:40 +01:00
lvessiller
cbbfe68482 FIX stickler-ci 2022-03-16 11:06:14 +01:00
lvessiller
4ad6cc6a65 FIX stickler-ci 2022-03-16 11:00:14 +01:00
lvessiller
6d6e6ff70c NEW clean values and amount in FEC import 2022-03-16 10:49:16 +01:00
Laurent Destailleur
67881a7932 Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Laurent Destailleur
9a3d8022f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:38 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
2022-02-18 21:50:08 +01:00
Laurent Destailleur
91eafaea98 Merge pull request #20109 from aspangaro/14p33
FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity
2022-02-18 20:21:43 +01:00
lvessiller
1107a60b58 FIX compute rule in FEC import 2022-02-18 16:53:55 +01:00
Alexandre SPANGARO
3f109aa911 FIX Accountancy - On manual transaction with multicompany - Function transformTransaction can validate & delete transaction of an other entity 2022-02-18 09:24:12 +01:00
Alexandre SPANGARO
0f51fadf38 Merge branch 'develop' into 16a12_assets_code 2022-02-17 04:15:03 +01:00
Frédéric FRANCE
935482ee22 uniformize 2022-02-15 19:04:18 +01:00
Frédéric FRANCE
a613553f37 Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Alexandre SPANGARO
a17ac09fd0 Resolve stickler-ci 2022-02-14 11:03:44 +01:00
stickler-ci
dd5be840aa Fixing style errors. 2022-02-14 03:31:30 +00:00
Alexandre SPANGARO
d5e521c87b Accountancy 2022-02-14 04:27:52 +01:00
Laurent Destailleur
fccddd7805 Fix property missing 2022-01-13 20:11:18 +01:00
Laurent Destailleur
965703e04a Fix missing var 2022-01-13 20:09:40 +01:00
Laurent Destailleur
3aea037889 FIX Debug level 3 of accounting account was using wront field 2022-01-13 19:49:38 +01:00
Laurent Destailleur
b6dc7a3f19 Doc 2022-01-13 19:09:34 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Alexandre SPANGARO
37033b04be FIX Accountancy - Separator problem with FEC/FEC2 export format 2021-12-20 07:04:12 +01:00
Laurent Destailleur
6643a05216 php 8 2021-12-19 00:19:17 +01:00
Laurent Destailleur
d46ef9c42a css 2021-12-18 23:51:14 +01:00
Laurent Destailleur
80a7b83956 Debug status of accounting account 2021-12-18 23:02:31 +01:00
Laurent Destailleur
5fed6de5b8 Fix feature to close record in accounting 2021-12-18 22:53:30 +01:00
Laurent Destailleur
fa5d96d562 Add more info to help debug 2021-12-18 16:48:08 +01:00
Laurent Destailleur
d92535ec59 FIX Debug transfert in accountancy for expense report 2021-12-16 15:41:23 +01:00
Frédéric FRANCE
e562bf5b1c can modify tooltip by reference 2021-11-22 20:08:21 +01:00
Frédéric FRANCE
c01cc0c212 can modify tooltip by reference 2021-11-22 20:06:51 +01:00
Laurent Destailleur
2975d47113 FIX Debug a lot of regression in accountancy transfer 2021-11-22 04:13:16 +01:00
Laurent Destailleur
5a1f54f47f Fix transfer in accountancy for supplier invoices 2021-11-15 09:57:41 +01:00
Laurent Destailleur
5dd2bedffa Fix fatal error 2021-11-15 09:42:27 +01:00
Laurent Destailleur
e29ef08ee7 Fix regression in default set of accounting accounts 2021-11-14 19:10:06 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
5085db36a7 Clean code 2021-11-07 18:54:59 +01:00
Alexandre SPANGARO
40a23e4aa4 Update work, thanks Florian 2021-10-22 17:12:44 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Alexandre SPANGARO
9685695577 FIX Accountancy - PHP8 2021-10-18 10:19:46 +02:00
Alexandre SPANGARO
de98900cb7 NEW Accountancy - Format FEC/FEC2 - Add column NumFacture 2021-10-11 22:00:59 +02:00
Florian HENRY
d565f9d3f1 reveiw code 2021-09-28 15:09:47 +02:00
Florian HENRY
f47a319c15 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta 2021-09-28 15:01:14 +02:00
Laurent Destailleur
00120109fb Merge pull request #18813 from aspangaro/14p21
FIX Accountancy - Error on ValidDate for FEC/FEC2 export
2021-09-24 13:07:17 +02:00
Alexandre SPANGARO
a1bd07d1a3 FIX Accountancy - Error on ValidDate for FEC/FEC2 export 2021-09-24 12:04:25 +02:00
Laurent Destailleur
dcd3f85e79 Fix sql error 2021-09-21 17:32:08 +02:00