lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
105,187 Commits 43 Branches 150 Tags 886 MiB
revert-19608-patch-2
Commit Graph

93038 Commits

Author SHA1 Message Date
Laurent Destailleur
c038c1881a Merge 2021-10-19 21:04:19 +02:00
Laurent Destailleur
f5f8d2558c
Merge pull request #18244 from Hystepik/develop#3 
Fix php debug bar for php 8.0
 2021-10-19 20:59:19 +02:00
Laurent Destailleur
3c9d8d0d30 Show status of MO on referring page of product. 2021-10-19 20:44:03 +02:00
Laurent Destailleur
b1de75758f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-19 20:04:14 +02:00
Laurent Destailleur
265f3d0ab0 Fix css 2021-10-19 20:03:59 +02:00
Laurent Destailleur
885e70ff03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-19 19:52:33 +02:00
Laurent Destailleur
9f9c1d2f7b css 2021-10-19 19:52:18 +02:00
Laurent Destailleur
99a939df57
Merge pull request #17518 from bb2a/add_option_pdf_global_with_picture 
[NEW] PDF width picture option
 2021-10-19 19:32:44 +02:00
Laurent Destailleur
3a14cd7a16
Update admin.lang 2021-10-19 19:32:28 +02:00
Laurent Destailleur
58941e9a95
Update pdf_other.php 2021-10-19 19:31:06 +02:00
Laurent Destailleur
b1e4e2699b
Merge pull request #18993 from atm-florianm/FIX_13.0_ticket_message_editing_requires_end_date 
FIX 13.0: end date required to edit a ticket message
 2021-10-19 19:05:36 +02:00
Laurent Destailleur
4764075cc7
Merge pull request #19016 from hregis/fix_possibility_to_bypass_main_antivirus_constants 
FIX add possibility to bypass MAIN_ANTIVIRUS_* constants
 2021-10-19 19:04:09 +02:00
Laurent Destailleur
121cb8f708
Merge pull request #19019 from Hystepik/develop#2 
Fix: selectGroupTickets multilevel
 2021-10-19 19:02:35 +02:00
kamel
f328bb32f6 Corrections 2021-10-19 17:34:03 +02:00
Adrien Raze
a3e8d43cf5 FIX : Travis 2021-10-19 17:25:51 +02:00
stickler-ci
d3035975cf Fixing style errors. 2021-10-19 14:52:56 +00:00
Adrien Raze
48b131b3f0 FIX : Retours 2021-10-19 16:50:15 +02:00
Laurent Destailleur
bfdf88ca6c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-19 16:48:00 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Adrien Raze
8daa1a810a FIX : Move interface.php to ajax/ 2021-10-19 16:44:59 +02:00
Adrien Raze
b5b7281094 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_sub_BOM 2021-10-19 16:40:02 +02:00
lmarcouiller
f5942300e0 fix CI bot error 2021-10-19 16:09:06 +02:00
lmarcouiller
d8cd6b6f55 Fix autoselect multilevel 2021-10-19 15:54:25 +02:00
Regis Houssin
db01fed447 FIX error when defining an already existing constant 2021-10-19 12:36:33 +02:00
Laurent Destailleur
6193e31eb4
Merge pull request #18999 from polkiko/payment_receipt 
NEW Added linked files page and send mail possibility in payments
 2021-10-19 12:25:37 +02:00
Regis Houssin
acbae5cafb FIX add possibility to bypass MAIN_ANTIVIRUS_* constants 2021-10-19 12:14:42 +02:00
Laurent Destailleur
572ed7db5b
Merge pull request #19001 from atm-gauthier/fix_hrm_list_filters 
FIX : keyval filters on lists don't work
 2021-10-19 11:10:19 +02:00
Laurent Destailleur
32ffd6f0f9
Merge pull request #19015 from Hystepik/develop#2 
FIX: boxes php 8.0 errors and warnings
 2021-10-19 11:09:44 +02:00
Laurent Destailleur
5e26e2a71a Trans 2021-10-19 10:54:09 +02:00
lmarcouiller
dd6457b259 FIX: boxes php 8.0 errors and warnings 2021-10-19 10:24:59 +02:00
Gauthier PC portable 024
0276cef4ad FIX : new modulebuilder template method 2021-10-19 09:09:01 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
252c910962 Debug feature for proposal signature 2021-10-18 20:46:28 +02:00
Jesús Jerez
43ac3230c3
Merge branch 'develop' into payment_receipt 2021-10-18 19:53:36 +02:00
Laurent Destailleur
297580ed11
Merge pull request #19011 from Hystepik/develop#2 
NEW: Online proposal signature
 2021-10-18 19:41:58 +02:00
Laurent Destailleur
eefa65f49b
Merge pull request #19006 from OPEN-DSI/v14-fix-propal-validate-with-pdf-options 
FIX generate documents with PDF options
 2021-10-18 19:29:58 +02:00
Laurent Destailleur
34abd39c0c
Merge pull request #19000 from aspangaro/14p12 
FIX #18912 Accountancy - SQL error when custom group is added without country defined
 2021-10-18 19:27:44 +02:00
Laurent Destailleur
8bc826bdda
Merge pull request #19004 from atm-florianm/FIX_14.0_typo_in_mode_parameter_for_adherent_list 
FIX 14.0 - due to a typo in the 'mode' parameter, the "first name" co…
 2021-10-18 19:23:52 +02:00
Laurent Destailleur
a81d6ef405 Debug v15 2021-10-18 19:13:36 +02:00
Laurent Destailleur
b0230ad42b Look and feel v15 2021-10-18 16:45:14 +02:00
Laurent Destailleur
2262646391 Standardize name of page 2021-10-18 16:04:49 +02:00
Laurent Destailleur
c98f28ffc8 Clean code 2021-10-18 15:57:33 +02:00
Laurent Destailleur
f1d646bded Look and feel v15 2021-10-18 15:41:55 +02:00
lmarcouiller
a324f74d88 update newonlinesign.php with border 2021-10-18 15:35:15 +02:00
lmarcouiller
9fc6be78e0 fix tcpdi.php each to foreach 2021-10-18 15:26:18 +02:00
lvessiller
98a613edec FIX show end hours in events linked to objects 2021-10-18 14:31:37 +02:00
lmarcouiller
0c2cf9980d NEW: online propal signature 2021-10-18 14:28:30 +02:00
Laurent Destailleur
e442fcb07e Trans 2021-10-18 12:22:27 +02:00
Laurent Destailleur
51f342c81a Clean code 2021-10-18 12:20:51 +02:00
atm-florian
c016a20aac FIX 13.0 - due to a typo in the 'mode' parameter, the "first name" column of the list of members displays the full name 2021-10-18 12:12:38 +02:00
lvessiller
a52ceaf1d2 FIX generate documents with PDF options 2021-10-18 12:12:00 +02:00
atm-florian
d0d5955fb1 FIX 13.0: sometimes firstname was mistyped as fistname 2021-10-18 12:09:33 +02:00
Laurent Destailleur
11230ebf7f Clean code 2021-10-18 12:05:40 +02:00
Alexandre SPANGARO
053740792f Update accounting.lib.php 2021-10-18 10:19:50 +02:00
Alexandre SPANGARO
9685695577 FIX Accountancy - PHP8 2021-10-18 10:19:46 +02:00
kamel
152aab4903 Add test if actual entity is different to the entity provided 2021-10-18 10:10:31 +02:00
lmarcouiller
c3a45dabad Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-10-18 09:51:45 +02:00
atm-florian
aff8d9c24a FIX 13.0 PR #18993: add comment on modified part 2021-10-18 09:46:20 +02:00
atm-florian
2ff75dfab4 FIX 13.0 feedback of PR #18993: make ticket messages punctual events with attr percentage = -1 2021-10-18 09:43:05 +02:00
Gauthier PC portable 024
cf63412fee FIX : keyval filters on lists don't work 2021-10-18 09:39:10 +02:00
Alexandre SPANGARO
dce1e56a78 FIX #18912 Accountancy - SQL error when custom group is added without country defined 2021-10-18 05:44:22 +02:00
Polkiko
c9ee0e5f93 Fixed error 2021-10-18 01:55:16 +02:00
stickler-ci
4c5e959911 Fixing style errors. 2021-10-17 23:52:24 +00:00
Polkiko
074b5589bd NEW Added documents page and send mail possibility in payments 
- Documents page has been added to the payments page so that documents can be linked and see the generated pdf documents.
- The possibility of sending payments by email has been added, attaching the payment receipts in pdf.
- In pdf standard model of payment, the possibility of seeing the active iban of a third party has been added if it exists.
 2021-10-18 01:15:12 +02:00
Laurent Destailleur
5221c9e38f Fix editline 2021-10-17 19:41:17 +02:00
Laurent Destailleur
7bcc76c1aa Fix margin rates and mark rates are 2 different columns 2021-10-17 19:41:02 +02:00
Laurent Destailleur
b318ccb2af Fix margin rates and mark rates are 2 different columns 2021-10-17 19:39:56 +02:00
Laurent Destailleur
099b2da2dc FIX #18974 2021-10-17 18:58:34 +02:00
Laurent Destailleur
1dec9877c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-17 17:17:30 +02:00
Laurent Destailleur
336b6cb7fc Fix editline 2021-10-17 17:17:08 +02:00
Laurent Destailleur
514bcc87ea Sync transifex 2021-10-17 15:53:29 +02:00
Laurent Destailleur
0aa90e82ea Clean code 2021-10-17 15:47:29 +02:00
Laurent Destailleur
c7152e5c7d
Merge pull request #18965 from vincentjdc/expensereport-pdf-preview 
NEW Preview of pdf files of expense report line
 2021-10-17 15:06:42 +02:00
Laurent Destailleur
79177b0a11 Rename method into selectLotDataList 2021-10-17 14:38:12 +02:00
Laurent Destailleur
78523e852d css 2021-10-17 14:04:49 +02:00
Laurent Destailleur
30d25bcb52 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-17 14:03:07 +02:00
Laurent Destailleur
30ba753b34 css 2021-10-17 14:02:37 +02:00
Laurent Destailleur
bd73545d08
Merge pull request #18985 from henrynopo/patch-5 
Fix the rounding issue in case of multi-currency
 2021-10-17 13:50:35 +02:00
Laurent Destailleur
7bfad108a8
Merge pull request #18995 from aspangaro/14p11 
FIX User salary card - translation problem
 2021-10-17 13:49:44 +02:00
Laurent Destailleur
0727e182ac
Merge pull request #18997 from hregis/fix_add_zstd_compression 
NEW add support for zstd compression
 2021-10-17 13:49:06 +02:00
Laurent Destailleur
766ad9601e css 2021-10-17 13:45:28 +02:00
Laurent Destailleur
b66155de4b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/filefunc.inc.php
 2021-10-17 13:30:13 +02:00
Laurent Destailleur
5b726635d4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-17 13:27:33 +02:00
Laurent Destailleur
10bd8db9b1 css 2021-10-17 13:27:14 +02:00
Laurent Destailleur
ccf78a1af4 FIX Use of accent into filename of GED 2021-10-17 12:30:08 +02:00
Laurent Destailleur
b30d7371a4 Fix allow ' - ' into file name 2021-10-17 12:21:22 +02:00
stickler-ci
9fa6a8daa7 Fixing style errors. 2021-10-17 10:05:58 +00:00
Regis Houssin
84e4bd8820 NEW add zstd compression 2021-10-17 11:59:25 +02:00
Alexandre SPANGARO
fb30136202 Translation 2021-10-17 08:12:28 +02:00
Alexandre SPANGARO
e9ecb2e1ee Translation 2021-10-17 08:11:34 +02:00
Alexandre SPANGARO
102c8a5772 FIX User salary card - translation problem 2021-10-17 08:02:28 +02:00
Laurent Destailleur
8bdece7101 CSS 2021-10-16 21:43:48 +02:00
Laurent Destailleur
ee6780c46e FIX #18968 2021-10-16 21:37:12 +02:00
Laurent Destailleur
48f6ebc344
Merge pull request #18971 from javieralapps4up/develop 
Update factures.php
 2021-10-16 21:24:29 +02:00
Laurent Destailleur
759502829c
Merge pull request #18973 from atm-maxime/fix_member_from_third 
Fix member creation from thirdparty extrafields
 2021-10-16 21:23:47 +02:00
Laurent Destailleur
68bb625ec7
Merge pull request #18976 from PyroShape/142 
FIX : #18634 : Problem of virtual stock with reception module enabled
 2021-10-16 21:23:08 +02:00
Laurent Destailleur
1c07385aba
Update product.class.php 2021-10-16 21:22:53 +02:00
Laurent Destailleur
c896c05464
Merge pull request #18989 from FHenry/dev_18986 
NEW: Add budget field into task #18986
 2021-10-16 21:16:01 +02:00
Laurent Destailleur
830e067eff Fix for tzuser 2021-10-16 21:03:47 +02:00
Laurent Destailleur
5a4383c9ac Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-16 20:07:19 +02:00
Laurent Destailleur
f2757a63a1 Clean code 2021-10-16 20:06:58 +02:00
Laurent Destailleur
308d408cd0
Merge pull request #18980 from OPEN-DSI/v14-fix-print-date-user-timezone 
FIX user date timezone offset
 2021-10-16 20:03:42 +02:00
Laurent Destailleur
94c48d3573 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-16 19:40:22 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
16293d768d
Merge pull request #18972 from hregis/fix_wrong_accented_characters 
FIX wrong accented characters with DolGraph
 2021-10-16 19:23:31 +02:00
Laurent Destailleur
25967da832
Merge pull request #18970 from hregis/fix_avoid_warning_non_numeric 
FIX avoid non-numeric warning
 2021-10-16 19:22:16 +02:00
Laurent Destailleur
2b5bc202fc
Merge pull request #18984 from henrynopo/patch-2 
Supplier Invoice Payment List
 2021-10-16 19:19:34 +02:00
Laurent Destailleur
1bee543eef
Merge pull request #18987 from atm-gauthier/NEW_more_param_on_function_deleteByParentField 
NEW : we need to be able to put more filters on deleteByParentField() function
 2021-10-16 19:11:52 +02:00
Laurent Destailleur
9469c0dc2b
Update commonobject.class.php 2021-10-16 19:10:50 +02:00
Laurent Destailleur
bbe867a7a9
Update commonobject.class.php 2021-10-16 19:06:50 +02:00
Laurent Destailleur
d60f4121ee
Merge pull request #18991 from FHenry/dev_new_option_pdfA_setting 
NEW: add setting to create PDF in PDF/A - 1b format #18990
 2021-10-16 19:04:52 +02:00
Laurent Destailleur
5dfbd3642f
Update pdf.php 2021-10-16 19:03:20 +02:00
Laurent Destailleur
a28d01ca83 Use PDF/A format instead of PDF 2021-10-16 18:59:01 +02:00
Laurent Destailleur
bbbc58ec02
Update admin.lang 2021-10-16 18:55:34 +02:00
Laurent Destailleur
bd52613331 Fix phpcs 2021-10-16 17:06:10 +02:00
Laurent Destailleur
7bb840fb04 Add a line to know instance uses not stable level of features 2021-10-16 16:58:55 +02:00
Laurent Destailleur
a0c81d6230 Prepare 13.0.5 2021-10-16 13:23:59 +02:00
Laurent Destailleur
7ff3e4253f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-16 13:01:27 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
Laurent Destailleur
46eed3767f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-16 12:54:05 +02:00
Laurent Destailleur
52890c64c1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/compta/prelevement/create.php
 2021-10-16 12:53:57 +02:00
Laurent Destailleur
faf80b94e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/stats/index.php
 2021-10-16 12:49:18 +02:00
Laurent Destailleur
a2733344e7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-16 12:33:32 +02:00
Laurent Destailleur
07052196e2 Fix popup message on sepa creation 2021-10-16 12:33:19 +02:00
lmarcouiller
9eb8dadfd9 WIP : signature of propal 2021-10-15 16:58:59 +02:00
atm-florian
bd7e3e57ca FIX 13.0: end date required to edit a ticket message 2021-10-15 16:56:38 +02:00
Florian HENRY
26c50b9e2c add setting to create PDF in PDF/A - 1b format #18990 2021-10-15 11:59:12 +02:00
Florian HENRY
aeffad4c0f fix order 2021-10-15 11:02:05 +02:00
Florian HENRY
ab9ba4e0a2 NEW: feature #18986 2021-10-15 10:53:17 +02:00
Laurent Destailleur
0865916fe2 Init page for public subscription 2021-10-15 10:43:27 +02:00
Gauthier PC portable 024
5ef681ef91 FIX : stickler 2021-10-15 10:36:47 +02:00
Florian HENRY
5f4410468d add filed budget in task 2021-10-15 10:24:56 +02:00
Gauthier PC portable 024
412746ec8f NEW : we need to be able to put more filters on deleteByParentField() function 2021-10-15 10:18:32 +02:00
stickler-ci
fb79aaeb0c Fixing style errors. 2021-10-15 07:19:49 +00:00
Henry
0cb1972674
Update card.php 2021-10-15 15:07:48 +08:00
Henry
316bc16634
Update card.php 2021-10-15 15:05:13 +08:00
Henry
3d62ee22d3
Supplier Invoice Payment List 
fix the missing multicurrency payments and remainders
 2021-10-15 11:13:40 +08:00
atm-lena
ff7727466a Function updateExtrafield : replace empty value to null 2021-10-14 17:13:44 +02:00
lvessiller
5d22eeeff2 FIX user date timezone offset 2021-10-14 16:06:22 +02:00
Laurent Destailleur
a6c3c6b7ec url 2021-10-14 15:56:01 +02:00
Laurent Destailleur
3875d26a2f Fix filter for supplierinvoice stats 2021-10-14 15:55:12 +02:00
Laurent Destailleur
db3d16f080 Fix filter tag for supplier invoice statistics 2021-10-14 15:43:35 +02:00
Laurent Destailleur
8bf396c0cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-14 14:56:28 +02:00
Laurent Destailleur
27e8b17aaf NEW Add STOCK_MOVEMENT_LIST_HIDE_UNIT_PRICE to hide unit price on 
movement list.
 2021-10-14 14:49:01 +02:00
Laurent Destailleur
bc230dbfc2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-14 12:00:33 +02:00
Laurent Destailleur
371c75e76a FIX list of categories in stats of supplier invoices 2021-10-14 11:58:21 +02:00
Benjamin Chantalat
3438a4a9f6 Add the module reception to the calcul of virtual stock 2021-10-14 09:33:26 +02:00
Alexandre SPANGARO
9e3a00521d FIX also on customer index for automatic binding 2021-10-13 21:36:04 +02:00
Alexandre SPANGARO
5d7587259d FIX Accountancy - If deposit invoice is used, force binding in deposit accounting account to solve transaction 2021-10-13 21:21:16 +02:00
Maxime Kohlhaas
3c33770f00 Fix member creation from thirdparty extrafields 2021-10-13 15:30:49 +02:00
Regis Houssin
b612815aed FIX wrong accented characters with DolGraph 2021-10-13 14:43:42 +02:00
stickler-ci
d264bbca3c Fixing style errors. 2021-10-13 12:36:58 +00:00
javieralapps4up
230af38010
Update factures.php 
When the list is greater than $ conf-> liste_limit, no more pages are output
 2021-10-13 14:34:50 +02:00
Regis Houssin
f14de50bd7 FIX check if numeric value 2021-10-13 14:26:43 +02:00
Regis Houssin
ce37323f69 FIX avoid non-numeric warning 2021-10-13 14:14:30 +02:00
Alexandre SPANGARO
41d6a96342 Merge remote-tracking branch 'upstream/develop' into 15a23 2021-10-13 03:29:57 +02:00
Alexandre SPANGARO
3a04a0115b Add data sortorder 2021-10-13 03:26:39 +02:00
Laurent Destailleur
726190b5d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-13 03:21:02 +02:00
Alexandre SPANGARO
04091169da Accountancy - Show message for admin if accountancy hidden options are activated to help to resolve some problems 2021-10-13 02:48:42 +02:00
Laurent Destailleur
4fc93ca7fa Fix css 2021-10-13 02:36:23 +02:00
Laurent Destailleur
507d5962ab
Merge pull request #18960 from vincentjdc/project-edit-fordid-supplier-order 
Add an option to forbid changing the project of a supplier order
 2021-10-13 01:55:37 +02:00
Laurent Destailleur
365d5d4588
Update card.php 2021-10-13 01:55:24 +02:00
Laurent Destailleur
4d48be415c
Fight against inflation of minor options 2021-10-13 01:53:44 +02:00
Laurent Destailleur
0ecf9ebc41
Update admin.lang 2021-10-13 01:52:53 +02:00
Laurent Destailleur
93eff144e5
Update admin.lang 2021-10-13 01:52:38 +02:00
Laurent Destailleur
c084bafbe3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-13 01:49:23 +02:00
Laurent Destailleur
e6c451cdae Fix responsive 2021-10-12 23:50:23 +02:00
Vincent Dieltiens
7f07d82d3f Rename FORBID_EDIT_PROJECT_ON_SUPPLIER_ORDER into SUPPLIER_ORDER_FORBID_EDIT_PROJECT 2021-10-12 23:34:00 +02:00
Vincent Dieltiens
d50c1a7603 preview of expense report file using pdf file instead of generated image 2021-10-12 23:27:22 +02:00
Laurent Destailleur
b2d0186011
Merge pull request #18963 from vincentjdc/supplier-order-list-valid-approve-dates 
NEW Add date_valid and date_approve columns in the list of supplier orders
 2021-10-12 23:18:46 +02:00
Vincent Dieltiens
d58f334348 Add date_valid and date_approve columns in the list of supplier orders 2021-10-12 21:34:24 +02:00
Laurent Destailleur
fe3e11a104
Merge pull request #18957 from OPEN-DSI/v14-fix-takepos-payment-style 
FIX payment style and html5 tags
 2021-10-12 16:45:56 +02:00
