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

116 Commits

Author SHA1 Message Date
Laurent Destailleur
be6bb3a756 FIX #yogosha5746 - next step (work in progress) 2021-03-30 19:12:07 +02:00
Laurent Destailleur
047471c220 Remove $_POST war 2021-03-24 19:06:44 +01:00
Alexandre SPANGARO
6960f0dc25 Uniformize translation 2021-03-16 04:22:55 +01:00
Frédéric FRANCE
6777f15db0
Update card.php 2021-03-13 13:30:19 +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
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
Laurent Destailleur
aee6d78928 Debug split of payment salary into salary + payment 2021-03-04 21:33:29 +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
b5def91b46 Fix phpcs 2021-03-04 17:57:08 +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
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
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
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
stickler-ci
9bfb7a5cbd Fixing style errors. 2021-02-05 12:08:05 +00: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
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
278ee07416 Fix position of field 2020-11-09 14:39:04 +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
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01: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
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
e5fc928fda
add new rule 2020-05-21 02:02:54 +02:00
Laurent Destailleur
cadb52c5b3 Look and feel v12 2020-04-20 19:39:34 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
Laurent Destailleur
d9a1e1b348 Fix several non dolibarr behaviour on input of salary payments 2019-12-19 10:01:11 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00