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 |
|
Sekan, Tobias
|
ae8c302c19
|
merge variable declaration
|
2020-09-18 10:52:17 +02:00 |
|
Sekan, Tobias
|
dc4250aed7
|
Make button visiblity identical on most lists
|
2020-09-18 10:46:23 +02:00 |
|
Sekan, Tobias
|
1b04ef8aad
|
Add function to all list that support $socid
|
2020-09-18 10:36:40 +02:00 |
|
Laurent Destailleur
|
c4b5f5a249
|
Maxi clean of code
|
2020-09-18 01:29:17 +02:00 |
|
Laurent Destailleur
|
9a758b7edd
|
FIX #yogosha4483
|
2020-09-17 14:31:25 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +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 |
|
Scrutinizer Auto-Fixer
|
1bf5745286
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-25 11:52:07 +00:00 |
|
Laurent Destailleur
|
72c6ac1c72
|
Complete #13708, normalization of code
|
2020-04-23 13:21:39 +02:00 |
|
Laurent Destailleur
|
cadb52c5b3
|
Look and feel v12
|
2020-04-20 19:39:34 +02:00 |
|
Laurent Destailleur
|
16e46c672c
|
Clean code
|
2020-04-20 15:06:27 +02:00 |
|
Laurent Destailleur
|
98f370034a
|
Look and feel v12
|
2020-04-20 14:53:17 +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
|
ec83f18944
|
Move more icon definition into CSS
|
2020-03-28 13:38:25 +01:00 |
|
Laurent Destailleur
|
8bab245c7e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/tpl/contacts.tpl.php
|
2020-03-18 18:50:55 +01:00 |
|
Laurent Destailleur
|
8192e9dc67
|
FIX Missing token in form
|
2020-03-14 03:02:49 +01:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|
Scrutinizer Auto-Fixer
|
8744f6ab7b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-18 15:17:07 +00:00 |
|
Laurent Destailleur
|
e5e7f19f48
|
Merge pull request #12367 from aspangaro/11.0_a4
NEW Salaries list - Add date start & date end
|
2020-01-15 17:54:03 +01: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 |
|
Alexandre SPANGARO
|
c646484f30
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a4
|
2019-12-23 21:08:26 +01:00 |
|
Laurent Destailleur
|
e60ae67aca
|
Fix stats page
|
2019-12-22 16:23:52 +01:00 |
|
Laurent Destailleur
|
38c8b79c54
|
Fix clear search field
|
2019-12-19 10:03:10 +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 |
|
Laurent Destailleur
|
1af67a4336
|
Merge pull request #12713 from frederic34/doxygen_warning
doxygen
|
2019-12-16 19:02:10 +01:00 |
|
Scrutinizer Auto-Fixer
|
c8baaa2995
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-12-16 12:06:25 +00:00 |
|
Frédéric FRANCE
|
9e4fb8d4fe
|
doxygen
|
2019-12-15 10:02:20 +01:00 |
|
Laurent Destailleur
|
ce47de453e
|
Fix HTML5
|
2019-12-12 10:31:08 +01:00 |
|
Alexandre SPANGARO
|
aa3b6533f1
|
Look & Feel v11
|
2019-11-27 02:45:43 +01:00 |
|
Alexandre SPANGARO
|
cd018b2b65
|
Merge remote-tracking branch 'upstream/develop' into 11.0_a4
|
2019-11-18 06:08:49 +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 |
|
Alexandre SPANGARO
|
5cf1111204
|
NEW Salaries list - Add date start & date end
|
2019-11-07 08:44:09 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Frédéric FRANCE
|
dacd7227bc
|
replace societe_id by socid
|
2019-11-04 20:23:21 +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
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Alexandre SPANGARO
|
1c13a38ce9
|
Typo abscissa
|
2019-09-23 21:45:23 +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 |
|