Commit Graph

719 Commits

Author SHA1 Message Date
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
ed2e1bda46 Clean code v16 2022-05-18 11:00:43 +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
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
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
stickler-ci
671ab9a412 Fixing style errors. 2022-03-24 08:55:18 +00: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
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
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
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
d92535ec59 FIX Debug transfert in accountancy for expense report 2021-12-16 15:41:23 +01:00
Frédéric FRANCE
dc3bfcfb87 can modify tooltip by reference 2021-11-22 19:57:26 +01: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
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
Marc de Lima Lucio
6a66fcbff8 NEW: expense report: show link to already existing overlapping expense report 2021-09-30 16:51:31 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +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
Laurent Destailleur
2824c8b8ab FIX support of localtax on expense report 2021-09-22 15:11:18 +02:00