Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
115,679 Commits 36 Branches 189 Tags
f7adbfef1663dfdfc8b923c69d260662685d2e5f
Commit Graph

276 Commits

Author SHA1 Message Date
Laurent Destailleur
fb2b4ea388 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-23 17:07:36 +01:00
root
435b82bbc8 #22883 2022-11-18 19:03:39 +05:30
root
bcb4919aa8 BUG FIXED #22883 2022-11-17 17:40:14 +05:30
Laurent Destailleur
eb0f898b01 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-13 01:10:31 +02:00
Laurent Destailleur
020d3dcbe5 Fix f... option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS (do not use this!) 2022-10-12 12:14:04 +02:00
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
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
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
0012c75ff3 Use isModEnabled 2022-08-29 12:04:03 +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
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
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
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
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
Laurent Destailleur
9a253d50c9 Fix report 2021-12-18 19:23:03 +01:00
Alexandre SPANGARO
0c8291b60f Fix INNER JOIN & Add urlencode() 2021-10-22 04:35:23 +02:00
Alexandre SPANGARO
d2b96fe0f6 Correct link to salary list with user search 2021-10-21 06:08:48 +02:00
Alexandre SPANGARO
a1c0e1ad1f Better fix with backward compatibility with old salary module 2021-10-21 05:45:37 +02:00
Alexandre SPANGARO
be7c1c8a23 Typo & translation 2021-10-21 05:18:56 +02:00
Alexandre SPANGARO
02bb39d438 FIX Accountancy simplified - Salaries are not present in report 2021-10-21 05:06:50 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
a4987c6e4f Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00