Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 00:53:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
108,518 Commits 37 Branches 191 Tags
0fd2e91ccc127f2a0791e2e9eb57504acba0d025
Commit Graph

419 Commits

Author SHA1 Message Date
Laurent Destailleur
ec9fdc1321 Fix regression with class="right". Style of amount lost. 2019-03-31 11:25:29 +02:00
Laurent Destailleur
fbc56d8413 WIP Preview pdf on expense report line 2019-03-24 20:37:57 +01:00
Laurent Destailleur
335af2f458 WIP Attach document to expense report lines 2019-03-24 20:33:00 +01:00
Laurent Destailleur
a950d8389e WIP Attach document to expense report lines 2019-03-24 20:22:05 +01:00
Laurent Destailleur
3578c7cb0a Fix phpcs 2019-03-24 18:20:56 +01:00
Laurent Destailleur
41223702d7 Use radio button to select file on expense report line 2019-03-24 15:02:53 +01:00
Laurent Destailleur
fad6efd86c WIP file attachment on expense report lines 2019-03-24 13:27:26 +01:00
Laurent Destailleur
5ff76e2c13 WIP file attachment on expense report lines 2019-03-24 12:15:19 +01:00
Laurent Destailleur
b54b687464 FIX bad check on type of expense report (mandatory status not working) 2019-03-24 11:05:07 +01:00
Laurent Destailleur
a0206d554e FIX bad check on type of expense report (mandatory status not working) 2019-03-24 11:04:32 +01:00
Laurent Destailleur
c569e71bc8 Fix remove warnings 2019-03-23 12:04:50 +01:00
Laurent Destailleur
aab9734f52 WIP Save link to file in expensereport lines 2019-03-22 18:03:08 +01:00
Laurent Destailleur
8ca5b2e45f Rename field 2019-03-22 17:43:53 +01:00
Laurent Destailleur
82a9ac4f65 Fix phpcs 2019-03-15 16:07:08 +01:00
Laurent Destailleur
0126303fae Fix new line on description of expense report 2019-03-15 16:05:50 +01:00
Laurent Destailleur
6f0fbc42c1 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea 
Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/members/new.php
	htdocs/public/opensurvey/studs.php
 2019-03-15 15:16:29 +01:00
Laurent Destailleur
e5c08978c3 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea 2019-03-15 15:13:28 +01:00
Laurent Destailleur
413ecd1d68 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-15 15:08:09 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Laurent Destailleur
1f02b74fee Merge pull request #10843 from grandoc/new_branch_html5 
update with html5 compliant code
 2019-03-15 12:30:09 +01:00
Laurent Destailleur
32767a487b FIX Missing id in call of restrictedArea for expense report card.php 2019-03-15 10:18:58 +01:00
Philippe GRAND
a479d536c5 update with html5 compliant code 2019-03-14 19:17:00 +01:00
BENKE Charlene
fef1f06d14 Update card.php 2019-03-13 10:15:32 +01:00
BENKE Charlene
79bb613285 Update card.php 2019-03-13 10:12:25 +01:00
BENKE Charlene
5e78907292 replace "brouillonner" by "setdraft" 2019-03-13 10:09:17 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Laurent Destailleur
0798f7b719 NEW Can upload files from the edit page of expense report 2019-03-07 20:53:03 +01:00
Laurent Destailleur
25fa729e4e NEW Add the now link when creating expense report 2019-03-07 14:32:03 +01:00
Laurent Destailleur
31e1ad48e3 css 2019-03-07 14:28:09 +01:00
Laurent Destailleur
b9408baef3 Fix if price net was not saved, we recalculate it at output 2019-03-07 14:27:20 +01:00
Laurent Destailleur
e67890bd22 NEW Can enter price with or without tax when entering expense repor line 2019-03-07 11:09:04 +01:00
Laurent Destailleur
96d4e28473 FIX Vat src code lost after editing expense report line 2019-03-07 11:08:01 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
623afd1020 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-12-17 18:50:06 +01:00
Laurent Destailleur
17b2fd295f FIX Css of amount on remain to pay on expense report 2018-12-17 13:57:30 +01:00
Laurent Destailleur
e014fdc20b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-17 11:43:02 +01:00
Laurent Destailleur
1979e3238c Fix rounding 2018-12-17 10:42:30 +01:00
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Frédéric FRANCE
61322b9ce2 devcamp 2018 fix #9642 2018-12-01 16:19:54 +01:00
IJ
db719dbcbb FIX: Display All Types of Payments on Expense Report Card 
Fixes #9991 - Bug: 7.0.4: Expense Report Payment Type Not Displayed 
- without this fix, only cash type accounts were shown when payment was made
 2018-11-25 20:36:25 +00:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
dfb20c705e NEW Add hidden option EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE 2018-10-31 16:05:50 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
0e464ea4f5 Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00