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

296 Commits

Author SHA1 Message Date
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
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments 2021-03-20 10:00:24 +01:00
Alexandre SPANGARO
6960f0dc25 Uniformize translation 2021-03-16 04:22:55 +01:00
Laurent Destailleur
4d1544a44a
Merge pull request #16641 from frederic34/patch-3 
fix getpost filter
 2021-03-15 11:14:59 +01:00
Frédéric FRANCE
0afd05c664
fix php8 warning 2021-03-14 23:56:04 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
Frédéric FRANCE
6777f15db0
Update card.php 2021-03-13 13:30:19 +01:00
Frédéric FRANCE
c74cd63728
Create index.html 2021-03-13 13:27:24 +01:00
Laurent Destailleur
e015f66936 Fix filter on employee 2021-03-10 17:31:33 +01:00
Laurent Destailleur
46d835b2bd Fix css 2021-03-10 17:25:26 +01:00
Laurent Destailleur
2ff2640c8d
Update card.php 2021-03-10 17:16:49 +01:00
Adrien Raze
6a7ecf210f FIX : Travis returns 2021-03-10 15:38:01 +01:00
Laurent Destailleur
f3508eed83
Update card.php 2021-03-09 15:09:28 +01:00
stickler-ci
93e50bcba6 Fixing style errors. 2021-03-09 10:50:59 +00:00
Adrien Raze
b82f14859c FIX : no fetch required 2021-03-09 11:48:25 +01:00
stickler-ci
1afddabed4 Fixing style errors. 2021-03-09 10:41:03 +00:00
Adrien Raze
07015ef29e FIX : Using function getSommePaiement() instead of using SQL request 2021-03-09 11:35:24 +01:00
stickler-ci
c55c1ab854 Fixing style errors. 2021-03-09 09:58:11 +00:00
Adrien Raze
a67fd6c0a4 FIX : Update pencil should be shown only when no payments has been entered 2021-03-09 10:55:10 +01:00
stickler-ci
cb5d532665 Fixing style errors. 2021-03-08 16:24:54 +00:00
Adrien Raze
946a1fe82d Merge branch 'NEW/12.0_new_payments_on_salaries' of https://github.com/ATM-Consulting/dolibarr into FIX/salaries_card 2021-03-08 17:12:48 +01:00
atm-gauthier
23f913ee86
Merge pull request #171 from atm-adrien/NEW/12.0_new_payments_on_salaries_rounding-amount 
FIX : Rounding amount on card updating
 2021-03-08 14:05:31 +01:00
x
1fec98c546 FIX : Rounding amount on card updating 2021-03-08 11:10:51 +01:00
Florian Mortgat
c73dbebd8f
Merge pull request #169 from atm-adrien/NEW/12.0_new_payments_on_salaries_devadrien 
FIX : pencil to update employee field on card view
 2021-03-08 10:31:51 +01:00