lvessiller
ab4da186c5 FIX 2 columns for total labels 2021-10-12 15:52:59 +02:00
Laurent Destailleur
ff15292b49
Merge pull request #18949 from aspangaro/15a26 
NEW Accountancy - Format FEC/FEC2 - Add column NumFacture
 2021-10-12 15:29:10 +02:00
Laurent Destailleur
c4c8d215c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-12 15:26:37 +02:00
Laurent Destailleur
2ef5522169
Merge pull request #18956 from Hystepik/develop#2 
NEW : Move of mailing attendies
 2021-10-12 15:26:22 +02:00
Laurent Destailleur
7f53d9f8e5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-12 15:25:58 +02:00
Laurent Destailleur
605aea62ca FIX TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT #18957 2021-10-12 15:25:44 +02:00
Laurent Destailleur
6bd1bc767b doc 2021-10-12 15:17:34 +02:00
Vincent Dieltiens
8370973a9d Add an option to forbird changing the project of a supplier order if validated or if in draft but already has a reference (not ) 2021-10-12 15:17:14 +02:00
Laurent Destailleur
f3ea05b701
Merge pull request #17873 from atm-quentin/FIX_multiple_order_linked_to_facture 
NEW when multiple order linked to facture, show list into note.
 2021-10-12 14:30:34 +02:00
lvessiller
1788508963 FIX payment style and html5 tags 2021-10-12 14:11:19 +02:00
lmarcouiller
415489c9fc NEW : Move of mailing attendies 2021-10-12 13:58:38 +02:00
lmarcouiller
0100cb4192 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-10-12 13:10:59 +02:00
Laurent Destailleur
34f2b2b68d
Merge branch 'develop' into 15a25 2021-10-12 12:50:30 +02:00
Laurent Destailleur
d75138b362
Merge pull request #18946 from atm-lena/13.0_FIX_HookCreateDictionaryFieldList_HTMLTRTag 
Hook createDictionaryFieldList :  tr html tag to right place
 2021-10-12 12:46:04 +02:00
Laurent Destailleur
3a7681c186
Merge pull request #18945 from PyroShape/14b 
FIX : Remove not complete order from the virtual stock
 2021-10-12 12:44:22 +02:00
Laurent Destailleur
faf3700dcc
Merge pull request #18947 from altairisfr/TICKETS_MESSAGE_FORCE_MAIL 
NEW : add constant TICKETS_MESSAGE_FORCE_MAIL
 2021-10-12 12:38:20 +02:00
Laurent Destailleur
1dbf75cab4
Merge pull request #18953 from Hystepik/develop#1 
FIX fatal error in php 8.0
 2021-10-12 12:34:15 +02:00
Laurent Destailleur
65e069a049 Fix var not initialized 2021-10-12 12:14:03 +02:00
Laurent Destailleur
eb73da5abc Fix set origin. 2021-10-12 12:04:43 +02:00
Laurent Destailleur
791a7206ee Fix var not defined 2021-10-12 11:48:51 +02:00
lmarcouiller
bac0c3d7c8 Fix fatal error on php 8.0 2021-10-12 11:30:35 +02:00
Lucas Marcouiller
10d1f81dcb first fix sendmail event 2021-10-12 10:53:10 +02:00
Laurent Destailleur
6168e844bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-12 01:43:20 +02:00
Laurent Destailleur
ed3b267d8f Fix css 2021-10-12 01:40:30 +02:00
Alexandre SPANGARO
de98900cb7 NEW Accountancy - Format FEC/FEC2 - Add column NumFacture 2021-10-11 22:00:59 +02:00
Laurent Destailleur
2e32254574 Fix rul to shipment files 2021-10-11 20:36:10 +02:00
Laurent Destailleur
c4ca9e92a6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-11 20:18:46 +02:00
Laurent Destailleur
4e9c7c9efb FIX Attachment of pdf into shipment when sending email 2021-10-11 20:04:45 +02:00
Christophe Battarel
96bdd61684 NEW : add constant TICKETS_MESSAGE_FORCE_MAIL 2021-10-11 17:36:31 +02:00
Laurent Destailleur
3a32787f15 Fix for backward compatibility 2021-10-11 16:14:34 +02:00
Laurent Destailleur
5fc0802eb1 Fix for backward compatibility 2021-10-11 16:13:55 +02:00
atm-lena
7c8bde885b hook createDictioaryFieldList : tr html tag to right place 2021-10-11 16:03:56 +02:00
Laurent Destailleur
5666c63de2
Merge pull request #18850 from atm-gauthier/NEW/integration_GPEC_code 
New : integration gpec, source code
 2021-10-11 15:39:54 +02:00
Laurent Destailleur
b51c904d2b
Merge pull request #18943 from Hystepik/develop#1 
FIX: creation of project backtopage
 2021-10-11 15:31:43 +02:00
Laurent Destailleur
f3c16ba490
Merge pull request #18905 from indelog/fix_origin_invoice_custom 
Fix creataing invoice originating for custom module object
 2021-10-11 15:26:07 +02:00
Laurent Destailleur
b29bd325fe
Update card.php 2021-10-11 15:25:25 +02:00
Benjamin Chantalat
91164951de Remove not complete order from virtual stock 2021-10-11 15:24:56 +02:00
Laurent Destailleur
e3045f24cd
Merge pull request #18923 from aspangaro/15a24 
NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account
 2021-10-11 15:20:27 +02:00
Lucas Marcouiller
bbf5cb5db1 FIX: creation of project backtopage 2021-10-11 15:02:53 +02:00
Indelog
94875cdc77 Fix : Re-add bloc to set $withtargettype and $withsourcetype 2021-10-11 13:37:37 +02:00
Alexandre SPANGARO
af8e8077b1 Uniformize 2021-10-11 12:50:16 +02:00
Alexandre SPANGARO
e899d94ed5 NEW Accountancy - rewrite bind accountancy code finding on purchase invoice 2021-10-11 12:50:07 +02:00
Anthony Berton
8bbbe7b8bb Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Edit_in_propal 2021-10-11 12:11:08 +02:00
Laurent Destailleur
33761f9de3
Merge pull request #18917 from FHenry/NEW_dev_filter_from_dt_to_dt_actionlist 
NEW:Add filter from date to date into action/evt list
 2021-10-11 11:51:48 +02:00
Laurent Destailleur
33e811ee96
Merge pull request #18926 from FHenry/fix_get_thirdparties_option_select 
fix: option COMPANY_SHOW_ADDRESS_SELECTLIST and SOCIETE_ADD_REF_IN_LIST work in ajaxcompanies
 2021-10-11 11:50:35 +02:00
Laurent Destailleur
dc7143cb77
Merge pull request #18919 from OPEN-DSI/new-takepos-receipt-free-label 
NEW print without details
 2021-10-11 11:23:54 +02:00
atm-florian
57052e2fba FIX PR#18931 Remove useless explicit call to dol_shutdown 2021-10-11 11:10:14 +02:00
Laurent Destailleur
05ddcf5132
Merge pull request #18927 from vincentjdc/supplier-order-export-validation-date-user 
NEW Allow exporting supplier order validation date + validation user
 2021-10-11 11:09:31 +02:00
Laurent Destailleur
279b78db49
Merge pull request #18928 from vincentjdc/supplier-proposal-reload-supplier-change 
Reload page if RELOAD_PAGE_ON_SUPPLIER_CHANGE is not empty
 2021-10-11 11:08:49 +02:00
Laurent Destailleur
9c749a37b1
Merge pull request #18930 from OPEN-DSI/v14-fix-optionals-create-card 
FIX optional visibility on create card
 2021-10-11 11:07:56 +02:00
Laurent Destailleur
c9972b9eea
Merge pull request #18937 from PyroShape/142 
Fix date format into supplier order info tab
 2021-10-11 11:04:39 +02:00
Laurent Destailleur
b43dcb24f0
Update fournisseur.commande.class.php 2021-10-11 11:04:21 +02:00
Laurent Destailleur
8ba05cc242
Merge pull request #18936 from PyroShape/14 
FIX #18875 in v14
 2021-10-11 10:26:55 +02:00
Laurent Destailleur
3222f39277
Merge pull request #18938 from andreubisquerra/develop 
Improve TakePOS notes
 2021-10-11 10:26:24 +02:00
Alexandre SPANGARO
754b13a83f NEW Add sortorder on units list 2021-10-11 08:58:00 +02:00
Laurent Destailleur
da815476fd Fix edit field from tab bank transfer of invoice 2021-10-11 02:00:12 +02:00
Laurent Destailleur
dbf2c0be7e Fix warning 2021-10-11 01:49:50 +02:00
Laurent Destailleur
a57925b0b7 FIX edition of fields on credit transfer tab 2021-10-11 01:43:36 +02:00
Laurent Destailleur
977a596500 Fix edit link 2021-10-11 01:27:21 +02:00
Laurent Destailleur
7c1d955f6c Fix: avoid to show warning in some cases 2021-10-11 01:23:00 +02:00
Laurent Destailleur
92a4000e73 css 2021-10-10 21:40:01 +02:00
Laurent Destailleur
7180f5eeff css 2021-10-10 21:25:46 +02:00
Benjamin Chantalat
a7563ff62e Fix : Found non quoted or not casted var into sql request 2021-10-10 21:15:14 +02:00
Laurent Destailleur
874731af84 The 'action=delete&file=...' has been replaced with 
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
 2021-10-10 21:11:48 +02:00
stickler-ci
73bd05606c Fixing style errors. 2021-10-10 18:53:22 +00:00
Benjamin Chantalat
65c0167d07 ADD : info of number of product still to dispatched in a supplier order 2021-10-10 20:50:51 +02:00
Laurent Destailleur
ff5f371428 Fix add protection to avoid deletion of page when deleting a file 2021-10-10 20:46:06 +02:00
andreubisquerra
be60293554
Travis fix 2021-10-10 08:58:17 +02:00
andreubisquerra
92756e1864
Improve public note 2021-10-09 23:48:35 +02:00
Benjamin Chantalat
6e60e1f453 Fix date format into supplier order info tab 2021-10-09 20:38:46 +02:00
Benjamin Chantalat
de17b367c8 FIX #18875 in v14 2021-10-09 20:14:16 +02:00
atm-florian
2da16ade6c FIX: consistent UX when calling a tab from the invoice card with empty ref / id 2021-10-08 17:24:52 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Vincent Dieltiens
6553defc14 Reload page if RELOAD_PAGE_ON_SUPPLIER_CHANGE is not empty 2021-10-08 13:17:43 +02:00
Florian HENRY
5d393f201c fix sql 2021-10-08 13:17:09 +02:00
Florian HENRY
0d47797be7 fix sql 2021-10-08 13:14:08 +02:00
Florian HENRY
7ffa8a14ab fix: option COMPANY_SHOW_ADDRESS_SELECTLIST and SOCIETE_ADD_REF_IN_LIST work in ajaxcompanies 2021-10-08 13:10:44 +02:00
Vincent Dieltiens
592fff1cfa Allow exporting supplier order validation date + validation user 2021-10-08 13:09:16 +02:00
Laurent Destailleur
1b504b3e2c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-08 12:15:18 +02:00
Laurent Destailleur
2f61c4e93b Add onbeforecopy and onbeforecut into the WAF 2021-10-08 12:14:42 +02:00
Laurent Destailleur
806d832549 Fix canonical url for open graph 2021-10-08 12:00:13 +02:00
Gauthier PC portable 024
3c5bf190a1 FIX : langs 2021-10-08 11:56:35 +02:00
Laurent Destailleur
a057c7c2a7 Add og graph 2021-10-08 11:49:28 +02:00
Gauthier PC portable 024
6c548d064f FIX : IHM 2021-10-08 11:47:35 +02:00
Laurent Destailleur
da0a9e13f5 Fix twitter tag 2021-10-08 11:41:45 +02:00
Laurent Destailleur
cb490c0eac Allow twitter cards per page. 2021-10-08 11:06:28 +02:00
Laurent Destailleur
816e4cdde6 Comment 2021-10-08 10:59:11 +02:00
Gauthier PC portable 024
82a299538b FIX : travis 2021-10-08 10:56:51 +02:00
Gauthier PC portable 024
f4ffeacba8 FIX : travis 2021-10-08 10:20:27 +02:00
Gauthier PC portable 024
1329df69c6 FIX : travis 2021-10-08 10:13:19 +02:00
Gauthier PC portable 024
03d7a8e946 FIX : travis 2021-10-08 10:04:35 +02:00
Gauthier PC portable 024
0f6d29549b FIX : travis 2021-10-08 09:57:33 +02:00
Gauthier PC portable 024
e00dcb4f73 FIX : travis 2021-10-08 09:48:17 +02:00
Gauthier PC portable 024
47e1d4f867 FIX : useless function 2021-10-08 09:39:04 +02:00
Gauthier PC portable 024
eb5c7d1f6f FIX : travis 2021-10-08 09:22:35 +02:00
Gauthier PC portable 024
36aff80387 FIX : travis 2021-10-08 09:12:48 +02:00
Alexandre SPANGARO
00eafcb6e7 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:50:22 +02:00
Alexandre SPANGARO
c7fd9328cd NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-08 06:29:22 +02:00
Alexandre SPANGARO
e68d9dc73c NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 22:02:56 +02:00
Florian HENRY
677002e834 fix travis 2021-10-07 20:20:29 +02:00
Florian HENRY
ac41d76b22 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_dev_filter_from_dt_to_dt_actionlist 2021-10-07 20:19:38 +02:00
Gauthier PC portable 024
6fdd1c49f3 FIX : travis 2021-10-07 17:29:20 +02:00
Laurent Destailleur
17d2c3cb08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/website/class/websitepage.class.php
 2021-10-07 16:10:48 +02:00
Laurent Destailleur
b905b1b4bc FIX missing filter status=1 on rss feeds 2021-10-07 16:09:32 +02:00
Gauthier PC portable 024
4094d94bd6 FIX : travis 2021-10-07 14:41:15 +02:00
Gauthier PC portable 024
da52b00aef fix br 2021-10-07 14:32:16 +02:00
Gauthier PC portable 024
0a73b28742 FIX : travis 2021-10-07 14:18:03 +02:00
Gauthier PC portable 024
3740ae90f1 Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-07 13:19:33 +02:00
Gauthier PC portable 024
12488f4a29 FIX : travis 2021-10-07 13:19:21 +02:00
stickler-ci
5e02548abb Fixing style errors. 2021-10-07 10:30:32 +00:00
Gauthier PC portable 024
92319464d8 FIX : travis 2021-10-07 12:27:52 +02:00
Laurent Destailleur
831c72411b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-07 11:35:58 +02:00
Laurent Destailleur
d245abe908 Fix rounding 2021-10-07 11:34:21 +02:00
Gauthier PC portable 024
de48c1bdde Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-07 11:23:37 +02:00
Laurent Destailleur
68ac62d09c Fix phpcs 2021-10-07 11:05:06 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
 2021-10-07 11:01:53 +02:00
Laurent Destailleur
9b5909300e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/fourn/facture/card.php
 2021-10-07 11:00:00 +02:00
Laurent Destailleur
efd44b0ec0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-07 10:57:03 +02:00
Laurent Destailleur
5910d10021 Add hidden option to allow to fix corrupted situations 2021-10-07 10:43:50 +02:00
Laurent Destailleur
162d5d8a39 Fix protection of double party accounting when using situation invoices 2021-10-07 10:38:10 +02:00
lvessiller
da52ee55a4 FIX sickler-ci errors 2021-10-07 10:13:30 +02:00
lvessiller
cc21257e3e NEW print without details 2021-10-07 09:51:55 +02:00
Alexandre SPANGARO
adfae30112 NEW Societe - Add perentity functionality on customer/supplier accountancy auxiliary account 2021-10-07 06:18:39 +02:00
Alexandre SPANGARO
24e3dd0992 Prepare sql 2021-10-07 06:05:36 +02:00
Laurent Destailleur
f8d4e2bbf9 Fix phpcs 2021-10-07 04:14:38 +02:00
Laurent Destailleur
ed6fefc493 Trans 2021-10-07 04:10:39 +02:00
Laurent Destailleur
ec545f8967 Fix data 2021-10-07 02:58:51 +02:00
Laurent Destailleur
5463a02887 Debug v14 2021-10-06 21:59:10 +02:00
Laurent Destailleur
6cb690e678 Debug v14 2021-10-06 21:56:48 +02:00
Laurent Destailleur
8fe37b20c0 Debug v14 2021-10-06 21:54:04 +02:00
Laurent Destailleur
2a5e654544 Debug v14 2021-10-06 21:47:46 +02:00
Laurent Destailleur
f95b0c3033 Debug 2021-10-06 21:43:30 +02:00
Laurent Destailleur
9cf46eaf25 Fix stats graphs 2021-10-06 20:29:48 +02:00
Laurent Destailleur
34187d53f6 Fix missing invoice in stats when due date is unknown/null 2021-10-06 20:10:36 +02:00
Laurent Destailleur
e1f5a39f48 Fix phpcs 2021-10-06 19:40:18 +02:00
Laurent Destailleur
e004d39ed4 Fix status of supplier invoice 2021-10-06 19:30:37 +02:00
Laurent Destailleur
ab78930476 Add api to post supplier proposal and supplier order documents 2021-10-06 18:50:29 +02:00
Laurent Destailleur
e228f07877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/mrp/lib/mrp_mo.lib.php
 2021-10-06 18:41:51 +02:00
Laurent Destailleur
88a482c615 Fix phpcs 2021-10-06 18:40:32 +02:00
Laurent Destailleur
144de734ce Fix phpcs 2021-10-06 18:39:16 +02:00
Laurent Destailleur
520a4f55f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-10-06 18:34:03 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
 2021-10-06 18:30:26 +02:00
Gauthier PC portable 024
231f809106 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:55:36 +02:00
Gauthier PC portable 024
0d5f06743f Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:48:06 +02:00
Gauthier PC portable 024
2efea59614 FIX : db escape 2021-10-06 17:47:27 +02:00
Indelog
18fb3a352b Add hook to overide sourcetype and targettype for linked object 
This add hook `setLinkedObjectSourceTargetType` in
`CommonObject::showLinkToObjectBlock()` and in
`CommonObject::fetchObjectLinked()` to allow overiding sourcetype and
targettype by custom modules.
 2021-10-06 17:18:45 +02:00
Florian HENRY
f52e2be10e NEW:Add filter from date to date into action/evt list 2021-10-06 16:23:11 +02:00
Laurent Destailleur
1c53035e38 Doc 2021-10-06 16:19:36 +02:00
Laurent Destailleur
cb84eef6dc
Update shipment.php 2021-10-06 16:13:02 +02:00
Laurent Destailleur
4208964153
Merge branch 'develop' into patch-10 2021-10-06 16:09:54 +02:00
Laurent Destailleur
e3032ef1c4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2021-10-06 16:06:25 +02:00
stickler-ci
528e4f87d1 Fixing style errors. 2021-10-06 13:59:03 +00:00
Gauthier PC portable 024
a271bb8316 Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-06 15:56:11 +02:00
Gauthier PC portable 024
ad2844d2f0 FIX : cast int 2021-10-06 15:55:59 +02:00
Laurent Destailleur
ad1cb443e4
Merge pull request #18520 from cfoellmann/PR/pdf-no-template 
allow supplier order to not generate pdfs
 2021-10-06 15:35:08 +02:00
stickler-ci
fd7b8ae01a Fixing style errors. 2021-10-06 13:34:00 +00:00
Laurent Destailleur
7e0ec949c0
Merge pull request #18915 from vincentjdc/vat-number-societe-list 
NEW Add `SOCIETE_SHOW_VAT_IN_LIST` to display VAT number in combo list of thirdparties
 2021-10-06 15:33:46 +02:00
Laurent Destailleur
a33ca7d528
Update admin.lang 2021-10-06 15:33:06 +02:00
Gauthier PC portable 024
2f329bf053 FIX : cast int 2021-10-06 15:31:32 +02:00
Laurent Destailleur
eba377cdf0
Merge pull request #18860 from FHenry/12_fix_selectline_from_supplier_order_to_supplier_invoice 
fix: Supplier order => Supplier Invoice : line selector (checkbox) wasn't working
 2021-10-06 15:31:14 +02:00
Laurent Destailleur
10f0434116
Update card.php 2021-10-06 15:30:19 +02:00
Vincent Dieltiens
2889af9fae Add SOCIETE_SHOW_VAT_IN_LIST option to let the possibility to display (and search) VAT number in list of 'societe' 2021-10-06 15:23:23 +02:00
Laurent Destailleur
d5d892b263
Merge pull request #18831 from SteiniGreenwork/develop 
NEW Can select existing batch numbers for a combo list (in mrp consumtion)
 2021-10-06 15:20:52 +02:00
Gauthier PC portable 024
468b76e9d6 FIX : useless function 2021-10-06 15:15:22 +02:00
Laurent Destailleur
de49e4e375
Merge branch 'develop' into NEW_expense_report_project_required 2021-10-06 14:34:58 +02:00
Gauthier PC portable 024
23ffc1f4b5 FIX : useless function 2021-10-06 14:33:01 +02:00
Laurent Destailleur
6b5ab8025c
Update admin.lang 2021-10-06 14:30:47 +02:00
Laurent Destailleur
3c885c1fce Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-06 14:27:47 +02:00
Laurent Destailleur
92ae3c9d52 Fix label in graph 2021-10-06 14:26:48 +02:00
Gauthier PC portable 024
ea13b043ee FIX : travis 2021-10-06 14:21:02 +02:00
Laurent Destailleur
7a9eb0baa7
Merge pull request #18911 from ksar-ksar/patch-10 
FIX #18910 : MRP List SQL query syntax error with more than one extrafileds.
 2021-10-06 14:10:37 +02:00
Laurent Destailleur
4be2d1414e Fix regression 2021-10-06 14:03:10 +02:00
Laurent Destailleur
b93110e4f0
Merge pull request #18901 from xgerhard/disabled-button-zero-qty-fix 
Fix #18890 Fix disabled button if sum real qty is 0
 2021-10-06 13:49:12 +02:00
