Laurent Destailleur
92b0fde4ca
Debug v15
2021-11-18 21:37:33 +01:00
Laurent Destailleur
d891dd8ddc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/stocks.lang
htdocs/product/stats/card.php
htdocs/projet/element.php
htdocs/salaries/card.php
2021-10-31 16:19:10 +01:00
Laurent Destailleur
e6e440e573
Fix #19257 error in the page Overview of a project
2021-10-31 15:14:15 +01:00
lmarcouiller
0d9280f945
Close #18607 : Implementation of salary button
2021-09-07 10:39:41 +02:00
Laurent Destailleur
0dce34f527
Fix trans
2021-07-01 19:06:16 +02:00
Laurent Destailleur
664af6ad1f
Fix trans
2021-07-01 18:22:33 +02:00
Laurent Destailleur
aee6d78928
Debug split of payment salary into salary + payment
2021-03-04 21:33:29 +01:00
atm-lena
292076e5dd
Ajout conf qui permet de décocher / cocher par défaut le paiement automatique des salaires
2021-02-26 15:59:27 +01:00
Gauthier PC portable 024
a767bffc3a
FIX : correction of payment salaries list on employee tab of user card
2021-02-23 15:08:27 +01:00
Gauthier PC portable 024
e188ec6cd7
NEW : add real payments on salaries objects
2021-02-04 17:21:08 +01:00
Alexandre SPANGARO
13836d3e21
Missing language ley
2019-06-19 06:21:53 +02:00
torvista
351274d85d
1) Standardization of use of "third party"
...
as a noun : third party
as an modifier: third-party contact
2) use of colons: no space before
3) Use of supplier/vendor was mixed.
Vendor is B2B or B2C, supplier is B2B. Changed all references to supplier.
4) Many minor grammar changes.
2018-12-11 10:08:19 +01:00
Laurent Destailleur
8a928a72fa
Sync transifex
2018-10-13 14:03:32 +02:00
Alexandre SPANGARO
0509a176ca
Merge branch 'develop' into 9.0_a3
2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0
New : Add project on salaries
2018-07-31 07:45:03 +02:00
Steve
e45e74a3bd
spelling and some grammar corrections to en_US
2018-07-09 17:38:28 +02:00
Alexandre SPANGARO
5eccc6bcbc
NEW Add stats in salaries module
2018-03-15 06:23:20 +01:00
Laurent Destailleur
a41847d084
Fix: date of modificaiton in ledger not visible.
...
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
2018-02-02 14:27:07 +01:00
Maxime Kohlhaas
25fa7d0564
New : add salaries, expense reports and leave requests in HRM tab of user card
2017-10-16 21:42:57 +02:00
Laurent Destailleur
cb87b314be
FIX Maxi debug of journalization of bank journal.
2017-07-15 03:41:07 +02:00
Alexandre SPANGARO
c381c213a5
Fix : Accountancy
2017-06-20 06:52:41 +02:00
Laurent Destailleur
04c0e87d79
Work on accounting module
2016-10-15 15:51:28 +02:00
Laurent Destailleur
92423be43d
Fix english
2016-10-11 15:03:56 +02:00
Laurent Destailleur
b3dab8a6f7
Better translation
2016-07-30 11:56:22 +02:00
Laurent Destailleur
52cd5d505e
Fix several bugs on css, translation or look
2016-01-01 23:44:23 +01:00
Frédéric FRANCE
ebf6493987
Typo
2015-11-02 17:31:03 +01:00
Laurent Destailleur
8010cb7f33
Fix the extracss parameter was overwritten other css into
...
textwithtooltip function.
Add tooltip on THM and TJM parameter of user.
2015-06-04 10:42:12 +02:00
Laurent Destailleur
90abe5cdf9
NEW: Add current salary on list of payment
2015-03-10 09:29:24 +01:00
Laurent Destailleur
23eee1b83a
New: Add hourly and daily amount on user card. Add weekly working hours
...
and salary on user card.
2014-09-13 17:41:26 +02:00
aspangaro
4c52a6ee6f
Add admin page into salaries to manage accountancy
2014-09-10 04:53:18 +02: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
