Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
127,354 Commits 36 Branches 190 Tags
0d7bbcb996a0f9050b8c80e98497b51f65be5973
Commit Graph

10133 Commits

Author SHA1 Message Date
Laurent Destailleur
1508d2121c Code comment 2023-11-18 02:11:59 +01:00
Laurent Destailleur
1b91a9f83b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-18 01:24:59 +01:00
Maxime Kohlhaas
a680d1e34d Fix strpos inversion for expedition and receipt in files.lib (#26701) 2023-11-18 00:42:15 +01:00
Laurent Destailleur
a0bba05b02 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
 2023-11-17 18:24:53 +01:00
Maxime Kohlhaas
c756aa8ad3 Fix tasklist extrafields (#26672) 
* Fix : value of extrafields not displayed in task list on a project

* Fix : icon to select columns was not displayed
 2023-11-17 16:39:49 +01:00
Laurent Destailleur
ac248dfd90 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-17 12:03:56 +01:00
Laurent Destailleur
042d583070 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-17 12:03:38 +01:00
Laurent Destailleur
6ea48ac22a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-17 12:02:21 +01:00
HENRY Florian
70a5a85eac fix: various getDol, display error on public page (#26652) 
* fix: various getDol, display error on public page

* fix: various getDol, display error on public page
 2023-11-17 11:39:16 +01:00
Eric
337fa2ac67 add category map to categorie (#26649) 2023-11-17 03:44:15 +01:00
lvessiller-opendsi
f5af28e1fb NEW substitute expiration date (#26628) 2023-11-16 23:36:31 +01:00
Maxime Kohlhaas
de0b733430 Fix : missing getEntity for hrm public holiday (#26627) 2023-11-16 23:27:20 +01:00
moreauftheobald
279343ee56 Ddevelop fix product class (#26632) 
* Add entity management on contact list on thirdparty card

* Correction On procduct class files "Access to an undefined property"
 2023-11-16 23:26:08 +01:00
Laurent Destailleur
c0510fc0f5 Debug v19 2023-11-14 20:59:31 +01:00
sonikf
0fbc5bd423 NEW: Supplier template invoive extrafields (#26570) 
* NEW: Supplier template invoive extrafields

* NEW: Supplier template invoive extrafields

* NEW: Supplier template invoive extrafields
 2023-11-14 14:46:48 +01:00
Regis Houssin
c9d2d77fef NEW add barcode function to check if EAN13 is valid (#26567) 2023-11-14 01:54:04 +01:00
Laurent Destailleur
804ee3b517 Debug v19 and option MAIN_DISALLOW_URL_INTO_DESCRIPTIONS 2023-11-14 01:32:42 +01:00
Laurent Destailleur
ca3f5eaadf Debug v19 2023-11-14 00:56:30 +01:00
Laurent Destailleur
d5139398cd Remove warning we should not have in a common usage. 2023-11-13 19:08:33 +01:00
Laurent Destailleur
061f340f90 Debug v19 2023-11-13 15:20:56 +01:00
Laurent Destailleur
c8c8618e55 Debug v19 2023-11-13 15:17:55 +01:00
Laurent Destailleur
69642e1048 Fix missing the src type and id when uploading a file as a message of 
ticket
 2023-11-13 12:36:38 +01:00
Laurent Destailleur
2d6559d74f Fix warning 2023-11-13 02:42:47 +01:00
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
 2023-11-12 23:06:31 +01:00
Laurent Destailleur
201ad75360 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
 2023-11-12 23:02:18 +01:00
Laurent Destailleur
bd2285ab91 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-12 22:58:37 +01:00
Laurent Destailleur
1dbb3f1f34 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/product/stock/stockatdate.php
 2023-11-12 22:58:23 +01:00
Laurent Destailleur
17ca6f651c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-12 22:18:06 +01:00
Laurent Destailleur
b709de584c Debug v19 2023-11-11 15:35:23 +01:00
lamrani abdelwadoud
c4b2555667 Fix massaction checkbox for display it on right side (#26539) 2023-11-10 18:49:20 +01:00
lvessiller-opendsi
785c85205b FIX substitute project variables in invoice documents (#26445) 
* FIX substitute project variables in invoice documents

* Keep key to substitute if no link with project
 2023-11-08 17:32:23 +01:00
lvessiller-opendsi
2ff8ddb4fa NEW lazy load to substitute project variables (#26451) 
* NEW lazy load to substitute project variables

* FIX load class file

* Keep key to substitute if no link with project
 2023-11-08 17:30:51 +01:00
Frédéric FRANCE
22a37bf36a QUAL group all flag images into 1 sprite file. (#26459) 
* add flag sprite

* add missing

* wip

* wip

* add script used to generate flags sprite

* add script used to generate flags sprite

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-07 18:52:08 +01:00
jyhere
f5cf5b6399 CHANGE: Allow local media in wysiwyg if dolibarr on private network (#26494) 2023-11-07 17:50:28 +01:00
Laurent Destailleur
75ac561595 Fix warnings 2023-11-06 20:08:27 +01:00
Laurent Destailleur
6fc0a868f5 Debug v19 2023-11-06 16:51:37 +01:00
Laurent Destailleur
27d2a1a220 Debug v19 2023-11-06 16:34:35 +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
Laurent Destailleur
b65d5c8740 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-05 19:52:54 +01:00
Laurent Destailleur
1a2e49cebe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-11-05 19:45:42 +01:00
Laurent Destailleur
9c7381601f Backport or better module compatibility 2023-11-05 19:35:34 +01:00
Laurent Destailleur
f9d520b29d Fix warning 2023-11-05 18:27:53 +01:00
Laurent Destailleur
2a2dec2f88 Debug v19 2023-11-04 16:02:24 +01:00
HENRY Florian
a3437c7207 fix: display details quantity in Kit in PDF #26359 (#26454) 
* add detail qty in kit displayed in PDF line

* fix: #26359
 2023-11-03 16:27:02 +01:00
Christophe Battarel
23c944a104 NEW : customize position in complete_head_from_modules (#26406) 
* NEW : customize position in complete_head_from_modules

* fix parenthesis search

* fix position search

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-11-01 15:00:29 +01:00
Laurent Destailleur
edaab57f2e Endpoint for API /partnershipapi and /recruitment has been renamed into 
/partnerships and /recruitments to follow name conventions.
 2023-10-31 13:37:15 +01:00
Laurent Destailleur
ca145ef912 QUAL: Endpoint for API /partnershipapi has been renamed into 
/partnerships to follow conventions
 2023-10-31 13:31:02 +01:00
Laurent Destailleur
0b9795f34c FIX upload of files src_object_type 2023-10-31 11:52:31 +01:00
Laurent Destailleur
85d36ddc58 FIX src_object_id and ttype not filed when uploading a file with API. 2023-10-31 11:52:17 +01:00
Laurent Destailleur
59b9d12ed5 FIX upload of files src_object_type 2023-10-31 10:44:58 +01:00