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

1305 Commits

Author SHA1 Message Date
Laurent Destailleur
a87aa30e75 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-23 18:53:18 +02:00
Regis Houssin
724490b94d FIX wrong result check when update expensereport line 2022-09-23 09:56:54 +02:00
Faustin
cea9a4c4cc cocorrection on expensereport/class/expensereport_ik.class.php: table_element_line doest not exist on class, so removed the call of fetchLine 2022-09-13 20:34:40 +02:00
Faustin
22ab13975f scrutinizer on expensereport/class/expensereport_rule.class.php: method fetchLine wasn't defined 2022-09-12 16:57:23 +02:00
Faustin
09eede8cde scrutinizer on expensereport/class/expensereport_ik.class.php: method fetchLine was not defined 2022-09-12 16:42:47 +02:00
Laurent Destailleur
4566342d59 FIX #yogosha12439 Remove define('NOCSRFCHECK', '1') 2022-09-12 11:47:06 +02:00
Laurent Destailleur
cf887dba16
Merge pull request #22075 from grandoc/new_branch_04_09_2022 
update code
 2022-09-09 18:03:43 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Philippe GRAND
4ecceb1fd0 update code 2022-09-04 13:30:34 +02:00
Frédéric FRANCE
9150f5102e Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009 2022-09-02 11:44:45 +02:00
Philippe GRAND
fd07c5d6a0 update code 2022-08-31 22:25:37 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
194c76727e fix php8 warnings 2022-08-31 21:37:10 +02:00
Philippe GRAND
a7697f6d9c FIX php8 compatibility 2022-08-28 14:12:33 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Laurent Destailleur
75fa3cf643 Debug v16 2022-08-12 15:45:27 +02:00
Laurent Destailleur
d0e74fbbeb Sync transifex 2022-07-26 10:54:03 +02:00
Yoan Mollard
edb2e95aaf Fixed labels for permission errors 2022-07-22 17:33:04 +02:00
Yoan Mollard
840437d312 Fixed labels for permission errors 2022-07-19 23:55:55 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Alexandre SPANGARO
f840af384a PHP8 Warning 2022-06-29 07:32:16 +02:00
Alexandre SPANGARO
b6dfa4179b Fix PHP8 2022-06-21 07:01:02 +02:00
Alexandre SPANGARO
d52d1e87a3 Fix PHP8 2022-06-21 06:52:49 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
1838baaa5c Debug v16 2022-06-08 21:20:12 +02:00
Laurent Destailleur
efb6a8a791
Merge pull request #20999 from atm-jpb/NEW/ExpenseReport_ik_add 
NEW : add coefficient on unit  ht   line  in expenseReport card
 2022-06-07 10:02:12 +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
stickler-ci
263a8af0e6 Fixing style errors. 2022-05-30 14:21:11 +00: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
dbd0c6d7d1 rr 2022-05-30 15:57:07 +02:00
jpb
cbbe225705 return 0 2022-05-30 15:53:37 +02:00
jpb
7aed7fbaa9 Merge branch 'NEW/ExpenseReport_ik_add' of github.com:atm-jpb/dolibarr into NEW/ExpenseReport_ik_add 2022-05-30 15:47:34 +02:00
jpb
cf0887cfdf swith table 2022-05-30 15:46:21 +02:00
Laurent Destailleur
faca7e057e
Update expensereport.class.php 2022-05-29 11:22:32 +02:00
Laurent Destailleur
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search 
FIX : regression select extrafield search + fix function name
 2022-05-24 21:55:33 +02:00
jpb
a4c5ba7239 Merge branch 'NEW/ExpenseReport_ik_add' of github.com:atm-jpb/dolibarr into NEW/ExpenseReport_ik_add 2022-05-24 09:07:25 +02:00
jpb
851b9e6cdd revamp sql 2022-05-24 09:06:57 +02:00
stickler-ci
d425e14d0d Fixing style errors. 2022-05-24 06:26:08 +00: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
6f0047cc77 stickler fix 2022-05-23 20:03:08 +02:00
jpb
dd5650025f fix stickler 2022-05-23 20:01:19 +02:00
jpb
68148c008c stickler fix 2022-05-23 19:59:54 +02:00
jpb
68564b3b20 Merge branch 'NEW/ExpenseReport_ik_add' of github.com:atm-jpb/dolibarr into NEW/ExpenseReport_ik_add 2022-05-23 16:59:44 +02:00
jpb
381e063123 fix cast in sql 2022-05-23 16:57:25 +02:00
stickler-ci
d47715d9f5 Fixing style errors. 2022-05-23 14:55:40 +00:00
jpb
eb526afc3a add coef on input ht line expenseReport 2022-05-23 16:41:05 +02:00
Maxime Kohlhaas
5a489e4594 Fix scrutinizer 2022-05-22 01:43:45 +02:00
Laurent Destailleur
86d34af4b0 Fix deprecated code 2022-05-18 11:38:56 +02:00
Laurent Destailleur
ed2e1bda46 Clean code v16 2022-05-18 11:00:43 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
508cbee1a5 Fix php8 2022-05-15 22:29:19 +02:00
Laurent Destailleur
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
0342872e6f
Merge pull request #20657 from atm-gauthier/NEW/expensereport_payments_list 
NEW : expense report payments list
 2022-04-29 19:38:47 +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
6f9f78af33 FIX : var name 2022-04-22 14:28:43 +02:00
Gauthier PC portable 024
609ef9bfa7 FIX : var name 2022-04-22 14:26:16 +02:00
Gauthier PC portable 024
ca0f98d09f FIX : label tax cat trad 2022-04-22 13:50:39 +02:00
stickler-ci
8f397a3809 Fixing style errors. 2022-04-15 12:25:22 +00:00
Gauthier PC portable 024
2aee60ad59 NEW : expense report payments list 2022-04-15 12:14:41 +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
Laurent Destailleur
e2a957c738 Clean some trigger names 2022-04-02 16:08:04 +02:00
Laurent Destailleur
5b91ae062f All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for 
code consistency purpose.
 2022-04-02 10:31:58 +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
Laurent Destailleur
ea8bc86c9f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-03-31 16:26:36 +02:00
ATM john
c1d9ea95dc fix function name 2022-03-30 12:16:17 +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
cd969449f2 Replaced duplicated code with extends of CommonObjectLine 2022-03-24 12:07:04 +01: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
stickler-ci
671ab9a412 Fixing style errors. 2022-03-24 08:55:18 +00: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
jpb
37e589807d add trigger create on expensereportdet 2022-03-24 09:50:16 +01:00
Laurent Destailleur
8603d493ad Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/install/mysql/tables/llx_partnership.key.sql
 2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06 Fix doxygen, missing error message 2022-03-18 16:14:20 +01:00
John Livingston
1ece554c92
Fix: typo in template name 
There was a typo in generated HTML comment.
 2022-03-01 17:39:38 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Frédéric FRANCE
935482ee22
uniformize 2022-02-15 19:04:18 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Laurent Destailleur
a7d3facf88 Fix tooltip for payment 2022-01-25 16:10:46 +01:00
Laurent Destailleur
19dcc95d6f Fix tooltip for payment 2022-01-24 23:58:31 +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
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
60b2479389 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
 2022-01-07 16:00:19 +01:00
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