Commit Graph

119472 Commits

Author SHA1 Message Date
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
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
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
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
7dcd050854
Merge pull request #24158 from atm-gauthier/NEW/element_time_code_integration
NEW : element time integration code + sql
2023-03-11 19:16:15 +01:00
Laurent Destailleur
24104118e0 Standardize the selection of the calculation mode in account reports 2023-03-11 15:15:49 +01:00
Laurent Destailleur
8e4f91514e Doc 2023-03-11 13:08:51 +01:00
Laurent Destailleur
c40fd8e708 Fix predefined filter on date for report 2023-03-11 13:03:44 +01:00
Laurent Destailleur
e7192e9814 Fix navigation 2023-03-11 11:39:08 +01:00
Laurent Destailleur
5f1a1e62e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-11 01:34:12 +01:00
Laurent Destailleur
f287106ef2 Doc 2023-03-11 01:31:40 +01:00
Laurent Destailleur
cfd48c20a9 CSS v18 2023-03-11 01:09:22 +01:00
Laurent Destailleur
293d7e8c0c
Merge pull request #24136 from OPEN-DSI/develop_new_orign_when_create_product_batch_from_movement_stock
NEW - Add origin info when create a product batch when created from a movement stock
2023-03-10 22:58:14 +01:00
Laurent Destailleur
17e5ee5f58
Merge pull request #24137 from MaximilienR-easya/dev_New_extrafield_public_ticket_view
extrafields inside public ticket view
2023-03-10 22:57:09 +01:00
Laurent Destailleur
7de853403a
Merge pull request #24143 from Quentin-Seekness/patch-7
Search all on projects
2023-03-10 22:50:33 +01:00
Laurent Destailleur
f8edbc5708
Merge pull request #24105 from FHenry/dev_fix_delete_info_time_spent_invoice_correctly
fix: remove invoice line id and invoice on time spend when delete line
2023-03-10 22:48:55 +01:00
stickler-ci
23f32933b6 Fixing style errors. 2023-03-10 18:42:22 +00:00
atm-gauthier
fd41ab77c3
Merge branch 'develop' into NEW/element_time_code_integration 2023-03-10 19:27:43 +01:00
Laurent Destailleur
f183f41ad3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-10 19:27:01 +01:00
Laurent Destailleur
b1472b2e31 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-10 19:25:25 +01:00
Laurent Destailleur
e216251db4
Merge pull request #24148 from OPEN-DSI/develop_new_triggers_create_expeditionlinebatch
NEW - Add a trigger when create a shipping line batch, fix propagate missing errors
2023-03-10 19:20:34 +01:00
atm-gauthier
a3db19c47b
Update 17.0.0-18.0.0.sql
FIX : drop index in mysql and pgsql
2023-03-10 19:19:54 +01:00
Laurent Destailleur
1cf3cc4813
Merge pull request #24144 from frederic34/patch-8
Fix translation
2023-03-10 19:14:17 +01:00
Laurent Destailleur
c20471bc99
Merge pull request #24152 from OPEN-DSI/develop_new_provide_oldcopy_in_setvaluefrom_function
NEW - Provide the oldcopy value when calling setValueFrom() function with a trigger key
2023-03-10 19:10:23 +01:00
Laurent Destailleur
be2597e2c3
Merge pull request #24155 from frederic34/barcodeenabled
use isModEnabled
2023-03-10 18:40:33 +01:00
Laurent Destailleur
8ac37e1d91
Merge pull request #24159 from bomuux/develop
FIX #20296
2023-03-10 14:50:34 +01:00
Laurent Destailleur
b92f3a0dcd
Merge pull request #24169 from frederic34/reportexportinlist
fix reports to be exportable by module
2023-03-10 14:47:31 +01:00
Laurent Destailleur
0028ca6fb6
Merge pull request #24177 from ATM-Consulting/FIX_16.0_expensereport_add_ndf
Fix expensereport add ndf
2023-03-10 14:46:17 +01:00
Laurent Destailleur
4722191f3b
Merge pull request #24171 from mapiolca/patch-48
FIX  Extrafields in Notes to unify with orders or invoices.
2023-03-10 14:45:45 +01:00
Laurent Destailleur
fc4dbc06fa
Merge pull request #24170 from frederic34/patch-13
typo in fr_FR
2023-03-10 14:45:14 +01:00
Laurent Destailleur
afc60aa853
Merge pull request #24176 from frederic34/fixreload
fix reload supplier order
2023-03-10 14:45:00 +01:00
Laurent Destailleur
0cd5485ed1
Merge pull request #24134 from frederic34/patch-5
remove duplicate
2023-03-10 14:42:09 +01:00
Laurent Destailleur
3692dcccfa
Merge branch 'develop' into patch-5 2023-03-10 14:41:36 +01:00
Laurent Destailleur
63b30397ad
Merge pull request #24142 from rycks/new_add_customer_code_to_invoices_listing
fix #23943 : duplicate code_client
2023-03-10 14:40:27 +01:00
Laurent Destailleur
ae8b213d04 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-10 13:31:02 +01:00