Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
127,913 Commits 36 Branches 189 Tags
58ba3e31fadd6b7a39e41a6481c2fbeb51cfdbc0
Commit Graph

12838 Commits

Author SHA1 Message Date
Charlène Benke
c1488e15fa bad internal filter with forgeSQLFromUniversalSearchCriteria (#26202) 
the filter (s.client:in:(1,2)) not work, same problem with s.client in (1,2)

we need to use now :   (s.client:in:1,2)
 2023-10-12 18:41:57 +02:00
jyhere
f67f8e54c2 CHANGE: allow to prepend html to morehtmlstatus content in hook (#26197) 2023-10-12 13:55:36 +02:00
Laurent Destailleur
92ec85df26 Debug v19 2023-10-11 14:40:02 +02:00
Laurent Destailleur
ce87d92301 Code comment 2023-10-11 12:22:38 +02:00
Laurent Destailleur
cc552a498c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-11 12:04:37 +02:00
Regis Houssin
cdf4292415 FIX remove DISTINCT when MULTICOMPANY_TRANSVERSE_MODE is used (#26143) 
* FIX (WIP) remove DISTINCT when MULTICOMPANY_TRANSVERSE_MODE is used

* FIX optimize code

* FIX replace with $this->db->prefix()

* FIX works on uniformize MULTICOMPANY_TRANSVERSE_MODE

* FIX syntax error
 2023-10-11 11:38:56 +02:00
Laurent Destailleur
20e3339de3 Clean code 2023-10-11 03:45:53 +02:00
Laurent Destailleur
b3971c54a4 Close #25984 Can have a combo of category with both picto and full path 2023-10-11 03:22:52 +02:00
Laurent Destailleur
616f0e41d4 Clean code 2023-10-11 02:54:19 +02:00
Laurent Destailleur
a7ac0a248f Debug v19 2023-10-11 00:39:38 +02:00
Laurent Destailleur
d4d6c3c03e Fix regex 2023-10-10 23:54:41 +02:00
Laurent Destailleur
946239dbf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-10 23:04:47 +02:00
Laurent Destailleur
d3dd3dacfe Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-10 22:52:04 +02:00
Laurent Destailleur
a9b3732584 Clean code. Setup Show left column was lost on saving page. 2023-10-10 22:36:54 +02:00
Lucas Marcouiller
694dc8d171 New Add js scanner expedition repartition (#26126) 
* add scanner js component

* new line creation

* add security + remove unused code

* add of object to test

---------

Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
 2023-10-10 19:34:54 +02:00
Lucas Marcouiller
97c4898f9c Fix createCommon line creation loop (#26171) 
Co-authored-by: Hystepik <lucas.marcouiller@gmail.com>
 2023-10-10 18:38:50 +02:00
Laurent Destailleur
39b6b34820 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-09 09:36:30 +02:00
Laurent Destailleur
ffbb05167a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-09 09:28:51 +02:00
Laurent Destailleur
793922d468 Fix for compatibility 2023-10-09 09:20:37 +02:00
Laurent Destailleur
b3368514ab NEW Add option MAIN_MAIL_DEBUG_LOG_WITH_DATE to add 1 log file per email 2023-10-09 09:13:27 +02:00
Dev2a
fcd4c4e429 Fix: Change access to $conf->global to function getDolGlobal (automatique) 2023-10-08 23:19:49 +02:00
Laurent Destailleur
d67d9e54c3 Merge pull request #26132 from aspangaro/19a9 
Update fiscal year
 2023-10-08 18:41:57 +02:00
Laurent Destailleur
b5036b7a0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-10-08 12:07:01 +02:00
Alexandre SPANGARO
1534b76082 Update Status 2023-10-07 08:17:26 +02:00
Noé Courtier
06bbb9517b FIX: Use of line->insert instead of line->create 2023-10-06 17:02:26 +02:00
Laurent Destailleur
f4166de704 Fix warning 2023-10-06 16:21:39 +02:00
William Mead
199eeff390 Merge branch 'Dolibarr:develop' into new-fichinter-close-notification 2023-10-06 14:36:29 +02:00
Laurent Destailleur
6cd7ef77fc Merge branch 'develop' into 13.0_fix_sellist_add_order_by_option 2023-10-06 01:42:22 +02:00
Laurent Destailleur
9deebe63d8 Update commonobject.class.php 2023-10-06 01:41:44 +02:00
Laurent Destailleur
c3a9ba5506 Update commonobject.class.php 2023-10-05 21:29:30 +02:00
Laurent Destailleur
b0cc8d7b0d Merge branch '18.0' into 13.0_fix_sellist_add_order_by_option 2023-10-05 21:25:19 +02:00
Laurent Destailleur
b307774dde Update commonobject.class.php 2023-10-05 21:17:40 +02:00
William Mead
b3ce1af29d NEW Added notification on closed intervention 2023-10-05 12:11:39 +02:00
Laurent Destailleur
c3ae353a2a Work on session add 2023-10-04 21:12:50 +02:00
Laurent Destailleur
3700b047ec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-04 13:04:54 +02:00
Laurent Destailleur
40f10588e3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-04 13:04:31 +02:00
Laurent Destailleur
4298150413 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:22:33 +02:00
Alexandre SPANGARO
5f6a4bb785 Merge branch 'develop' into 19a8 2023-10-03 03:27:46 +02:00
Laurent Destailleur
5537ccede2 FIX update_extras must use updateExtraFields 2023-10-03 00:23:06 +02:00
Alexandre SPANGARO
16a0025e93 NEW Project - List - use select2 multiselect for status 2023-10-02 22:57:53 +02:00
Laurent Destailleur
d3dc6615db Remove deprecated use of ->modelpdf (good is ->model_pdf) 2023-10-02 21:49:08 +02:00
Laurent Destailleur
a0248fe9e3 Merge pull request #26036 from atm-sami/NEW_add_data_in_printObjectLine_hook 
add extrafields and defaulttpldir for hook parameters
 2023-10-02 18:29:50 +02:00
Florent Poinsaut
ffee2af478 FiX CI 2023-10-02 17:01:53 +02:00
Florent Poinsaut
25bd19d7e5 Unneccesary else 2023-10-02 16:58:28 +02:00
Florent Poinsaut
17f8bc6c1f Reduce unnecessary complexity 2023-10-02 16:44:44 +02:00
Laurent Destailleur
4cf1dc1a2f Fix picto clear search 2023-10-02 13:21:09 +02:00
Laurent Destailleur
f9288ce862 Look and feel v18 2023-10-02 11:26:26 +02:00
Laurent Destailleur
b2a6823e56 Merge pull request #26087 from hregis/fix_menu_force_entity 
NEW possibility to deselect line when create a recurring invoice + missing to use fk_parent_line
 2023-10-01 17:54:05 +02:00
Laurent Destailleur
b8bd760e28 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 16:06:58 +02:00
Laurent Destailleur
998b5a6dd8 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-01 16:05:13 +02:00