lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
107,049 Commits 43 Branches 150 Tags 886 MiB
1a5beb0664
Commit Graph

26708 Commits

Author SHA1 Message Date
Laurent Destailleur
209ab708d4 FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-22 21:24:34 +01:00
Laurent Destailleur
c63e2c2981 Website tables are created only if module enabled. 2022-02-22 19:15:37 +01:00
Laurent Destailleur
8cc0f3bb58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-02-22 18:47:26 +01:00
Laurent Destailleur
8a99bc3b04 Try a more complete sanitization 2022-02-22 18:41:14 +01:00
Marc de Lima Lucio
0e0dd1ec6c FIX: invoice pdf: lines originating from deposits were not detailed anymore 2022-02-22 17:42:11 +01:00
Laurent Destailleur
f544219d92 FIX permission to download files of expense report with readall. 2022-02-22 16:44:17 +01:00
GregM
e107423c21 fix : change title if html not set 2022-02-22 12:25:30 +01:00
Laurent Destailleur
ff0c4ef635
Merge pull request #19952 from thomas-Ngr/develop_new_ticket_display_statut_warning 
NEW : optional display warning icons on ticket list
 2022-02-22 01:35:33 +01:00
Laurent Destailleur
741fabb983
Merge pull request #20133 from atm-lena/NEW_InventoryExtrafields 
New inventory extrafields
 2022-02-22 00:58:42 +01:00
Laurent Destailleur
eede3aaf17 Fix #yogosha9033 2022-02-21 22:50:32 +01:00
Laurent Destailleur
82250fae62 Fix #yogosha8963 2022-02-21 21:45:28 +01:00
Laurent Destailleur
28ac6a7b55 NEW on redirect of page in website module, GET parameters are kept. 2022-02-21 19:46:11 +01:00
Laurent Destailleur
9dfdce03aa Work on generic reporting tool. 2022-02-21 19:09:26 +01:00
Laurent Destailleur
97ed94fbda NEW Support html content for multiselect component. 2022-02-21 16:54:07 +01:00
BB2A Anthony Berton
d28ba84cb3 Mail sendto default and add filter 2022-02-21 16:15:40 +01:00
BB2A Anthony Berton
2595f1f9ee sens dump 2022-02-21 15:56:09 +01:00
atm-lena
8bbbc843eb Ajout onglet paramètres "Inventaire extrafields" 2022-02-21 15:20:22 +01:00
Laurent Destailleur
00e6d2786d Do not use dol_hash anymore for the name of cookies. 2022-02-21 12:21:43 +01:00
Thomas Negre
ad3f7b531e add constants declarations in the module class 2022-02-21 11:50:28 +01:00
Thomas Negre
e8c48a06c0 Correct typos in ticket.lib 2022-02-21 11:42:09 +01:00
Laurent Destailleur
9e6f782907 Clean code 2022-02-21 11:26:10 +01:00
Laurent Destailleur
9a3d8022f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:38 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2022-02-18 21:50:08 +01:00
Laurent Destailleur
19f51347ea
Merge pull request #20111 from atm-greg/Fix_14.0_price_extrafields_rounding_and_currency 
fix rounding for price and display currency
 2022-02-18 20:19:02 +01:00
lvessiller
1107a60b58 FIX compute rule in FEC import 2022-02-18 16:53:55 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Laurent Destailleur
f4f03d03f2 Fix link 2022-02-18 15:23:13 +01:00
Laurent Destailleur
e41e0f069a Fix creator in PDF. Add log to help to find strange bug 2022-02-18 15:09:52 +01:00
Laurent Destailleur
61e91656e0 FIX setup of member module 
FIX generation of business cards
 2022-02-18 14:14:34 +01:00
Laurent Destailleur
694ea8830b Fix missing name and type into template 2022-02-18 13:46:12 +01:00
Laurent Destailleur
dee5d8f9e8 Standardize name of button 2022-02-18 13:45:28 +01:00
stickler-ci
b5afa27774 Fixing style errors. 2022-02-18 10:09:38 +00:00
atm-greg
12c825ba84 fix rounding for price and display currency 2022-02-18 10:50:00 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
b013c9a15f Fix duplicate div 2022-02-17 20:37:39 +01:00
Laurent Destailleur
ec71eb410e
Merge pull request #20040 from thomas-Ngr/develop_ticket_config_auto_read 
ticket config: auto read ticket
 2022-02-17 19:58:01 +01:00
