Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 04:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,329 Commits 36 Branches 190 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

176 Commits

Author SHA1 Message Date
aspangaro
fde252ca0e ER: Show ref instead of id in index 2015-07-15 20:04:37 +02:00
Laurent Destailleur
e571f681a0 Fix can refuse expense report 2015-07-15 15:39:50 +02:00
Laurent Destailleur
66fcbeaf8d Fix: Translation missing 2015-07-15 15:11:23 +02:00
Laurent Destailleur
f48128baf7 Fix: default value of new expense report is not correctly set 2015-07-15 15:04:44 +02:00
Marcos García de La Fuente
b7809c788a FIX #2832: Fixed a problem with special characters in expense report PDF model 2015-07-07 12:27:36 +02:00
Laurent Destailleur
a49c9c299e Merge pull request #3102 from aspangaro/develop-patch42 
HRM area : Show Ref instead of id for expense report
 2015-07-04 03:40:13 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +02:00
aspangaro
7e54840cb6 Replace tabs with spaces 2015-06-29 13:12:37 +02:00
aspangaro
279d1d4320 Correct travis 2015-06-29 12:59:55 +02:00
aspangaro
cb0aa41386 Debug 2015-06-29 06:48:39 +02:00
aspangaro
768042513d Merge remote-tracking branch 'Upstream/develop' into develop-42 2015-06-29 06:45:24 +02:00
aspangaro
cff82a5226 Use ref instead of rowid for expense report 2015-06-29 06:41:24 +02:00
Laurent Destailleur
be92f5e7a0 Fix syntax error 2015-06-27 02:31:26 +02:00
Juanjo Menent
759aec3925 Merge pull request #3084 from aspangaro/develop-patch37 
Fix: ER button set_paid & merge with old option setPaid
 2015-06-24 18:27:25 +02:00
Laurent Destailleur
040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
 2015-06-23 18:34:39 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
aspangaro
385857380b Remove old field 2015-06-23 06:39:55 +02:00
aspangaro
134cea194d Debug 2015-06-22 06:53:43 +02:00
aspangaro
e0ae7bd430 Merge remote-tracking branch 'Upstream/develop' into develop-37 2015-06-21 21:09:55 +02:00
aspangaro
f0a3057221 Fix: ER button set_paid & merge with old option setPaid 2015-06-21 08:07:06 +02:00
aspangaro
0ff97da1ea Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT 2015-06-20 09:06:20 +02:00
aspangaro
f60ca03140 Fix travis 2015-06-19 06:11:32 +02:00
aspangaro
7539ad88fa Debug 2015-06-18 06:30:48 +02:00
aspangaro
9cf06ec21c Add function set_paid 2015-06-18 06:12:05 +02:00
aspangaro
50aa36502c Merge remote-tracking branch 'Upstream/develop' into develop-32 
Conflicts:
	htdocs/expensereport/card.php
 2015-06-17 07:21:43 +02:00
aspangaro
8d0e7261f5 Debug 2015-06-17 07:19:25 +02:00
aspangaro
2979815223 Update work on expensereport card 2015-06-16 06:56:58 +02:00
aspangaro
a1e383dafa Fix: ER Missing language key 2015-06-16 06:18:43 +02:00
aspangaro
2fb27b50ec Add payment page & class 2015-06-16 05:47:22 +02:00
Laurent Destailleur
4a18b730b5 Fix: Avoid warning in expense report validation 
Fix: navigation in expense report
 2015-06-08 13:49:09 +02:00
aspangaro
a8c49f11ca ER add key language 2015-05-28 06:16:58 +02:00
aspangaro
40b65a642d Fix: ER list don't respect $conf->liste_limit 2015-05-19 22:22:18 +02:00
Laurent Destailleur
03acb1a8c9 Uniformize way to report error after "buildoc" action. 2015-05-19 00:01:30 +02:00
Laurent Destailleur
49a13f5e72 Debug of module expense report 2015-05-15 03:52:29 +02:00
Laurent Destailleur
3f5215169a Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr 
into aspangaro-develop-ER_badge

Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
 2015-05-15 02:44:43 +02:00
Laurent Destailleur
bf883e1576 Minor cosmetic changes 
Fix permissions and CRLF
 2015-05-15 02:34:57 +02:00
Laurent Destailleur
3e94cc07d2 Fight against valign="top". Minor css fixes. 2015-05-14 16:47:15 +02:00
Laurent Destailleur
74607218ea Fight against key tva_taux. Removed completely. 2015-05-14 15:59:09 +02:00
aspangaro
766c58724a ER: Review & add a totalVAT in pdf 2015-05-14 08:26:41 +02:00
Raphaël Doursenaud
5d2f081152 [Qual] Fixed HTML select form selected attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
 2015-05-07 14:21:14 +02:00
aspangaro
c502dabd76 Merge remote-tracking branch 'Upstream/develop' into develop-ER_project 2015-05-03 14:31:15 +02:00
aspangaro
c6306260c5 Fix: ER Search mode doesn't work 2015-05-03 14:25:37 +02:00
aspangaro
da272c6aac ER Typo 2015-05-03 14:24:20 +02:00
aspangaro
be302ce5ae New: ER Add filter on amounts 2015-05-03 08:10:22 +02:00
aspangaro
55eecf3f25 ER add price format in total of list 2015-05-03 07:05:19 +02:00
aspangaro
b03a9dffeb Fix : ER Correct Link 2015-05-01 07:18:19 +02:00
aspangaro
95058607a4 Fix : ER Typo on all variable $_SERVER & traduce of button "Edit" not works 2015-05-01 07:13:04 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
Laurent Destailleur
6e251690ab Doxygen 2015-03-17 11:23:45 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00