Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
126,990 Commits 36 Branches 189 Tags
c2c99ab2b86b8ee4ee252a67ecf8a01d0b1cf80d
Commit Graph

162 Commits

Author SHA1 Message Date
Laurent Destailleur
05db4b9f8e Sync transifex 2023-12-15 13:34:39 +01:00
Laurent Destailleur
80576444f7 Debug v19 2023-12-14 16:00:05 +01:00
Laurent Destailleur
7d109e9419 Fix phpcs 2023-12-13 12:46:23 +01:00
Laurent Destailleur
e040219fdc Fix phpcs 2023-12-13 12:45:07 +01:00
Laurent Destailleur
db79a874a3 Debug v19 2023-12-12 00:13:36 +01:00
Laurent Destailleur
619155f65e Fix with php-cs-fixer 2023-12-04 13:53:48 +01:00
Laurent Destailleur
075ee02901 Fix php8.2 warnings 2023-11-27 12:08:48 +01:00
Eric
4f47f26aad undef chid from PaymentSalary -> id + deprecated doc (#26690) 
* undef chid from PaymentSalary -> id + deprecated doc

* Update card.php

* Update paiement_salary.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-18 12:46:29 +01:00
Eric
ee05f34237 Paymentsalary datepayment datep (#26688) 
* datepayment to datep member var

* datepayment to datep member var
 2023-11-18 12:39:25 +01:00
Alexandre SPANGARO
c6551dc1ad Review salaries (#26560) 
* Avoid some warnings PHP8.x

* Refer to $permissiontoxxx & review

* Review $title

* Refer to $permissiontoxxx & review

* Refer to $permissiontoxxx & review
 2023-11-13 21:07:38 +01:00
Laurent Destailleur
09e504c18e Debug v19 2023-11-06 17:26:13 +01:00
Laurent Destailleur
96db44174e css 2023-11-06 17:20:42 +01:00
lamrani abdelwadoud
23ce23021f NEW functionality for request_transfer (#26078) 
* NEW functionality for request_transfer

* fix problem

* fix problem in transferBank

* fix request sql

* ajust functions for salary invoices

* add badges for each onglet invoice and salary

* Fix update in table bon_prelevement for amount

* Fix in section virement_request list of bonPrelevements

* for prelevemts lignes

* for prelevemts lignes

* update sql for get lignes prelevement with correct info

* update sql for get lignes prelevement with correct info

* add function for check if invoice salaries

* adjust bonprelevement for get salaries

* fix incoherences in create function for class BonPrelevement

* fix request sql for insert in prelevement ligne table

* fix problems and incoherences

* remove parametre  from function

* add parenthensises for cast  in sql request

* disable button when make demande virement

* fix condition for type

* fix conflit "

* fix whitespace

* fix condition for sourcetype

* fix page demandes.php for list salaries invoices

* add prefix db

* fix incoherences for conditions

* Update virement_request.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-06 16:09:05 +01:00
Mohamed DAOUD
990f9113fc FIX - Auto fill the field end of period with end of month when cloning a salary (#26263) 
* Auto fill the field end of period

* Auto fill the field end of period without jsDate

* using formatDate function to format displayed date
 2023-10-26 14:03:21 +02:00
sonikf
d89954210e fix cannot cancel salary when language is not latin (#26281) 2023-10-20 01:29:09 +02:00
Laurent Destailleur
b8c8e903c2 Fix php8.2 warnings 2023-10-15 18:39:13 +02:00
Laurent Destailleur
f450e23ce6 Clean code: set_paid is deprecated. Replaced with setPaid. 2023-10-09 10:22:49 +02:00
Laurent Destailleur
9302a427a9 Debug v19 2023-07-31 03:29:45 +02:00
Florian HENRY
efc8f94019 fix php 8 2023-06-10 14:44:22 +02:00
Laurent Destailleur
f61f425231 NEW upload a file by drag and drop on social contribution and salary 2023-05-04 17:28:42 +02:00
Laurent Destailleur
46b270868b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-02-22 02:07:37 +01:00
Laurent Destailleur
fa9493db37 Update card.php 2023-02-22 01:54:06 +01:00
stickler-ci
af8e6bfa61 Fixing style errors. 2023-02-18 02:26:38 +00:00
Oarces DEV
aa7fdaf194 Update card.php 2023-02-18 03:23:45 +01:00
Laurent Destailleur
80d46a22f1 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-18 21:36:57 +01:00
Laurent Destailleur
48161b8400 Debug v17. Bad param for selection of project 2023-01-17 13:50:23 +01:00
Laurent Destailleur
3f65af193e Merge pull request #22913 from atm-gauthier/NEW/can_edit_amount_on_tva_and_salaries_clone 
NEW : Now we can edit amount on vat and salaries clone action
 2023-01-08 14:22:36 +01:00
Laurent Destailleur
ba08457171 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-01-06 16:55:41 +01:00
Laurent Destailleur
4d683692de Fix autofill js 2023-01-06 16:51:01 +01:00
Laurent Destailleur
fff3a492d5 Fix date 2022-12-30 00:27:00 +01:00
Laurent Destailleur
dbc5f5742f Clean code 2022-12-28 12:05:30 +01:00
Laurent Destailleur
42049a48eb Fix message 2022-12-05 15:54:03 +01:00
Laurent Destailleur
a36ed6a3c4 Debug v17 2022-11-23 10:43:09 +01:00
stickler-ci
c689ce1c52 Fixing style errors. 2022-11-21 16:08:00 +00:00
Gauthier PC portable 024
b5688427ab NEW : Now we can edit amount on vat and salaries clone action 2022-11-21 16:59:36 +01:00
Frédéric FRANCE
754881a6ef strftime is deprecated in php 8.1 2022-10-31 10:42:40 +01:00
Laurent Destailleur
5e93a09f6a css 2022-10-04 08:44:43 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Alexandre SPANGARO
ebc9581dde CSS 2022-08-30 16:37:29 +02:00
Alexandre SPANGARO
e2fdc64666 Typo 2022-08-29 10:56:06 +02:00
Alexandre SPANGARO
be043fb088 Use isModEnabled 2022-08-29 10:52:45 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
8bacb6c755 Fix name of var 2022-05-22 17:09:08 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +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