lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
89,109 Commits 43 Branches 150 Tags 886 MiB
9165ea9e67
Commit Graph

139 Commits

Author SHA1 Message Date
Laurent Destailleur
b3dc73e611 Look and feel v6 2017-05-21 02:43:51 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
35d80aa209 Miscellaneous fixes 2016-11-12 12:40:06 +01:00
aspangaro
31a895dddc Merge remote-tracking branch 'Upstream/develop' into 5.0-p1 2016-08-29 21:21:10 +02:00
aspangaro
5eb0e4ad87 Fix: Presentation on salaries payment index 2016-08-29 21:14:11 +02:00
Laurent Destailleur
86c90ade3f Another fix on bank account missing when bank module enabled. 2016-08-11 18:41:31 +02:00
Laurent Destailleur
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Laurent Destailleur
25b7f0ab62 FIX Remove a total that has no sense 2016-04-22 17:11:12 +02:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
52c82508e4 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/charges/index.php
 2016-02-18 23:27:57 +01:00
Laurent Destailleur
9796b1b268 Can select number of records into lists 2016-02-16 17:43:05 +01:00
aspangaro
d4057c3feb Fixed: Correct problem of rights beetween tax and salaries module 2016-02-15 06:56:51 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old 
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
 2015-12-21 13:56:59 +01:00
Laurent Destailleur
192fdbdcc4 Minor look uniformization 2015-11-14 23:10:12 +01:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
Laurent Destailleur
43b5209192 NEW Clean code into salary module, debug and add indexes 
NEW Can filter on user list and salary payments on user with naural
search.
 2015-05-13 08:57:39 +02:00
jfefe
22c3406498 Change title images for accountancy section 2015-04-18 23:17:47 +02:00
Laurent Destailleur
dc30092290 Add column to store salary ref when doing payment. 2015-03-10 10:11:51 +01:00
Laurent Destailleur
dc4a874e70 Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors 2014-12-25 12:08:10 +01:00
Laurent Destailleur
4a60d57544 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/fiche.php
	htdocs/product/liste.php
 2014-10-18 21:08:09 +02:00