Laurent Destailleur
ba15907582
Update inventory.php 2021-10-06 13:48:42 +02:00
Laurent Destailleur
a984eb5c98
Merge branch 'develop' into 14_fix_api_priduct_warning 2021-10-06 13:43:18 +02:00
Laurent Destailleur
7b1b7c0ad6
Update api_products.class.php 2021-10-06 13:42:49 +02:00
Laurent Destailleur
5d9c87a9ea
Update api_products.class.php 2021-10-06 13:42:13 +02:00
Francis Appels
dceb2b5341 Fix fatal error 2021-10-06 13:36:11 +02:00
Rüdiger Hahn
d963aa8832 Allow removal of tabs 
For being able to remove or replace tabs, it is also necessary to call
this function with 'remove' mode.
 2021-10-06 13:35:34 +02:00
Laurent Destailleur
b630b15991 Add missing line to remove a tab in modulebuilder 2021-10-06 13:33:13 +02:00
Laurent Destailleur
d1eb55ea2d
Merge pull request #18897 from code-chicken/patch-13 
Allow removal of tabs
 2021-10-06 13:30:14 +02:00
Laurent Destailleur
329bc331db
Merge pull request #18899 from fappels/14_fix_espadon 
FIX fatal error on expedition espadon model
 2021-10-06 13:29:47 +02:00
Laurent Destailleur
89b2ecf504 Add missing migration sql 2021-10-06 13:28:05 +02:00
Laurent Destailleur
65ea165721 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-06 13:27:42 +02:00
Laurent Destailleur
0cf18ded80
Merge pull request #18866 from marc-dll/14.0_FIX_holiday_increments_pgsql 
FIX: postgresql compatibility with camelcase fields
 2021-10-06 13:26:57 +02:00
Laurent Destailleur
8f9a7f4e35
Update 13.0.0-14.0.0.sql 2021-10-06 13:26:42 +02:00
Laurent Destailleur
ea3e3b133d Debug eventorganization modules 2021-10-06 12:55:07 +02:00
Laurent Destailleur
ff29ac93ad Debug eventorganization modules 2021-10-06 12:43:40 +02:00
Indelog
45e6ea45dc Fix stickler 2021-10-06 12:19:10 +02:00
Indelog
fb775e2c6e Fix Add module part in llx_element_element on CommonObject::add_object_linked() 
Add module part to target type if object has $module property and is'nt
in core modules.
 2021-10-06 12:14:46 +02:00
Laurent Destailleur
3709c6ff47 Fix phpcs 2021-10-06 11:53:27 +02:00
Laurent Destailleur
93b4853f8e Fix var_dump 2021-10-06 11:52:12 +02:00
ksar
6a20fcc5c0
FIX #18910 2021-10-06 11:24:42 +02:00
Florian HENRY
9d1915f9c2 fix php warning 2021-10-06 09:56:10 +02:00
Laurent Destailleur
36a00bc1ac Enhance selection of qty to transfer/correct stock 2021-10-05 20:42:52 +02:00
Laurent Destailleur
06eb138b47
Merge pull request #18902 from xgerhard/fix-negative-stock-correction 
Fix #18895 Fix negative stock correction
 2021-10-05 18:45:50 +02:00
Laurent Destailleur
e85a0c54cc
Update product.class.php 2021-10-05 18:43:35 +02:00
Laurent Destailleur
30ac1fbf01
Merge pull request #18904 from cfoellmann/PR/hook-beforebodyclose 
NEW add hook `beforeBodyClose`
 2021-10-05 16:52:46 +02:00
Laurent Destailleur
ff56415c00
Merge pull request #18903 from aspangaro/15a21 
HTML5 - <font> tag is deprecated, replace by <span>
 2021-10-05 16:51:41 +02:00
Gauthier PC portable 024
298f337f36 Revert "FIX : travis feedback" 
This reverts commit 1a651f089d.
 2021-10-05 16:45:18 +02:00
Gauthier PC portable 024
1a651f089d FIX : travis feedback 2021-10-05 16:38:20 +02:00
Marc de Lima Lucio
fdb6ebe80e FIX: postgresql: rename the oly column with uppercase characters to lowercase 2021-10-05 16:18:56 +02:00
Marc de Lima Lucio
88d93a4da5 FIX: expense reports: no need to delete const at project module activation 2021-10-05 15:59:29 +02:00
Gauthier PC portable 024
1d4d4dfe18 FIX : ihm 2021-10-05 15:43:57 +02:00
Gauthier PC portable 024
cf7def093f Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-05 15:21:53 +02:00
Gauthier PC portable 024
370af17894 FIX : ihm 2021-10-05 15:21:37 +02:00
stickler-ci
6c63020957 Fixing style errors. 2021-10-05 13:06:49 +00:00
Gauthier PC portable 024
5f0e09e1ef FIX : postgres adaptation 2021-10-05 15:04:15 +02:00
Laurent Destailleur
413164f5c0 NEW can upload the odt file for product doc template 2021-10-05 13:48:13 +02:00
Laurent Destailleur
b4cfe35138 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 13:39:46 +02:00
Laurent Destailleur
123c047e29 Fix look and feel v14 2021-10-05 13:34:25 +02:00
Laurent Destailleur
b11dbf069e FIX Bad use of a forced contact of another company on PDF/ODT documents 2021-10-05 13:11:54 +02:00
Gauthier PC portable 024
99f331c817 Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-10-05 12:43:56 +02:00
Gauthier PC portable 024
bea17e8d78 FIX : travis + User::hasRight() function modification to take care of hrm specific rights 2021-10-05 12:42:42 +02:00
Laurent Destailleur
379dd9ccbb Fix position of text 2021-10-05 12:09:03 +02:00
Alexandre SPANGARO
7f47df6ea4 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 11:44:48 +02:00
stickler-ci
39cc2ca5b6 Fixing style errors. 2021-10-05 09:42:52 +00:00
stickler-ci
75182f40a0 Fixing style errors. 2021-10-05 09:37:38 +00:00
Indelog
6c82b1d0e1 Fix creataing invoice originating for custom module 
This fix the invoice create form when we provide `origin` element in
url. The actual create form overide the value for origin field with
`$objectsrc->element`. This make creation of invoice originating from a custom
module module impossible because we need the module part to instantiate
the class for the custom module object.

This also modify Common Object::fetch Object Linked() to append the
module part for `$sourcetype` and `$targettype` if it not set and object
have module property and it not in core module.
 2021-10-05 11:35:43 +02:00
Gauthier PC portable 024
75c7502922 FIX : useless dol_include_once + travis feedback 2021-10-05 11:35:00 +02:00
Gauthier PC portable 024
5d179beaac FIX : several fixes + travis 2021-10-05 11:14:08 +02:00
Laurent Destailleur
50470f84c4 Look and feel v15. Stay at same position on doc generation 2021-10-05 11:03:51 +02:00
Christian Foellmann
caf26d95d6 add hook beforeBodyClose 2021-10-05 10:41:11 +02:00
Laurent Destailleur
f0703b414a css 2021-10-05 10:24:31 +02:00
Alexandre SPANGARO
1d2c8effd8 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 10:20:35 +02:00
Alexandre SPANGARO
f6a8082f16 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 10:01:37 +02:00
Alexandre SPANGARO
2e49eee106 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:52:45 +02:00
Alexandre SPANGARO
3f26ab195b HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:46:48 +02:00
Alexandre SPANGARO
edf91ce77c HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:41:03 +02:00
Laurent Destailleur
355f17be3d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-05 09:11:37 +02:00
Laurent Destailleur
5ad02ccc32 MAIN_EMAIL_ADD_TRACK_ID removed, MAIN_FIX_FOR_BUGGED_MTA 1 by defaut 2021-10-05 09:11:20 +02:00
Alexandre SPANGARO
c57aea1ead HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:10:37 +02:00
Alexandre SPANGARO
b8a7f122ef HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:06:07 +02:00
Alexandre SPANGARO
d10ec688c7 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 09:03:13 +02:00
Laurent Destailleur
b559dc9053 css 2021-10-05 08:55:57 +02:00
Alexandre SPANGARO
463efd3802 Missing language key 2021-10-05 06:26:19 +02:00
Alexandre SPANGARO
e75d7b2206 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 06:25:53 +02:00
xgerhard
e44c3a46e1 Fix #18895 Fix negative stock correction 
If people use a negative number as input, I think we can assume they want to delete units. It will now set the movement to 1 if the number is negative and 'add' was selected.

For each negative number we now multiply this number by -1, to make it a positive number again.
 2021-10-05 00:25:52 +02:00
xgerhard
cbd825e526 FIX|Fix #18890 Fix disabled button if sum real qty is 0 
Instead of counting the sum of the 'real qty' input, only disable the button if no input has been given, or if all input is the same as the expected qty.

'$object->status' check seems unnecessary here since the button is only there when the status is 'STATUS_VALIDATED'.
 2021-10-05 00:03:00 +02:00
Francis Appels
d3cbda08dc Fix fatal error 2021-10-04 22:12:50 +02:00
Laurent Destailleur
9617bbb463
Merge pull request #18788 from fr69400/develop 
New : Add showdocument hook
 2021-10-04 20:13:50 +02:00
stickler-ci
ced7c24c40 Fixing style errors. 2021-10-04 17:25:13 +00:00
Laurent Destailleur
2f6a4fa04a
Update html.formfile.class.php 2021-10-04 19:20:37 +02:00
Rüdiger Hahn
35aa9b0d35
Allow removal of tabs 
For being able to remove or replace tabs, it is also necessary to call this function with 'remove' mode.
 2021-10-04 19:19:12 +02:00
Laurent Destailleur
e14676be49 Fix phpunit 2021-10-04 19:09:38 +02:00
Laurent Destailleur
f7f8ff2df2
Merge pull request #18862 from marc-dll/NEW_expense_report_overlap_link 
NEW: expense report: show link to already existing overlapping expense report
 2021-10-04 15:37:49 +02:00
Laurent Destailleur
6f4c3cba6f
Merge pull request #18891 from stepanych/develop 
Fix #18875
 2021-10-04 15:33:13 +02:00
Laurent Destailleur
86c8a53f24
Merge pull request #18892 from aspangaro/15a23 
FIX Remove Isle of Man of ECC's countries compatible with VAT Rules
 2021-10-04 15:32:40 +02:00
Laurent Destailleur
bad5d87f57 NEW theme option THEME_ELDY_USEBORDERONTABLE 2021-10-04 14:56:30 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
stickler-ci
35e7a473f4 Fixing style errors. 2021-10-04 12:10:54 +00:00
Gauthier PC portable 024
0dd3681e50 FIX : several debug 2021-10-04 14:08:11 +02:00
Laurent Destailleur
6d8276c9c8 Doc 2021-10-04 12:59:53 +02:00
Laurent Destailleur
91ee704dc3 Move trans from admin to main 2021-10-04 12:16:50 +02:00
Laurent Destailleur
1c56f65c27 Fix missing migration instruction 2021-10-04 11:49:49 +02:00
Marc de Lima Lucio
704bae46a6 FIX: expense report: show link to already existing overlapping expense report without adding new parameter 2021-10-04 08:51:31 +02:00
Stephan Steininger
3bb941f3b8
Merge branch 'Dolibarr:develop' into develop 2021-10-04 08:12:19 +02:00
Laurent Destailleur
66310b14d7 Better way to present open invoice graph 2021-10-04 05:34:14 +02:00
Laurent Destailleur
7b02560c4f Better way to present open invoice graph 2021-10-04 05:27:07 +02:00
Laurent Destailleur
b6ec7ae77a Fix permissions on module PaymentByBankTransfer 2021-10-04 04:36:58 +02:00
Laurent Destailleur
b3cb56f2ef Clean css 2021-10-04 04:14:31 +02:00
Laurent Destailleur
2c32c6c5c9 Fix contextpage for list of tickets 2021-10-03 19:17:23 +02:00
Laurent Destailleur
e558adbcfc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-03 18:20:34 +02:00
Laurent Destailleur
d6e1a6be93 Look and feel v14 2021-10-03 18:20:01 +02:00
stickler-ci
76ec8e0f25 Fixing style errors. 2021-10-03 10:37:31 +00:00
Gauthier PC portable 024
a6c854cb59 FIX : restore link to hrm establishment tab 2021-10-03 12:34:47 +02:00
Alexandre SPANGARO
42bb9ac6d2 Better URL 2021-10-03 05:49:54 +02:00
Alexandre SPANGARO
94166cdb7e FIX Remove Isle of Man of ECC's countries 2021-10-03 05:36:53 +02:00
Alexandre SPANGARO
042d520061 Change Url 2021-10-03 05:30:49 +02:00
stepanych
b1eb1c1070 fix issue #18875 
added check for $$search_array_options
 2021-10-03 01:08:22 +02:00
Laurent Destailleur
2f813e0b6a
Merge pull request #18832 from atm-gauthier/NEW/integration_GPEC_sql 
NEW : integration HRM sql and migration files
 2021-10-02 21:18:50 +02:00
Laurent Destailleur
705644bf07
Merge branch 'develop' into NEW_expense_report_prefill_dates 2021-10-02 21:11:59 +02:00
Laurent Destailleur
a5daf9de9d
Update admin.lang 2021-10-02 21:09:03 +02:00
Laurent Destailleur
4c6f2fc4b5
Merge pull request #18874 from OPEN-DSI/v14-fix-product-per-entity-portability-sql 
FIX Product accountancy affectation with product_perentity activated …
 2021-10-02 21:04:11 +02:00
Laurent Destailleur
e5c5d8d755
Merge pull request #18878 from frederic34/patch-4 
doxygen
 2021-10-02 21:00:39 +02:00
Laurent Destailleur
1a8cb9c4b5
Merge pull request #18864 from marc-dll/NEW_expense_report_force_amounts_including_taxes 
NEW: expense reports: conf to force amounts to be entered only including taxes
 2021-10-02 21:00:29 +02:00
Laurent Destailleur
f479c2bc77
Merge pull request #18868 from frederic34/patch-1 
Fix migration Update 14.0.0-15.0.0.sql
 2021-10-02 20:50:10 +02:00
Laurent Destailleur
c149af82fe
Merge pull request #18873 from JR-Polyline/patch-1 
Fix dynamic prices not updating
 2021-10-02 20:45:16 +02:00
Laurent Destailleur
dd68e8c36e
Merge pull request #18877 from frederic34/patch-2 
doxygen
 2021-10-02 20:44:15 +02:00
Laurent Destailleur
c4ca0bdc28
Merge pull request #18879 from frederic34/patch-5 
doxygen
 2021-10-02 20:44:09 +02:00
Laurent Destailleur
2483cc7965 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-02 20:43:30 +02:00
Laurent Destailleur
55e97784bd FIX #18880 2021-10-02 20:42:54 +02:00
Laurent Destailleur
dfb1b1636f
Merge pull request #18881 from frederic34/patch-6 
doxygen
 2021-10-02 20:38:55 +02:00
Laurent Destailleur
084b6e3bd7
Merge pull request #18883 from frederic34/patch-8 
doxygen
 2021-10-02 20:38:49 +02:00
Laurent Destailleur
63fc0c1239
Merge pull request #18885 from frederic34/patch-10 
doxygen
 2021-10-02 20:38:41 +02:00
Laurent Destailleur
90a4f70501
Merge pull request #18882 from frederic34/patch-7 
doxygen
 2021-10-02 20:38:34 +02:00
Laurent Destailleur
8ba18f4d73
Merge pull request #18884 from frederic34/patch-9 
doxygen
 2021-10-02 20:38:27 +02:00
Laurent Destailleur
7e48d6d31b
Merge pull request #18886 from frederic34/patch-11 
doxygen
 2021-10-02 20:38:20 +02:00
Laurent Destailleur
bcb7d8c07a
Merge pull request #18887 from frederic34/patch-12 
doxygen
 2021-10-02 20:38:13 +02:00
Laurent Destailleur
1451e95e79
Merge pull request #18888 from frederic34/patch-13 
doxygen
 2021-10-02 20:37:53 +02:00
Laurent Destailleur
902fed1f0d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ecm/index.php
 2021-10-02 20:09:06 +02:00
Laurent Destailleur
d99b3d601a FIX #18854 2021-10-02 20:07:09 +02:00
Laurent Destailleur
2fe1b548ef Show label of permission as tooltip on list of modules/app 2021-10-02 19:45:58 +02:00
Laurent Destailleur
7863642daa FIX #18852 2021-10-02 19:16:42 +02:00
Laurent Destailleur
227adaf5fc CSS 2021-10-02 15:26:29 +02:00
Laurent Destailleur
04a5dc2794 css 2021-10-02 14:53:47 +02:00
Frédéric FRANCE
828c1d41e7
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:49:33 +02:00
Frédéric FRANCE
0ebe4de80a
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:48:27 +02:00
Frédéric FRANCE
1ba0369f01
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:47:30 +02:00
Frédéric FRANCE
365f2ba31e
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:42:19 +02:00
Frédéric FRANCE
c33d8ac49b
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:40:33 +02:00
Frédéric FRANCE
7bf07395c6
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:37:41 +02:00
Frédéric FRANCE
5c4b55fe7f
doxygen 
https://doxygen.dolibarr.org/develop/doxygen-warnings.log
 2021-10-02 13:35:17 +02:00
Frédéric FRANCE
10aa6106d2
doxygen 2021-10-02 13:34:08 +02:00
Frédéric FRANCE
5d181810da
doxygen 2021-10-02 13:31:54 +02:00
Frédéric FRANCE
c5871ac765
doxygen 
/home/dolibarr/htdocs/admin/eventorganization_confboothattendee_extrafields.php:23: warning: the name 'admin/conferenceorboothattendee_extrafields.php' supplied as the argument in the \file statement is not an input file
 2021-10-02 13:29:33 +02:00
Frédéric FRANCE
254fbb862b
doxygen 2021-10-02 13:27:25 +02:00
Laurent Destailleur
3102d0725c Fix test on action param 2021-10-02 13:04:57 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
2671eeb4e5 Responsive 2021-10-01 18:54:14 +02:00
lvessiller
fd7d1374c2 FIX Product accountancy affectation with product_perentity activated (PR #18620) 2021-10-01 16:37:54 +02:00
JR-Polyline
2be2423dee
Fix dynamic prices not updating 
When Dynamic price module active and an a math expression is used to compute buy price on supplier product card, the calculated price does not update on the card when saved.
Changing line 849 appears to solve this without any ill effect.
 2021-10-01 21:30:25 +08:00
Laurent Destailleur
d68719226b Fix can install module with name module_abc-x.y.z (w).zip 2021-10-01 14:10:50 +02:00
Laurent Destailleur
eada0f468f Set MAIN_SECURITY_CSRF_WITH_TOKEN recommended value to 1 2021-10-01 12:39:15 +02:00
Laurent Destailleur
c664b78800 MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3) 2021-10-01 12:37:32 +02:00
Laurent Destailleur
c244d7375c MAIN_SECURITY_CSRF_WITH_TOKEN now has 3 levels (1, 2, 3) 2021-10-01 12:30:24 +02:00
Frédéric FRANCE
87cbc2b555
Update 14.0.0-15.0.0.sql 2021-10-01 08:24:40 +02:00
stickler-ci
753644a024 Fixing style errors. 2021-10-01 06:09:45 +00:00
Gauthier PC portable 024
d01460d606 FIX : hrm_position > hrm_job_user + seEventMessage on evaluation close 2021-10-01 08:06:45 +02:00
Gauthier PC portable 024
433132de9a FIX : llx_hrm_position > llx_hrm_job_user 2021-10-01 07:49:31 +02:00
Laurent Destailleur
7f8d5adb6c css 2021-09-30 20:32:52 +02:00
Laurent Destailleur
157112758b Fix phpcs 2021-09-30 20:14:59 +02:00
Laurent Destailleur
166d3b08d6 Add LIBXML_NONET to simplexml_load_string 2021-09-30 20:12:01 +02:00
Marc de Lima Lucio
2a85a32659 FIX: postgresql compatibility with camelcase fields 2021-09-30 18:30:22 +02:00
Marc de Lima Lucio
d3e90e8f76 NEW: expense reports: conf to force amounts to be entered only including taxes 2021-09-30 17:24:57 +02:00
stickler-ci
e1777a6266 Fixing style errors. 2021-09-30 15:12:36 +00:00
Marc de Lima Lucio
0dae918b76 NEW: expense reports: make project field required on lines 2021-09-30 17:09:49 +02:00
Marc de Lima Lucio
6a66fcbff8 NEW: expense report: show link to already existing overlapping expense report 2021-09-30 16:51:31 +02:00
Marc de Lima Lucio
c2c7d88520 NEW: NEW: expense reports: conf to pre-fill start/end dates with bounds of current month 2021-09-30 16:40:34 +02:00
Florian HENRY
6d00097c89 fix 2021-09-30 16:37:52 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
0bf1db2fd4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-30 16:29:10 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
 2021-09-30 16:28:42 +02:00
Laurent Destailleur
44bb5ebf34 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-30 16:23:34 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +02:00
Laurent Destailleur
fc4a16b356 Fix avoid error when trigger run on downgraded version. 2021-09-30 16:18:07 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
608b6f5fa3 Clean code 2021-09-30 15:24:57 +02:00
Stephan Steininger
5bb717b887 Merge branch 'develop' of https://github.com/SteiniGreenwork/dolibarr into develop 2021-09-30 15:07:37 +02:00
Stephan Steininger
2e2048f6d8 Update documentation 2021-09-30 15:06:57 +02:00
Florian HENRY
d0508d557b fix: checkbox for line selection between supplier order and supplier invoice was infective 2021-09-30 14:56:02 +02:00
Laurent Destailleur
aaf170313f Clean code 2021-09-30 14:51:38 +02:00
Laurent Destailleur
9460ad152e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-30 14:46:39 +02:00
Laurent Destailleur
827639f28d
Try to solve pb of unique id 2021-09-30 14:45:22 +02:00
Laurent Destailleur
d764080636 Add tag data-ignoreidfordnd=1 to ignor lines for drage and drop lines 2021-09-30 14:43:19 +02:00
Laurent Destailleur
63218d5d5c
Update product.class.php 2021-09-30 14:30:50 +02:00
stickler-ci
c5ad75c7c1 Fixing style errors. 2021-09-30 12:27:01 +00:00
Laurent Destailleur
3565a47954
Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
Laurent Destailleur
17c89a478c
Merge pull request #17819 from FHenry/dev_new_splitcalc_suggestd_code_compta 
NEW : rewrite bind accountancy code finding on sales invoice
 2021-09-30 14:13:20 +02:00
