Commit Graph

175 Commits

Author SHA1 Message Date
Laurent Destailleur
2b588b9e43 FIX Initial month on report income/expense per predefined group 2018-03-27 13:37:40 +02: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
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
3001ee5fe7 Fix title of reports 2017-09-12 13:05:34 +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
f23a681dc0 Clean code 2017-09-05 10:16:08 +02:00
Laurent Destailleur
a0cdf784da Standardize code 2017-09-05 09:43:22 +02:00
Laurent Destailleur
e1fa37f7ff Work on reports per date 2017-09-05 02:13:02 +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
Regis Houssin
909826e24f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
d78d5d60c4 Fix pgsql
Fix missing vat rate info.
2017-06-20 01:45:44 +02:00
Regis Houssin
fa58f0f3e8 Fix: add entity filter 2017-06-09 09:25:15 +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
66819a34fa Fix several bugs 2017-01-22 13:19:07 +01:00
Laurent Destailleur
7dd06a1ae6 Fix margin pagination 2016-12-27 02:01:27 +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
Your Name
e1fa86914e The approved status is enough to expense appear in the report 2016-05-16 18:41:41 +02:00
Laurent Destailleur
a0563b410e Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:24:26 +01:00
Laurent Destailleur
884ba3a0ba Fix bad hook function name 2016-03-25 16:23:09 +01:00
Florian HENRY
0582c78131 Add exepnse report into accoutnacy standard report 2016-01-29 14:05:37 +01:00
Laurent Destailleur
c20296f963 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-10-04 20:46:17 +02:00
Laurent Destailleur
4201e8b032 FIX #3630 - Wrong balance report when module salaries and donation
disabled
2015-10-01 14:38:31 +02:00
Juanjo Menent
05b0a9b675 Merge remote-tracking branch 'origin/3.7' into 3.8
# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php
2015-08-01 14:50:07 +02:00
Laurent Destailleur
13dee1876a Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/resultat/clientfourn.php
2015-07-30 15:07:22 +02:00
Marcos GarciÌa de La Fuente
038f171d6c Fix: [ bug #3074 ] Accruals accounting use payment date instead of commitment date in turnover reports for salaries
Close #3074
2015-07-20 12:18:30 +02:00
Laurent Destailleur
5937cd7f70 NEW Forms are using the tab look, even in creation mode. 2015-05-13 17:53:25 +02:00
jfefe
f5db4d5bb7 Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/core/lib/tax.lib.php
2015-02-10 21:36:38 +01:00
aspangaro
f23212eb22 Center title column & modify language key 2015-02-07 14:55:56 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +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
Florian HENRY
32c777a78b Fix bad merge 2014-09-16 21:17:22 +02:00
Florian HENRY
14ab058f34 Add Dunning into compta report 2014-09-16 21:05:57 +02:00
Juanjo Menent
0e1f22fe26 Fix: Salary payments are not reflected on the reporting sheets 2014-08-28 15:16:14 +02:00
Marcos GarciÌ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
Juanjo Menent
a1fb21114b New: Add some hooks for financial reports 2014-03-28 18:31:43 +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
fc3483a4bb Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/webservices/server_user.php
2013-03-12 14:55:13 +01:00
simnandez
5c4b537a65 Fix: [ bug #762 ] Bad profit calculation in Reporting 2013-03-12 11:49:15 +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
Laurent Destailleur
79e3b4d792 Fix: Missing br 2012-11-03 04:02:48 +01:00
Laurent Destailleur
153997432f Fix: Several fix.
New: Also allow to enter a payment with a negative value on an invoice
and positive onto other.
2012-10-13 17:00:38 +02:00
Marcos GarciÌa
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos GarciÌa
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
0d96803937 Fix: strict mode tour 2012-08-03 20:09:37 +02:00
Laurent Destailleur
60e9bc9e8e Fix: Rounding 2012-04-09 01:20:33 +02:00
Laurent Destailleur
d9b12f4802 Fix: rounding 2012-04-08 23:31:54 +02:00
Laurent Destailleur
1645ddbe47 Sec: Sanitize all input for ids. 2012-02-27 22:26:22 +01:00
Regis Houssin
6e157e91a6 Fix: [bug #302] 2012-02-18 18:14:45 +01:00
Regis Houssin
4431510ce4 Fix: use entity field of object 2012-02-01 11:32:55 +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
580f2ef375 Look: Minor fix 2012-01-14 12:38:03 +01:00
Laurent Destailleur
77870d0557 Add hidden option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS 2012-01-08 23:43:32 +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
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
f4606c2253 Fix: Avoid errors into rpm packages 2011-08-03 00:45:22 +00:00
Laurent Destailleur
cd955234f7 Fix: Show both year when accountancy year is on 2 years 2011-05-27 17:30:23 +00:00
Laurent Destailleur
72e2567fa4 Fix: Removed deprecated text in reports 2011-01-10 22:36:34 +00:00
Laurent Destailleur
aa3a2f0a07 Fix: Reports does not use FISCAL_MONTH_START 2011-01-05 15:15:19 +00:00
Laurent Destailleur
d2aff43936 Remove pre.inc.php 2010-03-27 14:40:39 +00:00
Laurent Destailleur
449ac5fa2a Fix: Amount in Income / Expense report 2010-02-06 23:10:54 +00:00
Laurent Destailleur
c19fe2dfa0 Debug reporting 2010-02-02 23:23:20 +00:00
Laurent Destailleur
2b56ed9d60 Remove print 2010-01-14 20:03:35 +00:00
Laurent Destailleur
62f4345e92 Fix: Remove usage of pdate() 2010-01-13 18:51:19 +00:00
Regis Houssin
5fe44414c8 Fix: bad table link
Fix: doxygen
2009-12-09 09:26:30 +00:00
Regis Houssin
37c2825f93 Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0 2009-10-22 15:09:04 +00:00
Regis Houssin
a59d65b6ea New: early development of multi-company module 2009-05-08 15:58:01 +00:00
Laurent Destailleur
0823322ba1 Qual: All call to dolibarr_ functions are made on dol_ functions. 2009-02-20 22:53:15 +00:00
Laurent Destailleur
70b0f0042e Qual: Uniformize use of dolibarr_print_date 2008-10-26 15:55:50 +00:00
Laurent Destailleur
bd88573d1c Qual: All library files must be in lib directory and called *.lib.php 2008-04-20 04:24:00 +00:00
Laurent Destailleur
4ce77c2b97 Fix: Optimisation chargement lang 2008-02-20 00:39:33 +00:00
Laurent Destailleur
dd0eed5d03 New: Amélioration rapports TVA 2008-02-16 17:50:25 +00:00
Laurent Destailleur
d7d4904cff Qual: Réorganisation un peu plus logique de certaines fonctions. Réduction de la taille du fichier html.form.class.php qui est chargé a chaque fois et qui consomme a lui seul 1Mo 2008-01-10 17:12:07 +00:00
Laurent Destailleur
5541ce9351 Trad: Traduction ecran rapport compta
Fix: Quelques corrections mineures sur écrans rapports compta pour info plus claires.
2007-11-11 18:05:08 +00:00
Regis Houssin
59a3a32f78 Fix: changement de idp en rowid pour llx_societe et llx_socpeople afin d'unifier le code. 2007-06-11 22:51:47 +00:00
Laurent Destailleur
5247ac10e5 Les rapports tiennent compte du statut 2 et 3 des factures. 2007-02-28 10:23:03 +00:00
Laurent Destailleur
f9d90c3908 Fix: Uniformisation du nom du champ id societe. On prend partout "socid". 2006-09-13 18:56:30 +00:00
Laurent Destailleur
e83942468a Fix: Les charges d'une année incluait toutes les années dans le rapport recettes-dépenses 2005-07-02 17:16:15 +00:00
Laurent Destailleur
c1f0a2721b New: Ajout ligne total 2005-06-11 11:58:06 +00:00