2
0
forked from Wavyzz/dolibarr
Commit Graph

2645 Commits

Author SHA1 Message Date
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
Alexandre SPANGARO
791a69dd09 FIX Accountancy - Quadra export 2023-01-28 04:48:55 +01:00
Laurent Destailleur
f42f083d10 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-25 22:20:58 +01:00
stickler-ci
ec156ddf84 Fixing style errors. 2022-11-25 11:26:31 +00:00
Noé Courtier
043b2e9ea3 FIX: copy same behaviour in other accountancy files 2022-11-25 12:18:32 +01:00
Noé Courtier
2ada053855 FIX: Use the Hook addMoreActionsButtons resPrint 2022-11-25 11:44:34 +01:00
Alexandre SPANGARO
221ce01cdc FIX Accountancy - Better warning for situation invoice in index 2022-11-05 08:02:56 +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
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
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
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
Alexandre SPANGARO
e9ae888fc7 FIX Accountancy - Label of VAT account is empty 2022-07-22 16:01:39 +02:00
Alexandre SPANGARO
be491cc6cf FIX Accountancy - Model account list - Problem of CSRF 2022-07-15 16:22:22 +02:00
Laurent Destailleur
6e5cbd9f08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-27 12:09:42 +02:00
daraelmin
e381e646b3 Fix css class declared in wrong param
In print_liste_field_titre CSS class name can only be added in prefix parameter (except 'class="right"' for backward compatibility)
If the title is centered, the field should be also
2022-06-25 21:22:30 +02:00
Laurent Destailleur
18d9d6194e # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-17 14:48:27 +02:00
Alexandre SPANGARO
a49062338f Copyright 2022-06-17 04:41:15 +02:00
Alexandre SPANGARO
54a5967a71 FIX Accountancy - Partitioning of the entity on an automatic binding 2022-06-17 04:37:56 +02:00
Laurent Destailleur
12ee8eb40b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2022-06-13 13:32:11 +02:00
Alexandre SPANGARO
82d1cb4682 FIX #20527 Accountancy Unbalanced entry proposed when an employee are declared on social contribution 2022-06-09 17:30:16 +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
aeb4287d25 Merge pull request #21143 from fboitel/14.0
FIX #20696
2022-06-09 03:11:23 +02:00
Laurent Destailleur
8280447f3e # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-09 03:09:37 +02:00
Laurent Destailleur
900c71b5d6 Fix can add an empty line in tmp edit mode of transation 2022-06-09 03:07:11 +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
Faustin
b6724f6061 FIX #20696 2022-06-07 16:43:49 +02:00
Alexandre SPANGARO
e437a53657 Typo 2022-05-23 21:40:47 +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
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
Laurent Destailleur
93de425c47 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
2022-04-29 17:32:28 +02:00
daraelmin
5387a8e953 FiX miss spelling 2022-04-26 19:07:31 +02:00
stickler-ci
6a1d4c2255 Fixing style errors. 2022-04-25 20:36:34 +00:00
daraelmin
694bcda3bb Fix #20712 - No more empty wrong line added in bookkeeping confirme_create mode 2022-04-25 22:26:25 +02:00
Laurent Destailleur
d6860ca41b FIX bad bank amount in accounting with multicurrency 2022-04-09 02:22:45 +02:00
Laurent Destailleur
a221b17809 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/index.php
	htdocs/compta/facture/class/facture.class.php
2022-03-29 15:50:25 +02:00
Laurent Destailleur
a415711a66 Fix phpcs 2022-03-29 15:47:54 +02:00
Laurent Destailleur
1251e80963 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/index.php
	htdocs/commande/list.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/class/task.class.php
2022-03-29 15:10:11 +02:00