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
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
7dd06a1ae6
Fix margin pagination
2016-12-27 02:01:27 +01:00
Laurent Destailleur
fc401a9c68
Fix more security fixes
2016-12-18 17:27:06 +01:00
Laurent Destailleur
4eb397557f
Debug accounting module
2016-11-28 19:30:55 +01:00
Laurent Destailleur
94c5b40c51
Add warning
2016-10-10 21:22:28 +02:00
Laurent Destailleur
1e3038d634
Debug reports
2016-10-04 13:57:25 +02:00
Laurent Destailleur
b2307f9b90
Uniformize code
2016-09-28 21:08:25 +02:00
Laurent Destailleur
05b1528029
Merge pull request #5800 from atm-gauthier/NEW_filters_on_ca_report
...
NEW : add fields and filters on ca by third report
2016-09-28 20:00:16 +02:00
gauthier
e82f65cef2
NEW : add field and filters on ca by third report
2016-09-27 17:38:54 +02:00
Laurent Destailleur
d7007bd16b
Fix lang not loaded
2016-08-30 00:21:26 +02:00
Laurent Destailleur
0cde6ad98f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2016-04-29 20:43:42 +02:00
Laurent Destailleur
3d9456b202
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/fourn/facture/list.php
2016-04-29 20:42:35 +02:00
Maxime Kohlhaas
0a67614e72
Fix wrong qty total in ca by prod/serv report
2016-04-28 09:10:22 +02:00
Christophe Battarel
0dd25a7e70
add new filter in GROUP BY clause
2016-04-12 09:39:48 +02:00
Christophe Battarel
d052eac6fc
NEW: add product type filter on turnover report
2016-04-07 14:57:41 +02:00
aspangaro
e1f946578b
Fix presentation
2015-10-07 21:06:55 +02:00
Maxime Kohlhaas
fdf1d953a9
New : add stats by qty on report turnover by product (+ clean code)
2015-06-22 19:22:13 +02:00
Raphaël Doursenaud
becc240b92
Include Categories class whenever Categorie::TYPE is used
2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Laurent Destailleur
9dd73de9b0
Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-04-18 20:47:20 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
philippe grand
eaf0fda6aa
fix syntax errors
2015-04-18 18:07:41 +02:00
Raphaël Doursenaud
50c2b75ef8
Invoices: added situation (or interim) invoices support
2015-01-06 17:12:13 +01:00
Laurent Destailleur
bdb47921e7
Fixed: Bad value for % increase for first year.
2014-12-21 14:15:36 +01:00
Laurent Destailleur
ce98036725
Fixed: [ bug #1648 ] Can't see turnover report by product/services
2014-11-21 23:45:56 +01:00
Laurent Destailleur
6762b98c00
Minor look enhancement during debug
2014-11-07 23:25:39 +01:00
aspangaro
e147259e95
Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6
2014-09-21 20:30:55 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Grand Philippe
462f65614d
Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1
2014-01-13 10:10:17 +01:00
Laurent Destailleur
f0503dfaa9
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/compta/stats/cabyprodserv.php
htdocs/compta/stats/casoc.php
2014-01-03 18:28:00 +01:00
Laurent Destailleur
d992d5cb22
Fix: Bad SQL request when using filter on category.
2014-01-03 18:16:21 +01:00
Laurent Destailleur
303cad162b
Qual: Show the rule name used to make calculation and link to change
...
rule.
2013-10-10 19:33:49 +02:00
Laurent Destailleur
383ead9234
Fix: remove a test output
2013-10-10 17:30:28 +02:00
Maxime Kohlhaas
7b5386692c
Added w/o VAT on turnover report
2013-07-16 00:30:44 +02:00
Maxime Kohlhaas
bc0a52fa71
Fix : link to invoice list + SQL was bad when several invoices had the same amount on the same thirdparty
2013-07-16 00:29:03 +02:00
Maxime Kohlhaas
76870622e4
Add turnover report by product / serv
2013-06-25 14:54:29 +02:00
Grand Philippe
b599481ef6
standardize code
2013-06-20 09:18:12 +02:00
simnandez
9dde709c3e
Fix: typo errors
2013-04-25 13:01:38 +02:00
Laurent Destailleur
4e0ef01389
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
2013-04-25 01:13:13 +02:00
Raphaël Doursenaud
6cce2c0b10
Added forgotten file
2013-04-21 10:19:07 +02:00
Raphaël Doursenaud
50eb88db5d
Fixed turnover by user
...
Mistakingly used distinct in SQL request
2013-04-21 10:11:19 +02:00
Raphaël Doursenaud
f2bd1461b2
Improved reports
...
Added amount without VAT for "CREANCES-DETTES" mode
Added turnover by products/services
Added categories filter for users and products/services
Added period management
Added list sorting
2013-04-20 07:33:10 +02:00
Laurent Destailleur
746e005726
Fix: Fix ton of regression due to field name change
2013-03-09 20:34:38 +01:00
Grand Philippe
6adc9eb7f2
english language standardization
2013-02-23 17:40:28 +01:00
Grand Philippe
7c2a4500d6
fix: change name with lastname
2013-02-23 12:30:01 +01:00
Laurent Destailleur
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
Laurent Destailleur
96416735df
Fix: [ bug #618 ] External accounts can access confidential informations
...
(a lot)
2013-01-02 18:43:59 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Laurent Destailleur
f47422f551
Fix: Errors into turnover reports
2012-12-09 18:40:01 +01:00
Regis Houssin
43c0a03758
Fix: strict mode tornado
2012-09-15 11:21:22 +02:00
Marcos García
f3674317ec
Removed parenthesis from all require and replaced with single quotes
2012-08-22 23:24:21 +02:00
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Laurent Destailleur
e6cd400bc3
Qual: List of elements must be into a page called "list.php".
2012-06-09 19:16:31 +02:00
Regis Houssin
73487a6aec
Fix: replace mktime() by dol_now()
2012-04-30 15:01:25 +02:00
Laurent Destailleur
1645ddbe47
Sec: Sanitize all input for ids.
2012-02-27 22:26:22 +01:00
Laurent Destailleur
cfaf1f0813
New: Can add tabs on statistics views.
2012-02-12 23:29:31 +01:00
Laurent Destailleur
e528ac97a8
fix: [ bug #272 ] Impossible afficher Créances-Dettes sur période
...
d'analyse choisie
2012-01-14 13:45:42 +01:00
Laurent Destailleur
77870d0557
Add hidden option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS
2012-01-08 23:43:32 +01:00
Regis Houssin
00ffbd5e90
Fix: change the last database prefix
2011-11-23 21:25:02 +01:00
Laurent Destailleur
839781dfbe
Qual: Removed a TODO by renaming all ->monnaie into ->currency
2011-11-23 14:55:36 +01:00
Laurent Destailleur
bf9c482f8a
Fix: Deposits was not included into lines but into into remain to pay
2011-11-16 18:58:11 +01:00
Regis Houssin
f0c327c070
Fix: uniform code
...
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
2011-11-08 17:22:31 +08:00
Laurent Destailleur
784f696c85
Qual: Some fixes to make working with PHP option error_reporting
...
E_STRICT
2011-10-29 19:50:25 +02:00
Regis Houssin
56d6cbe56f
[task #216 ] Move lib in core directory
2011-10-24 12:59:44 +02:00
Regis Houssin
63d60a33fc
[task #216 ] Move lib in core directory
2011-10-24 11:25:54 +02:00
Laurent Destailleur
a2770df535
Qual: Removed dead file
2011-09-21 12:39:03 +00:00
Regis Houssin
2c1b3722f2
Fix: replace sizeof() by count()
2011-09-17 19:49:50 +00:00
Laurent Destailleur
c730fb3c0c
Fix: Bad link
2011-09-08 20:21:19 +00:00
Laurent Destailleur
a8be10b3c6
Qual: Uniformize code
...
Doxygen
2011-09-08 20:02:57 +00:00
Laurent Destailleur
9e5cad2c47
Fix: Bad link
2011-09-08 20:21:19 +00:00
Laurent Destailleur
351a2974dd
Doxygen
2011-09-03 00:14:27 +00:00
Laurent Destailleur
044879c838
Doxygen
2011-09-02 23:57:26 +00:00
Laurent Destailleur
0e2946cec7
Doxygen
2011-09-03 00:19:56 +00:00
Laurent Destailleur
e5988ad241
Fix: Error management when adding notification
2011-09-02 23:41:55 +00:00
Laurent Destailleur
2d89e6609e
Doxygen
2011-09-03 00:14:27 +00:00
Laurent Destailleur
5be5852cf4
Fix: Third party emails must not be visible into notification page
2011-09-02 23:07:47 +00:00
Laurent Destailleur
42c86ce1ac
Work on rpm package
2011-09-03 01:46:33 +00:00
Juanjo Menent
cac55067fb
Qual: Uniformize code
2011-09-02 22:33:28 +00:00
Laurent Destailleur
55c5c5f9f5
Work on rpm package
2011-09-03 01:27:00 +00:00
Laurent Destailleur
f5f37fa8dc
Qual: Uniformize code
2011-09-02 16:33:11 +00:00
Laurent Destailleur
d53b179102
Fix: Fix GNU address
...
Doxygen
2011-09-03 01:24:09 +00:00
Laurent Destailleur
f39c932b2e
Qual: Uniformize code
2011-09-02 16:25:07 +00:00
Laurent Destailleur
26badd59f4
Doxygen
2011-09-03 00:27:02 +00:00
Juanjo Menent
116e215323
Uniformize code
2011-09-02 15:41:35 +00:00
Laurent Destailleur
1ca46d8ec4
Doxygen
2011-09-03 00:19:56 +00:00
Juanjo Menent
8f19ee66e4
Uniformize code
2011-09-02 14:31:53 +00:00
Laurent Destailleur
d1d145620d
Doxygen
2011-09-03 00:14:27 +00:00
Regis Houssin
03711cf6f2
Fix: remove obsolete tags
2011-08-27 19:15:14 +00:00
Regis Houssin
2ecc03104c
Fix: remove obsolete tags (in progress)
2011-08-27 15:14:31 +00:00
Regis Houssin
726d9581dd
Fix: remove obsolete tags (in progress)
2011-08-27 14:24:16 +00:00
Laurent Destailleur
e2c007305c
Fix: Avoid errors into rpm packages
2011-07-31 22:21:57 +00:00
Laurent Destailleur
40704a5c5a
Look fixes and enhancements
2011-07-20 19:03:31 +00:00
