Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 02:58:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

219 Commits

Author SHA1 Message Date
Maxime Kohlhaas
90e8f062e9 Fix : link to user in bank was wrong regarding expensereport payment 2017-01-31 10:23:03 +01:00
Laurent Destailleur
053afe21dd Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2017-01-26 23:40:16 +01:00
Laurent Destailleur
c1b59b1950 Fix several security bugs on expense report 2017-01-26 18:08:00 +01:00
Laurent Destailleur
5fd8b1efcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 21:23:35 +01:00
Laurent Destailleur
f875597c0b Fix statistics of leave requests (date valid not defined if status is 
draft)
 2017-01-22 16:03:08 +01:00
Marcos García de La Fuente
e0cbcadd98 In case Model for document generation is not defined, the criteria to select the model is now: 
1. Model for the object
 2. Custom default module
 3. Hardcoded default module
 2017-01-16 21:16:05 +01:00
Laurent Destailleur
4349eac7ea Merge pull request #6225 from aspangaro/5.0-18 
Expense report - Better presentation - return lines order by date
 2017-01-12 11:37:31 +01:00
Laurent Destailleur
a4edaf4f43 Fix sql to get next ref on expense report 2017-01-03 10:18:47 +01:00
aspangaro
1338237d7c Expense report - Better presentation - return list order by date 2016-12-27 05:48:18 +01:00
Laurent Destailleur
9e44eb0d15 Fix return code REST similar for all api with POST 2016-12-23 02:08:22 +01:00
Laurent Destailleur
22b4a150a4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-22 17:31:22 +01:00
Laurent Destailleur
b4ed0a1e12 Fix nb of lat approvals wrong 2016-12-22 17:30:39 +01:00
Laurent Destailleur
d66bc10d05 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/list.php
 2016-12-22 15:54:01 +01:00
Laurent Destailleur
574f84bb84 Fix warning for approval delay. 2016-12-22 15:49:06 +01:00
Laurent Destailleur
1838670e31 Fix several security holes on api when used by external users 2016-12-07 19:02:39 +01:00
Laurent Destailleur
db9af0118c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2016-12-06 14:08:43 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
Laurent Destailleur
4abd417a6a Corrupted data must be fixed by repair not by code hack. 2016-12-03 19:50:52 +01:00
Laurent Destailleur
9c47f3d3fd Restore protection to avoid errors 2016-12-03 19:41:03 +01:00
Laurent Destailleur
6e5a8b6787 FIX Some statistics not compatible with multicompany module. 2016-12-03 19:14:16 +01:00
Laurent Destailleur
fe54673a87 FIX List of people able to validate an expense report was not complete. 2016-12-03 18:13:23 +01:00
Laurent Destailleur
dd27a52a85 Fix several problems on new REST API on project/tasks 2016-11-19 16:08:27 +01:00
Laurent Destailleur
d197a0e0aa NEW Can create expense report for someone else (advanced permission) 
NEW Can clone an expense report
 2016-11-13 22:01:22 +01:00
aspangaro
8909b4111d Add options on getNomUrl 2016-11-12 10:41:57 +01:00
Laurent Destailleur
f67863e1aa NEW Can use any filter on all REST API to list. 2016-10-25 19:15:47 +02:00
Laurent Destailleur
a54a610a05 Uniformize code 2016-10-14 17:44:41 +02:00
Laurent Destailleur
d39d7d92c9 Uniformize code. 2016-09-26 02:13:58 +02:00
Laurent Destailleur
4955e8d3de Fix doxygen 2016-09-10 05:34:00 +02:00
Laurent Destailleur
d7fce0cd24 NEW REST api: Add apis for expense reports 2016-09-09 20:17:34 +02:00
Laurent Destailleur
748656856e Fix doxygen 2016-09-09 18:56:13 +02:00
Laurent Destailleur
616594355b NEW Can select fields on expense report list. Can make mass delete. 2016-09-09 15:36:33 +02:00
Laurent Destailleur
8419202588 NEW Support free bottom text and watermark on expense report template 2016-09-06 12:47:18 +02:00
Laurent Destailleur
774e327831 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang
 2016-07-21 10:30:51 +02:00
Laurent Destailleur
972d998f7e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-21 10:25:03 +02:00
Sergio Sanchis Climent
e52d6db3fd Fix #5450 2016-07-17 12:18:29 +02:00
Sergio Sanchis Climent
3b56370060 Fix #5450 2016-07-17 02:48:04 +02:00
Laurent Destailleur
fb13225173 Fix links on list from warnings dashboard 2016-06-06 16:31:50 +02:00
Laurent Destailleur
e7072185ab Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/comm/propal.php
 2016-05-18 20:47:57 +02:00
Laurent Destailleur
49c2549400 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/propal.php
 2016-05-18 20:40:09 +02:00
Your Name
f7c9f20b16 Fix: Expensereport not compatible with multicompany. 2016-05-16 17:21:32 +02:00
Laurent Destailleur
0cde6ad98f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2016-04-29 20:43:42 +02:00
Laurent Destailleur
3c2c9a25b8 Merge pull request #5130 from frederic34/patch-9 
FIX if type fee not specified, line is invisible and can't edit it
 2016-04-29 17:11:14 +02:00
Laurent Destailleur
f4224881c3 Merge pull request #5132 from frederic34/patch-11 
FIX keep files attached with PROV status
 2016-04-29 17:08:22 +02:00
Frédéric FRANCE
7e8aef037a Update expensereport.class.php 2016-04-29 13:23:06 +02:00
Frédéric FRANCE
a982f764fe don't change ref if ref is not prov 2016-04-29 12:26:41 +02:00
Frédéric FRANCE
ab63bdd235 keep files attached with PROV status 2016-04-28 22:30:22 +02:00
Frédéric FRANCE
c743f6cfe5 If no project, update line is impossible 2016-04-28 21:56:28 +02:00
Laurent Destailleur
e3a4124a58 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/fr_FR/bills.lang
 2016-01-30 16:13:06 +01:00
bobby
72e8680f7c FIX : set column paid on expense report when expense is paid 2016-01-28 13:57:40 +01: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