Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
135,438 Commits 35 Branches 179 Tags 1.7 GiB
2f00a634e4
Commit Graph

120332 Commits

Author SHA1 Message Date
altairis-melina
2f00a634e4
ADD: TAKEPOS_NO_SPLIT_SALE const (#29767) 2024-06-04 19:33:54 +02:00
Frédéric FRANCE
d7a88a40a2
fix cti in odt template (#29840) 
* fix cti in odt template

* fix cti in odt recruitment
 2024-06-04 19:29:25 +02:00
Frédéric FRANCE
6393f9f7c2
fix cti (#29839) 2024-06-04 19:27:00 +02:00
Frédéric FRANCE
f9264de0dc
fix cti (#29837) 2024-06-04 19:23:04 +02:00
Kusco
8e8fdccec7
#29103 Fix error in export part of the builder module (#29835) 
In the builder module, suggestions are offered by default.
Just remove the comments for this to work.

Except for this line:
//$this->export_sql_end[$r] =' LEFT JOIN '.MAIN_DB_PREFIX.'competence_line as tl ON tl.fk_competence = t.rowid';

A "point" is missing before the "equal":
//$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'competence_line as tl ON tl.fk_competence = t.rowid';

The problem is the overwriting of part of the query, if we want to couple other tables.
 2024-06-04 14:49:25 +02:00
Frédéric FRANCE
741e75ee47
add phpdoc (#29832) 
* add phpdoc

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* fix phan

* add phpdoc

* fix phan

* fix phan
 2024-06-04 14:46:54 +02:00
Lucas Marcouiller
678c76b80e
Fix merge time spent task (#29834) 
* Fix time spent task

* Update task.class.php

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-04 14:46:01 +02:00
Laurent Destailleur
5bbc4e083e Add a phpunit test 2024-06-04 14:06:35 +02:00
Laurent Destailleur
46a7013713 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-04 13:00:29 +02:00
Vincent Maury
a44de3c527
Show docs (pdf) in expedition list (#29829) 
Like in command list, it would be usefull to dowload pdf docs beside ref in expedition list
 2024-06-04 12:43:32 +02:00
Laurent Destailleur
ae41b85a36 Fix look and feel v20 2024-06-04 11:58:43 +02:00
Laurent Destailleur
42470a113e Doc 2024-06-04 11:15:56 +02:00
Lucas Marcouiller
b169519b68
Fix test trigger code update of field (#29828) 
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
 2024-06-04 11:06:59 +02:00
Frédéric FRANCE
a371083741
Update modBookCal.class.php (#29827) 2024-06-04 10:59:54 +02:00
Zephyriony
c329e4446c
Update commande.class.php (#29823) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-04 10:52:47 +02:00
Laurent Destailleur
fd5a42a612 Fix phan 2024-06-04 10:44:44 +02:00
Laurent Destailleur
c7d744da4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-04 10:19:24 +02:00
Laurent Destailleur
b3a42dad39 Debug v20 2024-06-04 10:18:56 +02:00
Laurent Destailleur
d20ab1a0d0 Debug v20 2024-06-04 02:44:15 +02:00
Laurent Destailleur
fc797b2b75 Debug v20 2024-06-04 02:38:04 +02:00
Laurent Destailleur
22ab3bd334 Debug v20 2024-06-04 02:24:33 +02:00
Laurent Destailleur
c62183ba49 Debug v20 2024-06-04 01:53:22 +02:00
Laurent Destailleur
e5742de49d Debug v20 2024-06-04 01:18:56 +02:00
Laurent Destailleur
c00ffbcd66 Fix error in generic report 2024-06-03 22:43:09 +02:00
Laurent Destailleur
d325f2c25d Fix: Sanitize password to avoid to use the wrapper to inject malicious 
paylod into asterisk
 2024-06-03 22:17:41 +02:00
Laurent Destailleur
918c5aab43 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-03 21:44:15 +02:00
Laurent Destailleur
699d5047b1 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-06-03 21:42:06 +02:00
HENRY Florian
5a2bcc47b6
fix: do not allow/suggest create shipping with 2 time the same serial for the same product (#29749) 
* fix: #29674

* fix: #29674

* review
 2024-06-03 21:36:24 +02:00
Laurent Destailleur
f38837c99a FIX #29780 Restore filtes when using "back to list" 2024-06-03 21:14:27 +02:00
Laurent Destailleur
c1f5c86c28 FIX #29780 Restore filtes when using "back to list" 2024-06-03 21:13:33 +02:00
Laurent Destailleur
2f45629975 Look and feel v20 2024-06-03 19:43:08 +02:00
Laurent Destailleur
b7fa4feb33 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-03 19:20:11 +02:00
Laurent Destailleur
3f13d944f5 Clean code 2024-06-03 19:19:52 +02:00
Lucas Marcouiller
fd728cc28a
fix Show online payment link by using getValidOnlinePaymentMethod (#29764) 
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-03 18:06:46 +02:00
jyhere
88a294df22
CHANGE: add a notice in getRows() instead of returning false (#29790) 
* CHANGE: add a notice  in getRows() instead of returning false

* CHANGE: replace notice by a fatal error when using getRows with no limit
 2024-06-03 18:03:17 +02:00
Laurent Destailleur
6e6271c47e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2024-06-03 17:37:42 +02:00
MaximilienR-easya
a4f8866a86
Add hook to put signature on pdf (#29798) 
* Add hook to put signature depending of the default pdf model

* phan warning

* travis fix

* travis fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-03 17:31:21 +02:00
Mikko Virtanen
89bdb685af
Update functions_fi.lib.php (#29819) 
If amount is negative not generate barcode string.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-03 17:29:36 +02:00
Lucas Marcouiller
c5df307d03
Fix multi input workflow for text type (#29820) 
* Fix multi input workflow for text type

* fix phan

* fix phan

---------

Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
 2024-06-03 16:47:48 +02:00
Laurent Destailleur
47d36d3c44 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-06-03 16:40:06 +02:00
Laurent Destailleur
44de1529c0 Debug v20 2024-06-03 16:39:45 +02:00
jyhere
57f35d7774
FIX: default element_type should be 'commande' (e.g Commande::) (#29791) 
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2024-06-03 13:51:36 +02:00
Zephyriony
b1e235476a
FIX : Update extrafields ECMFiles (#29811) 
* FIX : Update extrafields ECMFiles

* Update ecmfiles.class.php

* Update ecmfiles.class.php

* Update ecmfiles.class.php

* Update ecmfiles.class.php
 2024-06-03 13:46:31 +02:00
Frédéric FRANCE
d5de4f4f67
fix cti (#29809) 
* fix cti

* Update accountingaccount.class.php

* Update accountingaccount.class.php

* Update admin.lang

* Update ignore_translation_keys.lst

* Update ignore_translation_keys.lst

* Update json.lib.php
 2024-06-03 13:44:31 +02:00
Frédéric FRANCE
652c8526fa
fix cti (#29813) 
* fix cti

* fix cti

* no photo in asset lines

* no photo in asset lines

* no photo in asset lines

* no photo in asset lines

* no photo in recruitment lines

* no photo in recruitment lines

* fix

* fix dead catch
 2024-06-03 13:44:14 +02:00
Frédéric FRANCE
689cfc36eb
fix cti (#29812) 
* fix cti

Dead catch - OdfException is never thrown in the try block.

* Update json.lib.php
 2024-06-03 13:43:20 +02:00
Laurent Destailleur
f34b6da91b Debug v20 2024-06-03 13:37:36 +02:00
Laurent Destailleur
e2e3cfcf1a trans 2024-06-03 13:29:47 +02:00
Laurent Destailleur
f4295c2efa Add warning to avoid bad use of report. 2024-06-03 12:31:43 +02:00
Laurent Destailleur
6e06f179f6 Missing field 2024-06-03 11:50:40 +02:00