Laurent Destailleur
620d7109b5
Update dict.php 2021-09-30 14:04:56 +02:00
stickler-ci
b069f81965 Fixing style errors. 2021-09-30 11:58:20 +00:00
Stephan Steininger
94cc75cb69 Changed input type from select to input. 
New function selectLot
 2021-09-30 13:56:43 +02:00
Gauthier PC portable 024
1ff39d79e5 Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-09-30 13:52:43 +02:00
Gauthier PC portable 024
53c63fdfe8 FIX : stickler feedbacks part 5 2021-09-30 13:52:31 +02:00
Florian HENRY
332fa77d90 fix: search code on tva dict 2021-09-30 13:49:02 +02:00
stickler-ci
033e756558 Fixing style errors. 2021-09-30 11:48:42 +00:00
Gauthier PC portable 024
499d30b04d Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-09-30 13:46:20 +02:00
Gauthier PC portable 024
030829942c FIX : stickler feedbacks part 4 2021-09-30 13:46:10 +02:00
Laurent Destailleur
95e1ec87dc
Merge branch 'develop' into patch-445 2021-09-30 13:40:23 +02:00
Laurent Destailleur
ee79df9bc7
Merge pull request #18839 from indelog/fix_list_of_autoecmfiles 
Fix FormFile::list_of_autoecmfiles object_instance classname after hook
 2021-09-30 13:39:16 +02:00
Laurent Destailleur
ae9643bbef
Update html.formfile.class.php 2021-09-30 13:38:38 +02:00
Laurent Destailleur
3deb424b4f
Merge pull request #18845 from indelog/fix_doc_prev_ecm 
Fix show for external module in ecm index auto page
 2021-09-30 13:36:49 +02:00
Norbert Penel
4e86f872ca it was impossible to update a task 
after some investigation i saw those errors but they are maybe some more around here
 2021-09-30 13:35:23 +02:00
Laurent Destailleur
89b24f1690
Merge pull request #18840 from homer8173/patch-23 
it was impossible to update a task
 2021-09-30 13:34:46 +02:00
Laurent Destailleur
98d8bad955
Merge pull request #18843 from indelog/fix_ecm_deletion 
Fix append module suffix on src_object_type when create ecm file
 2021-09-30 13:32:42 +02:00
Laurent Destailleur
4fe9a4fd30
Merge pull request #18846 from hregis/fix_avoid_warning_if_not_an_array 
FIX avoid warning if $categories is an id
 2021-09-30 13:30:37 +02:00
Laurent Destailleur
8ab9524d0d
Merge pull request #18849 from javieralapps4up/develop 
FIX: #18848 Add Andorra (AD) in the public function useDetailedBBAN () Feature request
 2021-09-30 13:30:02 +02:00
Norbert Penel
2205073f25
load_stats_reception is not loaded 2021-09-30 12:09:17 +02:00
Stephan Steininger
372aa6bf4c
Merge branch 'Dolibarr:develop' into develop 2021-09-30 09:05:05 +02:00
stickler-ci
e4b4035c05 Fixing style errors. 2021-09-30 06:47:15 +00:00
Gauthier PC portable 024
acbf09ba59 FIX : stickler feedbacks part 3 2021-09-30 08:44:38 +02:00
Laurent Destailleur
04fa5ff70b css 2021-09-30 01:50:11 +02:00
Laurent Destailleur
fca39d9179 css 2021-09-30 01:15:36 +02:00
Laurent Destailleur
1595b38498 Fix param $morecss on img_mime 2021-09-30 00:28:47 +02:00
Laurent Destailleur
a9805fbfc1 NEW The protection MAIN_SECURITY_CSRF_WITH_TOKEN=1 is on by default 2021-09-29 17:34:31 +02:00
Laurent Destailleur
3d239e7528 Trans 2021-09-29 17:28:06 +02:00
Laurent Destailleur
11c48a53a5 Fix name of file 2021-09-29 17:20:59 +02:00
Laurent Destailleur
a495d5e982 Fix translation 2021-09-29 17:14:37 +02:00
Laurent Destailleur
2dd55301de Fix duplicate field and look and feel 2021-09-29 17:06:51 +02:00
Laurent Destailleur
52fb627a64 Look and feel v14 2021-09-29 16:45:48 +02:00
Laurent Destailleur
1d35d8fd2d CSS popup company 2021-09-29 16:42:52 +02:00
Laurent Destailleur
34dacca77c Css 2021-09-29 16:31:40 +02:00
Laurent Destailleur
670a80c74c Trans 2021-09-29 16:26:10 +02:00
Laurent Destailleur
a395ff5ee3 Css 2021-09-29 16:19:47 +02:00
Laurent Destailleur
0f55eea276 css 2021-09-29 14:48:50 +02:00
Laurent Destailleur
c5d683a8bc Fix link param 2021-09-29 12:46:30 +02:00
Laurent Destailleur
9fe72597ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-29 12:43:27 +02:00
Laurent Destailleur
10ea7ddeef Fix link param 2021-09-29 12:31:25 +02:00
Regis Houssin
6e08ecde04 FIX indentation 2021-09-29 08:47:22 +02:00
Gauthier PC portable 024
92ae884331 Merge branch 'NEW/integration_GPEC_code' of github.com:atm-gauthier/dolibarr into NEW/integration_GPEC_code 2021-09-29 08:35:21 +02:00
Gauthier PC portable 024
f12a300795 FIX : td 2021-09-29 08:35:08 +02:00
stickler-ci
e8a5a2cc62 Fixing style errors. 2021-09-29 06:34:00 +00:00
Gauthier PC portable 024
eccff256b1 FIX : IHM 2021-09-29 08:30:30 +02:00
Gauthier PC portable 024
419ff967e3 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_sql 2021-09-29 07:52:13 +02:00
Gauthier PC portable 024
409c8c8d57 FIX : stickler feedbacks part 2 2021-09-29 07:49:42 +02:00
Laurent Destailleur
baadf2dc6c Fix reposition 2021-09-29 01:51:34 +02:00
stickler-ci
4d62aff8aa Fixing style errors. 2021-09-28 18:29:50 +00:00
ptibogxiv
1b71404225
Update api_setup.class.php 2021-09-28 20:27:45 +02:00
Laurent Destailleur
01c8bbedbf Look and feel v15 2021-09-28 19:40:41 +02:00
Laurent Destailleur
1e840fe7ed Code comment 2021-09-28 18:07:04 +02:00
Laurent Destailleur
65267920c8 Missing language 2021-09-28 17:25:57 +02:00
javieralapps4up
f6c8932cfa
Update account.class.php 2021-09-28 17:25:31 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
javieralapps4up
b6bb27e0f7
FIX: #18848 2021-09-28 17:21:22 +02:00
Laurent Destailleur
0f685853c4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 16:47:39 +02:00
Laurent Destailleur
7c5dfa0ad2 Fix language files 2021-09-28 16:47:09 +02:00
Regis Houssin
43a47999d7 FIX avoid warning if $categories is an id 2021-09-28 16:35:01 +02:00
Indelog
fae0337b3e Fix show for external module in ecm index auto page 
This set the correct `modulepart` parameter for link generated to
`document.php` of ecm auto index page if `src_object_type` for
ecm document has a module suffix (`@modulename`).
 2021-09-28 16:22:28 +02:00
Indelog
5b8b55cfba Fix append module suffix on src_object_type when create ecm file 
Files added to `llx_ecm_files` for externals modules never be removed on
object deletion.

When `CommonObject::deleteEcmFiles()` is called with `mode=1`, it  use
this sql filter to find the file related to the object which is removed
:

```
$sql .= " WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX."ecm_files WHERE src_object_type = '".$this->db->escape($this->table_element.(empty($this->module) ? '' : '@'.$this->module))."' AND src_object_id = ".((int) $this->id).")";
```

We see it append `'@'.$this->module` to `$this->table_element` but when
file is add to the `llx_ecm_files` by
`CommonObject::commonGenerateDocument()` , it added whiteout the
`'@'.$this->module` suffix. So the file is never remove from
`llx_ecm_files` when object is deleted.

This fix it by appending module suffix on `src_object_type` if object
has `module` property when add document to the `llx_ecm_files`.
 2021-09-28 15:26:08 +02:00
Florian HENRY
d565f9d3f1 reveiw code 2021-09-28 15:09:47 +02:00
Florian HENRY
f47a319c15 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta 2021-09-28 15:01:14 +02:00
Norbert Penel
d43cf4938a
it was impossible to update a task 
after some investigation i saw those errors but they are maybe some more around here
 2021-09-28 13:46:03 +02:00
Laurent Destailleur
abc7137c81 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-28 13:45:05 +02:00
Laurent Destailleur
fc56b88a1f FIX select list of orders not complete when field type of company is on 2021-09-28 13:44:42 +02:00
Laurent Destailleur
89ac5a5be6
Merge pull request #18723 from PyroShape/develop 
Explicit date_creation instead of date
 2021-09-28 13:34:44 +02:00
Laurent Destailleur
a8c4132a23
Update reception.class.php 2021-09-28 13:22:44 +02:00
Laurent Destailleur
f9913d2ebc
Merge branch 'develop' into develop#4 2021-09-28 13:21:43 +02:00
Laurent Destailleur
d7986fafbc
Merge pull request #18810 from aspangaro/14p16 
FIX Accountancy - Missing specific filename for export on format FEC2
 2021-09-28 13:20:33 +02:00
Alexandre SPANGARO
9426af8f6a NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3) 2021-09-28 13:16:44 +02:00
Laurent Destailleur
0c52817426
Merge pull request #18821 from aspangaro/15a20 
NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3)
 2021-09-28 13:14:16 +02:00
Laurent Destailleur
1199782d61
Update api_setup.class.php 2021-09-28 13:10:46 +02:00
Laurent Destailleur
21fa60a730 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-28 13:08:03 +02:00
Laurent Destailleur
cc3b826ed6
Merge pull request #18824 from ptibogxiv/patch-446 
NEW API get list of legal form of business
 2021-09-28 13:00:11 +02:00
Laurent Destailleur
4f660343aa
Update api_setup.class.php 2021-09-28 12:59:00 +02:00
Laurent Destailleur
b795d6b430
Update api_setup.class.php 2021-09-28 12:58:19 +02:00
Laurent Destailleur
43637c936c
Merge pull request #18825 from grandoc/new_branch_25_09_2021 
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\doliba…
 2021-09-28 12:56:43 +02:00
Laurent Destailleur
8f4fb9fd3c
Update barcode.lib.php 2021-09-28 12:56:33 +02:00
Laurent Destailleur
bde8ba300a
Merge pull request #18827 from aspangaro/15a21 
NEW #18814 Add legal form for Sweden
 2021-09-28 12:42:35 +02:00
stickler-ci
9e951d9a51 Fixing style errors. 2021-09-28 10:20:21 +00:00
Laurent Destailleur
0ae0d13f8b
Update mo_production.php 2021-09-28 12:20:02 +02:00
Laurent Destailleur
e6290b3b62
Merge pull request #18836 from aspangaro/14p22 
FIX Propal list - Problem of pagination on date
 2021-09-28 12:17:22 +02:00
Laurent Destailleur
a70f5dd90e Doc 2021-09-28 12:12:11 +02:00
Laurent Destailleur
6b80afa4d1
Merge pull request #18837 from habibulilalbaab/patch-1 
Bug Query llx_categorie_knowledgemanagement.sql
 2021-09-28 12:10:35 +02:00
Indelog
2472dff67b Fix FormFile::list_of_autoecmfiles object_instance classname after hook 
FormFile::list_of_autoecmfiles() can instantiate object with parameters
resulting of hook `addSectionECMAuto` but for do this,
it use `${$hookmanager->resArray['classname']}` which return a
`null`. Instead we should do this
`$hookmanager->resArray['classname']`.
 2021-09-28 12:08:45 +02:00
Laurent Destailleur
0e3ec3ea2d Trans 2021-09-28 11:56:43 +02:00
Laurent Destailleur
e6e224f33c Better translation 2021-09-28 11:53:00 +02:00
Gauthier PC portable 024
9713f6afd9 FIX : stickler feedbacks part 1 2021-09-28 08:40:15 +02:00
Muhammad Habib Ulil A
c857dc1904
Update llx_product.sql 2021-09-28 07:52:12 +07:00
Muhammad Habib Ulil A
ef7d3ec72d
Update llx_categorie_knowledgemanagement.sql 2021-09-28 07:44:26 +07:00
Laurent Destailleur
d3e5e3071b css 2021-09-28 00:26:58 +02:00
Laurent Destailleur
0750d4bb6e Look and feel v14 2021-09-28 00:21:54 +02:00
Alexandre SPANGARO
43ed88f056 FIX Propal list - Problem of pagination on date 2021-09-27 23:02:19 +02:00
Laurent Destailleur
ec3154075a Comment 2021-09-27 22:16:08 +02:00
Laurent Destailleur
338d5ac56e Look and feel v14 2021-09-27 22:12:08 +02:00
Laurent Destailleur
fa57191702 Fix regressions 2021-09-27 20:09:43 +02:00
Laurent Destailleur
0e1cc2b096 Fix cost price is 0. 2021-09-27 18:46:27 +02:00
Laurent Destailleur
80165811e0 Clean code 2021-09-27 15:50:19 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
javieralapps4up
11723c2cd0
Update date.lib.php 
Without words, sorry
 2021-09-27 14:49:22 +02:00
Marc de Lima Lucio
6abe6462e6 FIX: products/services card: hidden extrafields were overridden 2021-09-27 14:33:57 +02:00
javieralapps4up
c4f1eb0c46
Update date.lib.php 
Fix my error
 2021-09-27 14:32:03 +02:00
Laurent Destailleur
5c8b893877 Doc 2021-09-27 12:50:51 +02:00
Laurent Destailleur
72be24a835 Doc 2021-09-27 12:37:10 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
0176ab6057 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
 2021-09-27 11:40:47 +02:00
Laurent Destailleur
b77cadf39a Fix filter 2021-09-27 11:38:34 +02:00
Laurent Destailleur
9b825df158 Clean code 2021-09-27 11:36:40 +02:00
Laurent Destailleur
c9ae46db50 FIX Filter on categories 2021-09-27 11:34:26 +02:00
Laurent Destailleur
6d92591358 Fix look and feel v15 2021-09-27 11:28:34 +02:00
Laurent Destailleur
96c8743ee9 Look and feel 2021-09-27 11:27:02 +02:00
Gauthier PC portable 024
fde0f1ac25 NEW : HRM integration, source code 2021-09-27 11:20:38 +02:00
Gauthier PC portable 024
07bdc534db NEW : integration HRM sql and migrations files 2021-09-27 10:34:31 +02:00
stickler-ci
526380a4b8 Fixing style errors. 2021-09-27 08:10:49 +00:00
Stephan Steininger
c7ff60866a load existing batch numbers for item within mrp consumtion 2021-09-27 10:04:59 +02:00
Laurent Destailleur
4a85304572 Fix security 2021-09-26 21:01:34 +02:00
Laurent Destailleur
621296d84f Fix implement CSRF protection by session (with option per call) 2021-09-26 20:56:40 +02:00
Laurent Destailleur
bb5eb9e292 FIX Filter on categories 2021-09-26 20:56:17 +02:00
Laurent Destailleur
4f6586d6a8 Fix token 2021-09-26 20:35:54 +02:00
Laurent Destailleur
1436f0de7d Fix newToken 2021-09-26 20:26:20 +02:00
Laurent Destailleur
5497d7d730 Fix look and feel v15 2021-09-26 20:23:15 +02:00
Benjamin Chantalat
15b4e9f89d Merge branch 'develop' of https://github.com/PyroShape/dolibarr into develop 2021-09-26 19:09:56 +02:00
Benjamin Chantalat
e1fc471295
Merge branch 'Dolibarr:develop' into develop 2021-09-26 19:09:37 +02:00
Benjamin Chantalat
5623e5f98a Correct isset 2021-09-26 19:09:09 +02:00
Laurent Destailleur
d5d4b8d8e0 Fix escape the undescore on search in website module 2021-09-26 14:21:23 +02:00
Laurent Destailleur
cb964a3ab3 Fix cancel button 2021-09-26 13:55:19 +02:00
Laurent Destailleur
c02b5b08ea Fix trans 2021-09-26 12:58:34 +02:00
Alexandre SPANGARO
b7c577b762 NEW #18814 Add legal form for Sweden 2021-09-26 05:17:03 +02:00
Laurent Destailleur
a47cd22450 Fix sql 2021-09-25 21:15:53 +02:00
Laurent Destailleur
efa6e8a408 Fix sql 2021-09-25 21:15:21 +02:00
Laurent Destailleur
567334318a Fix sql eventorganization 2021-09-25 21:13:55 +02:00
Philippe Grand
f7041ef1fc
Update box_members_last_subscriptions.php 2021-09-25 19:03:08 +02:00
Philippe Grand
2edad621b8
Update box_members_last_modified.php 2021-09-25 19:02:28 +02:00
Philippe Grand
694754267c
Update box_members_by_type.php 2021-09-25 19:01:54 +02:00
Philippe Grand
a29ed0229b
Update barcode.php 2021-09-25 19:00:47 +02:00
Philippe Grand
dbe459bc3f
Update box_members_subscriptions_by_year.php 2021-09-25 18:59:39 +02:00
Philippe GRAND
661f13adb3 fix :Warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\admin\barcode.php on line 376 2021-09-25 18:58:06 +02:00
Philippe GRAND
67cc5155b1 fix :Warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\lib\barcode.lib.php on line 62 2021-09-25 18:15:44 +02:00
Philippe GRAND
1feb6e676c fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_by_type.php on line 70 2021-09-25 16:17:24 +02:00
Philippe GRAND
6b3cf5d482 fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_subscriptions_by_year.php on line 70 2021-09-25 16:15:31 +02:00
Philippe GRAND
d9110a8114 fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_subscriptions.php on line 70 2021-09-25 16:13:35 +02:00
Philippe GRAND
f8609a4619 fix : warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\core\boxes\box_members_last_modified.php on line 70 2021-09-25 16:09:34 +02:00
stickler-ci
509e1f5636 Fixing style errors. 2021-09-25 10:48:39 +00:00
ptibogxiv
1cdba9fb80
NEW API get list of legal form of business 2021-09-25 12:46:27 +02:00
stickler-ci
6b820ae4c5 Fixing style errors. 2021-09-25 10:16:29 +00:00
ptibogxiv
77d64e4fe2
NEW API list of staff units 2021-09-25 12:13:06 +02:00
Alexandre SPANGARO
372ba6cf0b NEW #18820 Accountancy - Add product account in import/export of thirdparty (level 3) 2021-09-25 07:49:08 +02:00
Alexandre SPANGARO
4e212054a4 Merge branch '14.0' into 14p16 2021-09-25 07:13:03 +02:00
Alexandre SPANGARO
8f5f657e4d FIX Accountancy - Missing specific filename for export on format FEC2, Ciel & repare it 2021-09-25 07:12:33 +02:00
lmarcouiller
14bcb124fe update reception class and card 2021-09-24 14:46:52 +02:00
Benjamin Chantalat
5cf90d0247 Correct date format 2021-09-24 14:10:19 +02:00
Benjamin Chantalat
95342777d9
Merge branch 'Dolibarr:develop' into develop 2021-09-24 14:09:14 +02:00
Laurent Destailleur
dc36724a10 FIX #18805 2021-09-24 13:51:52 +02:00
Laurent Destailleur
c90af50585
Merge branch 'develop' into NEW_develop_sub_BOM 2021-09-24 13:39:20 +02:00
Laurent Destailleur
14728e385e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-24 13:36:40 +02:00
Laurent Destailleur
8b7c677121
Merge pull request #18702 from Hystepik/develop#2 
Close #18692 : Possibility to move directories in ecm
 2021-09-24 13:36:25 +02:00
Laurent Destailleur
9a3d6679f0
Merge pull request #18778 from Hystepik/develop#1 
Fix : KM articles in public/ticket/create_ticket.php
 2021-09-24 13:35:17 +02:00
Laurent Destailleur
128bba1d9b Fix GETPOST 2021-09-24 13:29:03 +02:00
Laurent Destailleur
fd817ed015
Merge pull request #18800 from hregis/fix_wrong_request_sql 
FIX check if greater 0
 2021-09-24 13:10:24 +02:00
Laurent Destailleur
42a71e9303
Merge pull request #18812 from Hystepik/develop_v14#1 
Fix #18809 : error on client tooltip
 2021-09-24 13:10:00 +02:00
Laurent Destailleur
f85f81c2ee
Merge pull request #18811 from aspangaro/14p20 
FIX Accountancy - Option of export popup are inverted
 2021-09-24 13:09:04 +02:00
Laurent Destailleur
00120109fb
Merge pull request #18813 from aspangaro/14p21 
FIX Accountancy - Error on ValidDate for FEC/FEC2 export
 2021-09-24 13:07:17 +02:00
Alexandre SPANGARO
a1bd07d1a3 FIX Accountancy - Error on ValidDate for FEC/FEC2 export 2021-09-24 12:04:25 +02:00
Laurent Destailleur
dbf7a9a0d0 FIX payment using wrong type in takepos when too many payment mode 2021-09-24 11:48:43 +02:00
lmarcouiller
f88d12f55d Fix #18809 : error on client tooltip 2021-09-24 11:16:34 +02:00
lmarcouiller
68c9f4064b Fix sql in fetchKnowledgeRecord 2021-09-24 10:43:52 +02:00
Alexandre SPANGARO
3e485dcb41 FIX Accountancy - Option of export popup are inverted 2021-09-24 06:38:43 +02:00
Alexandre SPANGARO
15313b8d37 FIX Accountancy - Missing specific filename for export on format FEC2 2021-09-24 06:03:01 +02:00
Laurent Destailleur
4706ebe004 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-09-24 02:34:59 +02:00
Laurent Destailleur
70d255740b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/class/task.class.php
 2021-09-24 02:33:48 +02:00
