Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 04:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,347 Commits 36 Branches 190 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

62 Commits

Author SHA1 Message Date
Laurent Destailleur
73eba91756 Fix translation of email message 2018-03-19 17:06:59 +01:00
Laurent Destailleur
a4b155fc91 Fix typo and 2018-02-16 20:42:40 +01:00
Laurent Destailleur
d8872a412b Fix numbering for expense report 2018-02-07 15:52:57 +01:00
Laurent Destailleur
985675d680 Clean code 2017-10-20 18:04:46 +02:00
Laurent Destailleur
5c189449e1 Move default value for user expense report on tab expense report 2017-10-20 17:02:26 +02: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
phf
6ab0ec4b1b Fix travis and rename 2 fields 2017-07-07 10:22:37 +02:00
phf
1beec51928 New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE 2017-07-05 10:44:52 +02:00
Laurent Destailleur
7066ec7dab NEW Can clone expense report on another user 2017-05-29 13:22:52 +02:00
Laurent Destailleur
5f79b2d0c6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/accountancy/admin/categories.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2017-03-05 22:11:35 +01:00
Laurent Destailleur
f67c967d0b FIX The vat rate line used when adding a predefined product was wrong if 
there is several vat line with same rate.
 2017-03-04 22:27:44 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
Laurent Destailleur
3e2c0d26f2 Fix MVC 2017-02-20 11:59:58 +01:00
aspangaro
4705a87548 Finish work 2016-12-27 14:48:14 +01:00
aspangaro
c21300f0fa Expense report - Remove DEPLACEMENT_TO_CLEAN 2016-12-27 06:45:36 +01:00
Laurent Destailleur
9f0528f5f1 Complete work on dol_banner 2016-12-14 00:06:50 +01:00
aspangaro
8909b4111d Add options on getNomUrl 2016-11-12 10:41:57 +01:00
aspangaro
8800bf8b25 Update works 2016-10-26 07:46:48 +02:00
Laurent Destailleur
92423be43d Fix english 2016-10-11 15:03:56 +02:00
Laurent Destailleur
d0a15d32b2 Clean language files 2016-06-18 19:48:58 +02:00
Laurent Destailleur
6bccac5691 NEW Add Expense report to approve into workboard 
NEW Selection of boxes is move on top
 2016-01-18 11:35:45 +01:00
Laurent Destailleur
f25a9030eb Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
	htdocs/includes/adodbtime/adodb-time.inc.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-18 22:12:03 +01:00
aspangaro
c3acee56e2 Fix #3879 Wrong translation in the new expense report module 2015-12-12 10:06:11 +01:00
Laurent Destailleur
9c227d154e Clean duplicate translation key 2015-12-06 13:37:48 +01:00
Laurent Destailleur
7f3531a04c Enhance script to track duplicate translation string and use it to 
remove around 50 duplicates.
 2015-12-06 13:34:57 +01:00
aspangaro
bd69d37c3a New: Add number of expense reports to pay 2015-08-17 05:29:12 +02:00
aspangaro
e0b44d7954 ER: Add missing language key 2015-07-15 20:10:10 +02:00
aspangaro
cb36a919b5 HRM area : Show Ref instead of id for expense report 2015-06-26 05:34:12 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
faust
9a3b5305fe fix duplicate lines 2015-04-18 15:35:19 +02:00
Laurent Destailleur
f17a6cbe7e Merge branch 'develop' of https://github.com/novalore/dolibarr into 
novalore-develop

Conflicts:
	htdocs/langs/en_US/trips.lang
 2015-04-18 03:37:18 +02:00
faust
066e05a8ef another typo 2015-04-18 00:21:25 +02:00
Laurent Destailleur
5617399974 Removed deprecatd lines 2015-04-18 00:13:12 +02:00
faust
a54dd15afb fixed typos in trips.lang 2015-04-18 00:04:09 +02:00
Laurent Destailleur
0e7f4db0bb Move translation key 2015-04-13 09:59:38 +02:00
Laurent Destailleur
4241244345 Fix: class not defined 2015-04-02 17:35:07 +02:00
Laurent Destailleur
2bc6ac4671 Finished new module to manage expense reports ! 
Fix export to support corectly multicompany
 2015-02-22 13:16:49 +01:00
Laurent Destailleur
6d1324b463 Work on expense report module 2015-02-21 16:15:54 +01:00
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +01:00
Laurent Destailleur
070accd1e0 Work on new module expense report 2015-02-21 12:57:17 +01:00
Laurent Destailleur
448655ea45 First work on a new module for expense report matching dolibarr 
standard to replace current one.
 2015-02-14 18:39:45 +01:00
Laurent Destailleur
78d289110d Trans: Same verb 2014-10-17 13:07:23 +02:00
Laurent Destailleur
bc7d839c64 Fix: Missing status "refunded". 
Fix: translation
 2014-09-06 17:16:24 +02:00
Raphaël Doursenaud
e07e86b824 Deduplicated lines of the reference language files 
Used the new deduplicatefilelinesrecursively.sh script
 2014-03-27 12:04:03 +01:00
Laurent Destailleur
086eb125bf Qual: Removed no more required translation entry UTF8 2013-10-23 10:34:48 +02:00
Laurent Destailleur
d8cef10ea3 Make comment generic for all files 2013-05-27 10:38:50 +02:00
Laurent Destailleur
c747376945 Can input note (public and private) during trip and expense creation 2011-10-17 14:15:27 +02:00
Laurent Destailleur
c321b972de New: Add search box for donation and trips/expenses 2011-06-30 21:53:02 +00:00
Laurent Destailleur
efd7b8d429 Serious enhancement of expenses module 2011-06-29 17:55:32 +00:00
Laurent Destailleur
2dd4f080f0 New: Add statistics page for trips and expenses module 2010-04-05 01:01:28 +00:00