Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
130,797 Commits 36 Branches 189 Tags
a2c92f183cc54c35013469638780c28e65df0b51
Commit Graph

10504 Commits

Author SHA1 Message Date
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
Laurent Destailleur
8f91e6bce8 FIX src_object_id and ttype not filed when uploading a file with API. 2023-10-31 00:47:55 +01:00
Mohamed DAOUD
322b4d8be9 Adding __NEXT_MONTH_TEXT__ in mail template (#26391) 2023-10-30 18:04:42 +01:00
Mohamed DAOUD
08ef416958 New: Adding the PDF option displaying the product's barcode number (#26345) 
* Add a PDF option to show barcode number of product

* Add space before and after IF keyword

* fix error phpcs

* add barcode label before barcode number

* Use outputlangs and not langs

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-30 03:13:12 +01:00
Laurent Destailleur
582a6f7f45 Debug v19 2023-10-29 16:44:41 +01:00
Laurent Destailleur
00e706120d Fix warning 2023-10-28 02:17:48 +02:00
Laurent Destailleur
ca3c7f0a37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-26 13:52:22 +02:00
Laurent Destailleur
6822afac31 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-26 13:48:33 +02:00
Lucas Marcouiller
96146fcb6a New add note for mailing (#26331) 
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-26 13:40:44 +02:00
Florent Poinsaut
753430de5f Fix error return value in the dol_delete_preview (#26360) 2023-10-26 12:40:21 +02:00
HENRY Florian
7e3b098f78 fix: when option MAIN_USE_COMPANY_NAME_OF_CONTACT is set the VAT num have to be the VAT num of thirdparty of contact (#26371) 2023-10-26 12:28:00 +02:00
Laurent Destailleur
a318031034 QUAL Standardize code. Renamed ID of user properties into ->user_xxx_id 2023-10-24 11:37:29 +02:00
Laurent Destailleur
1d1a1c88f6 NEW Date format dayhoursec is using year on 2 char on smartphones 2023-10-24 01:13:43 +02:00
Laurent Destailleur
b7de0baedd Fix phpunit 2023-10-23 18:54:16 +02:00
Laurent Destailleur
d8d3faa50f dolPrintHTMLForAttribute remove \n 2023-10-23 13:14:59 +02:00
Laurent Destailleur
0b11668660 FIX better management of <br> for dolGetFirstLine 2023-10-23 12:26:23 +02:00
Laurent Destailleur
4b214b4100 Fix #yogosha18281 2023-10-21 02:39:27 +02:00
Laurent Destailleur
62c1baaa61 Clean param 2023-10-20 21:01:59 +02:00
Laurent Destailleur
455fb4417a Look and feel v19 2023-10-20 12:57:58 +02:00
MDW
706d0f6053 Fix __METHOD__ usage outside class-method (#26286) 2023-10-20 11:20:02 +02:00
Laurent Destailleur
5174522f6e PHP 8.2 2023-10-20 01:25:05 +02:00
Laurent Destailleur
f53ef65b99 Debug v19 2023-10-20 01:00:15 +02:00
Laurent Destailleur
8abde02b85 FIX dol_eval with function starting with ! 2023-10-18 16:26:27 +02:00
Laurent Destailleur
315030099a FIX dol_eval with function starting with ! 2023-10-18 16:19:59 +02:00
Laurent Destailleur
9f9a649f4c FIX dol_eval with function starting with ! 2023-10-18 16:12:57 +02:00
Laurent Destailleur
c31dd14d7c FIX dol_eval with function starting with ! 2023-10-18 16:10:53 +02:00
Anthony Berton
8cbbd88f52 FIX - Edit price product if status_buy or status is empty (#26239) 
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
 2023-10-17 16:39:55 +02:00
Laurent Destailleur
f18529f944 Clean code 2023-10-17 10:52:19 +02:00
Laurent Destailleur
fb8b4acdbf The duplicated and deprecated property ->date_livraison that was renamed 
into ->delivery_date has been completely removed.
 2023-10-17 10:36:11 +02:00
Laurent Destailleur
01a139158d Debug v19 2023-10-16 21:15:03 +02:00
Laurent Destailleur
801d669c9f Fix php8.2 2023-10-16 02:56:54 +02:00