2
0
forked from Wavyzz/dolibarr
Commit Graph

119528 Commits

Author SHA1 Message Date
Laurent Destailleur
cd2bbc8a87 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-03-15 09:46:44 +01:00
Laurent Destailleur
b97b85fa8c Look and feel v18 2023-03-14 12:05:25 +01:00
Laurent Destailleur
eccb61e95d Look and feel v18 2023-03-14 11:58:46 +01:00
Laurent Destailleur
10be924888 Look and feel v18 2023-03-14 10:58:35 +01:00
Laurent Destailleur
1d07d5ca87 Look and feel v18 2023-03-13 20:20:38 +01:00
Laurent Destailleur
7b91eeb271 Fix phpcs 2023-03-13 16:37:27 +01:00
Laurent Destailleur
ca096089fb Debug v18 2023-03-13 16:28:58 +01:00
Laurent Destailleur
4f7c54c125 Debug v18 2023-03-13 15:57:36 +01:00
Laurent Destailleur
68a2131ae6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-13 13:22:10 +01:00
Laurent Destailleur
7a1404c443 Fix sql 2023-03-13 13:21:48 +01:00
Laurent Destailleur
dc1ba8f447 Fix phpunit 2023-03-13 13:19:24 +01:00
Laurent Destailleur
f29d5c7844 Bettr order for mass action 2023-03-13 13:17:49 +01:00
Laurent Destailleur
d369a640de Fix encryption of api_key 2023-03-13 12:48:25 +01:00
Laurent Destailleur
022e06f4f3 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-13 10:33:47 +01:00
Laurent Destailleur
80678cfcb9 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-03-13 10:30:37 +01:00
Laurent Destailleur
abfd324301 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-13 10:24:01 +01:00
Laurent Destailleur
ade0592a9b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-03-13 10:23:52 +01:00
Laurent Destailleur
04c6cb22a1 Fix universal filter for != 2023-03-13 10:22:40 +01:00
Laurent Destailleur
2ef0f08c97 PHPunit 2023-03-13 10:20:03 +01:00
Laurent Destailleur
f84a8361bc Look and feel v18 2023-03-13 10:05:00 +01:00
Laurent Destailleur
8208884af4 Work on kanban views 2023-03-13 09:45:47 +01:00
Laurent Destailleur
800c2b4779 Look and feel v18 2023-03-13 09:33:31 +01:00
Laurent Destailleur
d6e0d745a8 FIX token error when closing ticket from public interface 2023-03-12 22:11:58 +01:00
Laurent Destailleur
2660948778 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-12 22:08:50 +01:00
Laurent Destailleur
843411ef5d Fix CSS public interface of tickets 2023-03-12 22:02:40 +01:00
Laurent Destailleur
11fd351b3d Some steps to merge manually #22960 2023-03-12 21:31:33 +01:00
Laurent Destailleur
8e282eff9b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-12 20:43:24 +01:00
Laurent Destailleur
9f13f17e36 Close #18253 by manual merge 2023-03-12 20:43:13 +01:00
Laurent Destailleur
ca57a3ef90 Merge pull request #23761 from habot-it/pdf.lib.php
Add options in function pdf_pagefoot & pdf_pagehead of pdf.lib.php
2023-03-12 18:48:23 +01:00
Laurent Destailleur
b49b0126a6 Merge branch 'develop' into pdf.lib.php 2023-03-12 18:47:40 +01:00
Laurent Destailleur
836717cced Update pdf.lib.php 2023-03-12 18:42:35 +01:00
Laurent Destailleur
20d6320818 Update pdf.lib.php 2023-03-12 18:39:58 +01:00
Laurent Destailleur
283d0ce785 Update pdf.lib.php 2023-03-12 18:38:26 +01:00
Laurent Destailleur
f6f70461ee Merge pull request #23802 from glu000/16.0-issue-23799
Fix #23799 External users are not able to create events
2023-03-12 17:48:54 +01:00
Laurent Destailleur
f6b8cd0208 Merge branch '16.0' into 16.0-issue-23799 2023-03-12 17:47:02 +01:00
Laurent Destailleur
534f1868f5 FIX #23899 2023-03-12 17:33:44 +01:00
Laurent Destailleur
5d31949263 Merge pull request #23897 from alexandre-janniaux/getopt-config/1
NEW inc.php: handle parameters from argv
2023-03-12 17:17:46 +01:00
Laurent Destailleur
cb40103d49 Merge pull request #23926 from rycks/16.0_fix_log_of_cmailfile_class_moved_after_bcc_defined
move log after variable updates to get good informations in logs
2023-03-12 17:15:17 +01:00
Laurent Destailleur
f7f3f130aa Update doc 2023-03-12 16:56:25 +01:00
Laurent Destailleur
1fa419f6d8 Merge manually #23950 2023-03-12 14:35:57 +01:00
Laurent Destailleur
6c259fa3b8 Doc 2023-03-12 14:19:25 +01:00
Laurent Destailleur
4b2a2c530e Merge pull request #24079 from Daviid-P/allow_file_upload_not_linked_to_dolibarr_class
Allow FileUpload to be used when $fk_element and $element are null
2023-03-12 14:15:05 +01:00
Laurent Destailleur
3ce9e394a7 Merge pull request #24130 from hregis/fix_multicompany_compatibility
FIX missing drop foreign key before modify field
2023-03-12 14:02:48 +01:00
Laurent Destailleur
3a1e6ff458 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-12 13:56:56 +01:00
Laurent Destailleur
60fe730a48 Look and feel v18 2023-03-12 13:56:15 +01:00
Laurent Destailleur
b8655b99ca Merge pull request #24133 from Easya-Solutions/new-takepos-show-cat-prod-img-size
NEW adapt category and product pictures sizes on takepos
2023-03-12 13:09:42 +01:00
Laurent Destailleur
29417861db Fix bad var shown 2023-03-12 11:54:46 +01:00
Laurent Destailleur
63dc6b0e54 css 2023-03-11 21:40:12 +01:00
Laurent Destailleur
925b47d1b2 Fix css 2023-03-11 21:32:51 +01:00
Laurent Destailleur
5ec52548ab For countries using the 2nd or 3rd tax, we force
MAIN_NO_INPUT_PRICE_WITH_TAX to disable input/edit of lines using the
price including tax (because 2nb and 3rd tax not yet taken into
account).
Work In Progress to support all taxes into unit price entry when
MAIN_UNIT_PRICE_WITH_TAX_IS_FOR_ALL_TAXES is set.
2023-03-11 20:37:01 +01:00