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

393 Commits

Author SHA1 Message Date
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
2dc97ac3ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2022-05-10 17:16:11 +02:00
Laurent Destailleur
7b21e0b6ff Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-10 16:06:32 +02:00
Laurent Destailleur
bb6f73136a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2022-05-06 12:46:26 +02:00
Gauthier PC portable 024
2256f8811d FIX : in salary stats and payment list, we must check right perms as well as salary list 2022-05-06 11:24:53 +02:00
Laurent Destailleur
05e22fb8bc css 2022-05-04 20:36:59 +02:00
Laurent Destailleur
c96e3bdddf PHP v8 compatibility 2022-04-30 19:50:20 +02:00
Laurent Destailleur
2113a944ce Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-14 23:14:56 +02:00
Laurent Destailleur
0c82ce1b69 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-14 23:04:36 +02:00
Laurent Destailleur
02a3cfbb5f
Update paymentsalary.class.php 2022-04-14 21:43:55 +02:00
kevin
f4023b4e44 Add missing entity on salary's payment 2022-04-12 11:08:50 +02:00
Laurent Destailleur
e2a957c738 Clean some trigger names 2022-04-02 16:08:04 +02:00
Laurent Destailleur
99277ddb15
Merge pull request #20406 from atm-GregM/DolGetButtonAction_Salaries 
FIX: replacing to dolGetButtonAction on Salaries card
 2022-03-25 15:07:30 +01:00
Laurent Destailleur
38439603be Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-24 13:23:04 +01:00
Frédéric FRANCE
e157dc117d
replace debug 2022-03-24 10:51:01 +01:00
Laurent Destailleur
3e6e67680c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-23 13:02:22 +01:00
Laurent Destailleur
8ad310c8a0 FIX Bad filter on date on salary list 2022-03-23 13:01:24 +01:00
GregM
457c760177 clean 2022-03-18 16:57:42 +01:00
GregM
4c4d18ebd6 clean 2022-03-18 16:28:25 +01:00
GregM
84ef951a99 replacing to dolGetButtonAction on Salaries card 2022-03-18 16:12:38 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Laurent Destailleur
19fdf3dc18 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-07 10:07:30 +01:00
Laurent Destailleur
e8acb551f9 Fix section of attached files for salaries 2022-02-07 09:50:07 +01:00
Laurent Destailleur
30811e9b1a
Merge branch 'develop' into NEW_Add_Hooks_salaries_sociales 2022-01-25 14:45:51 +01:00
Adrien Raze
c131bdcbd3 NEW : Add hooks on salaries and sociales card 2022-01-24 16:06:02 +01:00
Laurent Destailleur
60b90056c4 Fix #yogosha8450 2022-01-19 15:20:10 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Laurent Destailleur
72998cd8fe Debug v15 2022-01-03 12:26:57 +01:00
Laurent Destailleur
adec35d4b1 Debug v15 2022-01-02 15:46:28 +01:00
Laurent Destailleur
49dae0aed2 Look and feel v15 2022-01-01 18:41:26 +01:00
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html 
deprecated html attributes
 2021-11-30 14:27:12 +01:00
Laurent Destailleur
8b15741840 Fix button to close as paid 2021-11-29 19:46:43 +01:00
Laurent Destailleur
5cebaae235 Fix can close a salary if paid partially. 2021-11-29 19:39:03 +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
92b0fde4ca Debug v15 2021-11-18 21:37:33 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +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
Frédéric FRANCE
4fa050bd1a
Update salaries.php 2021-10-23 07:42:29 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +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
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Frédéric FRANCE
7bf07395c6
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:37:41 +02:00
Laurent Destailleur
01c8bbedbf Look and feel v15 2021-09-28 19:40:41 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +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
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Laurent Destailleur
478918bd45 Fix phpunit 2021-09-09 15:59:43 +02:00
Laurent Destailleur
f1758b6f0c
Merge pull request #18623 from atm-gauthier/14.0_fix_salary_extrafields 
14.0 fix salary extrafields are no more available
 2021-09-09 14:58:54 +02:00