Laurent Destailleur
cd46ccdb66 Code comment 2021-09-24 02:31:15 +02:00
Laurent Destailleur
b09c4166b3 Fix set position of lines in tasks of a project 2021-09-24 02:24:04 +02:00
Laurent Destailleur
3d22cbe4da Fix look and feel 2021-09-24 02:16:40 +02:00
Laurent Destailleur
4c80e0425b Fix date for tasks created during project creation 2021-09-24 02:10:42 +02:00
Laurent Destailleur
8fb5286260 FIX #18797 2021-09-24 02:02:12 +02:00
Laurent Destailleur
38b8ed9092
Merge pull request #18792 from cfoellmann/PR/minor-button-fixes 
another set of cleanup for action buttons
 2021-09-24 01:55:25 +02:00
Laurent Destailleur
f98d425064
Merge branch 'develop' into Link-to-MO 2021-09-24 01:54:21 +02:00
DevIntact
36a902167f Translation of event title for incoming email 
Event title for incoming email is not translated while collected by cronjob. 
i.e : ActionAC_EMAIL_IN
 2021-09-24 01:49:16 +02:00
Laurent Destailleur
a2a4a74964 Fix trans 2021-09-23 16:18:21 +02:00
lmarcouiller
ef70cd680c fix to match sql syntax 2021-09-23 15:00:55 +02:00
DevIntact
d357715538
Translation of event title for incoming email 
Event title for incoming email is not translated while collected by cronjob. 
i.e : ActionAC_EMAIL_IN
 2021-09-23 14:54:38 +02:00
Laurent Destailleur
9d5f6fbc1b Code comment 2021-09-23 13:39:48 +02:00
Laurent Destailleur
5c4922682c Trans 2021-09-23 13:29:18 +02:00
Benjamin Chantalat
c1e1a53503 Update Explicit date_creation instead of date 2021-09-23 13:23:16 +02:00
Laurent Destailleur
b08b7d2f68 NEW Can show progression of task into combo list of tasks 2021-09-23 13:20:42 +02:00
Laurent Destailleur
c39c823b66 Debug Date of line of services mandatory 2021-09-23 13:01:04 +02:00
Laurent Destailleur
545b4c56d5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-23 12:14:54 +02:00
Laurent Destailleur
d39ab4c288 Clean code 2021-09-23 12:14:32 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object 
NEW : field and behavior in product object
 2021-09-23 12:14:09 +02:00
Laurent Destailleur
4a43ed2852 Fix scrutinizer 2021-09-23 12:05:55 +02:00
Laurent Destailleur
0a28bf4d30 Trans 2021-09-23 11:44:16 +02:00
Laurent Destailleur
2538ebec03 Better test 2021-09-23 11:40:29 +02:00
Ilias Patsiaouras
977db0a2ba add MO to the list of possible object to link 2021-09-23 11:38:50 +02:00
Laurent Destailleur
a48a8231a1 Fix scrutinizer 2021-09-23 11:33:58 +02:00
Laurent Destailleur
31de16d305 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-23 03:21:54 +02:00
Laurent Destailleur
3467faab6b Fix property 2021-09-23 03:20:15 +02:00
Laurent Destailleur
31d9eb192f Clean code 2021-09-23 02:51:36 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Laurent Destailleur
128f6d9a5c Fix combo box for thirdparties in invoice stats used bad component 2021-09-23 02:38:53 +02:00
Laurent Destailleur
51b6318f88 FIX Test when date of invoie is in future (pb with TZ and offset) 2021-09-23 02:14:01 +02:00
Laurent Destailleur
60c11725ae Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-23 02:11:11 +02:00
Laurent Destailleur
1e0a7e4342 FIX Test when date of invoie is in future (pb with TZ and offset) 2021-09-23 02:10:39 +02:00
Laurent De Coninck
70e66627fe
restrict the html 2021-09-22 20:14:47 +02:00
stickler-ci
e5cff0ede1 Fixing style errors. 2021-09-22 16:07:36 +00:00
javieralapps4up
e74043d48e
Close: #18801 Jan-30 + 1m IS NOT Mar-2 
Close: #18801 related to avoid this behaviour https://bugs.php.net/bug.php?id=74013
 2021-09-22 17:56:31 +02:00
stickler-ci
2bd0fdd364 Fixing style errors. 2021-09-22 14:09:29 +00:00
Benjamin Chantalat
14f8d7c56b
Merge branch 'Dolibarr:develop' into develop 2021-09-22 15:49:43 +02:00
Laurent Destailleur
87da490b58 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-22 15:26:35 +02:00
Laurent Destailleur
bbd14a5bf3
Merge pull request #18791 from erikvanberkum/develop 
Fix translation Error: ConfirmDeleteMO
 2021-09-22 15:25:56 +02:00
Laurent Destailleur
a20ae60e70
Merge pull request #18793 from hregis/fix_wrong_table_element_line 
FIX init hookmanager after loading $conf values
 2021-09-22 15:25:17 +02:00
Laurent Destailleur
6f9fc205ef
Merge pull request #18796 from altairis-noe/warehouse_project_elements 
FIX: add warehouse in projects' overview count
 2021-09-22 15:24:05 +02:00
Noé Cendrier
066013c31f typo stickler 2021-09-22 15:15:39 +02:00
Laurent Destailleur
2824c8b8ab FIX support of localtax on expense report 2021-09-22 15:11:18 +02:00
Regis Houssin
144147c5d1 FIX check if greater 0 2021-09-22 14:58:03 +02:00
lmarcouiller
7361941420 Close #18770 : Can enter buying price on line 2021-09-22 14:56:44 +02:00
Regis Houssin
d91d14d10c FIX init hookmanager after loading $conf values 2021-09-22 12:48:05 +02:00
Laurent Destailleur
6c7c6c9efd FIX legal issue on expense report pdf (must also show price without tax) 2021-09-22 12:47:06 +02:00
Christian Foellmann
08b395e127 another set of cleanup for action buttons 2021-09-22 08:43:30 +02:00
Erik van Berkum
5d684b1c71 Fix: translation error: ConfirmDeleteMO is not delete this Bill Of Materials but delete this Manufacturing Order. 2021-09-22 10:03:25 +09:00
stickler-ci
49fd1b761c Fixing style errors. 2021-09-21 20:27:33 +00:00
fr69400
73b0d8079c Update html.formfile.class.php 2021-09-21 22:23:14 +02:00
kamel
9266b4e8fd FIX Button text on proposal card for create a invoice 2021-09-21 19:44:49 +02:00
Laurent Destailleur
8cfccdcc5f
Merge pull request #18782 from OPEN-DSI/fix_00017 
FIX Button text on proposal card for create a invoice
 2021-09-21 19:44:05 +02:00
Laurent Destailleur
b5d7a752f7
Merge pull request #18766 from ksar-ksar/patch-10 
FIX #18735
 2021-09-21 19:28:09 +02:00
Laurent Destailleur
c433d6ef4f
Merge pull request #18785 from hregis/fix_warning_php8 
FIX check if method exists instead in class
 2021-09-21 19:20:14 +02:00
Laurent Destailleur
7420234494
Merge pull request #18769 from ywarnier/turnover 
Add turnover homepage box
 2021-09-21 19:13:56 +02:00
Laurent Destailleur
1ade905daa
Merge pull request #18772 from javieralapps4up/14.0 
Update main.inc.php
 2021-09-21 19:10:39 +02:00
Laurent Destailleur
f96ea0cba0
Merge pull request #18776 from OPEN-DSI/fix-invoice-supplier-selected-lines 
FIX selected lines on supplier invoice create
 2021-09-21 19:09:13 +02:00
Laurent Destailleur
b7fadd0307
Merge pull request #18773 from aspangaro/15a18 
Missing language key
 2021-09-21 19:08:32 +02:00
Laurent Destailleur
b049b663b6
Merge pull request #18775 from bb2a/patch-1 
# Fix # Users search erreur
 2021-09-21 19:04:55 +02:00
Laurent Destailleur
e4c47e65c1
Merge pull request #18777 from ksar-ksar/patch-11 
FIX #18767 : Adherent delete
 2021-09-21 19:04:03 +02:00
stickler-ci
12be914d04 Fixing style errors. 2021-09-21 16:49:00 +00:00
fr69400
c4dd6be9f8 Add showdocument hook 2021-09-21 18:47:34 +02:00
Laurent Destailleur
a5566473d9 Clean code 2021-09-21 18:06:48 +02:00
stickler-ci
d6632757f9 Fixing style errors. 2021-09-21 16:06:03 +00:00
Regis Houssin
502c2a4505 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_warning_php8 2021-09-21 17:58:40 +02:00
Regis Houssin
e227bdb22b FIX check if method exists instead 2021-09-21 17:58:00 +02:00
Laurent Destailleur
04fb93370f
Merge pull request #18780 from ksar-ksar/patch-12 
Missing translations for Inventories
 2021-09-21 17:53:53 +02:00
Laurent Destailleur
dcd3f85e79 Fix sql error 2021-09-21 17:32:08 +02:00
Noé Cendrier
c89468428e add warehouse in projects elements count 2021-09-21 17:22:55 +02:00
Laurent Destailleur
97d912d553 Add more information about private or public poll. 2021-09-21 17:17:38 +02:00
Laurent Destailleur
9ba7f019ea Fix css 2021-09-21 16:53:29 +02:00
Laurent Destailleur
76ee014b52 Fix add a hidden solution to fix a corrupted value for AWP. 2021-09-21 16:32:32 +02:00
Regis Houssin
48ce3ea4d3 FIX check if $categories is not empty 2021-09-21 16:31:07 +02:00
Laurent Destailleur
a7ccbb4d9a css 2021-09-21 15:40:42 +02:00
Laurent Destailleur
841c4da0f8 Fix css 2021-09-21 15:39:05 +02:00
Laurent Destailleur
09fff2150e Fix: avoid to add line for event registration twice into invoice 2021-09-21 15:30:34 +02:00
Laurent Destailleur
e2c389a4a9 Fix delete invoice 2021-09-21 14:23:21 +02:00
Laurent Destailleur
b7105d572a Fix delete of invoice not complete (some fk_invoice still filled) 2021-09-21 14:20:01 +02:00
kamel
86a6e8af1f FIX Button text on proposal card for create a invoice 2021-09-21 14:15:17 +02:00
ksar
7a6a515386
Missing translations for Inventories 2021-09-21 12:18:37 +02:00
Laurent Destailleur
06f97f4f80 Look and feel v14 2021-09-21 12:04:28 +02:00
ksar
f2b39b3eeb
FIX #18767 : Adherent delete 
Adherent Delete was not working due to the fact that 
$features = 'adherent';
$feature2 = 'cotisation';
And $user->rights->$feature->$subfeature->supprimer does not exist

Also I used the double declaration of salaries.
 2021-09-21 11:27:41 +02:00
lmarcouiller
a7ff9d4889 Fix : KM articles in public/ticket/create_ticket.php 2021-09-21 11:26:49 +02:00
lvessiller
991a7ffd43 FIX selected lines on supplier invoice create 2021-09-21 11:04:59 +02:00
Anthony Berton
35707d1f4f
Update list.php 2021-09-21 09:13:01 +02:00
Alexandre SPANGARO
76f7efc193 Missing language key 2021-09-21 03:08:43 +02:00
javieralapps4up
278ae34b5f
Update main.inc.php 2021-09-21 00:53:10 +02:00
stickler-ci
a8a8fd7cff Fixing style errors. 2021-09-20 22:50:48 +00:00
javieralapps4up
08504c4e16
Update main.inc.php 2021-09-21 00:45:06 +02:00
Yannick Warnier
35e70e7936 Fix method visibility 2021-09-20 23:58:38 +02:00
Yannick Warnier
348c1c4caa Fix empty assignation line 2021-09-20 23:57:49 +02:00
Laurent De Coninck
5e2d8eac2b
Allow to edit the header of receipt by using HTML 
In the current version the WYSIWYG oesn't allow any HTML by thus fix you
can use any button from the wysiwyg and it displays on the receipe.

[see: X]
 2021-09-20 22:51:43 +02:00
stickler-ci
d919ef9c4c Fixing style errors. 2021-09-20 17:57:10 +00:00
Yannick Warnier
c40b22facd Add turnover homepage box 2021-09-20 19:41:13 +02:00
Laurent Destailleur
e3f3e01c21 Fields on surveys on 2 columns 2021-09-20 19:21:39 +02:00
Laurent Destailleur
d1bfaa5256 Trans 2021-09-20 19:02:04 +02:00
Laurent Destailleur
82f66f8b0a Better label of field 2021-09-20 19:00:28 +02:00
Laurent Destailleur
96ac0e4bb2 FIX action=deletecomment 2021-09-20 18:08:25 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
9b828532cc Fix membership css 2021-09-20 16:41:22 +02:00
Laurent Destailleur
c75fbb7642 FIX fetch of product with modulebuilder load too much data 2021-09-20 16:00:11 +02:00
Laurent Destailleur
1e735c48aa Code comment 2021-09-20 15:31:57 +02:00
Laurent Destailleur
f1b8941e27 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-20 15:30:06 +02:00
Laurent Destailleur
45c5abea69 FIX calculateCosts of BOM must not be included into fetch 2021-09-20 15:29:55 +02:00
Laurent Destailleur
261c0fc908
Merge pull request #18761 from javieralapps4up/14.0 
Fix: #18760 bad rights admin if advanced perms
 2021-09-20 14:06:58 +02:00
Laurent Destailleur
b97ad33911 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-20 13:21:13 +02:00
Laurent Destailleur
0eff2fa15b FIX default language defined for IN country 2021-09-20 13:20:54 +02:00
Laurent Destailleur
be2a95ca51 Add language as_IN 2021-09-20 13:01:53 +02:00
javieralapps4up
0453a27bda
Update main.inc.php 2021-09-20 12:24:44 +02:00
Laurent Destailleur
d8545f903e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-20 12:06:48 +02:00
ksar
131677a5ea
FIX #18735 
File preview is not working
 2021-09-20 11:50:10 +02:00
Laurent Destailleur
5397e2d9c3 Clean sql 2021-09-20 11:30:33 +02:00
Laurent Destailleur
71b5299c9f
Merge pull request #18718 from vincentjdc/product-replace-id 
FIX https://github.com/Dolibarr/dolibarr/issues/18717
 2021-09-20 11:07:21 +02:00
lmarcouiller
df0a26550f Update to match eldy's advices 2021-09-20 09:12:07 +02:00
Laurent Destailleur
360e3290b5 typo 2021-09-20 04:20:20 +02:00
Alexandre SPANGARO
ce56f52a30 FIX #18698 Supplier invoice list - "alert" checkbox not working 2021-09-20 03:28:30 +02:00
stickler-ci
1ea2182bf7 Fixing style errors. 2021-09-19 20:32:07 +00:00
javieralapps4up
77e493755f
Fix: #18760 bad rights admin if advanced perms 
Insufficient rights to view a group's card for admin users if advanced permissions are used
 2021-09-19 22:26:49 +02:00
Laurent Destailleur
b5a27b4c15 css 2021-09-19 21:27:01 +02:00
Laurent Destailleur
25971e373d Fix css 2021-09-19 21:20:12 +02:00
Laurent Destailleur
6af9f3b142 Fix css 2021-09-19 21:18:30 +02:00
Laurent Destailleur
3dc3214047 CSS 2021-09-19 21:13:27 +02:00
Laurent Destailleur
ee362a42bd css 2021-09-19 21:06:09 +02:00
Laurent Destailleur
14c8bdce1a Better desciption of option 2021-09-19 19:25:38 +02:00
Laurent Destailleur
a747c71cf5 css 2021-09-19 19:19:28 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
5631e8cc15 css 2021-09-19 15:01:57 +02:00
Laurent Destailleur
bf9f007c98 Fix MAIN_SECURITY_CSRF_WITH_TOKEN = 2 2021-09-19 14:57:14 +02:00
Laurent Destailleur
4d563651fa Add a mode MAIN_SECURITY_CSRF_WITH_TOKEN = 2 2021-09-19 14:49:11 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
e92a24d5f1 Fix test 2021-09-19 13:49:21 +02:00
Laurent Destailleur
1f76165e46 Fix do not show link on objects for object with existing hard link field 2021-09-19 01:35:42 +02:00
Laurent Destailleur
2acb84b432 FIX unprivileged user can see task associated with a not allowed project 2021-09-19 01:30:39 +02:00
Laurent Destailleur
facd6abec3 FIX user without permission can set ticket subject 2021-09-19 00:56:10 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
4253b564ba Fix add reopen as sensitive actions 2021-09-18 22:55:23 +02:00
Laurent Destailleur
89e8f24e15 Fix CSRF protection for all massactions 2021-09-18 22:38:25 +02:00
Laurent Destailleur
c3e88579ab Fix add remove_* action as sensitive action 2021-09-18 22:24:51 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
6390f2de6f Fix add all confirm_* action as sensitive actions 2021-09-18 19:47:51 +02:00
Laurent Destailleur
7dfedd242a Fix add confirm_deleteline as sensitive action 2021-09-18 19:43:38 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
858a5ab188 Add confirm_validate and confirm_close as sensitive actions 2021-09-18 18:36:45 +02:00
Laurent Destailleur
f0547438f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-18 18:28:17 +02:00
Laurent Destailleur
6c37836b3e Show value of MAIN_SECURITY_CSRF_WITH_TOKEN in setup page 2021-09-18 18:28:02 +02:00
Laurent Destailleur
97bb04c5b0
Merge branch 'develop' into NEW_develop_sub_BOM 2021-09-18 16:31:51 +02:00
Laurent Destailleur
a2db39e374
Merge pull request #18756 from mschamp/develop 
Show inventory in table toConsume
 2021-09-18 16:18:29 +02:00
Laurent Destailleur
a81ee14593
Update mo_production.php 2021-09-18 16:18:09 +02:00
Laurent Destailleur
91bf2a8d77
Update mo_production.php 2021-09-18 16:16:28 +02:00
Laurent Destailleur
c37767c5a0
Update mo_production.php 2021-09-18 16:15:21 +02:00
Laurent Destailleur
e9e0258444
Update mo_production.php 2021-09-18 16:14:42 +02:00
Laurent Destailleur
b8d37ec37e
Update mo_production.php 2021-09-18 16:12:10 +02:00
Laurent Destailleur
002703e724
Merge pull request #18746 from BlueGarm/patch-1 
Product name in inventory list
 2021-09-18 16:09:48 +02:00
Laurent Destailleur
30fb0d65bd
Merge pull request #18745 from Hystepik/develop#1 
Fix actions_addupdatedelete.inc.php on lang
 2021-09-18 16:09:04 +02:00
Laurent Destailleur
9e0a7c4687
Merge pull request #18748 from Hystepik/develop#4 
New : validate massaction KM
 2021-09-18 16:08:43 +02:00
Laurent Destailleur
061cbc4266
Merge pull request #18750 from maksimstojkovic/develop 
Fix Warehouse PDF Generation Error
 2021-09-18 16:08:16 +02:00
Laurent Destailleur
c72ce007b8
Merge pull request #18752 from maksimstojkovic/new-enable-pdf-stock-list 
New Enable PDF Regeneration in Warehouse List
 2021-09-18 16:08:01 +02:00
Laurent Destailleur
39d55b11b4
Merge pull request #18753 from maksimstojkovic/fix-movement-typo 
Fix typo in pdf_standard.modules.php
 2021-09-18 16:07:41 +02:00
Laurent Destailleur
052511d081 Fix sql error 2021-09-18 15:05:31 +02:00
ptibogxiv
5bb50ec951
Fix error when adding sql filter with hook in knowledgerecord 2021-09-18 13:47:18 +02:00
Laurent Destailleur
0bf213acac Code comment 2021-09-18 13:25:12 +02:00
Laurent Destailleur
2810315dc5 Fix payment of registration of event 2021-09-18 13:19:29 +02:00
mschamp
a231b44aae
Merge branch 'Dolibarr:develop' into develop 2021-09-18 12:58:02 +02:00
mschamp
018dbca5c0
Show inventory in table toConsume 
Add a column with the reel inventory to the production screen of manufacturing orders.
This gives the user an indication if production is possible.
 2021-09-18 12:51:32 +02:00
Laurent Destailleur
5fa62f25fa Fix registration of attendee 2021-09-18 12:39:26 +02:00
Laurent Destailleur
ceb368abd4 Fix message 2021-09-18 12:29:35 +02:00
Laurent Destailleur
0168a9860b Fix tooltip on website syntax disappear 
Fix backard compatibility of getLabelStatus
 2021-09-18 12:09:08 +02:00
Laurent Destailleur
dafc7d2617 Fix bad position of picto 2021-09-18 11:34:15 +02:00
Laurent Destailleur
ddcb4c149a css 2021-09-18 11:32:58 +02:00
Laurent Destailleur
0859438118 Show public and private note of attendee 2021-09-18 11:25:29 +02:00
Laurent Destailleur
66e58004fb Add column max_attendees for an event 2021-09-18 11:10:00 +02:00
Laurent Destailleur
0c67185dcf Add note on registration 2021-09-18 11:03:15 +02:00
Maksim Stojkovic
25111d47ee
New Enable PDF Regeneration in Stock List 
Enables PDF Regeneration in warehouse stock list
 2021-09-18 03:51:12 +10:00
