Alexandre SPANGARO
355286e50a
Use isModEnabled
2022-08-29 12:04:39 +02:00
Alexandre SPANGARO
768f6416ab
Use isModEnabled
2022-08-29 11:26:26 +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
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
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
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
7665b9d505
FIX Debug report
2021-12-18 21:13:22 +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
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
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
DEMAREST Maxime (Indelog)
bf8cd51a5a
Fix somes code formating errors
2020-05-06 13:37:24 +02:00
DEMAREST Maxime (Indelog)
128ec6fd78
Add include various payments and loans in accounting report
...
For simplified accouning, behaviour not enable by default and must be
enabed in simplified accounting module admin page (or by global
settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
ACCOUNTING_REPORTS_INCLUDE_LOAN).
2020-05-06 12:58:41 +02:00
Laurent Destailleur
146ead4d04
Code comment
2020-04-08 11:39:22 +02:00
Scrutinizer Auto-Fixer
455178ff73
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Laurent Destailleur
838633d0de
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Regis Houssin
a527e72124
FIX #12688
2019-12-12 16:35:07 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
Laurent Destailleur
2d9135b6ad
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/card.php
htdocs/holiday/list.php
2019-11-01 21:06:06 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
Laurent Destailleur
8849cd9897
Update index.php
2019-10-30 02:19:32 +01:00
Alexandre SPANGARO
db86dff7d1
Fix sign for VAT repaid in report
2019-10-29 17:10:10 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory
2019-10-26 18:13:20 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
9a32117b1d
Nowrap on amount
2019-06-19 08:43:57 +02:00
Philippe GRAND
e10d1eb365
update with html5 compliant code
2019-02-12 14:44:25 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
