Commit Graph

2517 Commits

Author SHA1 Message Date
Laurent Destailleur
e12d9ee979
Merge pull request #19156 from frederic34/defaultvaluegetglobal
can specify default in getDolGlobalString and getDolGlobalInt
2021-10-23 22:42:40 +02:00
Laurent Destailleur
dc1e57e267
Merge pull request #19155 from frederic34/patch-1
fix warnings
2021-10-23 22:41:05 +02:00
Frédéric FRANCE
cb66b71017
Update journals_list.php 2021-10-23 21:39:07 +02:00
Frédéric FRANCE
1639eae92e
fix warning remove unused 2021-10-23 21:37:17 +02:00
Frédéric FRANCE
29371487a0
fix warning 2021-10-23 21:14:32 +02:00
Frédéric FRANCE
635cb34606
fix warning 2021-10-23 21:10:43 +02:00
Frédéric FRANCE
08e5b55d16
can specify default in getDolGlobalString and getDolGlobalInt 2021-10-23 21:06:37 +02:00
Frédéric FRANCE
cdba9909be
fix warnings 2021-10-23 20:53:46 +02:00
Laurent Destailleur
757d841f15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 17:20:00 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Philippe GRAND
ce75806728 fix scrutinizer : The property datef does not exist on Facture 2021-10-23 11:46:54 +02:00
Laurent Destailleur
6ec19bca9d
Merge pull request #19128 from frederic34/warnfixes
fix warnings
2021-10-23 11:38:03 +02:00
Laurent Destailleur
df1d8b02c7
Merge pull request #19129 from frederic34/patch-4
fix warnings
2021-10-23 11:37:52 +02:00
Frédéric FRANCE
21aaed4a86
Update closure.php 2021-10-23 07:40:36 +02:00
Frédéric FRANCE
93e223bf84
fix warnings 2021-10-23 07:38:10 +02:00
Frédéric FRANCE
57bac4f5db
fix warnings 2021-10-23 07:29:12 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings 2021-10-23 07:13:08 +02:00
Laurent Destailleur
81f2a21954
Merge pull request #18942 from aspangaro/15a25
NEW Accountancy - rewrite bind accountancy code finding on purchase invoice
2021-10-22 22:56:24 +02:00
Laurent Destailleur
ea28256635
Merge pull request #19120 from frederic34/patch-5
fix warning
2021-10-22 22:47:57 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Frédéric FRANCE
e82a07085f
Update subaccount.php 2021-10-22 22:08:38 +02:00
Frédéric FRANCE
e411e23082
Update card.php 2021-10-22 22:08:13 +02:00
Frédéric FRANCE
6e2f438830
Update accountmodel.php 2021-10-22 22:07:47 +02:00
Frédéric FRANCE
9ca8dfcef9
fix warning 2021-10-22 22:05:04 +02:00
Alexandre SPANGARO
40a23e4aa4 Update work, thanks Florian 2021-10-22 17:12:44 +02:00
Alexandre SPANGARO
0cbfdb4219 Merge remote-tracking branch 'upstream/develop' into 15a25 2021-10-22 16:49:47 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer
fix: scrutinizer
2021-10-21 22:52:20 +02:00
Florian HENRY
0589c9c3ca fix: scrutinizer 2021-10-21 15:55:11 +02:00
Florian HENRY
f783dd56a4 fix: scrutinizer 2021-10-21 15:54:23 +02: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
Laurent Destailleur
766463a0b2
Merge pull request #18966 from aspangaro/14p22
Accountancy - Show message for admin if accountancy hidden options are activated to help to resolve some problems
2021-10-20 12:51:29 +02:00
Alexandre SPANGARO
bee6abd6fc Merge branch '14.0' into 14p24 2021-10-20 07:38:54 +02:00
Alexandre SPANGARO
9685695577 FIX Accountancy - PHP8 2021-10-18 10:19:46 +02:00
Alexandre SPANGARO
dce1e56a78 FIX #18912 Accountancy - SQL error when custom group is added without country defined 2021-10-18 05:44:22 +02:00
Alexandre SPANGARO
04091169da Accountancy - Show message for admin if accountancy hidden options are activated to help to resolve some problems 2021-10-13 02:48:42 +02:00
Laurent Destailleur
ff15292b49
Merge pull request #18949 from aspangaro/15a26
NEW Accountancy - Format FEC/FEC2 - Add column NumFacture
2021-10-12 15:29:10 +02:00
Laurent Destailleur
34f2b2b68d
Merge branch 'develop' into 15a25 2021-10-12 12:50:30 +02:00
Laurent Destailleur
6168e844bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-10-12 01:43:20 +02:00
Laurent Destailleur
ed3b267d8f Fix css 2021-10-12 01:40:30 +02:00
Alexandre SPANGARO
de98900cb7 NEW Accountancy - Format FEC/FEC2 - Add column NumFacture 2021-10-11 22:00:59 +02:00
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
2021-10-11 15:20:27 +02:00
Alexandre SPANGARO
af8e8077b1 Uniformize 2021-10-11 12:50:16 +02:00
Alexandre SPANGARO
e899d94ed5 NEW Accountancy - rewrite bind accountancy code finding on purchase invoice 2021-10-11 12:50:07 +02:00
Alexandre SPANGARO
c7fd9328cd NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:29:22 +02:00
Alexandre SPANGARO
e68d9dc73c NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 22:02:56 +02:00
Laurent Destailleur
831c72411b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-07 11:35:58 +02:00
Laurent Destailleur
d245abe908 Fix rounding 2021-10-07 11:34:21 +02:00
Laurent Destailleur
162d5d8a39 Fix protection of double party accounting when using situation invoices 2021-10-07 10:38:10 +02:00
Alexandre SPANGARO
adfae30112 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 06:18:39 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
2021-10-04 14:53:44 +02:00