Laurent Destailleur
c20d824999 Tables of module ticket are create only when module is enabled. 2022-02-17 19:30:18 +01:00
Laurent Destailleur
cbf15af853
Merge pull request #20095 from Hystepik/develop#3 
Fix : fix php 8.0 warnings
 2022-02-17 19:12:39 +01:00
Laurent Destailleur
85327f28b0
Update login.tpl.php 2022-02-17 19:12:24 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
lmarcouiller
aea9c2e427 Fix : fix php 8.0 warnings 2022-02-17 10:22:58 +01:00
Alexandre SPANGARO
0f51fadf38
Merge branch 'develop' into 16a12_assets_code 2022-02-17 04:15:03 +01:00
Laurent Destailleur
c16e013b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
 2022-02-16 21:13:49 +01:00
Laurent Destailleur
131ae92cc6 FIX #20063 2022-02-16 21:05:23 +01:00
Laurent Destailleur
a7fab01059
Merge pull request #20069 from vincentjdc/expensse-report-download-fix 
Fixes expensereport downloads
 2022-02-16 20:37:32 +01:00
Laurent Destailleur
60ada5fe72 Can filter on status purchase on list of products 2022-02-16 14:06:16 +01:00
Vincent Dieltiens
392f468a13 allow to add more CSS and more params on html fields 2022-02-16 10:01:55 +01:00
Alexandre SPANGARO
948f20c2b6 Add a graphical option to define duration per year for depreciation 2022-02-16 05:18:29 +01:00
Laurent Destailleur
453871bf38 css 2022-02-15 23:01:14 +01:00
Laurent Destailleur
50853205bb Support placeholder on multiselect components 2022-02-15 16:43:47 +01:00
Laurent Destailleur
1b53ed09f9 Work on custom report feature 2022-02-15 11:03:48 +01:00
Vincent Dieltiens
af0000d568 Fixes expensereport downloads 2022-02-15 10:13:28 +01:00
atm-greg
96c7a9f77c fix pdf_cornas 2022-02-14 15:16:36 +01:00
atm-greg
3ebdb89133 fix pdf_mucadet 2022-02-14 15:11:26 +01:00
Laurent Destailleur
5d90a00728 Debug v15 2022-02-14 12:27:35 +01:00
Laurent Destailleur
f2d5e43381 Fix showempty for select_salesrepresentatives 2022-02-14 12:25:48 +01:00
stickler-ci
526157dfcb Fixing style errors. 2022-02-14 03:56:45 +00:00
Alexandre SPANGARO
6734a3575e Core 2022-02-14 04:52:39 +01:00
Laurent Destailleur
27b94ceea1 Debug v15 2022-02-13 19:26:16 +01:00
Laurent Destailleur
d5e5e8d436 Debug v15 2022-02-13 17:09:40 +01:00
Laurent Destailleur
8000adb694 Fix test 2022-02-11 18:50:12 +01:00
Laurent Destailleur
eff2fc1e9e Complete option MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT 2022-02-11 18:19:50 +01:00
Laurent Destailleur
89ffe5baba Clean code for param of dol_stringtotime() 2022-02-11 14:07:10 +01:00
Laurent Destailleur
32af067e1e Code comment 2022-02-11 13:01:29 +01:00
Laurent Destailleur
b84fd3ec3d Clean code 2022-02-11 12:46:45 +01:00
Laurent Destailleur
27df3cc02c FIX events on several days may missing the last day in calendar view. 
FIX the drag and drop was not available on some events
 2022-02-11 11:27:50 +01:00
Laurent Destailleur
52bacbd914 Tables for emailing and asset modules are loaded on module activation 2022-02-10 19:21:15 +01:00
Thomas Negre
4c5ddcf030 ticket config: add constant TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND to admin panel 2022-02-10 17:57:28 +01:00
Laurent Destailleur
e0377d788c Send position x,y of cursor into an ACE editors on POST form 2022-02-10 14:34:04 +01:00
Laurent Destailleur
d69f9eca40 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2022-02-10 11:25:15 +01:00
Laurent Destailleur
e901949531 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-10 10:23:52 +01:00
Laurent Destailleur
06fe8c391e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
	htdocs/install/mysql/tables/llx_propaldet.sql
 2022-02-10 10:23:42 +01:00
Laurent Destailleur
11bef4e681
Merge branch 'develop' into 14_fix_sql_extrafields 2022-02-10 10:13:24 +01:00
Laurent Destailleur
e210952f74
Update extrafields.class.php 2022-02-10 10:11:46 +01:00
Laurent Destailleur
77f1649adf
Merge pull request #20012 from atm-adrien/NEW_rec_invoices_15.0_newPR 
NEW Recurring vendor invoices
 2022-02-10 10:09:47 +01:00
