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

181 Commits

Author SHA1 Message Date
Your Name
c30a3a5f7e Expense report grouped by user 2016-05-17 10:02:36 +02:00
Your Name
e1fa86914e The approved status is enough to expense appear in the report 2016-05-16 18:41:41 +02:00
Marcos García de La Fuente
82ee964c27 NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page 
Close #4972
 2016-04-23 18:22:11 +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
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Florian HENRY
0582c78131 Add exepnse report into accoutnacy standard report 2016-01-29 14:05:37 +01:00
bobby
b95e9f0097 NEW : Add expense report into accountancy report 2016-01-28 14:26:52 +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
Laurent Destailleur
00b9f98c1c Merge remote-tracking branch 'origin/3.7' into develop 2015-08-31 12:15:20 +02:00
fmarcet
cf38b17e88 FIX: Bad visualization of suppliers name on Incomes-Expenses mode 2015-08-31 09:18:37 +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 Garcí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
aspangaro
2b2b43afb6 Dir "Don" 2015-03-25 22:37:14 +01:00
aspangaro
fa41132372 Move module Don in htdocs->donations 2015-03-19 05:22:42 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
774389940e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/compta/bank/ligne.php
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/salaries/fiche.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/facture/paiement.php
 2015-02-18 23:51:41 +01:00
Marcos García de La Fuente
d9ac21ab82 Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL 2015-02-08 16:54:41 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +01:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
166853dd56 Fix: miscellaneous bugs 2014-10-03 12:15:21 +02:00
Laurent Destailleur
d0da5ef047 Merge pull request #1910 from FHenry/develop 
Better accountancy auto find accountancy code feature (work with several
 2014-09-22 23:48:32 +02: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
565de5258f Re-Add subtotal line on compta report (accidentaly remove before) 2014-09-20 09:19:26 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
Florian HENRY
15d680ea4b bad mege 2014-09-16 21:19:52 +02:00
Florian HENRY
fc65421b2e bad merge 2014-09-16 21:19:07 +02:00
Florian HENRY
32c777a78b Fix bad merge 2014-09-16 21:17:22 +02:00
Florian HENRY
bb612d24db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	ChangeLog
	htdocs/compta/resultat/clientfourn.php
	htdocs/compta/resultat/index.php
 2014-09-16 21:09:53 +02:00
Florian HENRY
14ab058f34 Add Dunning into compta report 2014-09-16 21:05:57 +02:00
Laurent Destailleur
2cfe088ee4 Better organization of accountancy menus 
Fix: sql error with pgsql
 2014-09-13 16:54:17 +02:00
Juanjo Menent
328b8b9643 Fix: Salary payments are not reflected on the reporting sheets 
Conflicts:
	ChangeLog
 2014-08-28 15:29:31 +02:00
Juanjo Menent
0e1f22fe26 Fix: Salary payments are not reflected on the reporting sheets 2014-08-28 15:16:14 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
bd061f4245 Fix: [ bug #1380 ] Customer invoices are not grouped in company results 
report
 2014-05-13 01:29:01 +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
c4d3307bfa Qual: Normalize file name. 2013-07-26 11:36:36 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02: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
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
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
Regis Houssin
0d96803937 Fix: strict mode tour 2012-08-03 20:09:37 +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
Laurent Destailleur
1645ddbe47 Sec: Sanitize all input for ids. 2012-02-27 22:26:22 +01:00
Laurent Destailleur
f74440aa65 Fix: request 2012-02-20 23:51:00 +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
77870d0557 Add hidden option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS 2012-01-08 23:43:32 +01:00
Laurent Destailleur
55bce13bfb Qual: Removed deprecated functions 2011-12-12 01:39:55 +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
4ea692f85a [ bug #83 ] Le montant du bénéfice par tiers sur le menu 'Résultat / 
Exercice' est de format incorrect
 2011-10-19 13:04:03 +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
6822aafb6d Fix: Total is not rounded on user precision 2011-08-06 18:44:59 +00:00
Laurent Destailleur
f4606c2253 Fix: Avoid errors into rpm packages 2011-08-03 00:45:22 +00:00
Laurent Destailleur
40704a5c5a Look fixes and enhancements 2011-07-20 19:03:31 +00:00
Laurent Destailleur
c3cbd7c24e New: Add link from turnover report by third parties to payments of third parties. 
Fix: List of payments with no invoices works again.
 2011-06-13 11:10:43 +00:00
Laurent Destailleur
b1bcd94b3b Fix: bug #33123 2011-05-28 12:19:49 +00:00
Laurent Destailleur
d7ea931590 Fix: Removed bad style 2011-02-22 09:01:34 +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
e751b5ed57 Fix: Postgresql compatibility 2010-11-16 22:04:07 +00:00
Laurent Destailleur
f6dd987782 Fix: CSS 2010-07-10 23:24:20 +00:00
Philippe Grand
8ffe05d2f0 according to new tree directory 2010-04-25 14:52:17 +00:00
Philippe Grand
04900427ca according to new tree directory 2010-04-25 14:52:17 +00:00
Laurent Destailleur
d2aff43936 Remove pre.inc.php 2010-03-27 14:40:39 +00:00
Philippe Grand
6d1d932497 move file class chargesociales to compta directory 2010-03-23 09:20:38 +00:00
Laurent Destailleur
449ac5fa2a Fix: Amount in Income / Expense report 2010-02-06 23:10:54 +00:00
Laurent Destailleur
68afbc0d1e Debug reporting 2010-02-03 02:22:15 +00:00
Laurent Destailleur
35bc818fe8 Debug reporting 2010-02-03 00:22:14 +00:00
Laurent Destailleur
c19fe2dfa0 Debug reporting 2010-02-02 23:23:20 +00:00
Laurent Destailleur
d82fff31d4 Debug reporting 2010-02-02 21:23:23 +00:00
Laurent Destailleur
9c53f0ed8e Fix: Fix global typo error 2009-08-19 17:16:47 +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
caf73a4aff Fix: Correct vat in report by company 2009-02-11 21:15:47 +00:00
Laurent Destailleur
b6a95136cd Translation 2008-11-15 21:35:01 +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
f640786680 New: Add card for vat payement 2008-04-03 19:35:46 +00:00
Laurent Destailleur
4ce77c2b97 Fix: Optimisation chargement lang 2008-02-20 00:39:33 +00:00
Laurent Destailleur
dd0eed5d03 New: Amlioration rapports TVA 2008-02-16 17:50:25 +00:00
Laurent Destailleur
fed065dd7f Qual: Nettoyage de code redondant. L'appel a getright est inutile car deja dans le main. 2008-01-29 19:03:26 +00:00
Laurent Destailleur
d7d4904cff Qual: Rorganisation un peu plus logique de certaines fonctions. Rduction 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
Laurent Destailleur
5ade1846b6 Dsactive cran obsolte. 2007-11-05 00:30:51 +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