Laurent Destailleur
675a30d500 Fix phpcs 2021-09-17 19:42:41 +02:00
Laurent Destailleur
b1c6a6e8d1 Fix show/hide combo when next combo has no item inside. 2021-09-17 19:38:55 +02:00
Laurent Destailleur
68a391b395 Fix not empty second level combo if first one not yet defined 2021-09-17 19:19:41 +02:00
Laurent Destailleur
7ed9e21266 Fix sql error 2021-09-17 19:16:46 +02:00
Maksim Stojkovic
d69ef7c134 Fix typo in pdf_standard.modules.php 2021-09-18 03:12:13 +10:00
Laurent Destailleur
446cc082e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-17 16:53:26 +02:00
Laurent Destailleur
91cd991828 Simplify the selectgroupTicket. 2021-09-17 16:52:42 +02:00
Maksim Stojkovic
44ff73f5de
Remove unused $nblines assignment 
Fixes the following warning received when attempting to generate a warehouse stock document using the default template:
`count(): Parameter must be an array or an object that implements Countable in /var/www/html/core/modules/stock/doc/pdf_standard.modules.php on line 211`.

$nblines is subsequently assigned on line 326, after which it is then used.
 2021-09-17 23:50:00 +10:00
Lucas Marcouiller
51f80bbc68 New : validate massaction KM 2021-09-17 15:09:21 +02:00
Mikaël MARTIN
7c4fe41e84
Update inventory.php 
Add the product name after the reference for better visualization during inventories.
 2021-09-17 13:17:23 +02:00
Lucas Marcouiller
e7a32834b7 Fix actions_addupdatedelete.inc.php on lang 2021-09-17 12:55:09 +02:00
Laurent Destailleur
6e3b91f268 Trans 2021-09-17 12:38:06 +02:00
Laurent Destailleur
9784a8207c
Merge branch 'develop' into patch-442 2021-09-17 12:32:14 +02:00
Laurent Destailleur
3d9be1437a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/list.php
	htdocs/fourn/paiement/list.php
	htdocs/projet/tasks/time.php
 2021-09-17 12:29:58 +02:00
Laurent Destailleur
b546f21ef4 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-17 12:21:25 +02:00
Laurent Destailleur
505517d142
Merge pull request #18629 from Gjuju/12.0 
Fix : GET extrafields on API "get events list" requests
 2021-09-17 12:16:32 +02:00
Laurent Destailleur
58fd4ad92f
Merge pull request #18641 from Gecka-Apps/14.0-fix-takepos-payment-methods 
14.0 fix takepos payment methods
 2021-09-17 12:15:35 +02:00
Laurent Destailleur
0ae8403fb4
Merge pull request #18690 from lainwir3d/add_rest_api_key_modify_right 
CLOSE #18689 REST API module: add api key generate / modify right.
 2021-09-17 12:10:03 +02:00
Laurent Destailleur
fdcd523c55
Merge branch 'develop' into develop#1 2021-09-17 11:59:20 +02:00
Laurent Destailleur
dff038fddd
Merge pull request #18705 from aspangaro/14p19 
FIX Accountancy - Format Quadra export - Missing line type C to create automaticly a subledger account with label
 2021-09-17 11:56:38 +02:00
Laurent Destailleur
9a6f4bf6d9
Merge pull request #18708 from javieralapps4up/develop 
Fix #18707 $search_account and $search_paymenttype are not saved when sorting by any field
 2021-09-17 11:51:35 +02:00
Laurent Destailleur
b248d2f1cf
Merge pull request #18709 from javieralapps4up/14.0 
Fix #18707 date, account and payment type are lost when sorting by any field
 2021-09-17 11:50:57 +02:00
Laurent Destailleur
5f5c659b76
Merge pull request #18710 from aspangaro/15a14 
NEW Customer invoice template list - Add input date from/to
 2021-09-17 11:50:29 +02:00
Laurent Destailleur
9d59a574f1
Merge pull request #18712 from cfoellmann/PR/correct-cancel-redirects 
fix cancel redirects on product,warehouse cards
 2021-09-17 11:50:09 +02:00
Laurent Destailleur
c04604ea1c
Merge pull request #18721 from fmarcet/13.0 
Fix: On payment list, not filter by company when it is an external user
 2021-09-17 11:48:54 +02:00
Laurent Destailleur
e7ed1d2e08
Merge pull request #18742 from FHenry/dev_barcode_lot_18741 
NEW: Add code codebar column on serial/lot structure
 2021-09-17 11:48:16 +02:00
Laurent Destailleur
a0681d460d
Update llx_product_lot.sql 2021-09-17 11:47:42 +02:00
Lucas Marcouiller
20e8dd4c54 Fix error on html.for.class on ismultientitymanaged test 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-09-17 11:30:45 +02:00
Lucas Marcouiller
0191e3b6ea Fix error on html.for.class on ismultientitymanaged test 2021-09-17 11:23:16 +02:00
Florian HENRY
61fddfd3b0 syntax 2021-09-17 11:09:08 +02:00
Florian HENRY
aa575cd250 add column 2021-09-17 11:06:25 +02:00
stickler-ci
46e8f1bebf Fixing style errors. 2021-09-17 10:59:42 +02:00
antonin_tdj
5f19291285 Avoir Error 19 Constraint Violation (in case of password unchanged) 2021-09-17 10:59:35 +02:00
antonin_tdj
8f3ff32c82 fix ldap passw bug with activedirectory 
Fix to avoid LDAP Error: 53 (Unwilling to perform) on Samba4 AD
 2021-09-17 10:59:09 +02:00
Laurent Destailleur
20b50993bb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-17 10:57:15 +02:00
Laurent Destailleur
6a73fc6e44
Merge pull request #18724 from ibuiv/patch-1 
Fix ldap passw bug with activedirectory
 2021-09-17 10:54:05 +02:00
Laurent Destailleur
d5d97e2d24
Merge pull request #18725 from aspangaro/14p16 
FIX Accountancy - Some correction on export name
 2021-09-17 10:52:48 +02:00
Laurent Destailleur
1a705adf6e
Merge pull request #18726 from cfoellmann/PR/button-classes 
add missing css classes to buttons
 2021-09-17 10:52:13 +02:00
Laurent Destailleur
775544d47d
Merge pull request #18727 from Hystepik/develop#4 
Close #18677 : new show articles of KM
 2021-09-17 10:51:38 +02:00
Marc de Lima Lucio
571d130c3c FIX: task time: keep on using natural_search 2021-09-17 10:51:37 +02:00
Laurent Destailleur
3a8a813c4e
Merge pull request #18730 from esion-net/patch-2 
NEW Expose bank account holder, label and number
 2021-09-17 10:50:11 +02:00
Laurent Destailleur
bed697c98d
Merge pull request #18732 from esion-net/patch-2 
NEW Expose bank account holder, label and number
 2021-09-17 10:49:51 +02:00
Laurent Destailleur
7cbb7d7f44
Merge pull request #18733 from esion-net/patch-3 
NEW Expose bank account holder, label and number
 2021-09-17 10:48:52 +02:00
Laurent Destailleur
c79d7fafa8
Merge pull request #18736 from FHenry/dev_new_add_link_mo_object 
NEW: add MRP into Object Linked Box
 2021-09-17 10:47:57 +02:00
Laurent Destailleur
02bed7ce01 Fix sanitize 2021-09-17 10:45:59 +02:00
Laurent Destailleur
c052a50d75 Fix phpcs 2021-09-17 10:32:19 +02:00
Laurent Destailleur
8a67100a31 Fix phpcs 2021-09-17 10:31:28 +02:00
Laurent Destailleur
c559e5cc3e Fix missing label 2021-09-16 21:23:02 +02:00
Laurent Destailleur
bf173fdbf1 Debug module event organization 2021-09-16 21:19:16 +02:00
Laurent Destailleur
ae028baea1 Debug module event organization 2021-09-16 21:12:29 +02:00
Laurent Destailleur
0c0ef7b683 Debug module event organization 2021-09-16 20:56:14 +02:00
Benjamin Chantalat
9eefafb2ae
Merge branch 'Dolibarr:develop' into develop 2021-09-16 19:33:14 +02:00
Laurent Destailleur
16331ce87b Better detection of company 2021-09-16 18:53:00 +02:00
Laurent Destailleur
bfe305dc47 Debug event organization module 2021-09-16 18:16:25 +02:00
Marc de Lima Lucio
88cd8fface FIX: task time: can't filter by user with pgsql + show error message 2021-09-16 17:53:47 +02:00
Florian HENRY
67c468025d add trans 2021-09-16 17:22:22 +02:00
Florian HENRY
47efccad75 remove debug 2021-09-16 17:13:34 +02:00
Florian HENRY
06b6ada060 fix trad 2021-09-16 17:13:03 +02:00
Florian HENRY
820a007731 NEW: add MRP into Object Linked Box 2021-09-16 17:10:06 +02:00
Laurent Destailleur
424ddcb218 Fix page of payment 2021-09-16 16:37:20 +02:00
Laurent Destailleur
253f01edcb Fix page of payment 2021-09-16 16:33:51 +02:00
Florian
b9e637a2b2
Expose bank account holder, label and number 
NEW Expose bank account holder, label and number
 2021-09-16 15:52:19 +02:00
Florian
3091448d1a
Expose bank account holder, label and number 
Useful for automated texts on invoices to have those values available as well.
 2021-09-16 15:40:25 +02:00
Laurent Destailleur
49ef24edcb Fix trans 2021-09-16 15:16:18 +02:00
Laurent Destailleur
fd3418d91d NEW Can edit the translation key of an overwrote translation key. 2021-09-16 15:13:15 +02:00
Laurent Destailleur
b70764af88 Fix translation of ticket categories 2021-09-16 15:08:04 +02:00
Laurent Destailleur
e9a3cca609 Fix lang file 2021-09-16 14:50:38 +02:00
Laurent Destailleur
1177e86f2e Fix language of group of tickets 2021-09-16 14:46:14 +02:00
Laurent Destailleur
d9751704c8 Fix ambiguous field 2021-09-16 14:37:38 +02:00
Laurent Destailleur
086754e149 Fix translation of category codes 2021-09-16 14:31:20 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
5b07be0179 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/holiday/list.php
 2021-09-16 13:33:49 +02:00
Laurent Destailleur
c68687bdf6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/fournisseurs.php
 2021-09-16 13:29:25 +02:00
Laurent Destailleur
87bb971d75 FIX autocalculation of the supplier price in main currency. 
Conflicts:
	htdocs/product/fournisseurs.php
 2021-09-16 13:22:22 +02:00
lmarcouiller
04a024570c update fetchKnowledge and html.formticket 2021-09-16 13:19:43 +02:00
Laurent Destailleur
f26601e836 FIX autocalculation of the supplier price in main currency. 2021-09-16 13:17:00 +02:00
Laurent Destailleur
9918873719 Better log 2021-09-16 13:07:02 +02:00
Laurent Destailleur
e6cd071e02 Fix email templates 2021-09-16 12:31:33 +02:00
Laurent Destailleur
3a04fc557b Fix email templates 2021-09-16 12:30:46 +02:00
Laurent Destailleur
0fc51b6564 Fix email content 2021-09-16 12:10:40 +02:00
Laurent Destailleur
b18e0e3d1e Add missing translation key 2021-09-16 12:04:46 +02:00
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +02:00
stickler-ci
9d3b680259 Fixing style errors. 2021-09-16 07:31:23 +00:00
antonin_tdj
8c1b3efc47
Avoir Error 19 Constraint Violation (in case of password unchanged) 2021-09-16 09:31:00 +02:00
Alexandre SPANGARO
ed37f9fb7a FIX Accountancy - Some correction on export name 2021-09-16 06:40:43 +02:00
Laurent Destailleur
b18e25db87 Code comment 2021-09-16 03:13:44 +02:00
Laurent Destailleur
aab8d4a628 css 2021-09-16 02:24:25 +02:00
Laurent Destailleur
c907c6ed08 Fix trans 2021-09-16 02:19:08 +02:00
Laurent Destailleur
51d7622434 Fix trans 2021-09-16 02:18:00 +02:00
Laurent Destailleur
2b340579a1 Fix look 2021-09-15 21:12:16 +02:00
Laurent Destailleur
0ab399aa37 Fix try to find the thirdparty from contacts too. 2021-09-15 20:46:48 +02:00
Laurent Destailleur
f859967c24 Fix look and feel v14 2021-09-15 20:28:47 +02:00
Laurent Destailleur
db57aea163 Fix class does not exist 2021-09-15 20:05:37 +02:00
Laurent Destailleur
b1cb32c743 Fix some sql 2021-09-15 20:03:38 +02:00
Laurent Destailleur
5aaf8ff8f3 Fix sql 2021-09-15 19:58:55 +02:00
Laurent Destailleur
801bf83334 Css v14 2021-09-15 19:48:43 +02:00
Laurent Destailleur
eab4014f20 Rename url 2021-09-15 19:42:07 +02:00
Laurent Destailleur
29d9771b80 Code comment 2021-09-15 19:39:22 +02:00
Laurent Destailleur
4a2d3a55d4 FIX Selection of type "people" for membership must hide the company 2021-09-15 19:33:30 +02:00
Laurent Destailleur
3f7a75b0a3 FIX translation into email for member at membership validation. 2021-09-15 19:02:17 +02:00
antonin_tdj
2c73c19bd5
fix ldap passw bug with activedirectory 
Fix to avoid LDAP Error: 53 (Unwilling to perform) on Samba4 AD
 2021-09-15 18:26:32 +02:00
lmarcouiller
b26e9be36f Close #18677 : new show articles of KM 2021-09-15 15:36:57 +02:00
Laurent Destailleur
599621cc1b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-09-15 13:29:55 +02:00
Laurent Destailleur
724badb522 Fix deletion of shipment when there is batch record 2021-09-15 13:29:19 +02:00
Benjamin Chantalat
5035ad9be1 Explicit date_creation instead of date 2021-09-15 12:32:18 +02:00
Ferran Marcet
7a637104b2 Fix: Not filter by company when it is an external user 2021-09-15 11:29:12 +02:00
Vincent Dieltiens
6a1588e925 FIX https://github.com/Dolibarr/dolibarr/issues/18717 2021-09-14 21:41:02 +02:00
Laurent Destailleur
3f2f6c3ed3 Fix online registration 2021-09-14 21:12:11 +02:00
Laurent Destailleur
81863e45f4 Fix link 2021-09-14 18:09:50 +02:00
Laurent Destailleur
6dbf316e66 Fix links 2021-09-14 17:56:06 +02:00
Laurent Destailleur
5f612dfd7c Trans 2021-09-14 17:38:17 +02:00
Laurent Destailleur
2d64c3e560 Fix filter 2021-09-14 17:35:54 +02:00
Laurent Destailleur
21462d0b82 Fix can reset filter in setup 2021-09-14 17:24:53 +02:00
Laurent Destailleur
aeead15a62 css 2021-09-14 17:07:29 +02:00
Laurent Destailleur
c7721563c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-14 17:00:01 +02:00
Laurent Destailleur
f3fcb7a48a Fix insertion of email templates 2021-09-14 16:59:49 +02:00
Christian Foellmann
c967c5c6d4 fix cancel redirects on product,warehouse cards 2021-09-14 08:46:07 +02:00
Alexandre SPANGARO
cb37c42b5e NEW Customer invoice template list - Add input date from/to 2021-09-14 04:50:05 +02:00
javieralapps4up
e1203d115a
Update list.php 2021-09-14 02:22:30 +02:00
javieralapps4up
0763846805
Bug: #18670 date, account and payment type are lost when sorting by any field 
Filtereds $date, $search_account and $search_paymenttype are not saved when sorting by any field
 2021-09-14 02:15:22 +02:00
javieralapps4up
d7126e8d24
Update list.php 
$search_account and $search_paymenttype are not saved when sorting by any field
 2021-09-14 01:49:24 +02:00
Alexandre SPANGARO
eae4269745 Merge branch '14p19' of https://github.com/aspangaro/dolibarr into 14p19 2021-09-13 21:32:55 +02:00
Alexandre SPANGARO
42543ba005 Add alpha key 2021-09-13 21:29:31 +02:00
stickler-ci
6368ba9a6e Fixing style errors. 2021-09-13 19:21:53 +00:00
Alexandre SPANGARO
44f4f9e288 Merge branch '14.0' into 14p19 2021-09-13 21:13:26 +02:00
Alexandre SPANGARO
fe241cc71f FIX Accountancy - Format Quadra export - Missing line type C (act account) 2021-09-13 21:12:39 +02:00
ptibogxiv
0ad8dc2838
Update knowledgerecord.class.php 2021-09-13 19:01:25 +02:00
Laurent Destailleur
7420e6ab9a
Merge pull request #18693 from FHenry/14_fix_ldap_limit 
fix: User class fetch method if LDAP Search LIMIT must be after ORDER BY
 2021-09-13 17:04:43 +02:00
Julien Gainza
65c4a21898 FIX move fetch_optionnal into $ac_static->fetch() 2021-09-13 16:35:13 +02:00
Laurent Destailleur
1ec9d08557
Merge pull request #18701 from aspangaro/14p18 
FIX Accountancy - Trunc code_journal to 2 in format XIMPORT (Ciel, Sage50)
 2021-09-13 16:33:43 +02:00
Laurent Destailleur
41f627b80d Prepare 14.0.3 2021-09-13 16:33:16 +02:00
Laurent Destailleur
283f37a364 Trans 2021-09-13 16:32:24 +02:00
lmarcouiller
324af09415 Close #18692 : Possibility to move directories in ecm 2021-09-13 15:57:21 +02:00
Alexandre SPANGARO
d7236fad99 Merge branch '14.0' into 14p18 2021-09-13 14:51:17 +02:00
Alexandre SPANGARO
3ee258fefc FIX Accountancy - Trunc code_journal to 2 in format XIMPORT (Ciel, Sage50) 2021-09-13 14:08:41 +02:00
lmarcouiller
977fa99681 update knowledgemanagement.key name 2021-09-13 11:39:08 +02:00
lmarcouiller
35ca516ef6 update knowledgerecord_card 2021-09-13 11:24:43 +02:00
lmarcouiller
4762fd9c2e Close #18678 : Implemention of tags/categories KM 2021-09-13 11:22:55 +02:00
Florian HENRY
d464922d71 fix: LDAP Search LIMIT must be after ORDER BY 2021-09-13 09:44:54 +02:00
Laurent Destailleur
ce9a10bd90 Fix description of some options 2021-09-13 03:43:25 +02:00
Laurent Destailleur
3ea617ef68 Fix missing trans 2021-09-13 03:07:57 +02:00
Laurent Destailleur
5869975ed1 Fix phpcs 2021-09-13 02:59:09 +02:00
Laurent Destailleur
bbacb4e740 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 02:45:00 +02:00
Laurent Destailleur
5756f0cfdf Fix code syntax 2021-09-13 01:36:18 +02:00
Laurent Destailleur
a974af131b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 01:32:35 +02:00
Laurent Destailleur
7deed57410 Fix scrutinizer errors 2021-09-13 01:32:20 +02:00
Laurent Destailleur
6fd191b01a Update doc 2021-09-13 01:22:53 +02:00
Laurent Destailleur
201e46f34b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-13 01:18:37 +02:00
Laurent Destailleur
7efd810d57 Clean code 2021-09-13 01:18:24 +02:00
Laurent Destailleur
669213a6db
Merge pull request #18685 from frederic34/patch-1 
doxygen
 2021-09-13 01:03:13 +02:00
stickler-ci
e424df6447 Fixing style errors. 2021-09-12 12:15:33 +00:00
lainwir3d
2fe85f2a86 CLOSE #18689 REST API module: add api key generate / modify right. 2021-09-12 15:47:56 +04:00
Laurent Destailleur
6353987b15 css 2021-09-12 02:04:02 +02:00
Laurent Destailleur
ce33f39bb0 Clean code. Menu must be greyed in get_menudiv 2021-09-11 15:43:26 +02:00
Frédéric FRANCE
88cba08475
doxygen 2021-09-11 09:52:21 +02:00
Frédéric FRANCE
5658c7daea
doxygen 2021-09-11 09:49:01 +02:00
Laurent Destailleur
c005a20cc0 Fix ldap with ssl 2021-09-11 03:27:59 +02:00
Laurent Destailleur
f8b1e4d482 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-10 20:56:15 +02:00
Laurent Destailleur
edb1f31a19 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
 2021-09-10 20:55:52 +02:00
Laurent Destailleur
9dcf3e49d0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2021-09-10 20:50:34 +02:00
Laurent Destailleur
2f4463c983 FIX Collapsing of extrafields has disappeared. 2021-09-10 20:49:22 +02:00
Laurent Destailleur
93fe2c5514
Merge pull request #18672 from aspangaro/15a14 
NEW Survey - Add a clickable link in email send
 2021-09-10 20:05:27 +02:00
Laurent Destailleur
5d512243b8
Merge pull request #18683 from FHenry/14_fix_search_evt_tab 
fix: on Event tabs, if no evt type use in filter, filter on label and state not apply
 2021-09-10 19:57:12 +02:00
Laurent Destailleur
4bbda0115c
Merge pull request #18682 from vincentjdc/product-price-in-product-select 
Add product-id and price-id in dataset of product select
 2021-09-10 19:51:24 +02:00
Laurent Destailleur
3980e4a32b
Merge pull request #18681 from FHenry/14_fix_extrafield_separator_type 
fix: show display/hide icon on extrafield type separator
 2021-09-10 19:49:26 +02:00
Laurent Destailleur
d50c518b70
Merge pull request #18676 from FHenry/14_fix_ajax_company_ambious_column 
fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken
 2021-09-10 19:49:12 +02:00
Laurent Destailleur
78ec200c73
Merge pull request #18679 from FHenry/14_fix_cat_icon_perms 
fix: do not display icon to edit/delete tags if user not authorize
 2021-09-10 19:45:23 +02:00
Laurent Destailleur
7eb3725862
Merge pull request #18680 from Hystepik/develop#2 
Fix  #18604 : fix percentage on variant product
 2021-09-10 19:44:04 +02:00