Regis Houssin
cc8af7b1d0
FIX not active value are not hidden (missing filter of field) (#20032) 
* FIX not active value are not hidden (missing filter of field)

* FIX wrong category table and wrong object id
 2022-02-10 09:19:14 +01:00
Laurent Destailleur
558db1b935 Fix #yogosha8845 2022-02-09 15:29:21 +01:00
Laurent Destailleur
47800aebfa Fix phpunit and mode save after opening a ref 2022-02-09 15:21:25 +01:00
Laurent Destailleur
6e6c57d0e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-09 13:22:53 +01:00
Laurent Destailleur
3653e8244b NEW Implement the generic method for Kaban views 2022-02-09 13:22:23 +01:00
Adrien Raze
194959c61c FIX : Fixing PR returns 2022-02-09 10:03:30 +01:00
Christian Foellmann
e0a3820b9c fix double VAT line in commande PDF template 2022-02-09 08:01:24 +01:00
Florian HENRY
316cb9e4e3 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_sql_extrafields 2022-02-08 08:46:21 +01:00
Florian HENRY
3f2c04a53c fix sql error return 2022-02-08 08:46:15 +01:00
Laurent Destailleur
bfa9986736
Merge pull request #20013 from thomas-Ngr/develop_db_ticket_last_message_date 
New : ticket add last_msg_sent field
 2022-02-07 20:54:26 +01:00
Laurent Destailleur
c496e6eb51 doc 2022-02-07 20:53:13 +01:00
Thomas Negre
b6b5eb633b only update last_msg_date if a message is really sent. 2022-02-07 17:38:32 +01:00
Florian HENRY
e672b6f6e0 fix: in some case index do not exists and return an error 2022-02-07 16:41:45 +01:00
Florian HENRY
30779be77e fix: if capital is not numeric just display input value 2022-02-07 16:36:47 +01:00
Florian HENRY
228142684b fix: if capital is not numeric just display input value 2022-02-07 16:33:27 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-02-07 15:51:01 +01:00
Thomas Negre
26648e4f12 ticket : update date_last_msg_sent on message sending from backend or public interface 2022-02-07 15:19:13 +01:00
Laurent Destailleur
53bac7ae0f Fix menu 2022-02-07 15:16:11 +01:00
Laurent Destailleur
02ec11ff64 css 2022-02-07 15:07:03 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
Laurent Destailleur
19fdf3dc18 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-07 10:07:30 +01:00
Laurent Destailleur
e8acb551f9 Fix section of attached files for salaries 2022-02-07 09:50:07 +01:00
Laurent Destailleur
856b83a202 CSS 2022-02-07 09:26:03 +01:00
Laurent Destailleur
9b1f04209d NEW Change in theme colors does not need to use the refresh button 2022-02-06 22:11:44 +01:00
Laurent Destailleur
3fa3cd28cd clean code 2022-02-06 15:21:49 +01:00
Laurent Destailleur
3e6d922cc0
Merge pull request #19938 from bb2a/border-table-2 
NEW - Border table
 2022-02-06 14:59:31 +01:00
Laurent Destailleur
6562b24e41 NEW Some core tables are created only at module activation 2022-02-06 13:31:44 +01:00
Laurent Destailleur
2991f992dc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-06 13:28:30 +01:00
Laurent Destailleur
cd491280cf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-06 13:06:27 +01:00
Laurent Destailleur
bd3218b460 Fix remove dead code 2022-02-06 13:06:12 +01:00
Laurent Destailleur
f2120a6463
Merge pull request #19994 from defrance/patch-177 
fix : duration in hour and min (not in second)
 2022-02-06 12:35:59 +01:00
Laurent Destailleur
d1f3411bac
Update list_print_total.tpl.php 2022-02-06 12:35:33 +01:00
Laurent Destailleur
9c0fc59166 Fix #yogosha8791 2022-02-05 19:42:43 +01:00
BENKE Charlene
9977761846
print the good format of totalisation 2022-02-05 12:12:37 +01:00
ATM john
ba46d04d6e Fix logic for form setup 2022-02-04 21:51:33 +01:00
Laurent Destailleur
c53bac831d Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 20:33:32 +01:00
Laurent Destailleur
ba795310b5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-04 20:32:39 +01:00
Laurent Destailleur
7ade138590 Fix phpcs 2022-02-04 20:30:45 +01:00
Laurent Destailleur
c9a685e09d Better error message 2022-02-04 19:21:47 +01:00
Anthony Berton
07c7209c0c
Update pdf.lib.php 2022-02-04 19:05:22 +01:00
Laurent Destailleur
7cc06a0ef9 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-02-04 15:40:28 +01:00
Laurent Destailleur
5249840402 FIX #yogosha8628 2022-02-04 15:14:10 +01:00
Laurent Destailleur
85e198283b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-04 13:18:26 +01:00
Laurent Destailleur
66430f6087 FIX #19939 2022-02-04 13:18:07 +01:00
Laurent Destailleur
a81b437d04
Merge pull request #19971 from atm-quentin/NEW_exclude_natural_search 
NEW Can use ! to make a search that exclude a string
 2022-02-04 12:51:26 +01:00
Laurent Destailleur
4324558d67 FIX backup fails 2022-02-04 12:34:42 +01:00
Laurent Destailleur
a7021008ba Update pdf.lib.php 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2022-02-04 12:27:13 +01:00
Laurent Destailleur
bfea5cd69d
Merge pull request #19966 from habot-it/develop 
Fix "Warning: This option make TCPDF library being crazy sometime and…
 2022-02-04 12:14:26 +01:00
Laurent Destailleur
6894cb3925
Update pdf.lib.php 2022-02-04 12:14:11 +01:00
Laurent Destailleur
5294a9ae2f
Merge pull request #19949 from hregis/fix_works_to_add_prefix_db_function 
Works on replace MAIN_DB_PREFIX by $db->prefix()
 2022-02-04 11:09:51 +01:00
Laurent Destailleur
3a9564ed88
Merge pull request #19976 from bb2a/patch-1 
FIX - Trigger in setPaymentMethods for order
 2022-02-04 09:23:11 +01:00
Laurent Destailleur
a5bdd62268
Merge pull request #19981 from aspangaro/14p30 
FIX Accountancy - Wrong name rule on FEC import
 2022-02-04 09:12:11 +01:00
Alexandre SPANGARO
6d350f9a75 FIX Accountancy - Wrong name rule on import 2022-02-03 05:53:05 +01:00
Laurent Destailleur
3db0a98594 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-02 18:26:15 +01:00
Laurent Destailleur
ef62cd0b18 css 2022-02-02 18:24:30 +01:00
Laurent Destailleur
0259f094bd Fix trans 2022-02-02 18:04:11 +01:00
Laurent Destailleur
ba77700619 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-02 17:58:09 +01:00
Laurent Destailleur
73474a1cea Fix css 2022-02-02 17:57:20 +01:00
Anthony Berton
da91c5f5ef
Update commonobject.class.php 2022-02-02 12:38:22 +01:00
Quentin VIAL-GOUTEYRON
f36a513a10 fix sticler 2022-02-01 16:18:02 +01:00
Laurent Destailleur
35ac8923dd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 16:14:12 +01:00
Laurent Destailleur
1ca1f111b3 Fix warnings 2022-02-01 16:12:51 +01:00
Laurent Destailleur
89a06014da Fix warnings 2022-02-01 15:55:04 +01:00
Laurent Destailleur
44bc197d03 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 13:25:45 +01:00
Laurent Destailleur
6ddc4ba3a0 Fix bad value for total VAT on PDF 2022-02-01 13:23:52 +01:00
Quentin VIAL-GOUTEYRON
e17d3b029e FIX delete criteria 2022-02-01 12:24:04 +01:00
Quentin VIAL-GOUTEYRON
e086d5a5f2 NEW Exclude filter 2022-02-01 12:21:06 +01:00
Laurent Destailleur
d167e022eb Debug v15 2022-01-31 12:08:51 +01:00
Laurent Destailleur
91be7b279e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-30 17:28:23 +01:00
Laurent Destailleur
723b9d101a FIX #yogosha8604 2022-01-30 17:24:10 +01:00
Laurent Destailleur
a9737a91e7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-30 16:31:42 +01:00
Laurent Destailleur
87de9a8a23 Fix #yogosha8590 2022-01-30 16:30:19 +01:00
habot-it
93ae62431c Fix "Warning: This option make TCPDF library being crazy sometime and content on image disappeared!" 2022-01-30 13:09:42 +00:00
Regis Houssin
b2384b624a FIX regression 2022-01-30 11:40:12 +01:00