Commit Graph

478 Commits

Author SHA1 Message Date
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
jpb
bc925d8fb4 change id to class name on input qty 2022-06-06 18:03:41 +02:00
jpb
b95ad9d847 add jsnotify on error 2022-05-30 16:38:09 +02:00
jpb
2526afa5b9 remove console.log 2022-05-30 16:15:25 +02:00
jpb
0b0f3af6c0 add trigger on js 2022-05-30 16:13:56 +02:00
jpb
a549e922a9 add return on tax_rat <= 0 2022-05-30 16:08:04 +02:00
jpb
23cd63963a add the annual accumulation of mileage costs for the selection of the coefficient 2022-05-24 08:15:28 +02:00
jpb
68148c008c stickler fix 2022-05-23 19:59:54 +02:00
jpb
eb526afc3a add coef on input ht line expenseReport 2022-05-23 16:41:05 +02:00
Laurent Destailleur
49d15b691b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/expensereport/card.php
2022-04-29 17:35:36 +02:00
Laurent Destailleur
93de425c47 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
2022-04-29 17:32:28 +02:00
Gauthier PC portable 024
ca0f98d09f FIX : label tax cat trad 2022-04-22 13:50:39 +02:00
Laurent Destailleur
5960d5971c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/accounting-files.php
2022-04-04 10:49:51 +02:00
Laurent Destailleur
1c71a8da1e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/compta/accounting-files.php
2022-04-03 17:27:15 +02:00
jpb
1cdf55fea0 remove empty line 2022-04-01 14:21:13 +02:00
jpb
f2480b6443 fix : remove tds add by mistake 2022-04-01 13:56:10 +02:00
stickler-ci
d188f44a4c Fixing style errors. 2022-04-01 07:58:41 +00:00
Gauthier PC portable 024
fa0e7a641c FIX : Missing unset fields after updateline expensereport 2022-04-01 09:52:16 +02:00
jpb
4e9c7afc01 add td 2022-03-29 15:54:49 +02:00
stickler-ci
147f1b9a0c Fixing style errors. 2022-03-29 12:39:13 +00:00
jpb
732b1ab548 add trigger update and delete on expense report det
add class name on card.php expensereport
2022-03-29 14:31:17 +02:00
Laurent Destailleur
ea4b842c86
Update card.php 2022-03-24 12:01:53 +01:00
Laurent Destailleur
fdfbf05705
Update card.php 2022-03-24 12:00:11 +01:00
jpb
71c1f2de3c add class td 2022-03-24 09:51:12 +01:00
jpb
7be3c8b64d ajout de class pour les <td> 2022-03-24 09:51:00 +01:00
jpb
4bc75f6487 ajout class name on create det <td> 2022-03-24 09:50:44 +01:00
jpb
a577956b73 ajout de nom de class dans les entes de ligne det en affichage 2022-03-24 09:50:30 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00
Laurent Destailleur
f04a07b6a7 FIX Pb with permission on holiday and expense report 2022-01-14 13:42:38 +01:00
Philippe GRAND
67b9244c6b fix: Fatal error: Uncaught Error: Class 'AccountingAccount' not found in /home/httpd/vhosts/doliweb.com/httpdocs/expensereport/card.php on line 2099 2021-12-20 10:36:35 +01:00
Laurent Destailleur
d92535ec59 FIX Debug transfert in accountancy for expense report 2021-12-16 15:41:23 +01:00
Vincent Dieltiens
5f5c284af7 Fixes https://github.com/Dolibarr/dolibarr/issues/19541 2021-12-07 09:37:47 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Vincent Dieltiens
4af8a4e9fd Add EXPENSEREPORT_FILE_IS_REQUIRED global var to force user to join a file for each line of an expense report 2021-11-05 12:11:54 +01:00
Laurent Destailleur
20c874d441 Fix escape sql params. 2021-10-25 18:48:44 +02:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Maxime Kohlhaas
860fb21d2d Fix expense report warning display + translations 2021-10-21 23:52:05 +02:00
Maxime Kohlhaas
ae6cae0313 Fix MAIN_USE_EXPENSE_RULE is now stable 2021-10-21 22:57:50 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
2021-10-20 15:06:10 +02:00
Alexandre SPANGARO
63fafdf120 FIX Expense report - In edit mode, field qty doesn't accept decimal unlike the create mode 2021-10-20 07:54:09 +02:00
Laurent Destailleur
5221c9e38f Fix editline 2021-10-17 19:41:17 +02:00
Laurent Destailleur
1dec9877c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-17 17:17:30 +02:00
Laurent Destailleur
336b6cb7fc Fix editline 2021-10-17 17:17:08 +02:00
Laurent Destailleur
0aa90e82ea Clean code 2021-10-17 15:47:29 +02:00
Laurent Destailleur
c7152e5c7d
Merge pull request #18965 from vincentjdc/expensereport-pdf-preview
NEW Preview of pdf files of expense report line
2021-10-17 15:06:42 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
Vincent Dieltiens
d50c1a7603 preview of expense report file using pdf file instead of generated image 2021-10-12 23:27:22 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Laurent Destailleur
de49e4e375
Merge branch 'develop' into NEW_expense_report_project_required 2021-10-06 14:34:58 +02:00
Laurent Destailleur
f7f8ff2df2
Merge pull request #18862 from marc-dll/NEW_expense_report_overlap_link
NEW: expense report: show link to already existing overlapping expense report
2021-10-04 15:37:49 +02:00
Laurent Destailleur
705644bf07
Merge branch 'develop' into NEW_expense_report_prefill_dates 2021-10-02 21:11:59 +02:00
Marc de Lima Lucio
d3e90e8f76 NEW: expense reports: conf to force amounts to be entered only including taxes 2021-09-30 17:24:57 +02:00
stickler-ci
e1777a6266 Fixing style errors. 2021-09-30 15:12:36 +00:00
Marc de Lima Lucio
0dae918b76 NEW: expense reports: make project field required on lines 2021-09-30 17:09:49 +02:00
Marc de Lima Lucio
6a66fcbff8 NEW: expense report: show link to already existing overlapping expense report 2021-09-30 16:51:31 +02:00
Marc de Lima Lucio
c2c7d88520 NEW: NEW: expense reports: conf to pre-fill start/end dates with bounds of current month 2021-09-30 16:40:34 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
2021-09-23 02:41:53 +02:00
stickler-ci
2bd0fdd364 Fixing style errors. 2021-09-22 14:09:29 +00:00
Laurent Destailleur
2824c8b8ab FIX support of localtax on expense report 2021-09-22 15:11:18 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
7533c9e3a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/interventions.lang
2021-07-12 12:01:53 +02:00
Laurent Destailleur
9fc2d9fc03 Fix phpcs 2021-07-06 19:02:03 +02:00
Laurent Destailleur
2a5699a9a2 Merge 2021-07-05 23:07:40 +02:00
Laurent Destailleur
db95339085 Code comment 2021-07-05 20:32:05 +02:00
Laurent Destailleur
8e7508dd9f Clean code 2021-07-05 19:50:16 +02:00
Laurent Destailleur
94ab340bba Fix css 2021-06-19 19:23:56 +02:00
Laurent Destailleur
6911cc93d1 Fix: do not open the section to link files automatically after submit 2021-06-19 15:53:36 +02:00
lvessiller
af634b7f2b FIX 17965 - Keep enter key only to submit expense lines form 2021-06-18 10:51:39 +02:00
lvessiller
7fb19b3ef9 NEW prevent default submit form on enter key in expense card 2021-06-17 15:27:17 +02:00
Maxime Kohlhaas
c820231363 Fix id of expense report must be before object fetch 2021-05-16 12:24:27 +02:00
Laurent Destailleur
d61f61ab45 Clean $_GET 2021-03-30 03:55:17 +02:00
Laurent Destailleur
1d87f060dc Fix #yogosha5756 2021-03-29 21:30:26 +02:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
UT from dolibit
edd7de7abf
Update card.php
changed:  $helpurl  to  $help-url

add:  FR:Module_Notes_de_frais


$help_url = "EN:Module_Expense_Reports|FR:Module_Notes_de_frais";

llxHeader("", $title, $help_url);
2021-03-16 13:42:30 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Frédéric FRANCE
8a69fa0d35
code syntax expensereport directory 2021-02-25 22:45:02 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
2021-02-15 13:12:27 +01:00
Laurent Destailleur
29100a4766 FIX #16221 2021-02-10 02:28:22 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Frédéric FRANCE
0da942210f
deprecate non camelCaps functions 2021-02-09 09:55:48 +01:00
Laurent Destailleur
eee49b9132 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/delais.php
2021-02-04 13:50:07 +01:00
Laurent Destailleur
eca010937f FIX Trigger on expense report was not fired
FIX Bad dates on info tabs
2021-02-04 11:56:53 +01:00
Christian Foellmann
f801dd7d66 PR toggle FCKeditor on public/private notes 2020-11-30 16:39:14 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
0b619f63f3 Fix error management on HR modules 2020-10-10 16:35:30 +02:00
Laurent Destailleur
437eead694 Fix bad permission 2020-10-10 15:45:04 +02:00
Laurent Destailleur
0893f0250a Minor bug fixes 2020-10-02 12:54:56 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00