Laurent Destailleur
fcffcf3858 Remove useless css 2021-09-10 18:54:42 +02:00
Laurent Destailleur
649c618370 CSS 2021-09-10 17:58:41 +02:00
Laurent Destailleur
fe92c2605d Fix look and feel v14 2021-09-10 17:45:27 +02:00
Laurent Destailleur
75cd63a29b Fix css and missing test 2021-09-10 17:39:58 +02:00
Laurent Destailleur
32da715a6c Fix css and missing test 2021-09-10 17:39:08 +02:00
Laurent Destailleur
ae5b5defd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-10 17:17:07 +02:00
Laurent Destailleur
a1e51e212e Array of fields accept 'tdcss' property 2021-09-10 17:16:42 +02:00
Alexandre SPANGARO
d32ab42654 Merge remote-tracking branch 'upstream/develop' into 15a14 2021-09-10 16:59:31 +02:00
Alexandre SPANGARO
26d5ccee61 NEW Survey - Add a clickable link in email send 2021-09-10 16:58:29 +02:00
Florian HENRY
e7eb17177d merge 2021-09-10 15:52:54 +02:00
Florian HENRY
865c5d19bf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta 2021-09-10 15:51:36 +02:00
Florian HENRY
257686c2fe fix: on Event tabs, if no evt type use in filter, filter on label and state not apply 2021-09-10 15:45:03 +02:00
Vincent Dieltiens
b3984798ba Add product-id and price-id in dataset of product select 2021-09-10 15:32:16 +02:00
Florian HENRY
f3a555ec69 fix: show display/hide icon on extrafield type separator 2021-09-10 15:17:09 +02:00
lmarcouiller
3a1a688ab2 Fix #18604 : fix percentage on variant product 2021-09-10 15:03:08 +02:00
Florian HENRY
962bda810c Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_cat_icon_perms 2021-09-10 15:00:54 +02:00
Laurent Destailleur
6810bbf3bb css 2021-09-10 14:28:38 +02:00
Christian Foellmann
29820f446d fix import of product desc without wrong linebreaks 2021-09-10 13:37:42 +02:00
Laurent Destailleur
6f3170494f
Merge pull request #18673 from cfoellmann/PR/input-desc 
fix import of product desc without wrong linebreaks
 2021-09-10 13:36:45 +02:00
Laurent Destailleur
c983e889b6
Merge pull request #18675 from Hystepik/develop#1 
Fix : Sql error on movement_list
 2021-09-10 13:35:58 +02:00
Laurent Destailleur
51d23250de
Update movement_list.php 2021-09-10 13:35:47 +02:00
Laurent Destailleur
43684f26c9
Merge pull request #18628 from lainwir3d/fix_rest_api_fix_self_user_info_read 
FIX #18627 REST API: Allow users with self read / modify rights to get own info
 2021-09-10 13:34:56 +02:00
Laurent Destailleur
b1c23b9a93
Update api_users.class.php 2021-09-10 13:31:17 +02:00
Laurent Destailleur
d4bfbc69a4
Update api_users.class.php 2021-09-10 13:30:28 +02:00
Laurent Destailleur
999ad7629f
Update api_users.class.php 2021-09-10 13:29:19 +02:00
Florian HENRY
ef888d5fca Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_ajax_company_ambious_column 2021-09-10 13:26:05 +02:00
Florian HENRY
c66181a00e fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken 2021-09-10 13:25:40 +02:00
Laurent Destailleur
17b9957197
Update api_users.class.php 2021-09-10 13:20:49 +02:00
lmarcouiller
b98f239739 Fix : Sql error on movement_list 2021-09-10 12:10:08 +02:00
Juanjo Menent
1eb4975a76 fix: Bad date creation for project clone 2021-09-10 11:44:58 +02:00
Laurent Destailleur
1504ff2d6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-10 11:40:59 +02:00
Laurent Destailleur
11b6259130 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/langs/en_US/admin.lang
 2021-09-10 11:40:45 +02:00
Christian Foellmann
e5192de9f2 fix import of product desc without wrong linebreaks 2021-09-10 11:36:08 +02:00
Laurent Destailleur
1ddcd2e709
Merge pull request #18668 from aspangaro/15a12 
NEW Social Contributions - Add from/to on list
 2021-09-10 11:26:28 +02:00
Laurent Destailleur
4939cc9911 Fix trans 2021-09-10 11:04:59 +02:00
Laurent Destailleur
071a2959ab Fix trans 2021-09-10 11:04:49 +02:00
Alexandre SPANGARO
0aa0328313 Merge remote-tracking branch 'upstream/develop' into 15a14 2021-09-10 10:19:27 +02:00
Laurent Destailleur
6a296bf6c2 Debug setup 2021-09-10 10:18:46 +02:00
Laurent Destailleur
7526cb3b8b Fix VAT rate label and add Mali default vat rate 2021-09-10 09:44:06 +02:00
Laurent Destailleur
d382e8d8c9 Clean setup and translation 2021-09-10 09:21:37 +02:00
Alexandre SPANGARO
2eef38e44a Fix PR 2021-09-10 09:12:11 +02:00
Alexandre SPANGARO
4bb612650b NEW Survey - Add a clickable link in email send 2021-09-10 09:09:39 +02:00
Alexandre SPANGARO
12eb16b8b6 Merge branch '15a12' of https://github.com/aspangaro/dolibarr into 15a12 2021-09-09 22:24:42 +02:00
Alexandre SPANGARO
3ea6314494 Remove $year 2021-09-09 22:24:24 +02:00
stickler-ci
dfe1576b8d Fixing style errors. 2021-09-09 20:18:47 +00:00
Alexandre SPANGARO
f31b7fa3c4 NEW Social Contributions - Add from/to on list 2021-09-09 22:14:26 +02:00
Laurent Destailleur
5a87d94b3c Add missing fields into llx_holiday 2021-09-09 20:38:25 +02:00
Laurent Destailleur
77247ec43a Add date valid/approval 2021-09-09 20:35:57 +02:00
Laurent Destailleur
f4786c8a0a Include ref into label of log history 
Conflicts:
	htdocs/holiday/card.php
 2021-09-09 19:50:39 +02:00
Laurent Destailleur
6465e8aa36 Include ref into label of log history 2021-09-09 19:47:51 +02:00
Laurent Destailleur
b8b5b97d78 Code comment 2021-09-09 19:47:15 +02:00
Laurent Destailleur
22c77e0ff9 Include ref into label of log history 2021-09-09 19:46:40 +02:00
Laurent Destailleur
875b93aff2
Merge branch 'develop' into 15a8 2021-09-09 19:26:01 +02:00
Laurent Destailleur
520ce4c3ac Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 19:21:45 +02:00
Laurent Destailleur
ffd7f60830 FIX #18589 #18617 2021-09-09 19:21:32 +02:00
Laurent Destailleur
e43d91ee6e
Merge pull request #18665 from FHenry/14_fix_cat_icon_perms 
fix: do not display icon to edit/delete tags if user not authorize
 2021-09-09 19:00:04 +02:00
Laurent Destailleur
fba9567003
Merge pull request #18664 from Fyroeo/develop 
CLOSE|Close #18663 Make "L'Annuaire des Entreprises" the default provider for SIREN verification.
 2021-09-09 18:58:11 +02:00
Laurent Destailleur
caf0559985
Merge pull request #18624 from Hystepik/develop#1 
Close #18584 : Code enhancement of MO
 2021-09-09 18:54:34 +02:00
lainwir3d
63abe2f1ff FIX #18666 Order / Shipment list: Don't SQL JOIN category table when not necessary. 2021-09-09 19:56:28 +04:00
Florian HENRY
45ad23206a fix: do not display icon to edit/delete tags if not perms 2021-09-09 17:41:40 +02:00
Mazaud Thomas
2091f915b5
Fix the provided URL 
I made a typo in the URL.
 2021-09-09 16:38:45 +02:00
Mazaud Thomas
512aa92b7e
CLOSE|Close #18663 Make "L'Annuaire des Entreprises" the default provider for SIREN verification. 
Changing the default provider for SIREN verification by making the Government Owned "L'annuaire des Entreprises" the default one.
 2021-09-09 16:31:39 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Laurent Destailleur
a80950b96d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 16:06:28 +02:00
Laurent Destailleur
5406e3d34e Fix phpcs 2021-09-09 16:06:16 +02:00
Laurent Destailleur
478918bd45 Fix phpunit 2021-09-09 15:59:43 +02:00
lainwir3d
20e2eb1d9a Merge remote-tracking branch 'origin/develop' into fix_rest_api_fix_self_user_info_read 2021-09-09 17:46:59 +04:00
lainwir3d
ad7a5eaf70 Merge remote-tracking branch 'origin/develop' into fix_rest_api_fix_self_user_info_read 2021-09-09 17:44:22 +04:00
lmarcouiller
dea7e83360 update of mo_production.php 2021-09-09 15:33:06 +02:00
Laurent Destailleur
de005f5cd2
Merge pull request #18661 from Hystepik/develop_v14#4 
Fix #18660 : fix rights of supplier order with API
 2021-09-09 15:18:17 +02:00
Laurent Destailleur
5d5b7c3af4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/peruser.php
	htdocs/main.inc.php
 2021-09-09 15:15:26 +02:00
Laurent Destailleur
30894b989c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-09-09 15:12:16 +02:00
Laurent Destailleur
70f22f2648 # WARNING: head commit changed in the meantime 
Merge
 2021-09-09 15:12:02 +02:00
Laurent Destailleur
654bf4d672 Fix name of index #18623 2021-09-09 15:07:55 +02:00
Laurent Destailleur
e332ca88e4 Fix missing sql 2021-09-09 15:06:30 +02:00
Laurent Destailleur
4d5621ea6f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 14:59:12 +02:00
Laurent Destailleur
f1758b6f0c
Merge pull request #18623 from atm-gauthier/14.0_fix_salary_extrafields 
14.0 fix salary extrafields are no more available
 2021-09-09 14:58:54 +02:00
Laurent Destailleur
1a8364adcc
Merge pull request #18637 from hregis/fix_multicompany 
FIX multicompany transverse mode compatibility
 2021-09-09 14:50:22 +02:00
Laurent Destailleur
085b893074
Update mo_production.php 2021-09-09 14:44:52 +02:00
lmarcouiller
4928d03c4f update to have modify ! to empty() 2021-09-09 14:44:17 +02:00
fr69400
ad0c4c518f Update row.php 
right write doesn't exist for supplier_proposal

->line order dont works
 2021-09-09 14:42:43 +02:00
Laurent Destailleur
402757bdfe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-09 14:41:51 +02:00
Laurent Destailleur
3581c37b83
Merge pull request #18626 from fr69400/develop 
FIX : line reorder dont work on supplier_proposal
 2021-09-09 14:41:30 +02:00
lmarcouiller
8af6b8679e update with fournisseur && supplier_order 2021-09-09 14:40:39 +02:00
Laurent Destailleur
cbe08183ac
Merge pull request #18648 from atm-gauthier/NEW_mass_delete_objects 
NEW : mass action delete, no more break if at least one object has child
 2021-09-09 14:38:49 +02:00
Laurent Destailleur
d9cdddd688
Update actions_massactions.inc.php 2021-09-09 14:35:19 +02:00
Laurent Destailleur
7eba2f6f39 Code comment 2021-09-09 14:32:59 +02:00
Laurent Destailleur
dca743142e
Merge pull request #18636 from Hystepik/develop#2 
Close #18607 : Implementation of salary button
 2021-09-09 14:29:56 +02:00
Laurent Destailleur
97f3296c73
Update card.php 2021-09-09 14:29:42 +02:00
Laurent Destailleur
6df4f250a5
Update list.php 2021-09-09 14:21:20 +02:00
lmarcouiller
022f3e640d Fix #18660 : fix rights of supplier order with API 2021-09-09 13:28:30 +02:00
stickler-ci
1e8870eb95 Fixing style errors. 2021-09-09 09:30:29 +00:00
Gauthier PC portable 024
4e78a24a13 FIX : if delete return < 0, we break and rollback, if == 0, we set event message warning and we test other objects of list 2021-09-09 11:25:46 +02:00
lmarcouiller
d451703bbf Fix : reception list sql error 2021-09-09 11:21:34 +02:00
stickler-ci
3da71418ac Fixing style errors. 2021-09-09 08:52:26 +00:00
atm-gregr
b88a16b563 Merge branch '11.0_SupplierOrder_ValidateMassAction' of github.com:atm-gregr/dolibarr into NEW/develop_SupplierOrder_ValidateMassAction 2021-09-09 10:49:05 +02:00
atm-gregr
24117851cc NEW : massaction validate on supplier orders 2021-09-09 10:43:15 +02:00
stickler-ci
dd7f6b6a5c Fixing style errors. 2021-09-09 08:17:52 +00:00
jpb
9078bcb9a9 Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object 2021-09-09 10:15:09 +02:00
jpb
91e624fd5d change test 2021-09-09 10:14:39 +02:00
Regis Houssin
303b0e7f31 FIX better sql request 2021-09-09 09:21:30 +02:00
Laurent Destailleur
e5b71a1a89
Merge pull request #18598 from henrynopo/patch-2 
Increase the width of column for General Set-ups - Update dolibarr.php
 2021-09-09 05:12:06 +02:00
Laurent Destailleur
de97b248f2
Update dolibarr.php 2021-09-09 05:11:56 +02:00
Laurent Destailleur
ea9a07fb3d
Update dolibarr.php 2021-09-09 05:11:31 +02:00
Laurent Destailleur
a4d897f609
Merge pull request #18625 from jyhere/patch-1 
Fix : unable to create a direct debit if ics_transfer is empty
 2021-09-09 05:04:06 +02:00
Laurent Destailleur
adf4c94f45
Merge pull request #18631 from hregis/fix_maxlength_of_input 
FIX increase maxlength of password input
 2021-09-09 05:00:03 +02:00
Laurent Destailleur
9fe9d0e9bf
Merge pull request #18630 from hregis/fix_wrong_table_element_line 
FIX wrong table_element_line
 2021-09-09 04:59:27 +02:00
Laurent Destailleur
ba38bfd038
Merge pull request #18616 from cfoellmann/fix-redirect-soc 
fix GET parameter on redirect
 2021-09-09 04:58:44 +02:00
Laurent Destailleur
3c215730db
Merge pull request #18639 from Hystepik/develop_v14#1 
Fix #18633 : fix error message
 2021-09-09 04:56:54 +02:00
Laurent Destailleur
77b8d91895
Update 13.0.0-14.0.0.sql 2021-09-09 04:56:25 +02:00
Laurent Destailleur
ac8dfb2dd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 04:41:55 +02:00
Laurent Destailleur
d42492c67b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/dolreceiptprinter.class.php
 2021-09-09 04:41:39 +02:00
Laurent Destailleur
ca2aa6d031 Clean comment 2021-09-09 04:37:08 +02:00
Laurent Destailleur
6d7cb01951
Merge pull request #18645 from atm-adrien/FIX_add_token 
FIX : Add token to remove error when removing widget
 2021-09-09 04:31:03 +02:00
Laurent Destailleur
5de3d7d5d2 Clean var not initialized 2021-09-09 03:49:07 +02:00
Laurent Destailleur
7533092f27 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-09-09 03:42:12 +02:00
Laurent Destailleur
88cd9afe84
Merge pull request #18643 from Gecka-Apps/14-takepos-fast-product-search 
TakePos - fast product search
 2021-09-09 03:37:52 +02:00
Laurent Destailleur
66a7992441 Fix var init 2021-09-09 03:34:51 +02:00
Laurent Destailleur
e4a7903700
Merge pull request #18657 from moreauftheobald/14.0_fiix_knowledgemanagement_menu 
Fix: Enable Knowledge Management Menu
 2021-09-09 03:23:26 +02:00
Laurent Destailleur
61d5152209
Update eldy.lib.php 2021-09-09 03:23:04 +02:00
Laurent Destailleur
8b58de50d5 Clean code 2021-09-09 03:21:41 +02:00
Laurent Destailleur
722cc5f3f9
Merge pull request #18647 from Hystepik/develop#4 
Fix fatal error with php 8.0 holiday creation
 2021-09-09 03:06:54 +02:00
Laurent Destailleur
0146153792
Merge pull request #18650 from aspangaro/14p18 
css
 2021-09-09 03:02:54 +02:00
Laurent Destailleur
348fe00ffb
Merge pull request #18653 from Hystepik/develop_v14#2 
Fix permission for salaries module
 2021-09-09 03:02:34 +02:00
Laurent Destailleur
b87ac639fd
Update card.php 2021-09-09 03:02:18 +02:00
Laurent Destailleur
ff74fbdf16
Update card.php 2021-09-09 02:37:47 +02:00
Laurent Destailleur
4db234e036 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-09 02:29:10 +02:00
Laurent Destailleur
ad9bf27bea Clean code 2021-09-09 02:26:49 +02:00
Laurent Destailleur
89ed156d7e Complete getOutstandingBills() 2021-09-09 02:18:50 +02:00
Laurent Destailleur
39dd1e2dd1 Code comment 2021-09-09 02:00:07 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
 2021-09-08 22:13:35 +02:00
Laurent Destailleur
30856d5b18 FIX Relative discount with high nb of decimals 2021-09-08 22:09:02 +02:00
Laurent Destailleur
4705d41ed2 FIX Relative discount with high nb of decimals 2021-09-08 22:00:16 +02:00
Laurent Destailleur
8326ecee78 Fix phpcs 2021-09-08 21:19:40 +02:00
Laurent Destailleur
e0fa4e4b5c Fix phpcs 2021-09-08 21:19:01 +02:00
Laurent Destailleur
bfa75e91e2 Code comment 2021-09-08 20:59:56 +02:00
MOREAU FRANCK
04026dd0b0 fix Stickler CI review 2021-09-08 19:51:34 +02:00
Laurent Destailleur
57a2ea3a53 Fix sql error 2021-09-08 19:49:24 +02:00
Laurent Destailleur
405beb77f5 Fix sql error 2021-09-08 19:45:55 +02:00
MOREAU FRANCK
e9505c1109 Update V14 2021-09-08 18:23:44 +02:00
lmarcouiller
a5e670291e Fix permission for salaries module 2021-09-08 15:36:51 +02:00
Regis Houssin
8c95ada9fd FIX wrong users count in multicompany transverse mode 2021-09-08 10:25:27 +02:00
Alexandre SPANGARO
6c118b4dfb css 2021-09-08 04:31:38 +02:00
Laurent Destailleur
0b68da4e9e Debug organizedeventregistration module 2021-09-08 02:27:52 +02:00
Laurent Destailleur
f5903c9b02 Debug organizedeventregistration module 2021-09-08 02:17:00 +02:00
Laurent Destailleur
880ac07661 Debug organizedeventregistration module 2021-09-08 01:41:59 +02:00
Laurent Destailleur
b92784c04b Fix autoselect of thirdparty 2021-09-07 23:38:33 +02:00
Laurent Destailleur
3cc888f4df Debug event module 2021-09-07 23:19:36 +02:00
Laurent Destailleur
07d48e627e Debug event organization module 2021-09-07 23:19:16 +02:00
Laurent Destailleur
6089de568e Fix sort order 2021-09-07 23:15:06 +02:00
Laurent Destailleur
3df005778c Debug event module 2021-09-07 19:48:32 +02:00
Laurent Destailleur
f54e4690e6 Debug event organization module 2021-09-07 18:13:55 +02:00
Laurent Destailleur
32a09e9494 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/salaries/paiement_salary.php
 2021-09-07 17:47:00 +02:00
Laurent Destailleur
1fda7d43ef Fix sql 2021-09-07 17:45:22 +02:00
Laurent Destailleur
83ec43a2ee css 2021-09-07 17:44:57 +02:00
Laurent Destailleur
0edf2f344b Fix sql 2021-09-07 17:38:46 +02:00
Laurent Destailleur
f2df3aa151 css 2021-09-07 17:27:29 +02:00
Laurent Destailleur
4e0ae972f1 Fix css 2021-09-07 17:26:31 +02:00
Gauthier PC portable 024
938092d67c NEW : when we delete several objects with massaction, if somes object has child we must see which objects are concerned and nevertheless delete objects which can be deleted 2021-09-07 16:46:48 +02:00
lmarcouiller
a10adcabcb Fix fatal error with php 8.0 holiday creation 2021-09-07 16:45:52 +02:00
ksar
e26e6288c2
FIX #18591 : Remove double quotes of SQL Queries 
FIX #18591 : Remove double quotes of SQL Queries for postgresql compatibility
 2021-09-07 15:22:02 +02:00
Laurent Dinclaux
5ee51f965e Fixes coding standard 2021-09-08 00:12:55 +11:00
Laurent Dinclaux
303313b168 Takepos: set proper image directly when searching products 
Bypasses genimg/index.php that either redirects to viewimage.php or to nophoto.png. That was making lots of request to the server and excessive load on the database server, that queues them slowing down the UI.
 2021-09-08 00:02:27 +11:00
Laurent Destailleur
c3825e2394 css 2021-09-07 14:52:19 +02:00
Laurent Dinclaux
10780a343e TakePos: add temporization when searching products. 
Adds a temporization after each typed letter, giving the user 700ms to type next letter before sending the search request
It prevents hammering the server for each typed letter and "results jumping" effect, which is error-prone.
 2021-09-07 23:48:30 +11:00
