lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

1154 Commits

Author SHA1 Message Date
Laurent Destailleur
7618966f81 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/core/class/utils.class.php
	htdocs/install/mysql/data/llx_20_c_departements.sql
 2022-01-07 15:56:21 +01:00
Laurent Destailleur
451fa396aa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2022-01-07 15:50:30 +01:00
Laurent Destailleur
b23b82bd6f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-01-07 15:49:09 +01:00
Laurent Destailleur
265aeb76e6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/expensereport/class/expensereport.class.php
 2022-01-07 15:48:13 +01:00
Laurent Destailleur
5ee74d7c07 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2022-01-07 15:45:51 +01:00
Laurent Destailleur
1541e20870 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2022-01-07 15:43:28 +01:00
Laurent Destailleur
0a72aed3d7 Fix missing space before union 2021-12-23 13:35:38 +01:00
Laurent Destailleur
0cf460ced2
Merge pull request #19656 from grandoc/new_branch_20_12_2021 
fix: Fatal error: Uncaught Error: Class 'AccountingAccount' not found…
 2021-12-21 15:52:01 +01:00
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +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
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +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
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +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
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +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
c40a73162e Look and feel v15 2021-10-18 21:20:58 +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
Marc de Lima Lucio
704bae46a6 FIX: expense report: show link to already existing overlapping expense report without adding new parameter 2021-10-04 08:51:31 +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
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
31de16d305 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-23 03:21:54 +02:00
Laurent Destailleur
3467faab6b Fix property 2021-09-23 03:20:15 +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
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +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
bbacb4e740 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 02:45:00 +02:00
Laurent Destailleur
5756f0cfdf Fix code syntax 2021-09-13 01:36:18 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +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
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Laurent Destailleur
03ac579b64
Merge pull request #18241 from FHenry/fix_numbertotext_ndf 
fix: expense report line, on update qty must/can be decimal
 2021-07-28 19:31:16 +02:00
Florian HENRY
a7f55f4778 fix: Expense report line, on update qty can be decimal 2021-07-26 15:43:57 +02:00
Alexandre SPANGARO
5453e3b3b2 Security 2021-07-25 08:35:03 +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
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00
stickler-ci
d22ed4be82 Fixing style errors. 2021-07-11 07:47:50 +00:00
fr69400
ce9cf63c36
Update note.php 2021-07-11 09:47:36 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
9fc2d9fc03 Fix phpcs 2021-07-06 19:02:03 +02:00
Laurent Destailleur
ced4ea1314 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2021-07-06 15:59:59 +02:00
Laurent Destailleur
ab14a07064 Trans 2021-07-06 11:58:05 +02:00
Laurent Destailleur
7dab4ef571 Debug v14 2021-07-06 11:18:09 +02:00
Laurent Destailleur
9a3d2f13a6 Fix graph per type of expense report 2021-07-06 10:55:23 +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
6a6216898e Fix unit price of expense report 2021-07-05 19:57:11 +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
Laurent Destailleur
5fade1148d
Merge pull request #17829 from aspangaro/14b12 
NEW Add field date start/end from/to in expense report list
 2021-06-14 16:11:13 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
f8f951977c Debug v14 2021-06-14 01:33:01 +02:00
Laurent Destailleur
34cebe6aa3 Look and feel v14 2021-06-14 01:11:39 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Alexandre SPANGARO
51bce78e6e NEW Add field date start/end from/to in expense report list 2021-06-06 06:05:47 +02:00
Frédéric FRANCE
4c1503a93b
fix warnings 2021-05-27 22:50:56 +02:00