Commit Graph

275 Commits

Author SHA1 Message Date
Laurent Destailleur
86091c3fde Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-25 17:01:44 +02:00
Laurent Destailleur
cff5f9c330 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-25 16:57:53 +02:00
Laurent Destailleur
be770eefdc
Update bookkeeping.class.php 2022-09-25 13:04:04 +02:00
Alexandre SPANGARO
ecb6814e89 FIX Accountancy - Some manuals operations are displayed in subledger 2022-09-25 06:42:51 +02:00
Alexandre SPANGARO
4d8c41a371 Fix PHP8 Warning 2022-09-15 06:33:19 +02:00
Laurent Destailleur
a538609c9c Fix more complete filters supported in fetchAllBalance 2022-09-10 02:26:49 +02:00
Alexandre SPANGARO
32a6f3f756 PHP8 Warnings 2022-08-29 05:48:18 +02:00
Alexandre SPANGARO
f59795224f PHP8 Warnings 2022-08-29 05:26:57 +02:00
Laurent Destailleur
648f4b1d8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-09 12:51:02 +02:00
Laurent Destailleur
62d2084237 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-09 12:49:49 +02:00
Laurent Destailleur
974a1c2c6d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-09 12:48:51 +02:00
Laurent Destailleur
a4ca81d4ce FIX #21174 2022-06-09 12:46:13 +02:00
Laurent Destailleur
e10d89dd36 Fix regression 2022-06-09 03:00:51 +02:00
Faustin
f0a8765ee6 FIX #20696 2022-06-08 16:05:44 +02:00
daraelmin
0641b66118
Clean code 2022-06-08 01:39:53 +02:00
daraelmin
f872585ea2
Fix #21150 - Regression Can't insert manual lines
Fix #21150 - Regression Can not insert manual lines for automatically created transactions to the general ledger, this was possible before.
2022-06-08 01:02:02 +02:00
Laurent Destailleur
d9dbfd063b Debug v16 2022-05-20 23:34:58 +02:00
Laurent Destailleur
ee6131612a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
2022-05-20 23:28:01 +02:00
daraelmin
3d734e8d34
FIX regression PR #20713
Please do not revert with PR #20900
2022-05-20 09:22:16 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
2022-05-09 16:53:53 +02:00
Laurent Destailleur
0cac14c82f Fix trans 2022-05-09 16:51:31 +02:00
Laurent Destailleur
b3bfe22f58 FIX Error management 2022-05-09 16:45:57 +02:00
Laurent Destailleur
43e1486dbb FIX No empty line inserted into accounting_bookkeeping 2022-05-09 16:42:08 +02:00
Alexandre SPANGARO
1efa44a022 NEW Accountancy - Add reconcile functionality 2022-04-28 06:50:37 +02: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
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
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
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
5fed6de5b8 Fix feature to close record in accounting 2021-12-18 22:53:30 +01:00
Frédéric FRANCE
c01cc0c212
can modify tooltip by reference 2021-11-22 20:06:51 +01: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
Laurent Destailleur
dcd3f85e79 Fix sql error 2021-09-21 17:32:08 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
cfbe2bf995
Merge pull request #18422 from aspangaro/14p13
FIX Accountancy - SQL error on select journal on journal
2021-08-17 02:41:56 +02:00
Laurent Destailleur
7784c4fcc9
Update bookkeeping.class.php 2021-08-17 00:32:33 +02:00
Alexandre SPANGARO
4b615e541b FIX Accountancy - SQL error when insert a manuel transaction 2021-08-16 21:29:28 +02:00
Alexandre SPANGARO
1bfc0004b1 Better fix 2021-08-16 08:12:24 +02:00
Alexandre SPANGARO
ba12071ea3 FIX Accountancy - SQL error on select journal on journal 2021-08-16 07:57:40 +02:00
Alexandre SPANGARO
183d413b45 FIX: Accountancy - Rules to delete & modify transaction not applied in ledger & subledger 2021-07-26 04:42:35 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-06-14 13:37:02 +00:00
Alexandre SPANGARO
53d0909a7c Merge remote-tracking branch 'upstream/develop' into 14a26 2021-06-12 14:20:00 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00