Commit Graph

1923 Commits

Author SHA1 Message Date
Alexandre SPANGARO
d1ba6b9476 Merge remote-tracking branch 'upstream/develop' into 13a11 2020-09-08 05:01:36 +02:00
Alexandre SPANGARO
df7ca14b2c Security access 2020-09-08 04:58:25 +02:00
Alexandre SPANGARO
a4c581b34d Modify link on chart of accounts 2020-09-08 04:44:04 +02:00
Alexandre SPANGARO
939933f4f7 Add some language key 2020-09-08 04:24:18 +02:00
Alexandre SPANGARO
ca32a93c0b NEW Link on balance to bookkeeping 2020-09-07 22:03:41 +02:00
Alexandre SPANGARO
8c75f0b95b Code optimize 2020-09-07 21:38:39 +02:00
Alexandre SPANGARO
871826d023 Merge remote-tracking branch 'upstream/develop' into 13a8 2020-09-07 21:22:14 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
263989019c
Merge pull request #14493 from aspangaro/13a4
NEW Accountancy - Add options to disable accounting on sales, purchases & expense reports
2020-09-04 23:10:15 +02:00
Alexandre SPANGARO
247cc71ef4 Merge remote-tracking branch 'upstream/develop' into 13a8 2020-09-04 20:26:05 +02:00
Laurent Destailleur
ac8c6954bf
Merge pull request #14607 from aspangaro/13a9
New Accountancy - Balance - Move to getNomUrl on accounting account
2020-09-03 12:44:31 +02:00
Laurent Destailleur
87113a77b4
Update accountingaccount.class.php 2020-09-03 12:32:51 +02:00
Alexandre SPANGARO
853bacd545 New Accountancy Add predefined url in getNomUrl 2020-09-02 23:43:36 +02:00
Alexandre SPANGARO
fb88c68ddb New Accountancy - Balance - Move to getNomUrl on accounting account 2020-09-02 05:15:58 +02:00
stickler-ci
028275582a Fixing style errors. 2020-09-01 14:26:16 +00:00
Alexandre SPANGARO
0336fe5686 NEW Accountancy - On transfers, select the periodicity by default 2020-09-01 16:18:07 +02:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
Laurent Destailleur
4ecd15b7ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/main.lang
2020-08-27 21:57:42 +02:00
Alexandre SPANGARO
0adf267f66 Fix Accountancy Listbyaccount Error missing formfile->getDocumentsLink 2020-08-25 21:31:04 +02:00
Laurent Destailleur
b80ba1179f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/expensereport/lines.php
	htdocs/accountancy/supplier/lines.php
2020-08-21 13:19:28 +02:00
Alexandre SPANGARO
fbd4323dd8 Fix Accountancy - Show label account in page already bind 2020-08-19 06:01:10 +02:00
Alexandre SPANGARO
3e80c71713 NEW Accountancy - Add options to disable binding on sales, purchases & expense reports independently of the modules 2020-08-18 07:38:46 +02:00
Alexandre SPANGARO
8e0dfc8621 Fix oddeven 2020-08-18 06:28:16 +02:00
Alexandre SPANGARO
c3a23b0415 Remove admin access on option 2020-08-18 06:23:35 +02:00
Laurent Destailleur
24703b8fe7
Merge pull request #14487 from aspangaro/13a4
NEW Add a start date to begin binding in accountancy
2020-08-17 22:20:46 +02:00
Alexandre SPANGARO
498431fa6f NEW Add a start date to begin binding in accountancy 2020-08-17 15:27:05 +02:00
Laurent Destailleur
f6c444c235 css 2020-08-17 05:03:44 +02:00
Laurent Destailleur
99809b487e Standardize code 2020-08-16 23:33:50 +02:00
Laurent Destailleur
a53f7ff9c9
Merge pull request #14428 from asolslk/patch-3
Fix group by finance account error #14221
2020-08-08 13:33:10 +02:00
Laurent Destailleur
f8557879fb
Update listbyaccount.php 2020-08-08 13:15:29 +02:00
asolslk
41bb83f107
Update listbyaccount.php
fixed #14221
2020-08-08 19:10:50 +08:00
stickler-ci
d3cb704a0e Fixing style errors. 2020-08-08 11:05:19 +00:00
asolslk
5291746252
Update listbyaccount.php
fixed #14408
2020-08-08 19:04:38 +08:00
Laurent Destailleur
42234ba506 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/price.lib.php
2020-07-24 00:07:57 +02:00
Laurent Destailleur
f07a1a6d1e FIX for #14253 2020-07-18 18:54:55 +02:00
Laurent Destailleur
6ad8145645 FIX for #14253 2020-07-18 18:52:33 +02:00
Laurent Destailleur
2dc1008663 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-10 05:21:40 +02:00
Laurent Destailleur
c3375b176d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:21:01 +02:00
Laurent Destailleur
79a6246666 FIX Fails to retraive accounting code of social contribution sometimes
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
2020-07-10 05:18:46 +02:00
Laurent Destailleur
86744a2e0c FIX Fails to retraive accounting code of social contribution sometimes 2020-07-10 05:14:54 +02:00
Laurent Destailleur
17ebdd73fe FIX Fails to retraive accounting code of social contribution sometimes 2020-07-10 05:13:24 +02:00
Laurent Destailleur
07b2053a4b Fix regression 2020-07-10 03:59:28 +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
c36c8ed447 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/fourn/class/paiementfourn.class.php
2020-06-17 14:53:24 +02:00
Laurent Destailleur
7d3c176727 Prepare convertion of field "montant" into "amount" 2020-06-17 12:45:56 +02:00
Laurent Destailleur
4627f06c70 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-16 22:57:50 +02:00
gauthier
e50d239322 FIX : force rounding 2 on export ld compta 2020-06-16 11:40:01 +02:00
Laurent Destailleur
b7d835eceb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-15 16:10:27 +02:00