aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Laurent Destailleur
a5645b626c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
htdocs/projet/element.php
2015-03-11 03:55:46 +01:00
Laurent Destailleur
c1432eb2da
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/salaries/fiche.php
htdocs/projet/element.php
2015-03-11 03:29:52 +01:00
Maxime Kohlhaas
05a2a6af00
FIX : [bug #1900 ] Unable to remove a salary with enough permissions
2015-03-10 15:53:02 +01:00
Laurent Destailleur
dc30092290
Add column to store salary ref when doing payment.
2015-03-10 10:11:51 +01:00
Laurent Destailleur
90abe5cdf9
NEW: Add current salary on list of payment
2015-03-10 09:29:24 +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
6531a5c6c7
Fix: [ bug #1830 ] Salaries payment only allows checking accounts
2015-02-10 09:44:27 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Frédéric FRANCE
9b731753e7
Update /compta/salaries/index.php
2014-11-23 17:44:37 +01:00
Frédéric FRANCE
865ec76a51
Update /compta/salaries/index.php
2014-11-23 09:54:17 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
aspangaro
6109529c6c
vat payments list & typo on css class
2014-11-02 14:19:28 +01:00
aspangaro
5122b32ccc
Salaries list
2014-11-01 14:59:39 +01:00
Regis Houssin
a2446e51db
New: add context "globalcard" for declaring only once all cards
2014-10-06 07:20:58 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
291d70fa9d
Payment Salaries :: Add field required & control on it
2014-09-03 21:48:15 +02:00
aspangaro
4e05afdd66
Payment Salaries :: Add field required & control on it
2014-09-03 21:32:31 +02:00
Laurent Destailleur
d3a3e8786e
Fix: sql request with pgsql
2014-08-28 15:08:24 +02:00
Laurent Destailleur
3e2ed270e1
Fix: sql request with pgsql
2014-08-28 15:07:33 +02:00
Marcos García de La Fuente
4f4ac30fc0
Deprecating arbitrary use of dol_htmloutput* functions
2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Juanjo Menent
893240ce21
Qual: Uniformize code. Errors
2014-07-12 09:48:10 +02:00
KreizIT
a7afb5bdae
Refactor: PAIEMENT_SALARY_* trigger
2014-07-11 14:54:32 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
Raphaël Doursenaud
c48c3a9d91
Qual: remove PHP closing tag (again)
...
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
76330ad04a
Fix: [ bug #1383 ] When add a salary payment - In bank, link "user"
...
doesn't work
2014-05-11 18:35:25 +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
Laurent Destailleur
f36b9effe8
Fix: [ bug #1373 ] Required type of payment input is not visible
2014-05-10 17:22:12 +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
aspangaro
270e58637f
Salaries payments :: Add sortfield & search
2014-05-01 08:58:19 +02:00
aspangaro
ca0b6c26df
Translation
2014-05-01 08:19:55 +02:00
aspangaro
4caedaf3e5
Salaries : typo & presentation
2014-04-30 06:38:36 +02:00
aspangaro
9ff3dc6189
Fix :: MySql Problem when create a salary payment
2014-04-28 04:43:17 +02:00
Laurent Destailleur
59042a30e1
Fix and uniformize code for payment of salaries.
2014-03-25 21:35:52 +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
Laurent Destailleur
cafa61ef7d
Fix: Use correct syntax of date into sql requests (with quotes)
2014-03-15 23:12:00 +01:00
aspangaro
99b2dfda77
Correct Travis Error
2014-03-11 10:52:49 +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
74d3fdae15
Update langs & fix period for salaries in tax module
2014-03-07 06:42:48 +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
