Commit Graph

367 Commits

Author SHA1 Message Date
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
Laurent Destailleur
9a253d50c9 Fix report 2021-12-18 19:23:03 +01:00
Laurent Destailleur
bf441dda14 Fix report of expense-income must be without tax in debt 2021-12-18 18:11:28 +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
8e1ba67928 css 2021-04-29 18:04:10 +02:00
Laurent Destailleur
66103303eb Fix html tag 2021-04-29 18:02:24 +02:00
Alexandre SPANGARO
36e4f5aa22 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-06 10:29:44 +02:00
Laurent Destailleur
01eec2b919 FIx #yogosha5774 2021-04-05 15:11:28 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22 2021-03-20 13:42:54 +01:00
Laurent Destailleur
46972ec669 FIx #5660 2021-03-18 14:34:44 +01:00
Alexandre SPANGARO
6e17a588bb Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-16 03:26:28 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule 2021-03-01 20:37:16 +01:00
Alexandre SPANGARO
94a861c1c8 Code enhanced - Standardize field name 2021-03-01 04:07:31 +01:00
Frédéric FRANCE
61600a9e65
code syntax compta directory 2021-02-23 21:09:01 +01:00
Laurent Destailleur
0849ce288c Fix phpcs 2021-02-10 14:04:06 +01:00
Laurent Destailleur
92a1235066 Fix summary of report 2021-02-09 23:34:42 +01:00
Laurent Destailleur
6ceaa02abe Fix total in summary section was empty for income. 2021-02-09 23:08:59 +01:00
Laurent Destailleur
4471d7d1da FIX debug report expense/income 2020-12-23 22:18:38 +01:00
Laurent Destailleur
dac0267a38 Fix debug various payment module.
Fix debug report income/expense (for situation that should not happen
but if it happen, result is consistent with other screens).
2020-12-09 21:51:01 +01:00
Laurent Destailleur
51738e7e60 Fix links into translation strings 2020-12-09 17:02:26 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
2020-07-08 18:11:58 +02:00
Laurent Destailleur
091fbb2824 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-06 11:55:06 +02:00
Laurent Destailleur
1e9ae1bc02 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
2020-07-06 11:32:04 +02:00
Laurent Destailleur
053a1a2230 Fix duplicate code 2020-07-06 11:22:30 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec
add new rule 2020-05-21 01:52:25 +02:00
DEMAREST Maxime (Indelog)
7bf037ab2f Fix blank line at end of control structure 2020-05-06 13:46:24 +02:00