lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
108,518 Commits 43 Branches 150 Tags 886 MiB
0fd2e91ccc
Commit Graph

394 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00: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
Laurent Destailleur
3f0a9cfce9 Fix var not defined 2020-10-27 02:03:13 +01:00
Laurent Destailleur
9bbb471b4f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/loan/card.php
 2020-10-15 20:51:30 +02:00
Laurent Destailleur
d283e8f649 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-10-14 20:15:19 +02:00
Laurent Destailleur
1691fcedfb Fix phpcs 2020-10-14 20:13:30 +02:00
Laurent Destailleur
d3b6ada4eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-10-13 15:08:53 +02:00
Laurent Destailleur
496d429dcd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-13 15:04:25 +02:00
atm-lena
bf7d5b56fb FIX subcat filter 2020-10-12 11:50:19 +02:00
atm-lena
74ae9a2618 FIX CA report by product/service : subcategory filter 2020-10-08 10:49:46 +02:00
Got2be
03f37f3c1f NEW : add hooks on stats pages 2020-09-17 17:00:58 +02:00
Laurent Destailleur
6f12488e30 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2020-06-07 19:55:48 +02:00
Vaadasch
7b53ee2a6f Update byratecountry.php 
Add "cc.code" in the "GROUP BY" clause. Error in PGSQL if absent.
Add ORDER BY country / product_type / vatrate
 2020-06-07 14:13:57 +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
Laurent Destailleur
3090eb578b Look and feel v12 2020-04-25 17:43:12 +02:00
Laurent Destailleur
422e33a68b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ihm.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/stats/cabyprodserv.php
	htdocs/filefunc.inc.php
	htdocs/takepos/invoice.php
 2020-04-12 17:01:44 +02:00
Laurent Destailleur
1cda760621 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2020-04-12 16:54:09 +02:00
gauthier
1f471d46eb FIX : some others modules (like subtotal) use other product_type than 0 or 1 AND must not be considered in this report 2020-04-10 15:51:51 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
florian HENRY
48da8c315f fix php warning 2020-04-06 12:21:20 +02:00
Maxime Kohlhaas
fd5b2ba391 New supplier turnover by product service report 2020-04-04 23:29:45 +02:00
Maxime Kohlhaas
60bd0e49ec Fix missing token 2020-04-04 18:57:51 +02:00
Maxime Kohlhaas
fe876b96fe Fix links + getEntity 2020-04-04 18:49:30 +02:00
Maxime Kohlhaas
1adfe5c21f New supplier turnover by product service report 2020-04-04 15:45:32 +02:00
Maxime Kohlhaas
863f8dd1d6 New supplier turnover by thirdparty report 2020-04-04 15:38:22 +02:00
Maxime Kohlhaas
67f9b218c5 New supplier turnover report 2020-04-04 15:38:01 +02:00
Laurent Destailleur
99ddd25ad5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-02 16:51:50 +02:00
Laurent Destailleur
70706d9ea7 FIX Missing token and take into account max date when it can. 2020-04-01 18:48:45 +02:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
1dd5ba093d Prepare PHP v8 - mktime() and gmmktime() are no more allowed 2020-02-19 12:11:16 +01:00
Laurent Destailleur
58ad62aa7b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-14 19:12:11 +01:00
Laurent Destailleur
700e01d661 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-02-12 22:50:56 +01:00
atm-lena
ecea726323 FIX CA by prod list filter 2020-02-07 15:01:37 +01:00
Laurent Destailleur
58ff3e563d Fix link a href 2020-01-06 02:21:42 +01: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
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +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
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Regis Houssin
a527e72124 FIX #12688 2019-12-12 16:35:07 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
eb0d20b77e Fix label of country 
Fix div empty
 2019-12-09 09:16:59 +01:00
Scrutinizer Auto-Fixer
2ecfe41810 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 09:53:31 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
a1f0245c79
clean indent in compta, contact directory 2019-10-26 18:13:20 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
b044d95acf Merge 2019-07-18 17:50:15 +02:00
Laurent Destailleur
e0095871aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/stats/byratecountry.php
	htdocs/core/class/html.form.class.php
 2019-07-14 00:19:56 +02:00