Laurent Destailleur
97f3296c73
Update card.php 2021-09-09 14:29:42 +02:00
Laurent Destailleur
b87ac639fd
Update card.php 2021-09-09 03:02:18 +02:00
lmarcouiller
a5e670291e Fix permission for salaries module 2021-09-08 15:36:51 +02:00
lmarcouiller
0d9280f945 Close #18607 : Implementation of salary button 2021-09-07 10:39:41 +02:00
Gauthier PC portable 024
be1c08ddfe FIX : salary extrafields don't work and table is not well named 2021-09-06 12:30:39 +02:00
Laurent Destailleur
e4767e91ea Fix css 2021-09-06 03:26:43 +02:00
Laurent Destailleur
2d6b9a2a0a CSS 2021-09-06 03:26:27 +02:00
Laurent Destailleur
5850b68f79 Fix css 2021-09-06 03:22:06 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +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
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04: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
cf74af4401 css 2021-08-06 13:07:07 +02:00
Laurent Destailleur
d0c57dac34 FIx #18217 - Salary - link 'salary' of bank_url not managed 2021-08-03 15:02:09 +02:00
Francis Appels
1333ca3660 Fix php 8 warning on not set field keys 2021-07-05 14:51:34 +02:00
Laurent Destailleur
0dce34f527 Fix trans 2021-07-01 19:06:16 +02:00
Laurent Destailleur
414da83456 Fix colspan 2021-07-01 18:45:07 +02:00
stickler-ci
afa1e117c5 Fixing style errors. 2021-06-14 13:37:39 +00:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +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
91b8b6a600 Fix Title salary info card 2021-05-17 22:41:00 +02:00
Alexandre SPANGARO
c3c760c269 Fix Title salary document card 2021-05-17 22:18:46 +02:00
Alexandre SPANGARO
4236471a6f Fix Title salary card 2021-05-17 22:12:01 +02:00
Laurent Destailleur
ba6e675273 css 2021-05-12 22:21:20 +02:00
stickler-ci
762378c044 Fixing style errors. 2021-04-28 11:12:01 +00:00
Gauthier PC portable 024
c25b044da5 FIX : several fixes on salary and vat 2021-04-28 11:56:07 +02:00
Laurent Destailleur
fde4beb3b6
Merge pull request #17396 from atm-gauthier/fix_disable_delete_if_payments 
FIX : We must not be able to delete sociale charge, vat or salary if there are payments
 2021-04-26 21:08:29 +02:00
Laurent Destailleur
a29c26f299 Fix amount chosen lost 2021-04-26 21:07:46 +02:00
Gauthier PC portable 024
5ef22327a2 FIX : last modif date for salary 2021-04-26 12:29:17 +02:00
Gauthier PC portable 024
3920050186 FIX : useless column 2021-04-26 11:35:33 +02:00
Laurent Destailleur
b5868acf18 Fix phpcs 2021-04-19 15:30:30 +02:00
Laurent Destailleur
c4f27cc29f Debug module salary 2021-04-18 16:43:09 +02:00
Laurent Destailleur
f4fa16797b Complete information on tab for files on salary 2021-04-18 16:00:48 +02:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions 
Next picto mass actions
 2021-04-16 20:40:19 +02:00