x
55e9908601 FIX : PR returns 2021-03-08 10:09:38 +01:00
Gauthier PC portable 024
f9a1b5fd3e FIX : quote forgotten in merge 2021-03-08 09:21:03 +01:00
Gauthier PC portable 024
e7c030f576 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into FIX_salaries2 2021-03-08 09:16:00 +01:00
Gauthier PC portable 024
ff97a41386 FIX : num_payment on llx_salary is useless 2021-03-08 09:00:52 +01:00
Gauthier PC portable 024
dd83363392 FIX : several bugs on salaries + id salary in payments list 2021-03-05 10:15:35 +01:00
Laurent Destailleur
dfb791837c Debug split of payment salary into salary + payment 2021-03-04 21:43:01 +01:00
Laurent Destailleur
aee6d78928 Debug split of payment salary into salary + payment 2021-03-04 21:33:29 +01:00
Laurent Destailleur
d0ba10efe5 Fix phpcs 2021-03-04 19:48:50 +01:00
Laurent Destailleur
c044b43b66 Fix phpcs 2021-03-04 19:20:16 +01:00
Laurent Destailleur
525d643915 Fix debug split of payment salary into salary + payment 2021-03-04 18:57:03 +01:00
Laurent Destailleur
036c4bc730 Fix phpcs 2021-03-04 18:01:41 +01:00
Laurent Destailleur
b5def91b46 Fix phpcs 2021-03-04 17:57:08 +01:00
Laurent Destailleur
59f205596e Fix phpcs 2021-03-04 17:46:34 +01:00
Laurent Destailleur
6eafc3b774 Clean code 2021-03-04 17:23:12 +01:00
Gauthier PC portable 024
4fe292c76d FIX : getNomUrl() user in title and travis feedbacks 2021-03-04 16:29:32 +01:00
x
ae60f452cc FIX : pencil to update employee field on card view 2021-03-03 16:36:21 +01:00
stickler-ci
6cbc979520 Fixing style errors. 2021-03-03 13:52:21 +00:00
Gauthier PC portable 024
3643afd761 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-03-03 14:49:29 +01:00
Gauthier PC portable 024
ca8d2a671d FIX : conf ajax must be after main form 2021-03-03 14:47:30 +01:00
Gauthier PC portable 024
845b1c6c94 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-03-03 14:35:38 +01:00
x
049080991d FIX : label must be over user 2021-03-03 14:13:36 +01:00
atm-lena
2d2e76ee7f Affichage conf 2021-03-02 10:07:23 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Frédéric FRANCE
ebfba19778
code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
atm-lena
292076e5dd Ajout conf qui permet de décocher / cocher par défaut le paiement automatique des salaires 2021-02-26 15:59:27 +01:00
stickler-ci
c8b8c55054 Fixing style errors. 2021-02-23 14:22:55 +00:00
Gauthier PC portable 024
4f767c0823 Merge branch 'NEW/12.0_new_payments_on_salaries' of github.com:ATM-Consulting/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:18:44 +01:00
Gauthier PC portable 024
a767bffc3a FIX : correction of payment salaries list on employee tab of user card 2021-02-23 15:08:27 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Gauthier PC portable 024
3b8e804412 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 16:07:41 +01:00
Gauthier PC portable 024
3761dfe8bc FIX : table llx_salary_extrafield deosn't exists for the moment 2021-02-09 16:05:25 +01:00
Gauthier PC portable 024
11a4ab0e65 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 15:59:59 +01:00
Gauthier PC portable 024
d83914efd7 FIX : group by for for postgres 2021-02-09 15:58:32 +01:00
Gauthier PC portable 024
14f0b225bb Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 11:27:21 +01:00
Gauthier PC portable 024
9b18b15d8a FIX : several fixes 2021-02-09 11:25:30 +01:00
Gauthier PC portable 024
fe468ed710 Merge branch 'NEW/add_real_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 13:53:20 +01:00
Gauthier PC portable 024
736a546786 FIX : php doc 2021-02-05 13:52:57 +01:00
stickler-ci
9bfb7a5cbd Fixing style errors. 2021-02-05 12:08:05 +00:00
Gauthier PC portable 024
24b26b8980 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 12:49:23 +01:00
Gauthier PC portable 024
bed723aec0 FIX : getNomUrl() 2021-02-05 12:47:20 +01:00
Gauthier PC portable 024
d93c71a42f Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 12:28:15 +01:00
Gauthier PC portable 024
e6bea60409 FIX : bank_url 2021-02-05 12:27:14 +01:00
Gauthier PC portable 024
8784e5d043 FIX : several merge errors 2021-02-05 11:12:55 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Laurent Destailleur
2a48529aea Look and feel v14 2021-02-04 20:44:38 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
42ca3bcdc7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/salaries/class/paymentsalary.class.php
 2020-12-30 13:23:50 +01:00
Laurent Destailleur
6a63fea184 FIX #15817 2020-12-30 13:00:10 +01:00
Frédéric FRANCE
8d526f8f79
remove debug 2020-12-29 21:48:53 +01:00
Frédéric FRANCE
3fe495756b
add $fields in paymentsalary class 2020-12-29 21:44:41 +01:00
Laurent Destailleur
eebdd0bd7a Fix missing date value 2020-12-21 14:54:20 +01:00
Laurent Destailleur
d05f9c42f5 Fix bad dir 2020-12-21 14:43:23 +01:00
Laurent Destailleur
3d21a00f2b Removed not working code 2020-12-03 11:03:02 +01:00
Laurent Destailleur
dd54d28dc6 Debug v13 2020-12-03 10:13:13 +01:00
Laurent Destailleur
9137713056 Debug v13 2020-12-03 00:40:41 +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
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
6d4d3c618d FIX #15369 and standardize permission "readall" 2020-11-13 09:55:53 +01:00
Laurent Destailleur
278ee07416 Fix position of field 2020-11-09 14:39:04 +01:00
Laurent Destailleur
5e8dc36efc css 2020-11-06 17:01:47 +01:00
Laurent Destailleur
b0e2d40533 Debug and fix v13 2020-11-03 14:19:54 +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
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-27 18:46:07 +00:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Laurent Destailleur
6c06d2f0aa Look and feel v13 2020-09-22 15:26:29 +02:00
Laurent Destailleur
e5cca13ea0 Fix escaping 2020-09-20 03:32:43 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00