Commit Graph

201 Commits

Author SHA1 Message Date
Laurent Destailleur
215752a93c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-30 14:04:14 +01:00
Alexandre SPANGARO
413fc95f9a FIX: Accountancy - label_operation is used instead of label_compte 2021-01-28 23:40:15 +01:00
Laurent Destailleur
0f7bdef1c1 FIX in pages of balances 2021-01-21 18:02:17 +01:00
Laurent Destailleur
47b90ab400 Fix duplicate log 2021-01-17 12:49:37 +01:00
Laurent Destailleur
cdab7041c4 Fix duplicate log 2021-01-17 12:49:01 +01:00
Laurent Destailleur
77a094007f Fix parm to url to switch between screen
Fix error message
Make position of columns more friendly
2021-01-14 10:34:32 +01:00
Alexandre SPANGARO
691e8580cd Add date_export on new ledger & subledger to show edit or delete link when is not export yet 2021-01-03 05:44:07 +01:00
Alexandre SPANGARO
b01a9d6cc3 FIX: Accountancy - Reconciled options not working on ledger et subaccount ledger 2020-12-16 05:32:36 +01:00
Laurent Destailleur
52cc08f5da FIX option "Show subtotal" on the balance report 2020-11-26 16:12:55 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Laurent Destailleur
4dbac98d8c Merge pull request #15197 from aspangaro/14a2
NEW: Accountancy - Add a ledger for subaccount
2020-10-30 18:12:11 +01:00
Alexandre SPANGARO
86ee75363a NEW: Accountancy - Add a ledger for subaccount 2020-10-28 09:49:38 +01:00
Frédéric FRANCE
9ba22d2813 doxygen 2020-10-27 22:07:31 +01:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Frédéric FRANCE
4aa47d14b4 Update bookkeeping.class.php 2020-10-04 20:29:57 +02:00
Laurent Destailleur
7dd69a2b2b Fix escape 2020-09-19 20:11:04 +02:00
Laurent Destailleur
6c2d70d43b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 19:27:39 +02:00
Laurent Destailleur
32eaa9137c FIX #14034 2020-06-17 18:29:29 +02:00
Laurent Destailleur
7d3c176727 Prepare convertion of field "montant" into "amount" 2020-06-17 12:45:56 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
43dcd9beb5 add new rule 2020-05-21 00:02:33 +02:00
Laurent Destailleur
c0821a8ed6 Fix phpcs 2020-04-27 00:02:31 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
Laurent Destailleur
7931734ecb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
atm-greg
66f6d1bfd4 add missing fields 2020-02-11 15:57:49 +01:00
Laurent Destailleur
513b9b26a6 Merge branch 'develop' into 9.0_p4 2019-12-31 16:38:37 +01:00
Alexandre SPANGARO
77e3b01179 Fix Accountancy - Set NULL when data is empty 2019-12-31 08:00:20 +01:00
Laurent Destailleur
e3cc541ff2 Fix debug code 2019-12-16 19:19:37 +01:00
Laurent Destailleur
65abe7532c Fix error message not reported when deleting record in ledger. 2019-12-16 19:05:32 +01:00
Frédéric FRANCE
b61a3f1ba9 Update bookkeeping.class.php 2019-11-18 19:59:21 +01:00
Frédéric FRANCE
5c0976a778 doxygen accountancy class 2019-11-16 09:58:14 +01:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
stickler-ci
11f29df93d Fixing style errors. 2019-11-10 09:52:03 +00:00
Philippe GRAND
762b70fab7 add some comment 2019-11-10 10:51:16 +01:00
Philippe Grand
3692a6602d Update bookkeeping.class.php 2019-11-01 11:12:09 +01:00
stickler-ci
a8f7082a3a Fixing style errors. 2019-11-01 09:36:18 +00:00
Philippe GRAND
5bafcae767 add some comment 2019-11-01 10:36:17 +01:00
Laurent Destailleur
f85899742b Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-17 17:48:42 +02:00
Frédéric FRANCE
8761b46e21 Update bookkeeping.class.php 2019-10-16 22:31:34 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
a6e429ff32 Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal 2019-10-02 08:49:00 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
a005408d83 NEW Accountancy - Add an option to hide FAQ on index and add widget in area 2019-09-23 20:42:50 +02:00
Laurent Destailleur
e3fe3d7d4f Fix missing var 2019-08-31 13:17:40 +02:00
Laurent Destailleur
192fb45ce7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/bookkeeping/list.php
	htdocs/adherents/card.php
	htdocs/compta/sociales/list.php
	htdocs/compta/sociales/payments.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/holiday/class/holiday.class.php
	htdocs/viewimage.php
2019-07-30 20:55:15 +02:00
Alexandre SPANGARO
bb168d7f54 Merge branch '9.0' into 9.0_FEC 2019-07-29 06:54:48 +02:00
Alexandre SPANGARO
cd22cc70c8 FIX FEC Format - Save translation of the journal 2019-07-29 06:41:51 +02:00
Laurent Destailleur
4a8377e4fd Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-25 17:52:40 +02:00