Commit Graph

1221 Commits

Author SHA1 Message Date
Laurent Destailleur
b099e103b3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-10-14 21:00:26 +02:00
UltraViolet33
33c6d95b1c Backport Fix wrong invoice status when invoice has discount (#31323)
Co-authored-by: Ulysse Valdenaire <uvaldenaire@easya.solutions>
2024-10-13 21:04:17 +02:00
Frédéric FRANCE
c8d6ece3c0 fix free sql (#29579)
* fix free sql

* Update orders_list.php
2024-05-02 13:02:08 +02:00
xbloq
277f49aff6 Update card.php #28938
Conflicts:
	htdocs/compta/prelevement/card.php
2024-03-19 02:02:39 +01:00
Laurent Destailleur
8e0559f9a4 Debug v19 2024-02-08 04:23:29 +01:00
Laurent Destailleur
1d69089702 FIX Must use the ICS and not IDS bu default 2024-01-31 03:49:13 +01:00
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +01:00
Laurent Destailleur
1985d1fd4d Fix warnings 2023-12-23 20:00:57 +01:00
Hystepik
d08f91e4cb Fix some phpstan warnings 2023-12-21 13:43:19 +01:00
Laurent Destailleur
03c05b4fd8 Debug v19 2023-12-14 18:05:46 +01:00
Laurent Destailleur
80576444f7 Debug v19 2023-12-14 16:00:05 +01:00
Laurent Destailleur
20a934d724 Fix sql error 2023-12-14 15:32:23 +01:00
Laurent Destailleur
2aced0faaa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-12-14 14:52:34 +01:00
Laurent Destailleur
14ba1138c4 Fix payment SEPA for salary 2023-12-14 14:51:30 +01:00
Laurent Destailleur
33dd878f9e Fix payment SEPA for salary 2023-12-14 14:48:22 +01:00
Laurent Destailleur
d5722ee4b2 Fix payment SEPA for salary 2023-12-14 13:50:29 +01:00
Laurent Destailleur
0a2e28435e Debug v19 2023-12-13 20:33:36 +01:00
Laurent Destailleur
fb083a6cfc Fix warning with rector 2023-12-13 16:33:17 +01:00
Laurent Destailleur
d63aeeed9f Debug v19 2023-12-09 20:41:56 +01:00
Laurent Destailleur
100a657633 Debug v19 - Support of bank payment rejection on SEPA. 2023-12-09 20:28:28 +01:00
Laurent Destailleur
02735fab0a Debug v19 2023-12-09 19:20:19 +01:00
Laurent Destailleur
e6bdd3ffbf Debug v19 2023-12-09 17:53:32 +01:00
Laurent Destailleur
9d479c5df0 Debug v19 2023-12-08 21:39:10 +01:00
Laurent Destailleur
d248840779 Debug v19 2023-12-08 21:09:32 +01:00
Laurent Destailleur
01a207a592 Debug v19 2023-12-08 20:57:01 +01:00
Laurent Destailleur
230371a6c9 Debug v19 2023-12-08 19:08:42 +01:00
Frédéric FRANCE
61b79fda17 avoid phpstan error with phpdoc 2023-12-06 15:46:39 +01:00
Laurent Destailleur
ba10d60a0b Fix with php-cs-fixer 2023-12-04 12:02:35 +01:00
Frédéric FRANCE
53c8a3acf8 clean phpdoc for phpstan (#26905) 2023-12-01 19:51:32 +01:00
Laurent Destailleur
53dab922fd Fix php8.2 warnings 2023-11-27 11:39:32 +01:00
Laurent Destailleur
e6eb34a8db Fiw warnings: The private array ->status_short, ->statuts and
->status_long are now array ->labelStatusShort and ->labelStatus
everywhere.
2023-11-24 10:10:24 +01:00
lamrani abdelwadoud
5a105ad462 NEW functionality for combined salary invoice and supplier invoice (#26541)
* NEW functionality for combined salary invoice and supplier invoice

* remove print_r
2023-11-10 19:00:30 +01:00
lamrani abdelwadoud
07d2d6b861 NEW functionality for get bon prelevement in ligne order (#26540)
* Fix massaction checkbox for display it on right side

* get all order lines request
2023-11-10 18:56:52 +01:00
lamrani abdelwadoud
01d3526d8d FIX sql request in function checkIfSalary (#26538)
* fix sql request in function checkIfSalary

* Update bonprelevement.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-10 18:45:20 +01:00
Laurent Destailleur
3118b9fb4c Debug v19 2023-11-09 15:50:42 +01:00
Laurent Destailleur
955af0695e Fix return code 2023-11-09 15:44:17 +01:00
Laurent Destailleur
74ff2acc6c Debug v19 2023-11-07 15:03:45 +01:00
Laurent Destailleur
1e2d06bf80 Debug v19 2023-11-07 14:18:33 +01:00
Laurent Destailleur
e5d9fb10e5 Debug v19 2023-11-07 13:12:07 +01:00
Laurent Destailleur
cb81978080 NEW Add field TechnicalID in list of users 2023-11-07 11:07:31 +01:00
Laurent Destailleur
dc07b9f567 Debug v19 2023-11-07 10:55:23 +01:00
Laurent Destailleur
8ec367406d Clean code 2023-11-06 20:23:33 +01:00
Laurent Destailleur
ca78eff61f Fix round 2023-11-06 20:00:16 +01:00
Laurent Destailleur
3bd677ffb9 Debug v19 2023-11-06 19:59:19 +01:00
Laurent Destailleur
c154a72d88 Debug v19 2023-11-06 19:32:04 +01:00
Laurent Destailleur
6fc0a868f5 Debug v19 2023-11-06 16:51:37 +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
a1597e6eb1 Fix some warnings -technical debt- (#26466)
* fix warnings 1

* fix previous commit 1

* Update facture-rec.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-06 16:00:24 +01:00
Laurent Destailleur
a318031034 QUAL Standardize code. Renamed ID of user properties into ->user_xxx_id 2023-10-24 11:37:29 +02:00
Alexandre SPANGARO
58bdcb5245 Dolibarize - Look & feel v19 (#26246)
* NEW Accountancy - Add quick navigation with keyb. shortcut on ledger

* TitleSeparator - Job list

* TitleSeparator - Position list

* TitleSeparator

* TitleSeparator

* TitleSeparator

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Define $newcardbutton

* Variable $newcardbutton already define

* Define $newcardbutton

* TitleSeparator

* TitleSeparator

* TitleSeparator

* TitleSeparator

* TitleSeparator
2023-10-20 03:20:44 +02:00