Laurent Destailleur
3bfc1938d3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-07-14 00:13:16 +02:00
Laurent Destailleur
b6571d9fc3
Update byratecountry.php 2019-07-13 22:39:25 +02:00
gauthier
cce8f98afc FIX : accounting mode must be taken from global conf, because there's no way to choose a mode with interface 2019-07-10 16:33:03 +02:00
Laurent Destailleur
2c04a480a2 Fix phpcs 2019-06-04 02:31:19 +02:00
Laurent Destailleur
ba2b07917b Fix look and feel v10 2019-06-04 02:11:03 +02:00
Laurent Destailleur
74ba9f57f1 Fix phpcs 2019-04-19 18:48:00 +02:00
atm-quentin
cb7f9c2b6f NEW filter by thirdparty on report CA by prod/serv 2019-04-17 14:35:46 +02:00
Philippe GRAND
60e503c7d1 update with html5 compliant code 2019-02-12 15:02:54 +01:00
Philippe GRAND
5007ef82c8 update with html5 compliant code 2019-02-12 14:56:38 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +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
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Philippe GRAND
44708ce7d5 update with html5 compliant code 2019-01-18 10:16:51 +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
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +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
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +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
Laurent Destailleur
969b272576 Rename menu entries and report title for better understanding 2018-06-26 11:18:31 +02:00
Philippe GRAND
4c08e2ebf3 clean and update code 2018-06-17 14:33:29 +02:00
Frédéric FRANCE
4d5c28b597
loadlangs 2018-05-27 09:27:09 +02:00
Laurent Destailleur
d072c2eb5d Fix turnover invoiced by vat rate and country. Use fiscal month start. 2018-05-22 23:09:27 +02:00
Laurent Destailleur
3e27d7dd2a Report of turnover by vat rate / product type / country 2018-05-15 17:51:19 +02:00
Laurent Destailleur
b9e6f6eab8 Fix link to navigate in year only if filter is for a full year 2018-05-01 10:35:12 +02:00
Laurent Destailleur
ee69bdd3da
Merge pull request #8699 from DazzX/improve_stat_page 
New : Reactivate next and previous link
 2018-05-01 10:26:49 +02:00
Julien BARRET
bb2ef46ef4 Reactivate next and previous link 2018-04-30 00:24:47 +02:00
Julien BARRET
efcc3f40fa Fix link "refresh" on turnover report 2018-04-29 23:22:46 +02:00
Laurent Destailleur
c40b50ca71 Fix typo 2018-04-27 10:23:09 +02:00
Laurent Destailleur
489318d4db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-27 10:18:40 +02:00
Laurent Destailleur
aa30b946b6 Fix from #8677 2018-04-27 10:18:22 +02:00
Julien BARRET
8256bd1889 Fix Year selector issue in turnover statistics page 2018-04-23 11:39:34 +02:00
Laurent Destailleur
fec9303d18 Remove useless $var 2018-04-22 18:51:03 +02:00
Laurent Destailleur
4957ea9178 Fix SQLi reported by op7ica 2018-03-15 01:55:16 +01:00
Laurent Destailleur
0dfc9af72a FIX multicompany compatibility and fix reports 2018-03-06 19:58:13 +01:00
Laurent Destailleur
95d2a9f88d Responsive and css 2018-01-12 01:10:03 +01:00
Laurent Destailleur
a0cdf784da Standardize code 2017-09-05 09:43:22 +02:00
Laurent Destailleur
31a74d448c Work on accounting reports. 2017-08-31 22:38:30 +02:00
Laurent Destailleur
8248bc1c64 Uniformize code of accounting report 2017-08-31 15:44:36 +02:00
Laurent Destailleur
f10e89aa9f Fix utf8 bom forbidden 2017-08-27 00:33:50 +02:00
Darkjeff
dcc3febf6f add bookkkeeping in report turnover 2017-07-20 18:22:53 +02:00
Laurent Destailleur
7ae52d843c Look and feel v6 2017-07-01 14:23:24 +02:00