Commit Graph

953 Commits

Author SHA1 Message Date
Laurent Destailleur
9b656552dc
Merge pull request #23933 from altairis-melina/code_fourn
NEW : iSuiteExpert export model
2023-02-16 21:01:24 +01:00
FLIO
156922fc51 Fix (qodana) Incompatible return type 2023-02-14 14:09:56 +01:00
Mélina JOUM
d034acb3ec add supplier 2023-02-13 12:13:02 +01:00
Laurent Destailleur
5c6d0bc26f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-30 03:01:13 +01:00
Laurent Destailleur
1bbcd3c403 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-30 02:29:43 +01:00
Laurent Destailleur
c4d8268ea5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-30 02:27:28 +01:00
Laurent Destailleur
194f803dbd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-01-30 02:26:13 +01:00
Laurent Destailleur
d03ec374d0 NEW Can set a checkbox in formconfirm by clicking on the label 2023-01-30 02:21:54 +01:00
Alexandre SPANGARO
791a69dd09 FIX Accountancy - Quadra export 2023-01-28 04:48:55 +01:00
Laurent Destailleur
a6daba61ce Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-26 02:32:08 +01:00
Laurent Destailleur
5b5a3547e2 Debug v17 2023-01-24 13:00:09 +01:00
Laurent Destailleur
db56ef9090 Fix sql error 2023-01-11 21:32:01 +01:00
Alexandre SPANGARO
6d26f242bb Merge remote-tracking branch 'upstream/develop' into 18a2 2023-01-10 05:46:00 +01:00
Alexandre SPANGARO
cce5741aca NEW Accountancy - Add sub-account balance - FPC22 2023-01-10 05:45:47 +01:00
Laurent Destailleur
b3b0fe2444 Clean code 2023-01-06 20:12:58 +01:00
Laurent Destailleur
0feac89942
Merge pull request #23209 from Easya-Solutions/new-accountancy-export-quadatus-with-archive
NEW Quadratus export with attachments in accountancy export
2023-01-04 07:53:52 +01:00
Laurent Destailleur
fce5968510 Fix warning 2023-01-03 17:09:08 +01:00
Laurent Destailleur
dab6b5f8a5 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-30 12:15:46 +01:00
Laurent Destailleur
32c161e576 Fix warnings 2022-12-30 12:10:23 +01:00
VESSILLER
ed1c0897ed NEW copyrights 2022-12-30 10:59:45 +01:00
Laurent Destailleur
8d64f8617c Clean code 2022-12-30 01:52:41 +01:00
Laurent Destailleur
dd4810aef6 Fix escape 2022-12-30 01:40:09 +01:00
Laurent Destailleur
e9d66286e0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-29 20:29:07 +01:00
Laurent Destailleur
bcd5c207cf Debug v17 - Fix the report on custom groups, column previous period 2022-12-29 20:25:53 +01:00
Laurent Destailleur
a7c2d72315 NEW Can filter on a custom group of accounts. Perf or ledger list. 2022-12-29 16:39:27 +01:00
Laurent Destailleur
77d6b9510b Clean code 2022-12-28 13:04:11 +01:00
Laurent Destailleur
7ca850830a FIX #23212 2022-12-13 23:51:23 +01:00
VESSILLER
787618d9d6 NEW Copyrights 2022-12-13 16:36:49 +01:00
VESSILLER
88ab5d7203 NEW Quadratus export with attachments in accountancy export 2022-12-13 15:48:00 +01:00
Laurent Destailleur
e5176a78f5 Need 2 different translations for Debit-Credit in some pages for Italia 2022-11-30 18:56:16 +01:00
Alexandre SPANGARO
cca1839ab8 Use getDolGlobalString 2022-11-12 15:30:18 +01:00
Alexandre SPANGARO
36b8668648 FIX Accountancy - When origin invoice is deposit, suggest specific account on credit note 2022-11-10 02:02:04 +01:00
Alexandre SPANGARO
9c069b045b FIX Accountancy - When origin invoice is deposit, suggest specific account on credit note 2022-11-10 01:20:08 +01:00
Laurent Destailleur
ddf60b399e Fix better separation label journal and label transfer 2022-11-07 21:48:52 +01:00
Alexandre SPANGARO
1da35b9d92 Merge remote-tracking branch 'upstream/develop' into 17b14 2022-11-06 17:10:58 +01:00
Alexandre SPANGARO
b1db74d9f0 FIX Accountancy - Delete operation - Problem on SELECT 2022-11-06 14:35:17 +01:00
Laurent Destailleur
88273690c5 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/card.php
2022-11-02 00:24:08 +01:00
Laurent Destailleur
bc2e226ef8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/societe/class/societe.class.php
2022-11-02 00:19:23 +01:00
Laurent Destailleur
c28e6a46e2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/install/step5.php
2022-11-02 00:15:21 +01:00
Alexandre SPANGARO
d3d55240f9 FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format 2022-11-01 08:00:37 +01:00
Alexandre SPANGARO
4bd9bdaccd FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format 2022-11-01 07:56:24 +01:00
Alexandre SPANGARO
f45f3740e2 FIX Accountancy - Review of Winfic - eWinfic - Winsis compta export format 2022-10-28 08:10:39 +02:00
Laurent Destailleur
a0fed08272 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-08 02:56:52 +02:00
Laurent Destailleur
77301c50ee Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-08 02:55:55 +02:00
Alexandre SPANGARO
b47f5cd19d Merge remote-tracking branch 'upstream/develop' into 16p10-reconcilev2 2022-10-06 17:30:38 +02:00
ksar
ce7f553f7d
FIX #22507 2022-10-06 16:06:33 +02:00
Laurent Destailleur
be10cdee95 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-06 16:03:50 +02:00
Alexandre SPANGARO
4ef080dbe0 Update SQL with EXISTS 2022-10-01 08:15:14 +02:00
Alexandre SPANGARO
7b8ed8dfc5 Merge remote-tracking branch 'upstream/develop' into 16p10-reconcilev2 2022-10-01 08:06:52 +02:00
stickler-ci
6b4cf5c8d9 Fixing style errors. 2022-09-28 20:39:47 +00:00
Regis Houssin
36c54a140f FIX compatibility with Mysql <= 5.7 2022-09-28 22:32:55 +02:00
Regis Houssin
ee34b6d8f5 FIXME sql error 2022-09-27 09:39:37 +02:00
Laurent Destailleur
8952530fad
Merge pull request #22184 from fboitel/fboitel-dev-scrutinizer-10/09/2022
Fix scrutinizer 1
2022-09-25 17:17:48 +02:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-09-25 17:12:03 +02:00
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
Laurent Destailleur
45c4a6ce1c Fix regression using confirm as POST (pb with cursor and download file) 2022-09-21 11:11:56 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Alexandre SPANGARO
6fa428df41 Fix comment for parameter 2022-09-15 09:30:01 +02:00
stickler-ci
1cd4f4ed8d Fixing style errors. 2022-09-15 04:36:08 +00:00
Alexandre SPANGARO
4d8c41a371 Fix PHP8 Warning 2022-09-15 06:33:19 +02:00
Alexandre SPANGARO
373449900f FIX Accountancy - Review reconcile function (separate manuel & auto reconcile) 2022-09-15 05:21:22 +02:00
Faustin
349e33592d scrutinizer in accountancy/class/accountingaccount.class.php: variable not always defined 2022-09-10 14:09:58 +02:00
Laurent Destailleur
767897595b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-10 02:46:10 +02:00
Laurent Destailleur
a538609c9c Fix more complete filters supported in fetchAllBalance 2022-09-10 02:26:49 +02:00
Laurent Destailleur
7c7ccc2393 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
Thomas Negre
ce78e0164a Fix: When a custom compta group would be unactive, its code would stay in the computed formula. This would lead to wrong totals if the code is a number. 2022-09-01 17:49:05 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +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
Alexandre SPANGARO
8f41a59fce Use isModEnabled 2022-08-24 10:34:19 +02:00
Laurent Destailleur
45683d43d3
Merge pull request #21821 from aspangaro/17p2
NEW Accountancy - Manage supplier deposit with specific account
2022-08-22 23:50:44 +02:00
Laurent Destailleur
3b3ea5eea3 Fix typo 2022-08-22 23:50:21 +02:00
Philippe GRAND
9e69ab1153 FIX php8 compatibility 2022-08-22 14:01:19 +02:00
Alexandre SPANGARO
bb786d5ab9 NEW Accountancy - Manage supplier deposit with specific account 2022-08-21 08:06:04 +02:00
Philippe GRAND
7e9547c762 FIX php8 compatibility 2022-08-16 17:12:27 +02:00
Laurent Destailleur
75fa3cf643 Debug v16 2022-08-12 15:45:27 +02:00
Laurent Destailleur
67ade177c7 Fix error message 2022-06-28 20:11:18 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Laurent Destailleur
0091c31b99 Debug v16 2022-06-28 11:07:06 +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
0bb7defa88 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/card.php
2022-06-01 16:04:11 +02:00
Laurent Destailleur
baae99fbb4 Support ZATCA 2022-05-25 09:06:59 +02:00
Alexandre SPANGARO
e437a53657 Typo 2022-05-23 21:40:47 +02:00
Laurent Destailleur
c53b42ef29
Merge pull request #20910 from priojk/develop
NEW #20905 add hooks for accountancy export
2022-05-22 01:28:56 +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
stickler-ci
18e9a332b4 Fixing style errors. 2022-05-20 12:58:46 +00:00