Laurent Destailleur
cbbe909bc5 Fix: Pb in management of "or" ("|") for permission check. 2014-10-12 15:22:07 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
Juanjo Menent
747b6a9f94 [ task #1063 ] Allow edit localtaxes rate for thirds. Works with reports 
and payments
 2014-07-04 12:50:55 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 18:57:04 +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
Laurent Destailleur
c45f509984 Qual: Uniformizing payments 2014-03-26 15:41:09 +01:00
Laurent Destailleur
4828d1e89a New: Uniformize visible information on payment lists. 2014-03-25 20:24:51 +01:00
Laurent Destailleur
2889c3ac70 Qual: Feature to make payment of salaries has been moved into a module 
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
 2014-03-17 14:30:55 +01:00
aspangaro
12ffb19cec Use more explicit name for class and functions 2014-03-11 06:26:18 +01:00
aspangaro
61a5735300 Rename "Sal" class into "Salaries" 2014-03-10 21:17:03 +01:00
aspangaro
048b3c01ce Add salary payment in tax module - Link to user. 
Necessary for future hrm module.
 2014-03-06 21:21:16 +01:00
Laurent Destailleur
69f0d596ba Fix: Pagination 2013-11-18 12:20:53 +01:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +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
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
Laurent Destailleur
c1600bc4fa Minor fix 2012-02-10 09:16:38 +01:00
Regis Houssin
4431510ce4 Fix: use entity field of object 2012-02-01 11:32:55 +01:00
Laurent Destailleur
79c07397d6 Fix: Lang loaded 2011-12-21 20:34:10 +01:00
Regis Houssin
63d60a33fc [task #216] Move lib in core directory 2011-10-24 11:25:54 +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
Regis Houssin
3201226577 Fix: bad link if no payment 2010-09-30 19:41:01 +00:00
Laurent Destailleur
d109e0b170 Qual: Use only one class by file. 2010-09-12 11:49:02 +00:00
Laurent Destailleur
10e0b270df Fix: postgresql compatibility 2010-08-22 12:44:14 +00:00
Laurent Destailleur
bf2bf8893a New: Can sort on field in social contribution payment list 2010-04-25 20:12:41 +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
f8329da895 Remove pre.inc.php 2010-03-27 02:35:08 +00:00
Philippe Grand
f51a1f6bbd move file class chargesociales to compta directory 2010-03-23 08:26:27 +00:00
Regis Houssin
ecedb7b273 Fix: appel de classe en double 2010-03-23 07:04:00 +00:00
Laurent Destailleur
003caa7063 Qual: Better organisation of tax module menus to match other modules 2010-03-17 19:26:54 +00:00
Laurent Destailleur
d04578f966 Qual: Uniformize labels 2010-02-21 12:12:14 +00:00
Laurent Destailleur
808e54edfc Reports is more clear. 2010-02-14 19:38:20 +00:00
Laurent Destailleur
82cbed8dc1 Qual: Uniformise gui 2010-02-14 13:12:05 +00:00
Laurent Destailleur
e20e67968d Fix: Misc fix. Bad links. Missing label. 2010-02-14 12:42:00 +00:00
Laurent Destailleur
9c53f0ed8e Fix: Fix global typo error 2009-08-19 17:16:47 +00:00
Laurent Destailleur
d9183a681d Better management of social contribution 
New: Can edit label and date for period even if payed
 2009-05-09 19:45:18 +00:00
Regis Houssin
edafd9f333 Fix: view only customers 2009-05-02 13:38:05 +00:00
Regis Houssin
b86684805c New: early development of multi-company module 2009-04-27 20:37:50 +00:00
Laurent Destailleur
8476a218e5 Fix: Partial payment on social contributions not shown on main page. 
New: Can filter on social contribution type in list.
 2009-03-02 23:43:17 +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
a3384961e4 Fix: Social contributions payments appeared with empty label in list. Now it's link to social contribution card. 2008-10-18 14:01:55 +00:00
Laurent Destailleur
f640786680 New: Add card for vat payement 2008-04-03 19:35:46 +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
91193f7edb Qual: Reorganisation menu du module tax et charges pour meilleure comprhension. 2007-10-07 03:43:15 +00:00
Laurent Destailleur
52025a0843 Fix: Formulaire ajout charges n'tait plus visible 2006-08-20 21:22:48 +00:00
Laurent Destailleur
4c4627b8eb Fix: Pb test sur habilitations des charges et menu banque 2006-08-16 22:06:10 +00:00
Laurent Destailleur
b74d7784b4 Trad: Traduction incorrecte 2005-05-23 11:18:28 +00:00
Laurent Destailleur
3859615520 Look: Modifications ethtiques mineures 2005-05-03 01:03:58 +00:00
Laurent Destailleur
7f073ec704 Trad: Dbut de le traduction des notions de relevs et rapprochements 2005-01-31 18:28:05 +00:00
Laurent Destailleur
389d28c163 Fix: Quelques traductions sur les charges du module compta. 2004-11-23 19:17:49 +00:00
Laurent Destailleur
4ce75b6a78 Fix: Correction des mauvaises utilisations des fetch_objet ou on passait un paramtre jamais utilis. 2004-10-23 16:55:07 +00:00
opensides
ba95c1b6fc changement de <?PHPen <?php 
suivra l'indentation correcte du code ;-)
 2004-10-19 20:35:36 +00:00
Rodolphe Quiedeville
093605f0d3 Suppression des PHP_SELF 2004-07-30 13:13:05 +00:00
Laurent Destailleur
b26e85a935 Fix: Correction gestion de la 'periode' pour les charges sociales 2004-06-11 13:33:23 +00:00
Laurent Destailleur
3142aa0694 Ajout barre navigation anne suivante-prcdente 2004-06-08 11:09:10 +00:00
Laurent Destailleur
af6db0b09b New: Le rsum des charges affiche le nb d'appel de charges, le montant pay en plus du total. 
New: Le lien sur un type de charge sociale et clicable et amne sur la page des charges sociales avec filtre sur ce type.
 2004-05-02 15:58:38 +00:00
Laurent Destailleur
7635e618b7 Prefix en dur "llx_" remplac par constante "MAIN_DB_PREFIX". 2004-01-30 20:33:34 +00:00
beedauchon
00402b08f0 ajout des droits pour charges et resultat (bug #6435) 2003-11-08 19:05:47 +00:00
hitweb
774e6445ca migration php3 to php4 2003-09-11 20:18:51 +00:00
Rodolphe Quiedeville
45f6b5bd3c Nettoyage du code 2003-08-27 10:58:49 +00:00
Rodolphe Quiedeville
07c781760c Code cleaning 2003-08-25 09:42:26 +00:00