Adrien Raze
5f58eefc79 Merge branch '14.0' of https://github.com/Dolibarr/dolibarr into FIX_add_token 2021-09-07 14:48:23 +02:00
Adrien Raze
948d2bc4e9 FIX : Add token when remove the last widget on home page 2021-09-07 14:43:37 +02:00
Laurent Dinclaux
c8af143468 Fix coding standards 2021-09-07 23:27:31 +11:00
Laurent Destailleur
586e5c8b5b Can set sort order in the ->fields description array for foreign key 2021-09-07 14:10:26 +02:00
lmarcouiller
f3babd2819 Fix #18633 : fix error message 2021-09-07 13:59:36 +02:00
Laurent Dinclaux
807b4bf93e Fix cash payment in some cases. Make pay requests language independant and rely on payment method code. 2021-09-07 22:42:17 +11:00
Laurent Dinclaux
a39f469a50 Only check takepos configuration if a terminal is choosen, to prevent error message 2021-09-07 22:31:09 +11:00
Laurent Destailleur
4380c75c61 Show ref into bomco box and label 2021-09-07 13:09:12 +02:00
Laurent Destailleur
4cbe83fbc8 Add ref in combobox 2021-09-07 13:08:37 +02:00
Laurent Destailleur
7b43d07a36 Fix sql 2021-09-07 13:01:18 +02:00
Regis Houssin
52419f28c5 FIX add DISTINCT 2021-09-07 12:38:15 +02:00
Regis Houssin
4aaaa8e21a FIX multicompany transverse mode compatibility 2021-09-07 12:10:35 +02:00
lmarcouiller
0d9280f945 Close #18607 : Implementation of salary button 2021-09-07 10:39:41 +02:00
Laurent Destailleur
02f21d478a Fix trans 2021-09-06 19:06:46 +02:00
Laurent Destailleur
51a751f088 Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT 2021-09-06 19:00:01 +02:00
Laurent Destailleur
f5f0b9debc Fix label for selection 2021-09-06 18:41:04 +02:00
Laurent Destailleur
e77d7d22a8 Trans 2021-09-06 18:34:18 +02:00
Laurent Destailleur
70d52aca1d Trans 2021-09-06 17:42:17 +02:00
Regis Houssin
7d8023fea7 FIX wrong table_element_line 2021-09-06 16:21:30 +02:00
stickler-ci
f535a44921 Fixing style errors. 2021-09-06 13:58:23 +00:00
Julien Gainza
9d89e48d15 Fix : Add extrafields on API "get events list" 2021-09-06 15:55:33 +02:00
lainwir3d
09d1680ea0 FIX #18627 Allow users with self read / modify rights to get own info. 2021-09-06 17:52:41 +04:00
Laurent Destailleur
ae7a309e8d Fix css 2021-09-06 17:37:59 +04:00
Laurent Destailleur
4bf2259fb6 Fix css 2021-09-06 17:37:59 +04:00
Laurent Destailleur
93fdf41521 Fix css 2021-09-06 17:37:59 +04:00
Laurent Destailleur
fdce538380 Fix trans 2021-09-06 17:37:59 +04:00
Florian HENRY
a57c4c7cc5 ok for prod 2021-09-06 17:37:59 +04:00
Florian HENRY
8df911d728 work on event 2021-09-06 17:37:59 +04:00
stickler-ci
3537f68c7e Fixing style errors. 2021-09-06 13:24:22 +00:00
jyhere
18da6e6d6f
Update create.php 
Fix : unable to create a direct debit if ics and ics_transfer are empty even though ics_transfer is only used for bank transfer.
 2021-09-06 15:20:47 +02:00
fr69400
5c9100986d Update row.php 
right write doesn't exist for supplier_proposal

->line order dont works
 2021-09-06 15:19:35 +02:00
stickler-ci
1043bc964d Fixing style errors. 2021-09-06 12:58:06 +00:00
lmarcouiller
765f0c4d19 Close #18584 : Code enhancement of MO 2021-09-06 14:56:30 +02:00
Gauthier PC portable 024
383c92f6c6 FIX : migration script 2021-09-06 14:52:11 +02:00
Laurent Destailleur
a57e8a14b8 Fix look and feel v14 2021-09-06 12:56:33 +02:00
Laurent Destailleur
38bd5e0902 Fix trans 2021-09-06 12:51:40 +02:00
Gauthier PC portable 024
be1c08ddfe FIX : salary extrafields don't work and table is not well named 2021-09-06 12:30:39 +02:00
lmarcouiller
b9150c2441 add produce line if no produce objects 2021-09-06 11:20:36 +02:00
jpb
06b9f90383 merge conflict 2021-09-06 09:52:28 +02:00
jpb
65a2486f94 merge conflict 2021-09-06 09:43:52 +02:00
Christian Foellmann
c3f1ecb981 fix GET parameter on redirect 2021-09-06 09:14:19 +02:00
Laurent Destailleur
b782e5986a Fix css 2021-09-06 03:29:46 +02:00
Laurent Destailleur
e4767e91ea Fix css 2021-09-06 03:26:43 +02:00
Laurent Destailleur
2d6b9a2a0a CSS 2021-09-06 03:26:27 +02:00
Laurent Destailleur
5850b68f79 Fix css 2021-09-06 03:22:06 +02:00
Laurent Destailleur
9aaf11f8cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-06 01:52:34 +02:00
Laurent Destailleur
319a531571 Trans 2021-09-06 01:51:25 +02:00
Laurent Destailleur
8e90a374e0 Responsive 2021-09-06 01:47:18 +02:00
Laurent Destailleur
f288f36b71 NEW Can use textarea field into confirm popup. 
Reponsive
 2021-09-06 01:42:54 +02:00
Regis Houssin
1c97393a69 FIX increase maxlength of password input 2021-09-05 15:35:06 +02:00
Laurent Destailleur
b58684af98 Fix trans 2021-09-05 14:31:33 +02:00
stickler-ci
3ea23d75fe Fixing style errors. 2021-09-05 10:17:23 +00:00
ptibogxiv
940f77fb61
fix entity knowledgerecord 2021-09-05 12:15:11 +02:00
Laurent Destailleur
ed3919da13 Look and feel 2021-09-05 02:25:32 +02:00
Laurent Destailleur
2928c3dc9b NEW Add a PDF document template for Manufacturing Orders 2021-09-05 02:18:53 +02:00
Laurent Destailleur
4f744fb2c0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-05 02:03:31 +02:00
Laurent Destailleur
d0bbd33bb2
Merge pull request #18602 from mschamp/develop 
Manufacturing order pdf template
 2021-09-05 02:03:09 +02:00
Laurent Destailleur
0d6296e417
Merge pull request #18539 from GurvanKervern/undef4 
Undef4
 2021-09-05 01:57:16 +02:00
Laurent Destailleur
f79b883a4a
Update invoice.php 2021-09-05 01:57:05 +02:00
Laurent Destailleur
5268539f14 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-05 01:42:32 +02:00
Laurent Destailleur
de8db34f43 Fix filter on status of order 2021-09-05 01:42:15 +02:00
Laurent Destailleur
4d314d557d Doc 2021-09-05 01:14:42 +02:00
ptibogxiv
f3cf4f77b9
Update knowledgerecord.class.php 2021-09-04 21:30:56 +02:00
ptibogxiv
8850bd774c
Update 14.0.0-15.0.0.sql 2021-09-04 19:37:36 +02:00
ptibogxiv
c276882442
Update 14.0.0-15.0.0.sql 2021-09-04 19:36:57 +02:00
ptibogxiv
885237f3ac
Update llx_knowledgemanagement_knowledgerecord.sql 2021-09-04 19:32:15 +02:00
Laurent Destailleur
138af805b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-04 14:11:38 +02:00
Laurent Destailleur
5b9a583005 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-04 13:53:46 +02:00
Laurent Destailleur
4e7549ab7d css 2021-09-04 13:53:31 +02:00
stickler-ci
35f3742d08 Fixing style errors. 2021-09-04 11:05:50 +00:00
mschamp
db6a2844ad
Add files via upload 2021-09-04 12:36:54 +02:00
Frédéric FRANCE
456f25d57e
fix #17634 2021-09-04 11:30:03 +02:00
Henry
b13fc30a0a
Update dolibarr.php 2021-09-04 12:25:40 +08:00
Laurent Destailleur
94e708d196 Fix sql error 2021-09-03 21:59:13 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
87b33c09e0
Merge pull request #18595 from FHenry/14_eventorg 
NEW : Can register an attendees on project global (and also on conférence)
 2021-09-03 20:50:21 +02:00
Laurent Destailleur
f1fc17b663 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-03 18:04:31 +02:00
Laurent Destailleur
c4621f0433 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-09-03 18:04:14 +02:00
Laurent Destailleur
2e3b6b2fc8 Backport sql injection fix from develop 2021-09-03 18:00:28 +02:00
Florian HENRY
628c715878 ok for prod 2021-09-03 16:39:10 +02:00
Florian HENRY
96f9f8ae98 work on event 2021-09-03 15:40:33 +02:00
Laurent Destailleur
a7d9889c40
Merge pull request #18592 from fr69400/develop 
FIX : delete image from card.php page dont remove the thumbs
 2021-09-03 15:12:04 +02:00
fr69400
a89a6b6343 bug image delete 
Remove linked image from card.php (section builddoc) dont remove the thumbs of image file
 2021-09-03 14:18:44 +02:00
Laurent Destailleur
248e68aada Code comment 2021-09-03 13:39:08 +02:00
Laurent Destailleur
30c29f13c8 Fix go back on thirdparty file after Save 2021-09-03 13:19:37 +02:00
Laurent Destailleur
531037ddb6 Prepare 14.0.2 2021-09-03 11:04:49 +02:00
Laurent Destailleur
e965d6d6f2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf.php
	htdocs/api/class/api_access.class.php
 2021-09-03 11:02:21 +02:00
Laurent Destailleur
dc81f1de68 Fix var_dump 2021-09-03 11:00:14 +02:00
Laurent Destailleur
35e5480f2f Fix var init 2021-09-03 10:58:43 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Laurent Destailleur
7ca855d192
Update invoice.php 2021-09-02 21:14:01 +02:00
Laurent Destailleur
3598816763 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-02 21:05:00 +02:00
Laurent Destailleur
dd6647e6cb Fix label import fields 2021-09-02 21:03:49 +02:00
Laurent Destailleur
8ea1a9602b NEW Add import / export of MO and BOMLines - Close #18499 2021-09-02 21:00:31 +02:00
henrynopo
4c1d857991 Update remx.php 2021-09-02 19:36:48 +02:00
Laurent Destailleur
b217c5d43e
Merge pull request #18537 from henrynopo/patch-15 
Fix error no value of multicurrency discount amount consumed as payment to invoice
 2021-09-02 19:36:12 +02:00
Gurvan Kervern
1061a9f9fe
Update invoice.php 2021-09-03 01:27:43 +08:00
henrynopo
6e5258f482 Update stocks.lang 2021-09-02 19:26:32 +02:00
Laurent Destailleur
0c72734c4a
Merge pull request #18536 from henrynopo/patch-14 
Fix error of ValidateSending
 2021-09-02 19:23:59 +02:00
Laurent Destailleur
2123d9ce44
Merge pull request #18585 from Givriz/dev_5 
Compatibility phpv8
 2021-09-02 19:21:03 +02:00
Laurent Destailleur
67cd41fe17
Update list.php 2021-09-02 19:20:21 +02:00
Laurent Destailleur
cc86ab8c5e
Update list.php 2021-09-02 19:19:35 +02:00
Laurent Destailleur
74372a3bae
Update index.php 2021-09-02 19:17:38 +02:00
Laurent Destailleur
67db0f1bdb Add link "Now" on date selection when cloning social contribution 2021-09-02 19:15:21 +02:00
Givriz
1c99bd7c4a Compatibility phpv8 2021-09-02 18:48:46 +02:00
Laurent Destailleur
51b1cd583b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-09-02 18:48:20 +02:00
Laurent Destailleur
7017a98071
Merge pull request #18446 from henrynopo/patch-6 
Added function - using list of location_incoterms
 2021-09-02 18:47:15 +02:00
Laurent Destailleur
9e994e6373
Merge pull request #18579 from Hystepik/develop_v14#1 
Fix #18443 : overwrite file works fine
 2021-09-02 17:27:19 +02:00
Laurent Destailleur
147583d58b Remove useless parameters 2021-09-02 17:25:11 +02:00
Laurent Destailleur
9619791eaa
Merge pull request #18580 from frederic34/patch-8 
fix tooltip info
 2021-09-02 17:21:10 +02:00
Laurent Destailleur
fd2bfc82f2 Fix #18581 Fix #18582 2021-09-02 17:20:14 +02:00
ksar
260049c917
FIX #18565 2021-09-02 17:15:57 +02:00
Laurent Destailleur
7758c0b8a7 Fix phpcs 2021-09-02 16:06:19 +02:00
Laurent Destailleur
cd313d7506 Save type (manufacture/disassemble) on MO. 2021-09-02 15:23:31 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
cac1a7ba5f Fix sql request when using encrypt 2021-09-02 13:45:44 +02:00
Frédéric FRANCE
18d61574d3
fix tooltip info 2021-09-02 12:40:05 +02:00
stickler-ci
e01ccabbd5 Fixing style errors. 2021-09-02 08:56:53 +00:00
lmarcouiller
ae38490042 Fix #18443 : overwrite file works fine 2021-09-02 10:53:22 +02:00
Laurent Destailleur
e22bd5c048 Fix better format address for jp in romaji 2021-09-02 10:39:56 +02:00
Laurent Destailleur
8600d8d00d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 22:50:06 +02:00
Laurent Destailleur
8193e792b5 Fix responsive 2021-09-01 22:39:01 +02:00
Laurent Destailleur
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00
Laurent Destailleur
c762840dec FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:37:15 +02:00
Laurent Destailleur
1bce356efa Fix responsive 2021-09-01 21:34:59 +02:00
Laurent Destailleur
c207dde5e1 Fix cancel button 2021-09-01 20:10:56 +02:00
Laurent Destailleur
c38161374d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 19:46:03 +02:00
Laurent Destailleur
207328c872 Example to fix the #18448 2021-09-01 19:45:46 +02:00
Laurent Destailleur
28aa57b169
Merge pull request #18497 from FHenry/dev_new_projtask_changefilterdate 
NEW: date filter on project list and task list From->To
 2021-09-01 19:19:08 +02:00
Laurent Destailleur
03cfea2504 Fix const setup 2021-09-01 19:06:58 +02:00
Laurent Destailleur
eaf1379751 Trans 2021-09-01 18:55:27 +02:00
Laurent Destailleur
a7b0a837d4 Fix cancel button must be named "$cancel" everywhere. 2021-09-01 18:46:06 +02:00
Laurent Destailleur
7c7e89cc3b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 2021-09-01 18:41:44 +02:00
Laurent Destailleur
270eede593 Removed $_GET and $_REQUEST 2021-09-01 18:39:35 +02:00
Laurent Destailleur
4810db3dbf
Merge pull request #18498 from GurvanKervern/undefVars2 
Undef vars2
 2021-09-01 18:36:26 +02:00
Laurent Destailleur
7e567d5fd2
Update list.php 2021-09-01 18:36:00 +02:00
Laurent Destailleur
cc1ec0aad9
Update list.php 2021-09-01 18:35:19 +02:00
Laurent Destailleur
831a66465f Fix trans 2021-09-01 18:28:21 +02:00
Christian Foellmann
f391b11da7 fix product nature on create 2021-09-01 18:23:38 +02:00
Laurent Destailleur
7c429bca0d
Merge pull request #18533 from cfoellmann/PR/fix-nature 
fix product nature on create
 2021-09-01 18:20:52 +02:00
Laurent Destailleur
82d99bfa01
Merge pull request #18546 from lainwir3d/fix_restapi_order_mail_substitutes 
FIX #18544 Shipment rest api: load thirdparty object when validating
 2021-09-01 18:19:11 +02:00
Laurent Destailleur
f0a68d728a
Merge pull request #18548 from henrynopo/patch-17 
Fix error of SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED
 2021-09-01 18:17:37 +02:00
Laurent Destailleur
c4acfe5fc0
Merge pull request #18577 from Givriz/dev_2 
Compatibility phpv8
 2021-09-01 18:06:06 +02:00
Laurent Destailleur
7e8ce82e0a
Merge pull request #18543 from lainwir3d/fix_restapi_global_user_variable 
FIX #18542 REST API: set global $user variable to DolibarrApiAccess::user
 2021-09-01 18:05:40 +02:00
Laurent Destailleur
0f325bdd65
Update api_access.class.php 2021-09-01 18:05:24 +02:00
Laurent Destailleur
82d878dd7a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
 2021-09-01 17:59:07 +02:00
Laurent Destailleur
79a25248cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2021-09-01 17:55:32 +02:00
Laurent Destailleur
74f3b98ea9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2021-09-01 17:54:21 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Laurent Destailleur
3e4d7dfaba Fix $_SERVER["PHP_SEFL"] into $_SERVER["PHP_SELF"] 2021-09-01 17:44:54 +02:00
stickler-ci
1457afb9b9 Fixing style errors. 2021-09-01 15:35:23 +00:00
Laurent Destailleur
60e4e23870
Update object_discounts.tpl.php 2021-09-01 17:33:18 +02:00
Laurent Destailleur
7c5621a2d4
Merge pull request #18552 from aspangaro/15a12 
NEW Invoice list - Use complete country select field with EEC or not
 2021-09-01 17:17:48 +02:00
Laurent Destailleur
443827ff42 FIX #18531 2021-09-01 17:10:26 +02:00
Laurent Destailleur
65c92f176c
Merge pull request #18553 from Hystepik/develop#1 
Fix : KnowledgeManagement menu permission
 2021-09-01 16:43:01 +02:00
Givriz
688d217bed Compatibility phpv8 2021-09-01 16:39:28 +02:00
Laurent Destailleur
4b7b54e196
Update 14.0.0-15.0.0.sql 2021-09-01 16:32:25 +02:00
Laurent Destailleur
3b236f677d
Update llx_product_association.sql 2021-09-01 16:31:16 +02:00
Laurent Destailleur
ef2bb99476
Update commonobject.class.php 2021-09-01 16:29:08 +02:00
Laurent Destailleur
8dd4dae8f8
Merge pull request #18558 from FHenry/dev_more_inv_task_comment 
From #18530 display date and duration in invoice generation from task time spent
 2021-09-01 16:27:24 +02:00
Laurent Destailleur
b66bd781a4 Clean code 2021-09-01 16:26:59 +02:00
Vincent Dieltiens
2bad48bdcc FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject 2021-09-01 16:25:29 +02:00
Laurent Destailleur
4ba189fffb
Merge pull request #18560 from vincentjdc/supplier-order-dispatch-common-object-line 
FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject
 2021-09-01 16:23:28 +02:00
Laurent Destailleur
1027f1059e
Merge pull request #18574 from FHenry/14_eventorg 
fix: disabled module Event Org when project disabled
 2021-09-01 16:17:55 +02:00
Laurent Destailleur
14ca7db5d7 Typo in log 2021-09-01 16:17:31 +02:00
Vincent Dieltiens
59e917cd5f regroup BILL_SUPPLIER_VALIDATE actions 
Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2021-09-01 16:14:44 +02:00
Vincent Dieltiens
65ccbb6249 Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition 2021-09-01 16:06:36 +02:00
Laurent Destailleur
46a38506a5
Merge pull request #18562 from vincentjdc/bill-supplier-validate 
Bill supplier validate
 2021-09-01 16:04:50 +02:00
Laurent Destailleur
3728cca2f3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-01 15:23:53 +02:00
Florian HENRY
bb6dda087c Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_eventorg 2021-09-01 15:23:04 +02:00
Florian HENRY
bae73b9a52 disabled module on inactive 2021-09-01 15:16:11 +02:00
Laurent Destailleur
741bc5da20 Fix label 2021-09-01 15:13:31 +02:00
Laurent Destailleur
375557e092 FIX Menu List of project was not visible. 2021-09-01 15:10:02 +02:00
Alexandre SPANGARO
dbe6861f79 Merge remote-tracking branch 'upstream/develop' into 15a8 2021-09-01 14:09:02 +02:00
Laurent Destailleur
239599d1b1
Merge pull request #18564 from OPEN-DSI/new-agenda-ext-enable-default 
NEW can enable/disable external calendar by default
 2021-09-01 13:44:12 +02:00
Laurent Destailleur
9da82af74f
Merge pull request #18566 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2021-09-01 13:36:20 +02:00
Laurent Destailleur
fb0bd41178 Fix trans 2021-09-01 13:02:36 +02:00
Laurent Destailleur
bcd835ddbd Fix tooltips 2021-09-01 12:34:59 +02:00
Laurent Destailleur
a48473ba7a Missing trans exclude 2021-09-01 12:22:44 +02:00
Laurent Destailleur
da8dcaa0c9 Fix look and feel v14 2021-09-01 12:15:23 +02:00
Laurent Destailleur
dad4c34ec5 Debug module conference or booth 2021-08-31 23:51:45 +02:00
Laurent Destailleur
19f0db23df Fix scrutinizer bugs 2021-08-31 20:31:05 +02:00
Laurent Destailleur
f257d4372a Fix bad test 2021-08-31 20:21:20 +02:00
Scrutinizer Auto-Fixer
312ca95feb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-08-31 18:18:28 +00:00
Laurent Destailleur
d2d7b0defd Fix duplicate ; 2021-08-31 20:15:41 +02:00
lvessiller
163b12925a FIX stickler-ci 2021-08-31 18:37:34 +02:00
lvessiller
d64bc49d10 FIX stickler-ci 2021-08-31 18:35:56 +02:00
lvessiller
c367c1009b FIX stickler-ci 2021-08-31 18:34:26 +02:00
lvessiller
4781dca2c2 FIX stickler-ci 2021-08-31 18:30:11 +02:00
lvessiller
6c2cf4377a NEW can enable/disable external calendar by default 2021-08-31 18:14:16 +02:00
Laurent Destailleur
72131110e7 Fix protect public pages 2021-08-31 18:03:37 +02:00
Maxime Kohlhaas
d09d036f06
Fix supplier invoice pdf generation canelle 
Thirdparty wrongly fetched was causing errors on mass generation
 2021-08-31 16:10:55 +02:00
Laurent Destailleur
c7444865a1 Fix css 2021-08-31 13:16:37 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
bbf219fd7b FIX Export of website generates a package that contains a sql error 2021-08-31 13:09:52 +02:00
Vincent Dieltiens
a3f4ba11aa regroup BILL_SUPPLIER_VALIDATE actions 2021-08-31 12:47:32 +02:00
Vincent Dieltiens
19587fb88b Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition 2021-08-31 12:45:03 +02:00
Laurent Destailleur
cceba665a2 NEW Option "Add a link on the PDF to make the online payment" 2021-08-31 12:29:14 +02:00
Vincent Dieltiens
cd47bede37 FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject 2021-08-31 12:28:40 +02:00
Florian HENRY
673852c739 better line desc 2021-08-31 09:24:41 +02:00