Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing
2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats
2018-12-15 15:17:15 +01:00
Laurent Destailleur
21b3bbc2e6
Merge
2018-12-08 11:55:27 +01:00
Laurent Destailleur
5ce26bae1b
Fix form of bank info for CH
2018-12-04 22:01:35 +01:00
Alexandre SPANGARO
088c002ed1
NEW: Add stats on entries & movements by fiscal year
2018-12-02 11:01:11 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
f8316abfc0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/theme/md/style.css.php
2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/theme/md/style.css.php
2018-10-24 02:40:57 +02:00
Laurent Destailleur
cb29209457
NEW Enhancement in process to make manual bank conciliation
2018-10-10 12:47:18 +02:00
Philippe GRAND
e9bd1be41b
Standardize and update code
2018-10-09 15:38:42 +02:00
Philippe GRAND
15ff9f8917
Standardize and update code
2018-09-28 14:44:47 +02:00
Philippe GRAND
803505b6b7
Standardize and update code
2018-09-20 12:27:06 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 20:21:35 +02:00
Frédéric FRANCE
cdc5a174aa
Update account.class.php
2018-09-11 00:29:01 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-08 10:50:27 +02:00
Philippe GRAND
38ca6096b2
Standardize and update code
2018-09-05 10:31:12 +02:00
Frédéric FRANCE
7799774ca1
move phpcs:ignore
2018-09-04 22:52:55 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 20:48:35 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore
2018-09-02 13:38:11 +02:00
Philippe GRAND
c4f05aff28
Standardize and update code
2018-09-02 10:42:31 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Philippe GRAND
7354e485b0
precise label comment
2018-09-01 13:22:08 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Philippe GRAND
edaa575435
Standardize and update code
2018-08-31 18:36:15 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Philippe GRAND
2fa82edd39
Standardize and update code
2018-08-23 17:07:27 +02:00
Philippe GRAND
504b0e3d16
Update and standardize code
2018-08-22 18:34:50 +02:00
Philippe GRAND
6542dcf0bd
Update and standardize code
2018-08-22 12:04:50 +02:00
Philippe GRAND
e0462b975b
Update and standardize code
2018-08-22 11:48:26 +02:00
Philippe GRAND
95349365ba
Update and standardize code
2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974
Update and standardize code
2018-08-22 11:24:31 +02:00
Philippe GRAND
29f15b4ae6
Update and standardize code
2018-08-22 10:51:55 +02:00
Philippe GRAND
a669830427
Update and standardize code
2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration
2018-08-16 00:52:55 +02:00
Frédéric FRANCE
69a7af88e7
function declaration
2018-08-15 18:14:02 +02:00
Frédéric FRANCE
d25fa61998
return comment
2018-08-14 13:14:55 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Laurent Destailleur
34c2facff1
Fix missing link on bank account
2018-07-17 18:16:30 +02:00
Inovea Conseil
30cff2bb36
ADD check user's rights
2018-07-05 11:52:41 +02:00
Laurent Destailleur
2fc2c44de4
Fix phpcs
2018-04-29 20:18:50 +02:00
Laurent Destailleur
e72c2e6a11
Enhance sorting of field for lists on field with several sort criterias
2018-04-28 19:54:41 +02:00
Laurent Destailleur
d1e9a4719b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/accountancy/supplier/index.php
2018-03-27 12:27:15 +02:00
Laurent Destailleur
89bf781fe6
FIX Add warning when expense report line not into range
...
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
2018-03-26 14:13:40 +02:00
Laurent Destailleur
5a397fff72
Fix scrutinizer bugs
2018-03-16 00:16:32 +01:00
florian HENRY
8e84b733dc
fix scrutinizer
2018-03-10 00:13:41 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
7a1a2cf90d
Fix send into ledger for bank line record. Show accounted status.
2018-01-22 04:13:29 +01:00
Frédéric FRANCE
6a91b16995
info bank
2017-11-25 12:13:03 +01:00
Laurent Destailleur
aaf08ade2f
Fix bug reported by scrutinizer
2017-11-25 11:21:31 +01:00
Laurent Destailleur
6a3dc91414
Standardize code
2017-11-23 15:22:32 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Laurent Destailleur
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
Laurent Destailleur
7b661685cc
Debug modBlockedLog module
2017-10-24 15:22:46 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
5f401839d6
Fix verif
2017-10-12 00:42:48 +02:00
Laurent Destailleur
15bcbc8b43
FIX Check on bank info for sepa must be done on iban/swift not on ban
2017-10-12 00:38:59 +02:00
Laurent Destailleur
31ab73ff3c
Fix when verif is called several times
2017-10-12 00:12:26 +02:00
Laurent Destailleur
4c23363400
Fix creation of tax payment
2017-10-07 21:27:18 +02:00
Laurent Destailleur
e40bffb0d5
Fix bug reported by scrutinizer
2017-10-07 20:21:47 +02:00
Laurent Destailleur
f2e0ff0d30
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
2017-10-03 17:25:01 +02:00
Laurent Destailleur
a501a20487
NEW Search filters in lists are restored when using "back to list"
2017-10-03 16:00:52 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
gauthier
d270a8e009
FIX : same than precedent commit
2017-09-26 16:09:40 +02:00
gauthier
8de9c5cd36
FIX : forgotten php doc on function parameter
2017-09-26 14:18:26 +02:00
gauthier
7f938bc517
NEW : unexistant function load_state_board() on several objects
2017-09-26 12:32:58 +02:00
Laurent Destailleur
fcdbc66bb1
Merge pull request #7122 from atm-florian/develop_fixtransfert
...
NEW : Can transfer from bank account to bank account with different currencies
2017-09-25 17:36:52 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
3f7b705674
Use correct term accounting for codes
2017-09-18 00:48:09 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
GUERRIER Kevin
b6b3ab3f1b
NEW Add Next/Previous button on operation date of bank line
...
Operation date has to be frequently updated because some bank change them in many case. With this feature, this value can be updated simply like the value date.
2017-07-29 15:07:27 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
cb87b314be
FIX Maxi debug of journalization of bank journal.
2017-07-15 03:41:07 +02:00
florian HENRY
ffb8c684d0
NEW : Can transmer from bank account to bank account with different
...
currency
2017-07-06 13:40:26 +02:00
Regis Houssin
58b3d86b49
Fix: errors
2017-06-09 09:40:43 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Laurent Destailleur
97f9d8a87e
Merge pull request #6957 from aspangaro/6.0-vat2
...
Fix : Missing ref of getNomUrl in AccountLine (Bank)
2017-06-08 10:16:32 +02:00
Alexandre SPANGARO
a96049d0e6
Spaces!!!
2017-06-07 06:06:53 +02:00
Alexandre SPANGARO
c041fe2165
Fix : Missing ref of getNomUrl in AccountLine (Bank)
2017-06-07 06:03:52 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
4a085a8cc0
Fix phpunit
2017-05-21 21:21:44 +02:00
Alexandre SPANGARO
143c019905
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-14 08:07:34 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Destailleur
0d11fce834
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-12 15:45:30 +02:00
Laurent Destailleur
b81de35703
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/contrat/class/contrat.class.php
2017-05-12 15:44:09 +02:00
Laurent Destailleur
419c15ee8e
Fix escaping class
2017-05-12 15:28:10 +02:00
Laurent Destailleur
eb4cfc11cb
Fix syntax error
2017-05-11 11:58:16 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
d19d733f95
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-05-10 23:28:24 +02:00