Laurent Destailleur
e7d64d073a Look and feel v14 2021-04-14 23:14:38 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
f6251679a1 Fix label 2021-04-11 22:41:53 +02:00
Laurent Destailleur
062f451b20 css 2021-04-11 22:40:07 +02:00
Laurent Destailleur
990da5574d Fix trans 2021-04-11 22:35:20 +02:00
Laurent Destailleur
858693d631 CSS 2021-04-03 01:39:08 +02:00
Laurent Destailleur
5ce9bc5801 FIX #yogosha5748 2021-04-02 23:23:44 +02:00
stickler-ci
508dc33749 Fixing style errors. 2021-03-31 08:16:02 +00:00
Gauthier PC portable 024
19265179ca FIX : last uniformizations 2021-03-31 10:11:51 +02:00
Laurent Destailleur
47e9f7c458
Merge pull request #17032 from atm-gauthier/fix_develop 
FIX : several fix after lists uniformization
 2021-03-30 19:20:15 +02:00
Laurent Destailleur
d6b5e24d96
Update payments.php 2021-03-30 19:20:02 +02:00
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
stickler-ci
4903f92172 Fixing style errors. 2021-03-30 15:26:15 +00:00
Gauthier PC portable 024
3259d70e72 FIX : several fix after lists uniformization 2021-03-30 17:23:05 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
d61f61ab45 Clean $_GET 2021-03-30 03:55:17 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
stickler-ci
e1e3bcbf28 Fixing style errors. 2021-03-29 15:26:24 +00:00
Gauthier PC portable 024
139a1ba70d FIX : if $conf->banque->enabled 2021-03-29 17:22:19 +02:00
Gauthier PC portable 024
28620fe8d8 Merge branch 'fix_list_uniformization' of github.com:atm-gauthier/dolibarr into fix_list_uniformization 2021-03-29 16:27:59 +02:00
Gauthier PC portable 024
53ae1f9d5b Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization 2021-03-29 16:27:44 +02:00
stickler-ci
caa56729b3 Fixing style errors. 2021-03-29 14:25:36 +00:00
Gauthier PC portable 024
c8e40727c2 FIX : uniformization 2021-03-29 16:22:22 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00
stickler-ci
895c6efc14 Fixing style errors. 2021-03-26 15:26:05 +00:00
Gauthier PC portable 024
f553ad3fc8 FIX : orders columns 2021-03-26 16:14:00 +01:00
Gauthier PC portable 024
3fe1a05f26 FIX : employee must be after label as well as sociale charges list + social charges payments list must use INNER JOIN instead of LEFT JOIN 2021-03-26 10:23:44 +01:00
Gauthier PC portable 024
f5bf26e5d0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_list_uniformization 2021-03-26 09:59:27 +01:00
Laurent Destailleur
663138328e
Merge pull request #16962 from atm-gauthier/fix_autofill_amount_payment_salary 
FIX : autofill payment salary amount + several fixes
 2021-03-25 13:03:38 +01:00
Laurent Destailleur
2d76410a39
Merge pull request #16966 from dolibit-ut/patch-165 
Create index.html
 2021-03-25 12:39:36 +01:00
Gauthier PC portable 024
014ae0a8da FIX : lists uniformization 2021-03-25 11:59:22 +01:00
UT from dolibit
a33986e630
Create index.html 2021-03-25 11:21:30 +01:00
UT from dolibit
3570fea7aa
Create index.html 2021-03-25 11:20:49 +01:00
Gauthier PC portable 024
368bad1943 FIX : autofill payment salary amount + several fixes 2021-03-25 10:39:12 +01:00
Laurent Destailleur
f9722b7c3b
Merge pull request #16955 from atm-gauthier/fix_dol_get_fiche_head_salary 
FIX : wrong dol_get_fiche_end()
 2021-03-25 00:22:33 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
047471c220 Remove $_POST war 2021-03-24 19:06:44 +01:00
Gauthier PC portable 024
708f028888 FIX : wrong dol_get_fiche_end() 2021-03-24 15:30:22 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
6063b02bf4 Fix #ygosha5698 2021-03-22 12:47:23 +01:00
Laurent Destailleur
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
1c6585f06b Fix deprecated function 2021-03-21 22:37:24 +01:00
Laurent Destailleur
eeb1c5d884 Replace deprecated code 2021-03-20 21:46:10 +01:00