lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
104,390 Commits 43 Branches 150 Tags 886 MiB
dd7ee9e5f4
Commit Graph

93 Commits

Author SHA1 Message Date
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
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +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
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
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
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
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
Alexandre SPANGARO
4236471a6f Fix Title salary card 2021-05-17 22:12:01 +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
e7d64d073a Look and feel v14 2021-04-14 23:14:38 +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
5ce9bc5801 FIX #yogosha5748 2021-04-02 23:23:44 +02:00
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