Commit Graph

405 Commits

Author SHA1 Message Date
Frédéric France
1c2a89f52d Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-09 08:09:12 +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
5341c7a4a1 Fix sql error 2022-09-09 01:36:58 +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
Laurent Destailleur
fa64be5e82 Fix wrong number of td 2022-09-09 00:29:45 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
8f2a66cc44
Merge pull request #22078 from grandoc/fix_for_fichinter
fix : extrafields of line where missing when cloning a fichinter
2022-09-07 14:03:38 +02:00
Laurent Destailleur
6b7e11dbdd Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-07 13:59:12 +02:00
Alexandre SPANGARO
a13f232d2d FIX #22057 2022-09-06 05:42:04 +02:00
Laurent Destailleur
a67008f7e9
Merge pull request #22058 from grandoc/16.0
FIX : bug#22057
2022-09-03 11:38:36 +02:00
Philippe GRAND
7c04468246 fix bug#22057 2022-09-03 10:36:54 +02:00
Alexandre SPANGARO
16e1c7ea71
Update result.php
Fixed Stickler
2022-09-02 10:25:12 +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
Thomas Negre
30ce816c0c Fix: On a not configured personalized accounting group, the group code would be used in the formula. 2022-09-01 17:49:04 +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
355286e50a Use isModEnabled 2022-08-29 12:04:39 +02:00
Alexandre SPANGARO
0012c75ff3 Use isModEnabled 2022-08-29 12:04:03 +02:00
Alexandre SPANGARO
07e91a061a Use isModEnabled 2022-08-29 11:26:32 +02:00
Alexandre SPANGARO
768f6416ab Use isModEnabled 2022-08-29 11:26:26 +02:00
Alexandre SPANGARO
9019604885 Use isModEnabled 2022-08-29 11:26:18 +02:00
Laurent Destailleur
2e905b127a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/index.php
	htdocs/product/admin/product.php
2022-08-25 14:35:08 +02:00
Laurent Destailleur
0d693d723a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/propal/class/api_proposals.class.php
2022-08-25 14:31:47 +02:00
Laurent Destailleur
0c8eeed3f6
Merge pull request #21875 from FHenry/15_fix_defaultdate_CA_report
fix:  default filter date CA selling and buying report
2022-08-25 12:20:58 +02:00
Florian HENRY
282dda8660 fix: use Dolibarr std method and set correct end Year on CA report 2022-08-24 22:17:32 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
stickler-ci
2b4c83a680 Fixing style errors. 2022-08-22 16:42:08 +00:00
Yoan Mollard
3f1f02a8a8 Select sum of TTC payments for expense reports and 0 for HT because HT makes no sense
Only for mode RECETTES-DEPENSE
2022-08-22 18:21:24 +02:00
Alexandre SPANGARO
0e5a463f30 PHP8 Warnings Accountancy - Result report 2022-08-19 07:17:48 +02:00
Yoan Mollard
ed627613aa Fix multiple consecutive payments of a single expense report
total_ht and total_ttc are already the sum of the whole expense report,
no need to sum.
2022-08-18 01:51:49 +02:00
Laurent Destailleur
85fb7c1d5a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-12 15:56:15 +02:00
Laurent Destailleur
c089fe124c
Update clientfourn.php 2022-08-11 01:37:53 +02:00
Laurent Destailleur
ead7bd91fe
Update clientfourn.php 2022-08-11 01:36:31 +02:00
Yoan Mollard
4c649a227a More developer-friendly print of titles 2022-08-10 12:54:14 +02:00
stickler-ci
3a83676202 Fixing style errors. 2022-08-05 02:22:32 +00:00
Yoan Mollard
9db6c779f0 Fix layout of Incomes-Expenses + Claims-Debts accounting tables 2022-08-05 04:16:23 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
BENKE Charlene
364799582a fix : allow cut&paste as real numeric value to excel 2022-04-29 17:24:55 +02:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
f8a5749fc4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-25 19:00:10 +01:00
Laurent Destailleur
b989c257ad Fix report on salaries 2022-02-25 18:53:21 +01:00
atm-lena
ed6f4b4ee1 Display Salary Paiement on compta report 2022-02-23 15:33:51 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
8925a8041a Fix trforbreak 2021-12-18 23:16:46 +01:00
Laurent Destailleur
7b1b02ab16 css 2021-12-18 22:23:12 +01:00
Laurent Destailleur
ab7f118949 Add info to help debug report 2021-12-18 21:59:46 +01:00
Laurent Destailleur
d43c632c33 Add info to help debug report 2021-12-18 21:51:44 +01:00
Laurent Destailleur
7665b9d505 FIX Debug report 2021-12-18 21:13:22 +01:00
Laurent Destailleur
6be499e921 Fix report 2021-12-18 20:06:27 +01:00