Commit Graph

206 Commits

Author SHA1 Message Date
Laurent Destailleur
114e41108d FIX sort link 2020-02-26 06:43:58 +01:00
Laurent Destailleur
c38e88ca46 FIX Bad sort link in accounting report 2020-02-26 06:43:52 +01:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 23:15:34 +00:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +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
Alexandre SPANGARO
db86dff7d1 Fix sign for VAT repaid in report 2019-10-29 17:10:10 +01:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
21fc089f58 FIX Translation of month 2019-08-19 10:18:38 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Cristian Torres
7128270a95 [FIX] Variable $i is already declared
It was preventing displaying of the other accounts
2019-02-19 11:37:46 -06:00
Philippe Grand
d589ba4847 Update clientfourn.php
fixed...
2019-02-10 19:13:11 +01:00
Philippe GRAND
0911631b47 update with html5 compliant code 2019-02-10 16:31:34 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
atm-quentin
013c078c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice 2019-01-16 10:52:46 +01:00
Laurent Destailleur
21e9c02b11 Performance enhancement in Accounting Personalized report 2018-11-22 10:40:15 +01:00
atm-quentin
c18f486179 set facture to invoice AND check invoicenumber conf 2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62 remplacement en masse des $conf->entity par des getEntity('facture') 2018-11-16 11:17:18 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
c74ad61365 Fix look and feel v8 2018-11-08 10:04:25 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
a3fa13994b replace select_date 2018-09-09 09:36:12 +02:00
Philippe GRAND
5b8b4a1415 Standardize 2018-08-08 12:29:36 +02:00
Frédéric FRANCE
4d5c28b597 loadlangs 2018-05-27 09:27:09 +02:00
Laurent Destailleur
1c86eb1c44 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/quarter_report.php
	htdocs/core/lib/tax.lib.php
2018-03-29 03:08:01 +02:00
Laurent Destailleur
f9ee2930e2 FIX Data on income/expense report was always 0 2018-03-27 14:16:59 +02:00
Laurent Destailleur
0b13cd17ac FIX Some report have data when several chart of accounts exists
FIX Detail per account not visible when total < 0
2018-03-27 13:55:10 +02:00
Laurent Destailleur
2b588b9e43 FIX Initial month on report income/expense per predefined group 2018-03-27 13:37:40 +02:00
Laurent Destailleur
c4ca4a5a16 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/install/mysql/data/llx_accounting_category.sql
2018-03-15 15:11:18 +01:00
Laurent Destailleur
542eb2e5f4 Comment 2018-03-15 13:19:29 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
0dfc9af72a FIX multicompany compatibility and fix reports 2018-03-06 19:58:13 +01:00
Laurent Destailleur
ea92f6beae Fix for multicompany 2018-02-06 10:57:53 +01:00
Laurent Destailleur
abdf587fb5 Fix link to expert accounting no visible if module off 2018-01-20 12:12:36 +01:00
Laurent Destailleur
ef786f2271 Debug accountancy module 2017-11-28 11:31:55 +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
836f6bf3c9 Fix search filter when using extrafields 'links' 2017-11-12 12:39:23 +01:00
Laurent Destailleur
56e27d785a CSS on report 2017-10-14 01:03:59 +02:00
Regis Houssin
9823d6622c Fix: use default $shared value 2017-09-27 17:40:02 +02:00
Regis Houssin
a494e01f00 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Laurent Destailleur
f411476718 Fix default value of filter 2017-09-12 13:52:19 +02:00
Laurent Destailleur
3001ee5fe7 Fix title of reports 2017-09-12 13:05:34 +02:00
Laurent Destailleur
d0a0bf57b6 NEW The "Show detail by account" accepts 3 values: yes, no, if non zero 2017-09-12 12:52:48 +02:00
Regis Houssin
66e548427c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict

Conflicts:
	htdocs/compta/resultat/clientfourn.php
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
7a6f3d899c Fix initial data 2017-09-06 19:21:46 +02:00
Laurent Destailleur
48c526f87d Debug report for accounting module 2017-09-05 12:53:25 +02:00
Laurent Destailleur
f23a681dc0 Clean code 2017-09-05 10:16:08 +02:00
Laurent Destailleur
a0cdf784da Standardize code 2017-09-05 09:43:22 +02:00